diff options
author | Pascal Quantin <pascal.quantin@gmail.com> | 2013-12-08 20:03:15 +0000 |
---|---|---|
committer | Pascal Quantin <pascal.quantin@gmail.com> | 2013-12-08 20:03:15 +0000 |
commit | 93398e794e9afb2e304d27d86287db3054724755 (patch) | |
tree | b28073e4314ca33a4058bfd392df1642576a1f40 /epan | |
parent | 2dd25c2c482e573a26db19db995dd171c7667cea (diff) |
Use STR_UNICODE display instead of proto_tree_add_unicode_string() in the remaining dissectors
svn path=/trunk/; revision=53867
Diffstat (limited to 'epan')
-rw-r--r-- | epan/dissectors/packet-ansi_637.c | 30 | ||||
-rw-r--r-- | epan/dissectors/packet-etsi_card_app_toolkit.c | 16 | ||||
-rw-r--r-- | epan/dissectors/packet-gmr1_rr.c | 6 | ||||
-rw-r--r-- | epan/dissectors/packet-gsm_sms.c | 23 | ||||
-rw-r--r-- | epan/dissectors/packet-lte-rrc.c | 5 | ||||
-rw-r--r-- | epan/dissectors/packet-ptpip.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-rrc.c | 45 |
7 files changed, 62 insertions, 67 deletions
diff --git a/epan/dissectors/packet-ansi_637.c b/epan/dissectors/packet-ansi_637.c index 62a577412e..b2d28c25b4 100644 --- a/epan/dissectors/packet-ansi_637.c +++ b/epan/dissectors/packet-ansi_637.c @@ -597,8 +597,8 @@ tele_param_user_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint decode_7_bits(tvb_out, &offset, num_fields, &oct, &bit, ansi_637_bigbuf); - proto_tree_add_unicode_string(tree, hf_ansi_637_tele_user_data_text, tvb_out, saved_offset, - offset - saved_offset, ansi_637_bigbuf); + proto_tree_add_string(tree, hf_ansi_637_tele_user_data_text, tvb_out, saved_offset, + offset - saved_offset, ansi_637_bigbuf); switch (bit) { @@ -658,8 +658,8 @@ tele_param_user_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint out_len = decode_7_bits(tvb_out, &offset, num_fields, &oct, &bit, ansi_637_bigbuf); IA5_7BIT_decode(ia5_637_bigbuf, ansi_637_bigbuf, out_len); - proto_tree_add_unicode_string(tree, hf_ansi_637_tele_user_data_text, tvb_out, saved_offset, - offset - saved_offset, ia5_637_bigbuf); + proto_tree_add_string(tree, hf_ansi_637_tele_user_data_text, tvb_out, + saved_offset, offset - saved_offset, ia5_637_bigbuf); } else if (encoding == 0x04)/* UCS-2 (not UTF-16?) */ @@ -686,8 +686,8 @@ tele_param_user_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint utf8_text = g_convert_with_iconv(tvb_get_ptr(tvb_out, offset, required_octs), required_octs , cd , NULL , NULL , &l_conv_error); if (!l_conv_error) { - proto_tree_add_unicode_string(tree, hf_ansi_637_tele_user_data_text, tvb_out, offset, - required_octs, utf8_text); + proto_tree_add_string(tree, hf_ansi_637_tele_user_data_text, + tvb_out, offset, required_octs, utf8_text); } else { @@ -722,8 +722,8 @@ tele_param_user_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint utf8_text = g_convert_with_iconv(tvb_get_ptr(tvb_out, offset, num_fields), num_fields , cd , NULL , NULL , &l_conv_error); if (!l_conv_error) { - proto_tree_add_unicode_string(tree, hf_ansi_637_tele_user_data_text, tvb_out, offset, - num_fields, utf8_text); + proto_tree_add_string(tree, hf_ansi_637_tele_user_data_text, + tvb_out, offset, num_fields, utf8_text); } else { @@ -758,8 +758,8 @@ tele_param_user_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint utf8_text = g_convert_with_iconv(tvb_get_ptr(tvb_out, offset, num_fields) , num_fields , cd , NULL , NULL , &l_conv_error); if (!l_conv_error) { - proto_tree_add_unicode_string(tree, hf_ansi_637_tele_user_data_text, tvb_out, offset, - num_fields, utf8_text); + proto_tree_add_string(tree, hf_ansi_637_tele_user_data_text, + tvb_out, offset, num_fields, utf8_text); } else { @@ -807,8 +807,8 @@ tele_param_user_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint tvb_get_ptr(tvb_out, offset, required_octs), gsm_637_bigbuf); gsm_637_bigbuf[out_len] = '\0'; - proto_tree_add_unicode_string(tree, hf_ansi_637_tele_user_data_text, tvb_out, offset, - required_octs, gsm_sms_chars_to_utf8(gsm_637_bigbuf, num_fields)); + proto_tree_add_string(tree, hf_ansi_637_tele_user_data_text, tvb_out, offset, + required_octs, gsm_sms_chars_to_utf8(gsm_637_bigbuf, num_fields)); } else if (encoding == 0x10)/* KSC5601 (Korean) */ { @@ -834,8 +834,8 @@ tele_param_user_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint utf8_text = g_convert_with_iconv(tvb_get_ptr(tvb_out, offset, num_fields), num_fields , cd , NULL , NULL , &l_conv_error); if (!l_conv_error) { - proto_tree_add_unicode_string(tree, hf_ansi_637_tele_user_data_text, tvb_out, offset, - num_fields, utf8_text); + proto_tree_add_string(tree, hf_ansi_637_tele_user_data_text, + tvb_out, offset, num_fields, utf8_text); } else { @@ -2324,7 +2324,7 @@ proto_register_ansi_637(void) NULL, HFILL }}, { &hf_ansi_637_tele_user_data_text, { "Encoded user data", "ansi_637_tele.user_data.text", - FT_STRING, BASE_NONE, NULL, 0, + FT_STRING, STR_UNICODE, NULL, 0, NULL, HFILL }}, }; diff --git a/epan/dissectors/packet-etsi_card_app_toolkit.c b/epan/dissectors/packet-etsi_card_app_toolkit.c index 1274fbed2a..c8b8164737 100644 --- a/epan/dissectors/packet-etsi_card_app_toolkit.c +++ b/epan/dissectors/packet-etsi_card_app_toolkit.c @@ -1071,7 +1071,7 @@ dissect_cat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) out_len = gsm_sms_char_7bit_unpack(0, len-1, sizeof(msgbuf), tvb_get_ptr(tvb, pos+1, len-1), msgbuf); msgbuf[out_len] = '\0'; - proto_tree_add_unicode_string(elem_tree, hf_ctlv_text_string, tvb, pos+1, + proto_tree_add_string(elem_tree, hf_ctlv_text_string, tvb, pos+1, len-1, gsm_sms_chars_to_utf8(msgbuf, out_len)); } break; @@ -1087,7 +1087,7 @@ dissect_cat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) if ((cd = g_iconv_open("UTF-8","UCS-2BE")) != (GIConv)-1) { utf8_text = g_convert_with_iconv(tvb_get_ptr(tvb, pos+1, len-1), len-1, cd, NULL, NULL, &l_conv_error); if(!l_conv_error) { - proto_tree_add_unicode_string(elem_tree, hf_ctlv_text_string, tvb, + proto_tree_add_string(elem_tree, hf_ctlv_text_string, tvb, pos+1, len-1, utf8_text); } else { proto_tree_add_text(elem_tree, tvb, pos+1, len-1, "Failed to decode UCS2"); @@ -1294,8 +1294,7 @@ dissect_cat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) break; case 0x76: /* Geographical Location Parameters / IARI */ if (ims_event) { - proto_tree_add_unicode_string(elem_tree, hf_ctlv_iari, tvb, pos, len, - tvb_get_string_enc(wmem_packet_scope(), tvb, pos, len, ENC_UTF_8 | ENC_NA)); + proto_tree_add_item(elem_tree, hf_ctlv_iari, tvb, pos, len, ENC_UTF_8 | ENC_NA); } break; case 0x77: /* GAD Shapes / IMPU list */ @@ -1304,8 +1303,7 @@ dissect_cat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) while (i < len) { if (tvb_get_guint8(tvb, pos+i) == 0x80) { g8 = tvb_get_guint8(tvb, pos+i+1); - proto_tree_add_unicode_string(elem_tree, hf_ctlv_impu, tvb, pos+i+2, g8, - tvb_get_string_enc(wmem_packet_scope(), tvb, pos+i+2, g8, ENC_UTF_8 | ENC_NA)); + proto_tree_add_item(elem_tree, hf_ctlv_impu, tvb, pos+i+2, g8, ENC_UTF_8 | ENC_NA); i += 2+g8; } else { break; @@ -1450,7 +1448,7 @@ proto_register_card_app_toolkit(void) }, { &hf_ctlv_text_string, { "Text String", "etsi_cat.comp_tlv.text", - FT_STRING, BASE_NONE, NULL, 0, + FT_STRING, STR_UNICODE, NULL, 0, NULL, HFILL }, }, { &hf_ctlv_event, @@ -1770,12 +1768,12 @@ proto_register_card_app_toolkit(void) }, { &hf_ctlv_iari, { "IARI", "etsi_cat.comp_tlv.iari", - FT_STRING, BASE_NONE, NULL, 0, + FT_STRING, STR_UNICODE, NULL, 0, NULL, HFILL }, }, { &hf_ctlv_impu, { "IMPU", "etsi_cat.comp_tlv.impu", - FT_STRING, BASE_NONE, NULL, 0, + FT_STRING, STR_UNICODE, NULL, 0, NULL, HFILL }, }, { &hf_ctlv_ims_status_code, diff --git a/epan/dissectors/packet-gmr1_rr.c b/epan/dissectors/packet-gmr1_rr.c index 215621b9b0..19a91e8dd1 100644 --- a/epan/dissectors/packet-gmr1_rr.c +++ b/epan/dissectors/packet-gmr1_rr.c @@ -663,8 +663,8 @@ GMR1_IE_FUNC(gmr1_ie_rr_pos_display) out_len = gsm_sms_char_7bit_unpack(0, 11, 12, txt_packed, txt_unpacked); /* Display it */ - proto_tree_add_unicode_string(tree, hf_rr_pos_display_text, - tvb, offset, 11, gsm_sms_chars_to_utf8(txt_unpacked, out_len)); + proto_tree_add_string(tree, hf_rr_pos_display_text, tvb, offset, 11, + gsm_sms_chars_to_utf8(txt_unpacked, out_len)); return 11; } @@ -2082,7 +2082,7 @@ proto_register_gmr1_rr(void) }, { &hf_rr_pos_display_text, { "Country and Region name", "gmr1.rr.pos_display.text", - FT_STRING, BASE_NONE, NULL, 0x00, + FT_STRING, STR_UNICODE, NULL, 0x00, NULL, HFILL } }, { &hf_rr_pos_upd_info_v, diff --git a/epan/dissectors/packet-gsm_sms.c b/epan/dissectors/packet-gsm_sms.c index 07a43a6b91..edfabf3377 100644 --- a/epan/dissectors/packet-gsm_sms.c +++ b/epan/dissectors/packet-gsm_sms.c @@ -2790,9 +2790,8 @@ dis_field_ud(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 offset (udl > SMS_MAX_MESSAGE_SIZE ? SMS_MAX_MESSAGE_SIZE : udl), tvb_get_ptr(tvb , offset , length) , messagebuf); messagebuf[out_len] = '\0'; - proto_tree_add_unicode_string(subtree, hf_gsm_sms_text, tvb, offset, - length, - gsm_sms_chars_to_utf8(messagebuf, out_len)); + proto_tree_add_string(subtree, hf_gsm_sms_text, tvb, offset, length, + gsm_sms_chars_to_utf8(messagebuf, out_len)); } else { @@ -2813,9 +2812,9 @@ dis_field_ud(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 offset tvb_get_ptr(sm_tvb, total_sms_len, p_frag_params->length), messagebuf); messagebuf[out_len] = '\0'; - proto_tree_add_unicode_string(subtree, hf_gsm_sms_text, sm_tvb, - total_sms_len, p_frag_params->length, - gsm_sms_chars_to_utf8(messagebuf, out_len)); + proto_tree_add_string(subtree, hf_gsm_sms_text, sm_tvb, + total_sms_len, p_frag_params->length, + gsm_sms_chars_to_utf8(messagebuf, out_len)); total_sms_len += p_frag_params->length; } @@ -2850,8 +2849,8 @@ dis_field_ud(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 offset /* Show unreassembled SMS */ utf8_text = g_convert_with_iconv(tvb_get_ptr(sm_tvb, 0, rep_len), rep_len , cd , NULL , NULL , &l_conv_error); if(!l_conv_error) { - ucs2_item = proto_tree_add_unicode_string(subtree, hf_gsm_sms_text, tvb, - offset, length, utf8_text); + ucs2_item = proto_tree_add_string(subtree, hf_gsm_sms_text, tvb, + offset, length, utf8_text); } else { ucs2_item = proto_tree_add_text(subtree, tvb, offset, length, "Failed to decode UCS2!"); } @@ -2882,9 +2881,9 @@ dis_field_ud(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 offset } else length_ucs2 = len_sms % MAX_SMS_FRAG_LEN; - ucs2_item = proto_tree_add_unicode_string(subtree, hf_gsm_sms_text, sm_tvb, - i * MAX_SMS_FRAG_LEN, length_ucs2, - &utf8_text[i * MAX_SMS_FRAG_LEN]); + ucs2_item = proto_tree_add_string(subtree, hf_gsm_sms_text, sm_tvb, + i * MAX_SMS_FRAG_LEN, length_ucs2, + &utf8_text[i * MAX_SMS_FRAG_LEN]); PROTO_ITEM_SET_GENERATED(ucs2_item); /* return the save byte to utf8 buffer*/ @@ -3767,7 +3766,7 @@ proto_register_gsm_sms(void) }, { &hf_gsm_sms_text, { "SMS text", "gsm_sms.sms_text", - FT_STRING, BASE_NONE, NULL, 0x00, + FT_STRING, STR_UNICODE, NULL, 0x00, "The text of the SMS", HFILL } }, { &hf_gsm_sms_tp_fail_cause, diff --git a/epan/dissectors/packet-lte-rrc.c b/epan/dissectors/packet-lte-rrc.c index 70d92d88d9..8b73eb0466 100644 --- a/epan/dissectors/packet-lte-rrc.c +++ b/epan/dissectors/packet-lte-rrc.c @@ -9359,8 +9359,7 @@ dissect_lte_rrc_T_hnb_Name(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ offset = dissect_per_octet_string(tvb, offset, actx, tree, -1, 1, 48, FALSE, &hnb_name_tvb); - actx->created_item = proto_tree_add_unicode_string(tree, hf_index, hnb_name_tvb, 0, -1, - tvb_get_string_enc(wmem_packet_scope(), hnb_name_tvb, 0, tvb_length(hnb_name_tvb), ENC_UTF_8 | ENC_NA)); + actx->created_item = proto_tree_add_item(tree, hf_index, hnb_name_tvb, 0, -1, ENC_UTF_8|ENC_NA); return offset; @@ -38485,7 +38484,7 @@ void proto_register_lte_rrc(void) { "T_csfb_DualRxTxSupport_r11", HFILL }}, { &hf_lte_rrc_hnb_Name, { "hnb-Name", "lte-rrc.hnb_Name", - FT_STRING, BASE_NONE, NULL, 0, + FT_STRING, STR_UNICODE, NULL, 0, NULL, HFILL }}, { &hf_lte_rrc_messageIdentifier, { "messageIdentifier", "lte-rrc.messageIdentifier", diff --git a/epan/dissectors/packet-ptpip.c b/epan/dissectors/packet-ptpip.c index 71f4065e3c..ce654bc8aa 100644 --- a/epan/dissectors/packet-ptpip.c +++ b/epan/dissectors/packet-ptpip.c @@ -866,7 +866,7 @@ void dissect_ptpIP_unicode_name(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t nameLen = tvb_unicode_strsize(tvb, *offset); name = tvb_get_unicode_string(wmem_packet_scope(), tvb, *offset, nameLen, ENC_LITTLE_ENDIAN); - proto_tree_add_unicode_string(tree, hf_ptpIP_name, tvb, *offset, nameLen, name); + proto_tree_add_string(tree, hf_ptpIP_name, tvb, *offset, nameLen, name); *offset += nameLen; col_append_fstr( pinfo->cinfo, @@ -925,7 +925,7 @@ void proto_register_ptpip( void ) "GUID", "ptpip.guid", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_ptpIP_name, { - "Host Name", "ptpip.name", FT_STRINGZ, BASE_NONE, + "Host Name", "ptpip.name", FT_STRINGZ, STR_UNICODE, NULL, 0, NULL, HFILL }}, { &hf_ptpIP_version, { "Version", "ptpip.version", FT_STRING, BASE_NONE, diff --git a/epan/dissectors/packet-rrc.c b/epan/dissectors/packet-rrc.c index 6ef8be1413..9800bffcd5 100644 --- a/epan/dissectors/packet-rrc.c +++ b/epan/dissectors/packet-rrc.c @@ -16393,7 +16393,7 @@ dissect_rrc_ActivationTime(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ static int dissect_rrc_RB_Identity(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 879 "../../asn1/rrc/rrc.cnf" +#line 878 "../../asn1/rrc/rrc.cnf" offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 1U, 32U, &rbid, FALSE); @@ -16410,7 +16410,7 @@ dissect_rrc_RB_Identity(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, static int dissect_rrc_RLC_SequenceNumber(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 885 "../../asn1/rrc/rrc.cnf" +#line 884 "../../asn1/rrc/rrc.cnf" offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 0U, 4095U, &activation_frame, FALSE); @@ -16430,7 +16430,7 @@ static const per_sequence_t RB_ActivationTimeInfo_sequence[] = { static int dissect_rrc_RB_ActivationTimeInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 857 "../../asn1/rrc/rrc.cnf" +#line 856 "../../asn1/rrc/rrc.cnf" fp_info *fpinf; rrc_ciphering_info * c_inf; @@ -16581,7 +16581,7 @@ dissect_rrc_PLMN_Identity(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U static int dissect_rrc_NAS_SystemInformationGSM_MAP(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 679 "../../asn1/rrc/rrc.cnf" +#line 678 "../../asn1/rrc/rrc.cnf" tvbuff_t *nas_sys_info_gsm_map_tvb = NULL; guint32 length; proto_item *item; @@ -16626,7 +16626,7 @@ dissect_rrc_NAS_SystemInformationGSM_MAP(tvbuff_t *tvb _U_, int offset _U_, asn1 static int dissect_rrc_T_cn_CommonGSM_MAP_NAS_SysInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 663 "../../asn1/rrc/rrc.cnf" +#line 662 "../../asn1/rrc/rrc.cnf" actx->private_data = GUINT_TO_POINTER(RRC_NAS_SYS_INFO_CN_COMMON+1); offset = dissect_rrc_NAS_SystemInformationGSM_MAP(tvb, offset, actx, tree, hf_index); @@ -16646,7 +16646,7 @@ static const value_string rrc_CN_DomainIdentity_vals[] = { static int dissect_rrc_CN_DomainIdentity(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 658 "../../asn1/rrc/rrc.cnf" +#line 657 "../../asn1/rrc/rrc.cnf" guint32 nas_sys_info_gsm_map; offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 2, &nas_sys_info_gsm_map, FALSE, 0, NULL); @@ -20513,7 +20513,7 @@ dissect_rrc_T_r3(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_ static int dissect_rrc_H_RNTI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 787 "../../asn1/rrc/rrc.cnf" +#line 786 "../../asn1/rrc/rrc.cnf" tvbuff_t *hrnti_tvb; struct rrc_info *rrcinf; offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index, @@ -20522,7 +20522,7 @@ dissect_rrc_H_RNTI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, prot -#line 792 "../../asn1/rrc/rrc.cnf" +#line 791 "../../asn1/rrc/rrc.cnf" rrcinf = (struct rrc_info *)p_get_proto_data(wmem_file_scope(), actx->pinfo, proto_rrc, 0); if (!rrcinf) { rrcinf = wmem_new0(wmem_file_scope(), struct rrc_info); @@ -20548,7 +20548,7 @@ dissect_rrc_E_RNTI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, prot static int dissect_rrc_T_cn_CommonGSM_MAP_NAS_SysInfo_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 667 "../../asn1/rrc/rrc.cnf" +#line 666 "../../asn1/rrc/rrc.cnf" actx->private_data = GUINT_TO_POINTER(RRC_NAS_SYS_INFO_CN_COMMON+1); offset = dissect_rrc_NAS_SystemInformationGSM_MAP(tvb, offset, actx, tree, hf_index); @@ -41346,7 +41346,7 @@ dissect_rrc_RLC_Info_r5(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, static int dissect_rrc_MAC_d_FlowIdentity(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 784 "../../asn1/rrc/rrc.cnf" +#line 783 "../../asn1/rrc/rrc.cnf" offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 0U, 7U, &flowd, FALSE); @@ -41394,7 +41394,7 @@ static const per_choice_t DL_TransportChannelType_r5_choice[] = { static int dissect_rrc_DL_TransportChannelType_r5(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 713 "../../asn1/rrc/rrc.cnf" +#line 712 "../../asn1/rrc/rrc.cnf" gint *flowd_p; gint *cur_val=NULL; @@ -44868,7 +44868,7 @@ static const per_choice_t DL_TransportChannelType_r7_choice[] = { static int dissect_rrc_DL_TransportChannelType_r7(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 748 "../../asn1/rrc/rrc.cnf" +#line 747 "../../asn1/rrc/rrc.cnf" gint *flowd_p; gint *cur_val=NULL; @@ -84193,7 +84193,7 @@ dissect_rrc_UE_ConnTimersAndConstants(tvbuff_t *tvb _U_, int offset _U_, asn1_ct static int dissect_rrc_T_cn_CommonGSM_MAP_NAS_SysInfo_02(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 671 "../../asn1/rrc/rrc.cnf" +#line 670 "../../asn1/rrc/rrc.cnf" actx->private_data = GUINT_TO_POINTER(RRC_NAS_SYS_INFO_CN_COMMON+1); offset = dissect_rrc_NAS_SystemInformationGSM_MAP(tvb, offset, actx, tree, hf_index); @@ -87482,7 +87482,7 @@ static const per_choice_t DL_DCCH_MessageType_choice[] = { static int dissect_rrc_DL_DCCH_MessageType(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 889 "../../asn1/rrc/rrc.cnf" +#line 888 "../../asn1/rrc/rrc.cnf" offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_DL_DCCH_MessageType, DL_DCCH_MessageType_choice, &msg_type); @@ -87502,7 +87502,7 @@ static const per_sequence_t DL_DCCH_Message_sequence[] = { static int dissect_rrc_DL_DCCH_Message(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 892 "../../asn1/rrc/rrc.cnf" +#line 891 "../../asn1/rrc/rrc.cnf" offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_DL_DCCH_Message, DL_DCCH_Message_sequence); @@ -87516,7 +87516,7 @@ dissect_rrc_DL_DCCH_Message(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx static int dissect_rrc_START_Value(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 800 "../../asn1/rrc/rrc.cnf" +#line 799 "../../asn1/rrc/rrc.cnf" tvbuff_t * start_val; fp_info *fpinf; rrc_ciphering_info * c_inf; @@ -114211,7 +114211,7 @@ static const per_choice_t HandoverToUTRANCommand_choice[] = { static int dissect_rrc_HandoverToUTRANCommand(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 895 "../../asn1/rrc/rrc.cnf" +#line 894 "../../asn1/rrc/rrc.cnf" offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_HandoverToUTRANCommand, HandoverToUTRANCommand_choice, NULL); @@ -114352,7 +114352,7 @@ static const per_sequence_t UE_SecurityInformation_sequence[] = { static int dissect_rrc_UE_SecurityInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 898 "../../asn1/rrc/rrc.cnf" +#line 897 "../../asn1/rrc/rrc.cnf" actx->private_data = GUINT_TO_POINTER(RRC_NAS_SYS_INFO_CS+1); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_UE_SecurityInformation, UE_SecurityInformation_sequence); @@ -114755,7 +114755,7 @@ static const per_sequence_t UE_SecurityInformation2_sequence[] = { static int dissect_rrc_UE_SecurityInformation2(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 902 "../../asn1/rrc/rrc.cnf" +#line 901 "../../asn1/rrc/rrc.cnf" actx->private_data = GUINT_TO_POINTER(RRC_NAS_SYS_INFO_PS+1); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_UE_SecurityInformation2, UE_SecurityInformation2_sequence); @@ -133095,8 +133095,7 @@ dissect_rrc_HNBName(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pro offset = dissect_per_octet_string(tvb, offset, actx, tree, -1, 1, maxHNBNameSize, FALSE, &hnbname_tvb); - actx->created_item = proto_tree_add_unicode_string(tree, hf_index, hnbname_tvb, 0, -1, - tvb_get_string_enc(wmem_packet_scope(), hnbname_tvb, 0, tvb_length(hnbname_tvb), ENC_UTF_8 | ENC_NA)); + actx->created_item = proto_tree_add_item(tree, hf_index, hnbname_tvb, 0, -1, ENC_UTF_8|ENC_NA); @@ -133368,7 +133367,7 @@ dissect_rrc_SIB_ReferenceList(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act static int dissect_rrc_T_cn_CommonGSM_MAP_NAS_SysInfo_03(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 675 "../../asn1/rrc/rrc.cnf" +#line 674 "../../asn1/rrc/rrc.cnf" actx->private_data = GUINT_TO_POINTER(RRC_NAS_SYS_INFO_CN_COMMON+1); offset = dissect_rrc_NAS_SystemInformationGSM_MAP(tvb, offset, actx, tree, hf_index); @@ -178974,7 +178973,7 @@ void proto_register_rrc(void) { NULL, HFILL }}, { &hf_rrc_hNBName, { "hNBName", "rrc.hNBName", - FT_STRING, BASE_NONE, NULL, 0, + FT_STRING, STR_UNICODE, NULL, 0, NULL, HFILL }}, { &hf_rrc_nonCriticalExtensions_234, { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element", |