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-pptp.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-pptp.c')
| -rw-r--r-- | epan/dissectors/packet-pptp.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/epan/dissectors/packet-pptp.c b/epan/dissectors/packet-pptp.c index 97bb09af4c..e5e9c90a2a 100644 --- a/epan/dissectors/packet-pptp.c +++ b/epan/dissectors/packet-pptp.c @@ -243,10 +243,10 @@ dissect_cntrl_req(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_item(tree, hf_pptp_firmware_revision, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_pptp_host_name, tvb, offset, 64, FALSE); + proto_tree_add_item(tree, hf_pptp_host_name, tvb, offset, 64, ENC_ASCII|ENC_NA); offset += 64; - proto_tree_add_item(tree, hf_pptp_vendor_name, tvb, offset, 64, FALSE); + proto_tree_add_item(tree, hf_pptp_vendor_name, tvb, offset, 64, ENC_ASCII|ENC_NA); } static void @@ -277,10 +277,10 @@ dissect_cntrl_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_item(tree, hf_pptp_firmware_revision, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_pptp_host_name, tvb, offset, 64, FALSE); + proto_tree_add_item(tree, hf_pptp_host_name, tvb, offset, 64, ENC_ASCII|ENC_NA); offset += 64; - proto_tree_add_item(tree, hf_pptp_vendor_name, tvb, offset, 64, FALSE); + proto_tree_add_item(tree, hf_pptp_vendor_name, tvb, offset, 64, ENC_ASCII|ENC_NA); } @@ -370,10 +370,10 @@ dissect_out_req(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_item(tree, hf_pptp_reserved, tvb, offset, 2, ENC_NA); offset += 2; - proto_tree_add_item(tree, hf_pptp_phone_number, tvb, offset, 64, FALSE); + proto_tree_add_item(tree, hf_pptp_phone_number, tvb, offset, 64, ENC_ASCII|ENC_NA); offset += 64; - proto_tree_add_item(tree, hf_pptp_subaddress, tvb, offset, 64, FALSE); + proto_tree_add_item(tree, hf_pptp_subaddress, tvb, offset, 64, ENC_ASCII|ENC_NA); } static void @@ -431,13 +431,13 @@ dissect_in_req(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_item(tree, hf_pptp_dialing_number_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_pptp_dialed_number, tvb, offset, 64, FALSE); + proto_tree_add_item(tree, hf_pptp_dialed_number, tvb, offset, 64, ENC_ASCII|ENC_NA); offset += 64; - proto_tree_add_item(tree, hf_pptp_dialing_number, tvb, offset, 64, FALSE); + proto_tree_add_item(tree, hf_pptp_dialing_number, tvb, offset, 64, ENC_ASCII|ENC_NA); offset += 64; - proto_tree_add_item(tree, hf_pptp_subaddress, tvb, offset, 64, FALSE); + proto_tree_add_item(tree, hf_pptp_subaddress, tvb, offset, 64, ENC_ASCII|ENC_NA); } static void @@ -516,7 +516,7 @@ dissect_disc_notify(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_item(tree, hf_pptp_reserved, tvb, offset, 2, ENC_NA); offset += 2; - proto_tree_add_item(tree, hf_pptp_call_statistics, tvb, offset, 64, FALSE); + proto_tree_add_item(tree, hf_pptp_call_statistics, tvb, offset, 64, ENC_ASCII|ENC_NA); } static void |