diff options
| author | Martin Kaiser <wireshark@kaiser.cx> | 2014-01-23 22:20:35 +0000 |
|---|---|---|
| committer | Martin Kaiser <wireshark@kaiser.cx> | 2014-01-23 22:20:35 +0000 |
| commit | 81f3392d329306800f3e5cdd39c42395a3cdacdf (patch) | |
| tree | ddd5edbdbf05990b9c326d21d9a6ea30aec75097 /epan/dissectors/packet-dvbci.c | |
| parent | 089cedc784b4e161cd7bf1e9c8a20be82c975c56 (diff) | |
| download | wireshark-81f3392d329306800f3e5cdd39c42395a3cdacdf.tar.gz | |
country and language are ISO-8859-1
svn path=/trunk/; revision=54935
Diffstat (limited to 'epan/dissectors/packet-dvbci.c')
| -rw-r--r-- | epan/dissectors/packet-dvbci.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/epan/dissectors/packet-dvbci.c b/epan/dissectors/packet-dvbci.c index c1ba62e896..4ff1fbdd73 100644 --- a/epan/dissectors/packet-dvbci.c +++ b/epan/dissectors/packet-dvbci.c @@ -3046,16 +3046,19 @@ 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_ASCII|ENC_NA); + tvb, offset, tvb_reported_length_remaining(tvb, offset), + ENC_ISO_8859_1|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_ASCII|ENC_NA); + tvb, offset, tvb_reported_length_remaining(tvb, offset), + ENC_ISO_8859_1|ENC_NA); } /* both apdus' body is only a country code, this can be shared */ - str = tvb_get_string(wmem_packet_scope(), tvb, offset, - tvb_reported_length_remaining(tvb, offset)); + str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, + tvb_reported_length_remaining(tvb, offset), + ENC_ISO_8859_1|ENC_NA); if (str) col_append_sep_fstr(pinfo->cinfo, COL_INFO, ": ", "%s", str); } @@ -5389,11 +5392,11 @@ proto_register_dvbci(void) }, { &hf_dvbci_host_country, { "Host country", "dvb-ci.hlc.country", - FT_STRING, STR_ASCII, NULL, 0, NULL, HFILL } + FT_STRING, STR_UNICODE, NULL, 0, NULL, HFILL } }, { &hf_dvbci_host_language, { "Host language", "dvb-ci.hlc.language", - FT_STRING, STR_ASCII, NULL, 0, NULL, HFILL } + FT_STRING, STR_UNICODE, NULL, 0, NULL, HFILL } }, { &hf_dvbci_cup_type, { "CAM upgrade type", "dvb-ci.cup.type", |