diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2012-06-19 19:25:01 +0000 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2012-06-19 19:25:01 +0000 |
| commit | fe8280ce5ecf2b35c5667131239b66dc871f61f4 (patch) | |
| tree | d93a5f280227ddb290ff7511e42c225c7d09eecb | |
| parent | d50353013b525564a97e5b2d73dc95d9bf26982d (diff) | |
Use tvb_get_ephemeral_string_enc() in combination with proto_tree_add_unicode_string() (as recommended by Jakub on the mailing list)
svn path=/trunk/; revision=43385
| -rw-r--r-- | asn1/lte-rrc/lte-rrc.cnf | 2 | ||||
| -rw-r--r-- | asn1/rrc/rrc.cnf | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-lte-rrc.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-rrc.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/asn1/lte-rrc/lte-rrc.cnf b/asn1/lte-rrc/lte-rrc.cnf index ba1c541ea0..d7b27e490b 100644 --- a/asn1/lte-rrc/lte-rrc.cnf +++ b/asn1/lte-rrc/lte-rrc.cnf @@ -727,7 +727,7 @@ SystemInformationBlockType9/hnb-Name TYPE=FT_STRING DISPLAY=BASE_NONE %(DEFAULT_BODY)s proto_tree_add_unicode_string(tree, hf_index, hnb_name_tvb, 0, -1, - tvb_get_ephemeral_string(hnb_name_tvb, 0, tvb_length(hnb_name_tvb))); + tvb_get_ephemeral_string_enc(hnb_name_tvb, 0, tvb_length(hnb_name_tvb), ENC_UTF_8 | ENC_NA)); #.FN_BODY RRCConnectionReject-r8-IEs/waitTime %(DEFAULT_BODY)s diff --git a/asn1/rrc/rrc.cnf b/asn1/rrc/rrc.cnf index 7b3381415a..96f6593482 100644 --- a/asn1/rrc/rrc.cnf +++ b/asn1/rrc/rrc.cnf @@ -604,7 +604,7 @@ HNBName TYPE=FT_STRING DISPLAY=BASE_NONE %(DEFAULT_BODY)s proto_tree_add_unicode_string(tree, hf_index, hnbname_tvb, 0, -1, - tvb_get_ephemeral_string(hnbname_tvb, 0, tvb_length(hnbname_tvb))); + tvb_get_ephemeral_string_enc(hnbname_tvb, 0, tvb_length(hnbname_tvb), ENC_UTF_8 | ENC_NA)); #.FN_BODY CN-DomainIdentity VAL_PTR = (guint32*)(&rrc_nas_sys_info_gsm_map_type) %(DEFAULT_BODY)s diff --git a/epan/dissectors/packet-lte-rrc.c b/epan/dissectors/packet-lte-rrc.c index 1e0bef6b90..0e9621d209 100644 --- a/epan/dissectors/packet-lte-rrc.c +++ b/epan/dissectors/packet-lte-rrc.c @@ -7726,7 +7726,7 @@ dissect_lte_rrc_T_hnb_Name(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ 1, 48, FALSE, &hnb_name_tvb); proto_tree_add_unicode_string(tree, hf_index, hnb_name_tvb, 0, -1, - tvb_get_ephemeral_string(hnb_name_tvb, 0, tvb_length(hnb_name_tvb))); + tvb_get_ephemeral_string_enc(hnb_name_tvb, 0, tvb_length(hnb_name_tvb), ENC_UTF_8 | ENC_NA)); return offset; diff --git a/epan/dissectors/packet-rrc.c b/epan/dissectors/packet-rrc.c index 865d817c45..71cc75e7bd 100644 --- a/epan/dissectors/packet-rrc.c +++ b/epan/dissectors/packet-rrc.c @@ -121020,7 +121020,7 @@ dissect_rrc_HNBName(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pro 1, maxHNBNameSize, FALSE, &hnbname_tvb); proto_tree_add_unicode_string(tree, hf_index, hnbname_tvb, 0, -1, - tvb_get_ephemeral_string(hnbname_tvb, 0, tvb_length(hnbname_tvb))); + tvb_get_ephemeral_string_enc(hnbname_tvb, 0, tvb_length(hnbname_tvb), ENC_UTF_8 | ENC_NA)); |