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-pktc.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-pktc.c')
| -rw-r--r-- | epan/dissectors/packet-pktc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-pktc.c b/epan/dissectors/packet-pktc.c index 2d0ec43d44..7367fd78cb 100644 --- a/epan/dissectors/packet-pktc.c +++ b/epan/dissectors/packet-pktc.c @@ -216,7 +216,7 @@ dissect_pktc_app_specific_data(packet_info *pinfo _U_, proto_tree *parent_tree, offset+=1; /* usmUserName */ - proto_tree_add_item(tree, hf_pktc_usmUserName, tvb, offset, len, FALSE); + proto_tree_add_item(tree, hf_pktc_usmUserName, tvb, offset, len, ENC_ASCII|ENC_NA); offset+=len; break; @@ -324,7 +324,7 @@ dissect_pktc_wakeup(proto_tree *tree, tvbuff_t *tvb, int offset) /* Server Kerberos Principal Identifier */ string_len=tvb_strsize(tvb, offset); - proto_tree_add_item(tree, hf_pktc_server_principal, tvb, offset, string_len, FALSE); + proto_tree_add_item(tree, hf_pktc_server_principal, tvb, offset, string_len, ENC_ASCII|ENC_NA); offset+=string_len; return offset; @@ -427,7 +427,7 @@ dissect_pktc_rekey(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offs /* Server Kerberos Principal Identifier */ string_len=tvb_strsize(tvb, offset); - proto_tree_add_item(tree, hf_pktc_server_principal, tvb, offset, string_len, FALSE); + proto_tree_add_item(tree, hf_pktc_server_principal, tvb, offset, string_len, ENC_ASCII|ENC_NA); offset+=string_len; /* Timestamp: YYMMDDhhmmssZ */ @@ -525,7 +525,7 @@ dissect_pktc_mtafqdn_krbsafeuserdata(packet_info *pinfo, tvbuff_t *tvb, proto_tr string_len = tvb_length_remaining(tvb, offset) - 4; if (string_len <= 0) THROW(ReportedBoundsError); - proto_tree_add_item(tree, hf_pktc_mtafqdn_fqdn, tvb, offset, string_len, FALSE); + proto_tree_add_item(tree, hf_pktc_mtafqdn_fqdn, tvb, offset, string_len, ENC_ASCII|ENC_NA); offset+=string_len; /* MTA IP address */ |