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-vtp.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-vtp.c')
| -rw-r--r-- | epan/dissectors/packet-vtp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-vtp.c b/epan/dissectors/packet-vtp.c index 3157731a40..cadb8136ce 100644 --- a/epan/dissectors/packet-vtp.c +++ b/epan/dissectors/packet-vtp.c @@ -169,7 +169,7 @@ dissect_vtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 1; proto_tree_add_item(vtp_tree, hf_vtp_md, tvb, offset, - 32, FALSE); + 32, ENC_ASCII|ENC_NA); offset += 32; proto_tree_add_item(vtp_tree, hf_vtp_conf_rev_num, tvb, @@ -203,7 +203,7 @@ dissect_vtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 1; proto_tree_add_item(vtp_tree, hf_vtp_md, tvb, offset, - 32, FALSE); + 32, ENC_ASCII|ENC_NA); offset += 32; proto_tree_add_item(vtp_tree, hf_vtp_conf_rev_num, tvb, @@ -228,7 +228,7 @@ dissect_vtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 1; proto_tree_add_item(vtp_tree, hf_vtp_md, tvb, offset, - 32, FALSE); + 32, ENC_ASCII|ENC_NA); offset += 32; proto_tree_add_item(vtp_tree, hf_vtp_start_value, tvb, @@ -244,7 +244,7 @@ dissect_vtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 1; proto_tree_add_item(vtp_tree, hf_vtp_md, tvb, offset, - 32, FALSE); + 32, ENC_ASCII|ENC_NA); offset += 32; proto_tree_add_item(vtp_tree, hf_vtp_pruning_first_vid, tvb, offset, @@ -398,7 +398,7 @@ dissect_vlan_info(tvbuff_t *tvb, int offset, proto_tree *tree) if (vlan_info_left < vlan_name_len) return -1; proto_tree_add_item(vlan_info_tree, hf_vtp_vlan_name, tvb, offset, - vlan_name_len, FALSE); + vlan_name_len, ENC_ASCII|ENC_NA); offset += vlan_name_len; vlan_info_left -= vlan_name_len; |