diff options
| author | Bill Meier <wmeier@newsguy.com> | 2011-10-15 18:46:26 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2011-10-15 18:46:26 +0000 |
| commit | 126aa8539380e6b0b465b48d30f349b76afdc489 (patch) | |
| tree | 16b43738b14751d74a8ca8e4de803ba0b6c87196 /epan/dissectors/packet-fcdns.c | |
| parent | 4c9bb81ad7b0f609fa236c808a1ab9ef6cab5a79 (diff) | |
Convert proto_tree_add_item() 'encoding' arg for field types FT_STRING, FT_STRINGZ, FT_UINT_STRING as follows:
1. If there's no character encoding (ENC_ASCII, ...) specified
then use ENC_ASCII.
2. For all but FT_UINT_STRING, always use ENC_NA
(replacing any existing True/1/FALSE/0
/ENC_BIG_ENDIAN/ENC_LITTLE_ENDIAN).
svn path=/trunk/; revision=39426
Diffstat (limited to 'epan/dissectors/packet-fcdns.c')
| -rw-r--r-- | epan/dissectors/packet-fcdns.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/epan/dissectors/packet-fcdns.c b/epan/dissectors/packet-fcdns.c index f9ca387b05..ec3da26486 100644 --- a/epan/dissectors/packet-fcdns.c +++ b/epan/dissectors/packet-fcdns.c @@ -459,7 +459,7 @@ dissect_fcdns_ganxt (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq) if (len) { proto_tree_add_item (req_tree, hf_fcdns_rply_spname, tvb, - offset+13, len, 0); + offset+13, len, ENC_ASCII|ENC_NA); } if (tvb_offset_exists (tvb, 292)) { @@ -473,7 +473,7 @@ dissect_fcdns_ganxt (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq) offset+276, 1, ENC_BIG_ENDIAN); if (len) { proto_tree_add_item (req_tree, hf_fcdns_rply_sname, tvb, - offset+277, len, 0); + offset+277, len, ENC_ASCII|ENC_NA); } } if (tvb_offset_exists (tvb, 556)) { @@ -586,7 +586,7 @@ dissect_fcdns_gspnid (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq) proto_tree_add_item (req_tree, hf_fcdns_rply_spnamelen, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item (req_tree, hf_fcdns_rply_spname, tvb, - offset+1, len, ENC_NA); + offset+1, len, ENC_ASCII|ENC_NA); } } } @@ -789,7 +789,7 @@ dissect_fcdns_gsnnnn (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq) proto_tree_add_item (req_tree, hf_fcdns_rply_snamelen, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item (req_tree, hf_fcdns_rply_sname, tvb, - offset+1, len, 0); + offset+1, len, ENC_ASCII|ENC_NA); } } } @@ -1046,7 +1046,7 @@ dissect_fcdns_rspnid (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq) len = tvb_get_guint8 (tvb, offset+4); proto_tree_add_item (req_tree, hf_fcdns_req_spname, tvb, offset+5, - len, 0); + len, ENC_ASCII|ENC_NA); } } @@ -1083,7 +1083,7 @@ dissect_fcdns_rfdid (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq) proto_tree_add_item (req_tree, hf_fcdns_req_fdesclen, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item (req_tree, hf_fcdns_req_fdesc, tvb, offset+1, - len, 0); + len, ENC_ASCII|ENC_NA); offset += 256; len -= 256; } @@ -1128,7 +1128,7 @@ dissect_fcdns_rsnnnn (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq) proto_tree_add_item (req_tree, hf_fcdns_req_snamelen, tvb, offset+8, 1, ENC_BIG_ENDIAN); proto_tree_add_item (req_tree, hf_fcdns_req_sname, tvb, offset+9, - len, 0); + len, ENC_ASCII|ENC_NA); } } @@ -1227,7 +1227,7 @@ dissect_fcdns_swils_entries (tvbuff_t *tvb, proto_tree *tree, int offset) proto_tree_add_item (tree, hf_fcdns_rply_spnamelen, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_fcdns_rply_spname, tvb, - offset+1, len, 0); + offset+1, len, ENC_ASCII|ENC_NA); offset += 256; } proto_tree_add_string (tree, hf_fcdns_rply_nname, tvb, offset, 8, @@ -1238,7 +1238,7 @@ dissect_fcdns_swils_entries (tvbuff_t *tvb, proto_tree *tree, int offset) proto_tree_add_item (tree, hf_fcdns_rply_snamelen, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_fcdns_rply_sname, tvb, - offset+1, len, 0); + offset+1, len, ENC_ASCII|ENC_NA); offset += 256; } proto_tree_add_item (tree, hf_fcdns_rply_ipa, tvb, offset, 8, ENC_NA); @@ -1396,7 +1396,7 @@ dissect_fcdns_gezn (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq) proto_tree_add_text (req_tree, tvb, offset, 1, "Name Length: %d", str_len); proto_tree_add_item (req_tree, hf_fcdns_zonenm, tvb, offset+3, - str_len, ENC_NA); + str_len, ENC_ASCII|ENC_NA); } } else { |