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-pppoe.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-pppoe.c')
| -rw-r--r-- | epan/dissectors/packet-pppoe.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-pppoe.c b/epan/dissectors/packet-pppoe.c index cbeb8e1844..d6a5936070 100644 --- a/epan/dissectors/packet-pppoe.c +++ b/epan/dissectors/packet-pppoe.c @@ -466,12 +466,12 @@ dissect_pppoe_tags(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *tr if (poe_tag_length > 0) { proto_tree_add_item(pppoe_tree, hf_pppoed_tag_service_name, tvb, - tagstart+4, poe_tag_length, FALSE); + tagstart+4, poe_tag_length, ENC_ASCII|ENC_NA); } break; case PPPOE_TAG_AC_NAME: proto_tree_add_item(pppoe_tree, hf_pppoed_tag_ac_name, tvb, - tagstart+4, poe_tag_length, FALSE); + tagstart+4, poe_tag_length, ENC_ASCII|ENC_NA); /* Show AC-Name in info column */ if (check_col(pinfo->cinfo, COL_INFO)) { @@ -646,15 +646,15 @@ dissect_pppoe_tags(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *tr strings. */ case PPPOE_TAG_SVC_ERR: proto_tree_add_item(pppoe_tree, hf_pppoed_tag_service_name_error, tvb, - tagstart+4, poe_tag_length, FALSE); + tagstart+4, poe_tag_length, ENC_ASCII|ENC_NA); break; case PPPOE_TAG_AC_ERR: proto_tree_add_item(pppoe_tree, hf_pppoed_tag_ac_system_error, tvb, - tagstart+4, poe_tag_length, FALSE); + tagstart+4, poe_tag_length, ENC_ASCII|ENC_NA); break; case PPPOE_TAG_GENERIC_ERR: proto_tree_add_item(pppoe_tree, hf_pppoed_tag_generic_error, tvb, - tagstart+4, poe_tag_length, FALSE); + tagstart+4, poe_tag_length, ENC_ASCII|ENC_NA); break; /* Get out if see end-of-list tag */ |