diff options
| author | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-10-15 18:46:26 +0000 |
|---|---|---|
| committer | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-10-15 18:46:26 +0000 |
| commit | 324bfeb5e255e490809e91ccd615d7d9b538984c (patch) | |
| tree | 16b43738b14751d74a8ca8e4de803ba0b6c87196 /epan/dissectors/packet-dvbci.c | |
| parent | 7b25ae429b0dab3ed9566f8a9d1a069216bc69e4 (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).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39426 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-dvbci.c')
| -rw-r--r-- | epan/dissectors/packet-dvbci.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-dvbci.c b/epan/dissectors/packet-dvbci.c index 616638b765..f13303cb87 100644 --- a/epan/dissectors/packet-dvbci.c +++ b/epan/dissectors/packet-dvbci.c @@ -1430,7 +1430,7 @@ dissect_conn_desc(tvbuff_t *tvb, gint offset, /* everything from here to the descriptor's end is a hostname */ hostname_len = (offset_body+len_field)-offset; proto_tree_add_item(conn_desc_tree, hf_dvbci_lsc_hostname, - tvb, offset, hostname_len, ENC_ASCII|ENC_BIG_ENDIAN); + tvb, offset, hostname_len, ENC_ASCII|ENC_NA); offset += hostname_len; } else { proto_tree_add_text(conn_desc_tree, tvb, @@ -2266,11 +2266,11 @@ dissect_dvbci_payload_hlc(guint32 tag, gint len_field _U_, if (tag==T_HOST_COUNTRY) { proto_tree_add_item(tree, hf_dvbci_host_country, - tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_BIG_ENDIAN); + tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_ASCII|ENC_NA); } else if (tag==T_HOST_LANGUAGE) { proto_tree_add_item(tree, hf_dvbci_host_language, - tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_BIG_ENDIAN); + tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_ASCII|ENC_NA); } /* both apdus' body is only a country code, this can be shared */ @@ -2515,7 +2515,7 @@ dissect_dvbci_payload_cc(guint32 tag, gint len_field _U_, case T_CC_PIN_MMI_REQ: proto_tree_add_item(tree, hf_dvbci_pincode, tvb, offset, tvb_reported_length_remaining(tvb, offset), - ENC_ASCII|ENC_BIG_ENDIAN); + ENC_ASCII|ENC_NA); break; default: break; @@ -2551,7 +2551,7 @@ dissect_dvbci_payload_ami(guint32 tag, gint len_field _U_, "Initial Object length %d", init_obj_len); offset++; proto_tree_add_item(tree, hf_dvbci_app_dom_id, - tvb, offset, app_dom_id_len, ENC_BIG_ENDIAN); + tvb, offset, app_dom_id_len, ENC_ASCII|ENC_NA); app_dom_id = tvb_get_ephemeral_string(tvb, offset, app_dom_id_len); if (app_dom_id) { col_append_sep_fstr(pinfo->cinfo, COL_INFO, " ", @@ -2559,7 +2559,7 @@ dissect_dvbci_payload_ami(guint32 tag, gint len_field _U_, } offset += app_dom_id_len; proto_tree_add_item(tree, hf_dvbci_init_obj, - tvb, offset, init_obj_len, ENC_BIG_ENDIAN); + tvb, offset, init_obj_len, ENC_ASCII|ENC_NA); break; case T_REQUEST_START_ACK: ack_code = tvb_get_guint8(tvb, offset); |