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-dcerpc-epm.c | |
| parent | 4c9bb81ad7b0f609fa236c808a1ab9ef6cab5a79 (diff) | |
| download | wireshark-126aa8539380e6b0b465b48d30f349b76afdc489.tar.gz | |
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-dcerpc-epm.c')
| -rw-r--r-- | epan/dissectors/packet-dcerpc-epm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-dcerpc-epm.c b/epan/dissectors/packet-dcerpc-epm.c index ac2f7b2b05..d1c551f54a 100644 --- a/epan/dissectors/packet-dcerpc-epm.c +++ b/epan/dissectors/packet-dcerpc-epm.c @@ -187,7 +187,7 @@ epm_dissect_ept_entry_t(tvbuff_t *tvb, int offset, offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_epm_ann_len, &len); str=tvb_get_ephemeral_string(tvb, offset, len); - proto_tree_add_item(tree, hf_epm_annotation, tvb, offset, len, TRUE); + proto_tree_add_item(tree, hf_epm_annotation, tvb, offset, len, ENC_ASCII|ENC_NA); offset += len; if(str&&str[0]){ @@ -437,17 +437,17 @@ epm_dissect_tower_data (tvbuff_t *tvb, int offset, break; case PROTO_ID_NAMED_PIPES: /* \\PIPE\xxx named pipe */ - proto_tree_add_item(tr, hf_epm_proto_named_pipes, tvb, offset, len, TRUE); + proto_tree_add_item(tr, hf_epm_proto_named_pipes, tvb, offset, len, ENC_ASCII|ENC_NA); proto_item_append_text(tr, "NamedPipe:%s", tvb_get_ephemeral_string(tvb, offset, len)); break; case PROTO_ID_NAMED_PIPES_2: /* PIPENAME named pipe */ - proto_tree_add_item(tr, hf_epm_proto_named_pipes, tvb, offset, len, TRUE); + proto_tree_add_item(tr, hf_epm_proto_named_pipes, tvb, offset, len, ENC_ASCII|ENC_NA); proto_item_append_text(tr, "PIPE:%s", tvb_get_ephemeral_string(tvb, offset, len)); break; case PROTO_ID_NETBIOS: /* \\NETBIOS netbios name */ - proto_tree_add_item(tr, hf_epm_proto_netbios_name, tvb, offset, len, TRUE); + proto_tree_add_item(tr, hf_epm_proto_netbios_name, tvb, offset, len, ENC_ASCII|ENC_NA); proto_item_append_text(tr, "NetBIOS:%s", tvb_get_ephemeral_string(tvb, offset, len)); break; case PROTO_ID_HTTP: /* RPC over HTTP */ |