osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Fix errors found by fix-encoding-args.pl

This commit is contained in:
João Valverde 2021-12-19 22:08:45 +00:00 committed by Wireshark GitLab Utility
parent 80c9b56e7a
commit dec5590b5b
61 changed files with 392 additions and 392 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/file-mp4.c
View File

@ -540,7 +540,7 @@ dissect_mp4_hdlr_body(tvbuff_t *tvb, gint offset, gint len _U_,
/* name is a 0-terminated UTF-8 string, len includes the final 0 */
hdlr_name_len = tvb_strsize(tvb, offset);
proto_tree_add_item(tree, hf_mp4_hdlr_name,
tvb, offset, hdlr_name_len, ENC_UTF_8|ENC_NA);
tvb, offset, hdlr_name_len, ENC_UTF_8);
offset += hdlr_name_len;
return offset-offset_start;

2
epan/dissectors/packet-3g-a11.c
View File

@ -1378,7 +1378,7 @@ dissect_a11_extensions( tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tre
* UTF-8.
*/
proto_tree_add_item(ext_tree, hf_a11_next_nai, tvb, offset,
ext_len, ENC_UTF_8|ENC_NA);
ext_len, ENC_UTF_8);
break;
case GEN_AUTH_EXT: /* RFC 3012 */

4
epan/dissectors/packet-acn.c
View File

@ -5645,10 +5645,10 @@ dissect_acn_dmx_base_pdu(guint32 protocol_id, tvbuff_t *tvb, packet_info *pinfo,
switch (vector) {
case ACN_DMP_VECTOR_SET_PROPERTY:
if (protocol_id == ACN_PROTOCOL_ID_DMX_2 || protocol_id == ACN_PROTOCOL_ID_DMX_3) {
proto_tree_add_item(pdu_tree, hf_acn_dmx_source_name, tvb, data_offset, 64, ENC_UTF_8|ENC_NA);
proto_tree_add_item(pdu_tree, hf_acn_dmx_source_name, tvb, data_offset, 64, ENC_UTF_8);
data_offset += 64;
} else {
proto_tree_add_item(pdu_tree, hf_acn_dmx_source_name, tvb, data_offset, 32, ENC_UTF_8|ENC_NA);
proto_tree_add_item(pdu_tree, hf_acn_dmx_source_name, tvb, data_offset, 32, ENC_UTF_8);
data_offset += 32;
}

22
epan/dissectors/packet-afp.c
View File

@ -1478,7 +1478,7 @@ parse_long_filename(proto_tree *tree, tvbuff_t *tvb, gint offset, gint org_offse
len = tvb_get_guint8(tvb, tp_ofs);
proto_tree_add_item(tree, hf_afp_path_len, tvb, tp_ofs, 1, ENC_BIG_ENDIAN);
tp_ofs++;
proto_tree_add_item(tree, hf_afp_path_name, tvb, tp_ofs, len, ENC_UTF_8|ENC_NA);
proto_tree_add_item(tree, hf_afp_path_name, tvb, tp_ofs, len, ENC_UTF_8);
tp_ofs += len;
}
return tp_ofs;
@ -1517,7 +1517,7 @@ parse_UTF8_filename(proto_tree *tree, tvbuff_t *tvb, gint offset, gint org_offse
proto_tree_add_item( tree, hf_afp_path_unicode_len, tvb, tp_ofs, 2, ENC_BIG_ENDIAN);
tp_ofs += 2;
proto_tree_add_item(tree, hf_afp_path_name, tvb, tp_ofs, len, ENC_UTF_8|ENC_NA);
proto_tree_add_item(tree, hf_afp_path_name, tvb, tp_ofs, len, ENC_UTF_8);
tp_ofs += len;
}
return tp_ofs;
@ -2638,7 +2638,7 @@ dissect_query_afp_login_ext(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t
len = tvb_get_ntohs(tvb, offset);
proto_tree_add_item(tree, hf_afp_user_len, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
proto_tree_add_item(tree, hf_afp_user_name, tvb, offset, len, ENC_UTF_8|ENC_NA);
proto_tree_add_item(tree, hf_afp_user_name, tvb, offset, len, ENC_UTF_8);
offset += len;
/* directory service */
@ -2652,14 +2652,14 @@ dissect_query_afp_login_ext(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t
len = tvb_get_guint8(tvb, offset);
proto_tree_add_item(tree, hf_afp_path_len, tvb, offset, 1, ENC_BIG_ENDIAN);
offset++;
proto_tree_add_item(tree, hf_afp_path_name, tvb, offset, len, ENC_UTF_8|ENC_NA);
proto_tree_add_item(tree, hf_afp_path_name, tvb, offset, len, ENC_UTF_8);
offset += len;
break;
case 3:
len = tvb_get_ntohs(tvb, offset);
proto_tree_add_item( tree, hf_afp_path_unicode_len, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
proto_tree_add_item(tree, hf_afp_path_name, tvb, offset, len, ENC_UTF_8|ENC_NA);
proto_tree_add_item(tree, hf_afp_path_name, tvb, offset, len, ENC_UTF_8);
offset += len;
break;
default:
@ -3274,7 +3274,7 @@ dissect_query_afp_get_icon(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
PAD(1);
proto_tree_add_item(tree, hf_afp_dt_ref, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
proto_tree_add_item(tree, hf_afp_file_creator, tvb, offset, 4, ENC_UTF_8|ENC_NA);
proto_tree_add_item(tree, hf_afp_file_creator, tvb, offset, 4, ENC_UTF_8);
offset += 4;
proto_tree_add_item(tree, hf_afp_file_type, tvb, offset, 4, ENC_ASCII|ENC_NA);
@ -3721,7 +3721,7 @@ dissect_reply_afp_get_server_message(tvbuff_t *tvb, packet_info *pinfo _U_, prot
proto_tree_add_item(tree, hf_afp_message_len, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
if (len) {
proto_tree_add_item(tree, hf_afp_message, tvb, offset, len , ENC_UTF_8|ENC_NA);
proto_tree_add_item(tree, hf_afp_message, tvb, offset, len , ENC_UTF_8);
offset += len;
}
} else {
@ -3817,7 +3817,7 @@ decode_attr_name (proto_tree *tree, packet_info *pinfo _U_, tvbuff_t *tvb, gint
ett_afp_extattr_names, NULL, label, name);
proto_tree_add_item(sub_tree, hf_afp_extattr_namelen, tvb, offset, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(sub_tree, hf_afp_extattr_name, tvb, offset +2, len, ENC_UTF_8|ENC_NA);
proto_tree_add_item(sub_tree, hf_afp_extattr_name, tvb, offset +2, len, ENC_UTF_8);
}
offset += 2 +len;
@ -3972,7 +3972,7 @@ dissect_reply_afp_list_ext_attrs(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr
while (remain > 0) {
length = (gint)tvb_strsize(tvb, offset);
proto_tree_add_item(sub_tree, hf_afp_extattr_name, tvb, offset, length, ENC_UTF_8|ENC_NA);
proto_tree_add_item(sub_tree, hf_afp_extattr_name, tvb, offset, length, ENC_UTF_8);
offset += length;
remain -= length;
}
@ -4562,7 +4562,7 @@ dissect_query_afp_spotlight(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
case SPOTLIGHT_CMD_GET_VOLPATH:
tvb_get_stringz_enc(wmem_packet_scope(), tvb, offset, &len, ENC_UTF_8|ENC_NA);
proto_tree_add_item(tree, hf_afp_spotlight_volpath_client, tvb, offset, len, ENC_UTF_8|ENC_NA);
proto_tree_add_item(tree, hf_afp_spotlight_volpath_client, tvb, offset, len, ENC_UTF_8);
offset += len;
break;
@ -4771,7 +4771,7 @@ dissect_reply_afp_spotlight(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
offset += 4;
tvb_get_stringz_enc(wmem_packet_scope(), tvb, offset, &len, ENC_UTF_8|ENC_NA);
proto_tree_add_item(tree, hf_afp_spotlight_volpath_server, tvb, offset, len, ENC_UTF_8|ENC_NA);
proto_tree_add_item(tree, hf_afp_spotlight_volpath_server, tvb, offset, len, ENC_UTF_8);
offset += len;
break;

20
epan/dissectors/packet-aim.c
View File

@ -855,7 +855,7 @@ dissect_aim_buddyname(tvbuff_t *tvb, packet_info *pinfo _U_, int offset,
ett_aim_buddyname, NULL, "Buddy: %s",
tvb_format_text(pinfo->pool, tvb, offset, buddyname_length));
proto_tree_add_item(buddy_tree, hf_aim_buddyname_len, tvb, offset-1, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(buddy_tree, hf_aim_buddyname, tvb, offset, buddyname_length, ENC_UTF_8|ENC_NA);
proto_tree_add_item(buddy_tree, hf_aim_buddyname, tvb, offset, buddyname_length, ENC_UTF_8);
}
return offset+buddyname_length;
@ -2715,7 +2715,7 @@ static int dissect_aim_snac_location_request_user_information(tvbuff_t *tvb, pac
offset += 1;
/* Buddy name */
proto_tree_add_item(tree, hf_aim_location_buddyname, tvb, offset, buddyname_length, ENC_UTF_8|ENC_NA);
proto_tree_add_item(tree, hf_aim_location_buddyname, tvb, offset, buddyname_length, ENC_UTF_8);
offset += buddyname_length;
return offset;
@ -2732,7 +2732,7 @@ static int dissect_aim_snac_location_user_information(tvbuff_t *tvb, packet_info
offset += 1;
/* Buddy name */
proto_tree_add_item(tree, hf_aim_location_buddyname, tvb, offset, buddyname_length, ENC_UTF_8|ENC_NA);
proto_tree_add_item(tree, hf_aim_location_buddyname, tvb, offset, buddyname_length, ENC_UTF_8);
offset += buddyname_length;
/* Warning level */
@ -3413,7 +3413,7 @@ static int dissect_aim_snac_signon_signon_reply(tvbuff_t *tvb,
offset += 2;
/* Challenge */
proto_tree_add_item(tree, hf_aim_signon_challenge, tvb, offset, challenge_length, ENC_UTF_8|ENC_NA);
proto_tree_add_item(tree, hf_aim_signon_challenge, tvb, offset, challenge_length, ENC_UTF_8);
offset += challenge_length;
return offset;
}
@ -3492,7 +3492,7 @@ static int dissect_ssi_item(tvbuff_t *tvb, packet_info *pinfo, int offset, proto
/* Buddy Name */
if (buddyname_length > 0) {
proto_tree_add_item(ssi_entry, hf_aim_fnac_subtype_ssi_buddyname, tvb, offset, buddyname_length, ENC_UTF_8|ENC_NA);
proto_tree_add_item(ssi_entry, hf_aim_fnac_subtype_ssi_buddyname, tvb, offset, buddyname_length, ENC_UTF_8);
offset += buddyname_length;
}
@ -3608,7 +3608,7 @@ static int dissect_aim_snac_ssi_auth_request(tvbuff_t *tvb, packet_info *pinfo _
/* show buddy name */
if (buddyname_length > 0) {
proto_tree_add_item(tree, hf_aim_fnac_subtype_ssi_buddyname, tvb, offset, buddyname_length, ENC_UTF_8|ENC_NA);
proto_tree_add_item(tree, hf_aim_fnac_subtype_ssi_buddyname, tvb, offset, buddyname_length, ENC_UTF_8);
offset += buddyname_length;
}
/* get reason message length (2 bytes) */
@ -3618,7 +3618,7 @@ static int dissect_aim_snac_ssi_auth_request(tvbuff_t *tvb, packet_info *pinfo _
/* show reason message if present */
if (reason_length > 0) {
proto_tree_add_item(tree, hf_aim_fnac_subtype_ssi_reason_str, tvb, offset, reason_length, ENC_UTF_8|ENC_NA);
proto_tree_add_item(tree, hf_aim_fnac_subtype_ssi_reason_str, tvb, offset, reason_length, ENC_UTF_8);
offset += reason_length;
}
@ -3642,7 +3642,7 @@ static int dissect_aim_snac_ssi_auth_reply(tvbuff_t *tvb, packet_info *pinfo _U_
/* show buddy name */
if (buddyname_length > 0) {
proto_tree_add_item(tree, hf_aim_fnac_subtype_ssi_buddyname, tvb, offset, buddyname_length, ENC_UTF_8|ENC_NA);
proto_tree_add_item(tree, hf_aim_fnac_subtype_ssi_buddyname, tvb, offset, buddyname_length, ENC_UTF_8);
offset += buddyname_length;
}
@ -3657,7 +3657,7 @@ static int dissect_aim_snac_ssi_auth_reply(tvbuff_t *tvb, packet_info *pinfo _U_
/* show reason message if present */
if (reason_length > 0) {
proto_tree_add_item(tree, hf_aim_fnac_subtype_ssi_reason_str, tvb, offset, reason_length, ENC_UTF_8|ENC_NA);
proto_tree_add_item(tree, hf_aim_fnac_subtype_ssi_reason_str, tvb, offset, reason_length, ENC_UTF_8);
offset += reason_length;
}
@ -3809,7 +3809,7 @@ static const aim_subtype aim_fnac_family_translate[] = {
***********************************************************************************************************/
static int dissect_aim_userlookup_search(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *lookup_tree)
{
proto_tree_add_item(lookup_tree, hf_aim_userlookup_email, tvb, 0, tvb_reported_length(tvb), ENC_UTF_8|ENC_NA);
proto_tree_add_item(lookup_tree, hf_aim_userlookup_email, tvb, 0, tvb_reported_length(tvb), ENC_UTF_8);
return tvb_reported_length(tvb);
}

4
epan/dissectors/packet-ajp13.c
View File

@ -453,7 +453,7 @@ display_rsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ajp13_tree, ajp13_con
/* MESSAGE DATA (COPOUT)
*/
if (ajp13_tree)
proto_tree_add_item(ajp13_tree, hf_ajp13_data, tvb, pos+2, -1, ENC_UTF_8|ENC_NA);
proto_tree_add_item(ajp13_tree, hf_ajp13_data, tvb, pos+2, -1, ENC_UTF_8);
break;
}
}
@ -508,7 +508,7 @@ display_req_body(tvbuff_t *tvb, proto_tree *ajp13_tree, ajp13_conv_data* cd)
return;
}
cd->content_length -= content_length;
proto_tree_add_item(ajp13_tree, hf_ajp13_data, tvb, pos+2, content_length, ENC_UTF_8|ENC_NA);
proto_tree_add_item(ajp13_tree, hf_ajp13_data, tvb, pos+2, content_length, ENC_UTF_8);
}

2
epan/dissectors/packet-applemidi.c
View File

@ -152,7 +152,7 @@ dissect_applemidi_common( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g
if ( len > 0 ) {
name = tvb_get_string_enc( pinfo->pool, tvb, offset, len, ENC_UTF_8|ENC_NA );
string_size = (gint)( strlen( name ) + 1 );
proto_tree_add_item( applemidi_tree, hf_applemidi_name, tvb, offset, string_size, ENC_UTF_8|ENC_NA );
proto_tree_add_item( applemidi_tree, hf_applemidi_name, tvb, offset, string_size, ENC_UTF_8 );
col_append_fstr( pinfo->cinfo, COL_INFO, ": peer = \"%s\"", name );
offset += string_size;
}

2
epan/dissectors/packet-bgp.c
View File

@ -10106,7 +10106,7 @@ dissect_bgp_notification(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo)
(minor_cease == BGP_CEASE_MINOR_ADMIN_SHUTDOWN || minor_cease == BGP_CEASE_MINOR_ADMIN_RESET) ) {
proto_tree_add_item(tree, hf_bgp_notify_communication_length, tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1;
proto_tree_add_item(tree, hf_bgp_notify_communication, tvb, offset, clen, ENC_UTF_8|ENC_NA);
proto_tree_add_item(tree, hf_bgp_notify_communication, tvb, offset, clen, ENC_UTF_8);
/* otherwise just dump the hex data */
} else if ( major_error == BGP_MAJOR_ERROR_OPEN_MSG && minor_cease == 7 ) {
while (offset < hlen) {

2
epan/dissectors/packet-blip.c
View File

@ -544,7 +544,7 @@ dissect_blip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, _U_ void *data
}
if(reported_length_remaining > 0) {
proto_tree_add_item(blip_tree, hf_blip_message_body, tvb_to_use, offset, reported_length_remaining, ENC_UTF_8|ENC_NA);
proto_tree_add_item(blip_tree, hf_blip_message_body, tvb_to_use, offset, reported_length_remaining, ENC_UTF_8);
}
proto_tree_add_item(blip_tree, hf_blip_checksum, tvb, tvb_reported_length(tvb) - BLIP_BODY_CHECKSUM_SIZE, BLIP_BODY_CHECKSUM_SIZE, ENC_BIG_ENDIAN);

4
epan/dissectors/packet-bthci_evt.c
View File

@ -1766,7 +1766,7 @@ dissect_bthci_evt_remote_name_req_complete(tvbuff_t *tvb, int offset,
offset = dissect_bd_addr(hf_bthci_evt_bd_addr, pinfo, tree, tvb, offset, FALSE, bluetooth_data->interface_id, bluetooth_data->adapter_id, bd_addr);
proto_tree_add_item(tree, hf_bthci_evt_remote_name, tvb, offset, 248, ENC_UTF_8|ENC_NA);
proto_tree_add_item(tree, hf_bthci_evt_remote_name, tvb, offset, 248, ENC_UTF_8);
if (!pinfo->fd->visited) {
wmem_tree_key_t key[6];
guint32 interface_id;
@ -4082,7 +4082,7 @@ dissect_bthci_evt_command_complete(tvbuff_t *tvb, int offset,
send_hci_summary_status_tap(status, pinfo, bluetooth_data);
offset += 1;
proto_tree_add_item(tree, hf_bthci_evt_device_name, tvb, offset, 248, ENC_UTF_8|ENC_NA);
proto_tree_add_item(tree, hf_bthci_evt_device_name, tvb, offset, 248, ENC_UTF_8);
if (status == STATUS_SUCCESS && !pinfo->fd->visited) {
gchar *name;
localhost_name_entry_t *localhost_name_entry;

6
epan/dissectors/packet-cell_broadcast.c
View File

@ -314,11 +314,11 @@ dissect_gsm_cell_broadcast(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
proto_tree *cbs_page_subtree = proto_tree_add_subtree(cbs_page_tree, tvb, offset, -1,
ett_gsm_cbs_page_content, NULL, "Cell Broadcast Page Contents");
len = tvb_reported_length(cbs_page_tvb);
proto_tree_add_item(cbs_page_subtree, hf_gsm_cbs_page_content, cbs_page_tvb, 0, text_len, ENC_UTF_8|ENC_NA);
proto_tree_add_item(cbs_page_subtree, hf_gsm_cbs_page_content, cbs_page_tvb, 0, text_len, ENC_UTF_8);
len -= text_len;
if (len)
{
proto_tree_add_item(cbs_page_subtree, hf_gsm_cbs_page_content_padding, cbs_page_tvb, text_len, len, ENC_UTF_8|ENC_NA);
proto_tree_add_item(cbs_page_subtree, hf_gsm_cbs_page_content_padding, cbs_page_tvb, text_len, len, ENC_UTF_8);
}
}
if (text_len)
@ -354,7 +354,7 @@ dissect_gsm_cell_broadcast(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
cbs_msg_item = proto_tree_add_protocol_format(proto_tree_get_root(tree), proto_cell_broadcast, cbs_msg_tvb, 0, len, "GSM Cell Broadcast Message");
cbs_msg_tree = proto_item_add_subtree(cbs_msg_item, ett_cbs_msg);
proto_tree_add_item(cbs_msg_tree, hf_gsm_cbs_message_content, cbs_msg_tvb, 0, len, ENC_UTF_8|ENC_NA);
proto_tree_add_item(cbs_msg_tree, hf_gsm_cbs_message_content, cbs_msg_tvb, 0, len, ENC_UTF_8);
}
return tvb_captured_length(tvb);

4
epan/dissectors/packet-ceph.c
View File

@ -1845,7 +1845,7 @@ guint c_dissect_str(proto_tree *root, int hf, c_str *out,
tvb, off, 4, ENC_LITTLE_ENDIAN);
off += 4;
proto_tree_add_item(tree, hf_string_data,
tvb, off, d.size, ENC_UTF_8|ENC_NA);
tvb, off, d.size, ENC_UTF_8);
off += d.size;
if (out) *out = d;
@ -5501,7 +5501,7 @@ guint c_dissect_msg_mon_cmd_ack(proto_tree *root,
c_warn_size(tree, tvb, off, front_len, data);
proto_tree_add_item(tree, hf_msg_mon_cmd_ack_data,
tvb, front_len, data_len, ENC_UTF_8|ENC_NA);
tvb, front_len, data_len, ENC_UTF_8);
return front_len+data_len;
}

2
epan/dissectors/packet-cisco-marker.c
View File

@ -61,7 +61,7 @@ dissect_marker(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _
ti = proto_tree_add_item(tree, proto_marker, tvb, 0, -1, ENC_NA);
marker_tree = proto_item_add_subtree(ti, ett_marker);
proto_tree_add_item(marker_tree, hf_cisco_erspan_prop_header, tvb, 0, 20, ENC_LITTLE_ENDIAN);
proto_tree_add_item(marker_tree, hf_cisco_erspan_prop_header, tvb, 0, 20, ENC_NA);
proto_tree_add_item(marker_tree, hf_cisco_erspan_info, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += 2;

6
epan/dissectors/packet-classicstun.c
View File

@ -437,7 +437,7 @@ dissect_classicstun(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *d
proto_tree_add_item(att_tree, classicstun_att_error_number, tvb, offset+3, 1, ENC_BIG_ENDIAN);
if (att_length < 5)
break;
proto_tree_add_item(att_tree, classicstun_att_error_reason, tvb, offset+4, (att_length-4), ENC_UTF_8|ENC_NA);
proto_tree_add_item(att_tree, classicstun_att_error_reason, tvb, offset+4, (att_length-4), ENC_UTF_8);
break;
case LIFETIME:
@ -479,7 +479,7 @@ dissect_classicstun(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *d
break;
case SERVER:
proto_tree_add_item(att_tree, classicstun_att_server_string, tvb, offset, att_length, ENC_UTF_8|ENC_NA);
proto_tree_add_item(att_tree, classicstun_att_server_string, tvb, offset, att_length, ENC_UTF_8);
break;
case XOR_MAPPED_ADDRESS:
@ -526,7 +526,7 @@ dissect_classicstun(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *d
break;
case CONNECTION_REQUEST_BINDING:
proto_tree_add_item(att_tree, classicstun_att_connection_request_binding, tvb, offset, att_length, ENC_UTF_8|ENC_NA);
proto_tree_add_item(att_tree, classicstun_att_connection_request_binding, tvb, offset, att_length, ENC_UTF_8);
break;
default:

4
epan/dissectors/packet-componentstatus.c
View File

@ -178,8 +178,8 @@ dissect_componentstatusprotocol_cspreport_message(tvbuff_t *message_tvb, proto_t
t.secs = (time_t)(interval / 1000000);
t.nsecs = (int)((interval - 1000000 * t.secs) * 1000);
proto_tree_add_time(message_tree, hf_cspreport_report_interval, message_tvb, 24, 4, &t);
proto_tree_add_item(message_tree, hf_cspreport_location, message_tvb, 28, 128, ENC_UTF_8|ENC_NA);
proto_tree_add_item(message_tree, hf_cspreport_status, message_tvb, 156, 128, ENC_UTF_8|ENC_NA);
proto_tree_add_item(message_tree, hf_cspreport_location, message_tvb, 28, 128, ENC_UTF_8);
proto_tree_add_item(message_tree, hf_cspreport_status, message_tvb, 156, 128, ENC_UTF_8);
workload = (float)(100.0 * CSR_GET_WORKLOAD(tvb_get_ntohs(message_tvb, 284)));
if(workload < 0.0) { /* Special value 0xffff -> -1.0 means "no load provided"! */

2
epan/dissectors/packet-cvspserver.c
View File

@ -42,7 +42,7 @@ dissect_cvspserver(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* di
for (offset = 0; tvb_offset_exists(tvb, offset); offset = next_offset)
{
length = tvb_find_line_end_unquoted(tvb, offset, -1, &next_offset);
proto_tree_add_item(cvspserver_tree, hf_cvspserver_data, tvb, offset, length, ENC_UTF_8|ENC_NA);
proto_tree_add_item(cvspserver_tree, hf_cvspserver_data, tvb, offset, length, ENC_UTF_8);
lines++;
}

2
epan/dissectors/packet-dcerpc-dnsserver.c
View File

@ -591,7 +591,7 @@ dnsserver_dissect_struct_DNS_RPC_NAME(tvbuff_t *tvb _U_, int offset _U_, packet_
}
offset = dissect_ndr_uint8(tvb, offset, pinfo, tree, di, drep, hf_dnsserver_DNS_RPC_NAME_NameLength, &len);
proto_tree_add_item(tree, hf_dnsserver_DNS_RPC_NAME_name, tvb,
offset, len, ENC_UTF_8|ENC_NA);
offset, len, ENC_UTF_8);
offset += len;
proto_item_set_len(item, offset-old_offset);
return offset;

4
epan/dissectors/packet-dcm.c
View File

@ -1848,7 +1848,7 @@ dissect_dcm_assoc_user_identify(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t
proto_tree_add_item(assoc_item_user_identify_tree, hf_dcm_info_user_identify_primary_field_length, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
proto_tree_add_item(assoc_item_user_identify_tree, hf_dcm_info_user_identify_primary_field, tvb, offset, primary_field_length, ENC_UTF_8|ENC_NA);
proto_tree_add_item(assoc_item_user_identify_tree, hf_dcm_info_user_identify_primary_field, tvb, offset, primary_field_length, ENC_UTF_8);
proto_item_append_text(assoc_item_user_identify_item, ": %s", tvb_get_string_enc(pinfo->pool, tvb, offset, primary_field_length, ENC_UTF_8|ENC_NA));
offset += primary_field_length;
@ -1857,7 +1857,7 @@ dissect_dcm_assoc_user_identify(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t
proto_tree_add_item(assoc_item_user_identify_tree, hf_dcm_info_user_identify_secondary_field_length, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
proto_tree_add_item(assoc_item_user_identify_tree, hf_dcm_info_user_identify_secondary_field, tvb, offset, secondary_field_length, ENC_UTF_8|ENC_NA);
proto_tree_add_item(assoc_item_user_identify_tree, hf_dcm_info_user_identify_secondary_field, tvb, offset, secondary_field_length, ENC_UTF_8);
proto_item_append_text(assoc_item_user_identify_item, ", %s", tvb_get_string_enc(pinfo->pool, tvb, offset, secondary_field_length, ENC_UTF_8|ENC_NA));
}
}

4
epan/dissectors/packet-dhcp.c
View File

@ -3181,7 +3181,7 @@ dissect_dhcpopt_bulk_lease_status_code(tvbuff_t *tvb, packet_info *pinfo, proto_
}
proto_tree_add_item(tree, hf_dhcp_option_bulk_lease_status_code, tvb, 0, 1, ENC_BIG_ENDIAN);
if ( tvb_reported_length_remaining(tvb, 1) > 0) {
proto_tree_add_item(tree, hf_dhcp_option_bulk_lease_status_message, tvb, 1, tvb_reported_length_remaining(tvb, 1), ENC_UTF_8|ENC_NA);
proto_tree_add_item(tree, hf_dhcp_option_bulk_lease_status_message, tvb, 1, tvb_reported_length_remaining(tvb, 1), ENC_UTF_8);
}
return tvb_captured_length(tvb);
@ -4675,7 +4675,7 @@ dissect_vendor_bsdp_suboption(packet_info *pinfo, proto_item *v_ti, proto_tree *
dissect_vendor_bsdp_boot_image(o43bsdp_vb_tree, tvb, attributes_off);
proto_tree_add_item(o43bsdp_vb_tree, hf_dhcp_option43_bsdp_boot_image_index, tvb, attributes_off+2, 2, ENC_BIG_ENDIAN|ENC_NA);
proto_tree_add_item(o43bsdp_vb_tree, hf_dhcp_option43_bsdp_boot_image_name_len, tvb, attributes_off+4, 1, ENC_BIG_ENDIAN|ENC_NA);
proto_tree_add_item(o43bsdp_vb_tree, hf_dhcp_option43_bsdp_boot_image_name, tvb, attributes_off+5, string_len, ENC_UTF_8|ENC_NA);
proto_tree_add_item(o43bsdp_vb_tree, hf_dhcp_option43_bsdp_boot_image_name, tvb, attributes_off+5, string_len, ENC_UTF_8);
}
attributes_off += 5 + string_len;
attributes_len -= 5 + string_len;

2
epan/dissectors/packet-dhcpv6.c
View File

@ -2859,7 +2859,7 @@ dhcpv6_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree,
proto_tree_add_item(subtree, hf_option_failover_reconfigure_key, tvb, off+4, optlen-4, ENC_NA);
break;
case OPTION_F_RELATIONSHIP_NAME:
proto_tree_add_item(subtree, hf_option_failover_relationship_name, tvb, off, optlen, ENC_UTF_8|ENC_NA);
proto_tree_add_item(subtree, hf_option_failover_relationship_name, tvb, off, optlen, ENC_UTF_8);
break;
case OPTION_F_SERVER_FLAGS:
if (optlen != 1) {

4
epan/dissectors/packet-dlep.c
View File

@ -398,7 +398,7 @@ decode_dataitem_status(tvbuff_t *tvb, int offset, proto_item *pi, proto_tree *pt
proto_item_append_text(pi, ", Code: %s (%u)", val_to_str(status_code, status_code_vals, "Unknown"), status_code);
offset+=1;
proto_tree_add_item(pt, hf_dlep_dataitem_status_text, tvb, offset, len-1, ENC_UTF_8|ENC_NA);
proto_tree_add_item(pt, hf_dlep_dataitem_status_text, tvb, offset, len-1, ENC_UTF_8);
proto_item_append_text(pi, ", Text: %s", tvb_get_string_enc(pinfo->pool, tvb, offset, len-1, ENC_UTF_8));
offset+=len-1;
@ -489,7 +489,7 @@ decode_dataitem_peertype(tvbuff_t *tvb, int offset, proto_item *pi, proto_tree *
proto_tree_add_item(flags_pt, hf_dlep_dataitem_peertype_flags_smi, tvb, offset, DLEP_DIT_PEERTYPE_FLAGS_LEN, ENC_NA);
offset+=DLEP_DIT_PEERTYPE_FLAGS_LEN;
proto_tree_add_item(pt, hf_dlep_dataitem_peertype_description, tvb, offset, len-DLEP_DIT_PEERTYPE_FLAGS_LEN, ENC_UTF_8|ENC_NA);
proto_tree_add_item(pt, hf_dlep_dataitem_peertype_description, tvb, offset, len-DLEP_DIT_PEERTYPE_FLAGS_LEN, ENC_UTF_8);
proto_item_append_text(pi, ", Description: %s", tvb_get_string_enc(pinfo->pool, tvb, offset, len-DLEP_DIT_PEERTYPE_FLAGS_LEN, ENC_UTF_8));
offset+=len-DLEP_DIT_PEERTYPE_FLAGS_LEN;

2
epan/dissectors/packet-dns.c
View File

@ -3057,7 +3057,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
cur_offset += 2;
rropt_len -= 2;
if (optlen > 2) {
proto_tree_add_item(rropt_tree, hf_dns_opt_ext_error_extra_text, tvb, cur_offset, optlen - 2, ENC_UTF_8|ENC_NA);
proto_tree_add_item(rropt_tree, hf_dns_opt_ext_error_extra_text, tvb, cur_offset, optlen - 2, ENC_UTF_8);
cur_offset += (optlen - 2);
rropt_len -= (optlen - 2);
}

8
epan/dissectors/packet-drda.c
View File

@ -708,16 +708,16 @@ dissect_drda_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data
proto_item_append_text(ti, " (%s)", val_to_str_ext(iParameterCP, &drda_opcode_vals_ext, "Unknown (0x%02x)"));
proto_tree_add_item(drda_tree_sub, hf_drda_param_length, tvb, offset, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(drda_tree_sub, hf_drda_param_codepoint, tvb, offset + 2, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(drda_tree_sub, hf_drda_param_data, tvb, offset + 4, iLengthParam - 4, ENC_UTF_8|ENC_NA);
proto_tree_add_item(drda_tree_sub, hf_drda_param_data_ebcdic, tvb, offset + 4, iLengthParam - 4, ENC_EBCDIC|ENC_NA);
proto_tree_add_item(drda_tree_sub, hf_drda_param_data, tvb, offset + 4, iLengthParam - 4, ENC_UTF_8);
proto_tree_add_item(drda_tree_sub, hf_drda_param_data_ebcdic, tvb, offset + 4, iLengthParam - 4, ENC_EBCDIC);
if (iCommand == DRDA_CP_SQLSTT)
{
/* Extract SQL statement from packet */
tvbuff_t* next_tvb = NULL;
next_tvb = tvb_new_subset_length(tvb, offset + 4, iLengthParam - 4);
add_new_data_source(pinfo, next_tvb, "SQL statement");
proto_tree_add_item(drdaroot_tree, hf_drda_sqlstatement, next_tvb, 0, iLengthParam - 5, ENC_UTF_8|ENC_NA);
proto_tree_add_item(drdaroot_tree, hf_drda_sqlstatement_ebcdic, next_tvb, 0, iLengthParam - 4, ENC_EBCDIC|ENC_NA);
proto_tree_add_item(drdaroot_tree, hf_drda_sqlstatement, next_tvb, 0, iLengthParam - 5, ENC_UTF_8);
proto_tree_add_item(drdaroot_tree, hf_drda_sqlstatement_ebcdic, next_tvb, 0, iLengthParam - 4, ENC_EBCDIC);
}
}
offset += iLengthParam;

4
epan/dissectors/packet-iax2.c
View File

@ -1938,7 +1938,7 @@ dissect_fullpacket(tvbuff_t *tvb, guint32 offset,
int textlen = tvb_captured_length_remaining(tvb, offset);
if (textlen > 0)
{
proto_tree_add_item(packet_type_tree, hf_iax2_text_text, tvb, offset, textlen, ENC_UTF_8|ENC_NA);
proto_tree_add_item(packet_type_tree, hf_iax2_text_text, tvb, offset, textlen, ENC_UTF_8);
offset += textlen;
}
}
@ -1953,7 +1953,7 @@ dissect_fullpacket(tvbuff_t *tvb, guint32 offset,
int urllen = tvb_captured_length_remaining(tvb, offset);
if (urllen > 0)
{
proto_item *pi = proto_tree_add_item(packet_type_tree, hf_iax2_html_url, tvb, offset, urllen, ENC_UTF_8|ENC_NA);
proto_item *pi = proto_tree_add_item(packet_type_tree, hf_iax2_html_url, tvb, offset, urllen, ENC_UTF_8);
proto_item_set_url(pi);
offset += urllen;
}

8
epan/dissectors/packet-ieee1905.c
View File

@ -2112,7 +2112,7 @@ dissect_generic_phy_device_info(tvbuff_t *tvb, packet_info *pinfo _U_,
offset++;
proto_tree_add_item(intf_tree, hf_ieee1905_local_intf_variant_name,
tvb, offset, 32, ENC_UTF_8|ENC_NA);
tvb, offset, 32, ENC_UTF_8);
offset += 32;
url_field_count = tvb_get_guint8(tvb, offset);
@ -2151,15 +2151,15 @@ dissect_device_identification(tvbuff_t *tvb, packet_info *pinfo _U_,
proto_tree *tree, guint offset)
{
proto_tree_add_item(tree, hf_ieee1905_dev_id_friendly_name, tvb,
offset, 64, ENC_UTF_8|ENC_NA);
offset, 64, ENC_UTF_8);
offset += 64;
proto_tree_add_item(tree, hf_ieee1905_dev_id_manuf_name, tvb,
offset, 64, ENC_UTF_8|ENC_NA);
offset, 64, ENC_UTF_8);
offset += 64;
proto_tree_add_item(tree, hf_ieee1905_dev_id_manuf_model, tvb,
offset, 64, ENC_UTF_8|ENC_NA);
offset, 64, ENC_UTF_8);
offset += 64;
return offset;

4
epan/dissectors/packet-l2tp.c
View File

@ -1648,11 +1648,11 @@ static int dissect_l2tp_broadband_avps(tvbuff_t *tvb, packet_info *pinfo _U_, pr
switch (avp_type) {
case BROADBAND_AGENT_CIRCUIT_ID:
proto_tree_add_item(l2tp_avp_tree, hf_l2tp_broadband_agent_circuit_id, tvb, offset, avp_len, ENC_UTF_8|ENC_NA);
proto_tree_add_item(l2tp_avp_tree, hf_l2tp_broadband_agent_circuit_id, tvb, offset, avp_len, ENC_UTF_8);
break;
case BROADBAND_AGENT_REMOTE_ID:
proto_tree_add_item(l2tp_avp_tree, hf_l2tp_broadband_agent_remote_id, tvb, offset, avp_len, ENC_UTF_8|ENC_NA);
proto_tree_add_item(l2tp_avp_tree, hf_l2tp_broadband_agent_remote_id, tvb, offset, avp_len, ENC_UTF_8);
break;
case BROADBAND_ACTUAL_DR_UP:

8
epan/dissectors/packet-mc-nmf.c
View File

@ -235,7 +235,7 @@ dissect_mc_nmf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _
if (!get_size_length(tvb, &offset, &len_length, pinfo, &size))
return tvb_reported_length(tvb);
proto_tree_add_uint(rec_tree, hf_mc_nmf_via_length, tvb, offset - len_length, len_length, size);
proto_tree_add_item(rec_tree, hf_mc_nmf_via, tvb, offset, size, ENC_UTF_8|ENC_NA);
proto_tree_add_item(rec_tree, hf_mc_nmf_via, tvb, offset, size, ENC_UTF_8);
offset += size;
break;
case MC_NMF_REC_KNOWN_ENC:
@ -250,7 +250,7 @@ dissect_mc_nmf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _
if (!get_size_length(tvb, &offset, &len_length, pinfo, &size))
return tvb_reported_length(tvb);
proto_tree_add_uint(rec_tree, hf_mc_nmf_encoding_length, tvb, offset - len_length, len_length, size);
proto_tree_add_item(rec_tree, hf_mc_nmf_encoding_type, tvb, offset, size, ENC_UTF_8|ENC_NA);
proto_tree_add_item(rec_tree, hf_mc_nmf_encoding_type, tvb, offset, size, ENC_UTF_8);
offset += size;
break;
case MC_NMF_REC_UNSIZED_ENV:
@ -286,7 +286,7 @@ dissect_mc_nmf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _
if (!get_size_length(tvb, &offset, &len_length, pinfo, &size))
return tvb_reported_length(tvb);
proto_tree_add_uint(rec_tree, hf_mc_nmf_fault_length, tvb, offset - len_length, len_length, size);
proto_tree_add_item(rec_tree, hf_mc_nmf_fault, tvb, offset, size, ENC_UTF_8|ENC_NA);
proto_tree_add_item(rec_tree, hf_mc_nmf_fault, tvb, offset, size, ENC_UTF_8);
offset += size;
break;
case MC_NMF_REC_UPGRADE_REQ:
@ -296,7 +296,7 @@ dissect_mc_nmf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _
if (!get_size_length(tvb, &offset, &len_length, pinfo, &size))
return tvb_reported_length(tvb);
proto_tree_add_uint(rec_tree, hf_mc_nmf_upgrade_length, tvb, offset - len_length, len_length, size);
proto_tree_add_item(rec_tree, hf_mc_nmf_upgrade, tvb, offset, size, ENC_UTF_8|ENC_NA);
proto_tree_add_item(rec_tree, hf_mc_nmf_upgrade, tvb, offset, size, ENC_UTF_8);
upgrade_protocol = tvb_get_string_enc(pinfo->pool, tvb, offset, size, ENC_UTF_8|ENC_NA);
offset += size;
if (strcmp((char*)upgrade_protocol, "application/negotiate") == 0) {

2
epan/dissectors/packet-mcpe.c
View File

@ -182,7 +182,7 @@ mcpe_dissect_string(proto_tree *tree, int hf, tvbuff_t *tvb, gint *offset, guint
*offset += length_width;
proto_tree_add_item(string_tree, hf_mcpe_UTF8_string, tvb,
*offset, length, ENC_UTF_8|ENC_NA);
*offset, length, ENC_UTF_8);
*offset += length;
}
else {

12
epan/dissectors/packet-megaco.c
View File

@ -1104,7 +1104,7 @@ nextcontext:
megaco_command = MEGACO_CMD_NOT_SET;
/* creation of the megaco_tree_command_line additionally Command and Transaction ID will be printed in this line */
/* Changed to use the lines above. this code is saved if there is complaints
sub_ti = proto_tree_add_item(megaco_tree,hf_megaco_command_line,tvb,tvb_command_start_offset,tokenlen, ENC_UTF_8|ENC_NA);
sub_ti = proto_tree_add_item(megaco_tree,hf_megaco_command_line,tvb,tvb_command_start_offset,tokenlen, ENC_UTF_8);
megaco_tree_command_line = proto_item_add_subtree(sub_ti, ett_megaco_command_line);
*/
if (!global_megaco_dissect_tree) {
@ -2085,7 +2085,7 @@ dissect_megaco_eventsdescriptor(tvbuff_t *tvb, packet_info *pinfo, proto_tree *m
tokenlen = tvb_RBRKT+1 - tvb_previous_offset;
}
megaco_requestedevent_ti = proto_tree_add_item(megaco_eventsdescriptor_tree,hf_megaco_pkgdname,tvb,tvb_previous_offset,tokenlen, ENC_UTF_8|ENC_NA);
megaco_requestedevent_ti = proto_tree_add_item(megaco_eventsdescriptor_tree,hf_megaco_pkgdname,tvb,tvb_previous_offset,tokenlen, ENC_UTF_8);
megaco_requestedevent_tree = proto_item_add_subtree(megaco_requestedevent_ti, ett_megaco_requestedevent);
if ( tvb_help_offset < tvb_RBRKT && tvb_help_offset != -1 ){
@ -2228,7 +2228,7 @@ dissect_megaco_signaldescriptor(tvbuff_t *tvb, packet_info *pinfo, proto_tree *m
pkg_tokenlen = tvb_RBRKT+1 - tvb_previous_offset;
}
megaco_requestedsignal_ti = proto_tree_add_item(megaco_signalsdescriptor_tree,hf_megaco_pkgdname,tvb,tvb_previous_offset,pkg_tokenlen, ENC_UTF_8|ENC_NA);
megaco_requestedsignal_ti = proto_tree_add_item(megaco_signalsdescriptor_tree,hf_megaco_pkgdname,tvb,tvb_previous_offset,pkg_tokenlen, ENC_UTF_8);
megaco_requestedsignal_tree = proto_item_add_subtree(megaco_requestedsignal_ti, ett_megaco_requestedsignal);
if ( tvb_help_offset < tvb_RBRKT && tvb_help_offset != -1 ){
@ -2642,7 +2642,7 @@ dissect_megaco_observedeventsdescriptor(tvbuff_t *tvb, packet_info *pinfo, proto
megaco_observedevent_tree = proto_item_add_subtree(megaco_observedevent_ti, ett_megaco_observedevent);
proto_tree_add_item(megaco_observedevent_tree,hf_megaco_pkgdname,tvb,tvb_previous_offset,pkg_tokenlen, ENC_UTF_8|ENC_NA);
proto_tree_add_item(megaco_observedevent_tree,hf_megaco_pkgdname,tvb,tvb_previous_offset,pkg_tokenlen, ENC_UTF_8);
if ( tvb_help_offset < tvb_RBRKT && tvb_help_offset != -1 ){
@ -2719,7 +2719,7 @@ dissect_megaco_Packagesdescriptor(tvbuff_t *tvb, proto_tree *megaco_tree_command
tokenlen = (tvb_RBRKT+1) - tvb_previous_offset;
megaco_packagesdescriptor_ti = proto_tree_add_item(megaco_tree_command_line,hf_megaco_packages_descriptor,tvb,tvb_previous_offset,tokenlen, ENC_UTF_8|ENC_NA);
megaco_packagesdescriptor_ti = proto_tree_add_item(megaco_tree_command_line,hf_megaco_packages_descriptor,tvb,tvb_previous_offset,tokenlen, ENC_UTF_8);
megaco_packagesdescriptor_tree = proto_item_add_subtree(megaco_packagesdescriptor_ti, ett_megaco_packagesdescriptor);
tvb_current_offset = tvb_find_guint8(tvb, tvb_previous_offset, tvb_RBRKT, '=');
@ -2926,7 +2926,7 @@ dissect_megaco_errordescriptor(tvbuff_t *tvb, packet_info* pinfo, proto_tree *me
tvb_current_offset = tvb_find_guint8(tvb, tvb_previous_offset+1, tvb_RBRKT, '\"');
tokenlen = tvb_current_offset - tvb_previous_offset-1;
proto_tree_add_item(error_tree, hf_megaco_error_string, tvb, tvb_previous_offset+1, tokenlen, ENC_UTF_8|ENC_NA);
proto_tree_add_item(error_tree, hf_megaco_error_string, tvb, tvb_previous_offset+1, tokenlen, ENC_UTF_8);
}
static void
dissect_megaco_TerminationStatedescriptor(tvbuff_t *tvb, proto_tree *megaco_mediadescriptor_tree, gint tvb_next_offset, gint tvb_current_offset)

2
epan/dissectors/packet-mint.c
View File

@ -420,7 +420,7 @@ dissect_mint_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
offset += 1;
message_type = tvb_get_ntohl(tvb, offset);
proto_tree_add_item(mint_ctrl_tree, hf_mint_router_message_type, tvb,
offset, 4, ENC_NA);
offset, 4, ENC_ASCII);
offset += 4;
proto_tree_add_item(mint_ctrl_tree, hf_mint_router_header_sender, tvb,
offset, 4, ENC_NA);

12
epan/dissectors/packet-mongo.c
View File

@ -364,7 +364,7 @@ dissect_bson_document(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tre
e_type = tvb_get_guint8(tvb, offset);
tvb_get_stringz_enc(pinfo->pool, tvb, offset+1, &str_len, ENC_ASCII);
element = proto_tree_add_item(elements_tree, hf_mongo_element_name, tvb, offset+1, str_len-1, ENC_UTF_8|ENC_NA);
element = proto_tree_add_item(elements_tree, hf_mongo_element_name, tvb, offset+1, str_len-1, ENC_UTF_8);
element_sub_tree = proto_item_add_subtree(element, ett_mongo_element);
proto_tree_add_item(element_sub_tree, hf_mongo_element_type, tvb, offset, 1, ENC_LITTLE_ENDIAN);
@ -380,7 +380,7 @@ dissect_bson_document(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tre
case BSON_ELEMENT_TYPE_SYMBOL:
str_len = tvb_get_letohl(tvb, offset);
proto_tree_add_item(element_sub_tree, hf_mongo_element_value_string_length, tvb, offset, 4, ENC_LITTLE_ENDIAN);
proto_tree_add_item(element_sub_tree, hf_mongo_element_value_string, tvb, offset+4, str_len, ENC_UTF_8|ENC_NA);
proto_tree_add_item(element_sub_tree, hf_mongo_element_value_string, tvb, offset+4, str_len, ENC_UTF_8);
offset += str_len+4;
break;
case BSON_ELEMENT_TYPE_DOC:
@ -421,17 +421,17 @@ dissect_bson_document(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tre
case BSON_ELEMENT_TYPE_REGEX:
/* regex pattern */
tvb_get_stringz_enc(pinfo->pool, tvb, offset, &str_len, ENC_ASCII);
proto_tree_add_item(element_sub_tree, hf_mongo_element_value_regex_pattern, tvb, offset, str_len, ENC_UTF_8|ENC_NA);
proto_tree_add_item(element_sub_tree, hf_mongo_element_value_regex_pattern, tvb, offset, str_len, ENC_UTF_8);
offset += str_len;
/* regex options */
tvb_get_stringz_enc(pinfo->pool, tvb, offset, &str_len, ENC_ASCII);
proto_tree_add_item(element_sub_tree, hf_mongo_element_value_regex_options, tvb, offset, str_len, ENC_UTF_8|ENC_NA);
proto_tree_add_item(element_sub_tree, hf_mongo_element_value_regex_options, tvb, offset, str_len, ENC_UTF_8);
offset += str_len;
break;
case BSON_ELEMENT_TYPE_DB_PTR:
str_len = tvb_get_letohl(tvb, offset);
proto_tree_add_item(element_sub_tree, hf_mongo_element_value_string_length, tvb, offset, 4, ENC_LITTLE_ENDIAN);
proto_tree_add_item(element_sub_tree, hf_mongo_element_value_string, tvb, offset+4, str_len, ENC_UTF_8|ENC_NA);
proto_tree_add_item(element_sub_tree, hf_mongo_element_value_string, tvb, offset+4, str_len, ENC_UTF_8);
offset += str_len;
proto_tree_add_item(element_sub_tree, hf_mongo_element_value_db_ptr, tvb, offset, 12, ENC_NA);
offset += 12;
@ -445,7 +445,7 @@ dissect_bson_document(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tre
js_code = proto_tree_add_item(element_sub_tree, hf_mongo_element_value_js_code, tvb, offset, str_len+4, ENC_NA);
js_code_sub_tree = proto_item_add_subtree(js_code, ett_mongo_code);
proto_tree_add_item(js_code_sub_tree, hf_mongo_element_value_string_length, tvb, offset, 4, ENC_LITTLE_ENDIAN);
proto_tree_add_item(js_code_sub_tree, hf_mongo_element_value_string, tvb, offset+4, str_len, ENC_UTF_8|ENC_NA);
proto_tree_add_item(js_code_sub_tree, hf_mongo_element_value_string, tvb, offset+4, str_len, ENC_UTF_8);
offset += str_len+4;
doc_len = e_len - (str_len + 8);
js_scope = proto_tree_add_item(element_sub_tree, hf_mongo_element_value_js_scope, tvb, offset, doc_len, ENC_NA);

18
epan/dissectors/packet-mqtt.c
View File

@ -899,7 +899,7 @@ static guint dissect_mqtt_properties(tvbuff_t *tvb, proto_tree *mqtt_tree, guint
break;
default:
proto_tree_add_item(mqtt_prop_tree, hf_mqtt_prop_unknown, tvb, offset, bytes_to_read - offset, ENC_UTF_8|ENC_NA);
proto_tree_add_item(mqtt_prop_tree, hf_mqtt_prop_unknown, tvb, offset, bytes_to_read - offset, ENC_UTF_8);
offset += (bytes_to_read - offset);
break;
}
@ -1041,7 +1041,7 @@ static int dissect_mqtt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi
proto_tree_add_item_ret_uint(mqtt_tree, hf_mqtt_proto_len, tvb, offset, 2, ENC_BIG_ENDIAN, &mqtt_str_len);
offset += 2;
proto_tree_add_item(mqtt_tree, hf_mqtt_proto_name, tvb, offset, mqtt_str_len, ENC_UTF_8|ENC_NA);
proto_tree_add_item(mqtt_tree, hf_mqtt_proto_name, tvb, offset, mqtt_str_len, ENC_UTF_8);
offset += mqtt_str_len;
mqtt->runtime_proto_version = tvb_get_guint8(tvb, offset);
@ -1064,7 +1064,7 @@ static int dissect_mqtt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi
proto_tree_add_item_ret_uint(mqtt_tree, hf_mqtt_client_id_len, tvb, offset, 2, ENC_BIG_ENDIAN, &mqtt_str_len);
offset += 2;
proto_tree_add_item(mqtt_tree, hf_mqtt_client_id, tvb, offset, mqtt_str_len, ENC_UTF_8|ENC_NA);
proto_tree_add_item(mqtt_tree, hf_mqtt_client_id, tvb, offset, mqtt_str_len, ENC_UTF_8);
offset += mqtt_str_len;
if (mqtt_con_flags & MQTT_CONMASK_WILLFLAG)
@ -1079,7 +1079,7 @@ static int dissect_mqtt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi
if (mqtt_str_len > 0)
{
proto_tree_add_item(mqtt_tree, hf_mqtt_will_topic, tvb, offset, mqtt_str_len, ENC_UTF_8|ENC_NA);
proto_tree_add_item(mqtt_tree, hf_mqtt_will_topic, tvb, offset, mqtt_str_len, ENC_UTF_8);
offset += mqtt_str_len;
}
else
@ -1092,7 +1092,7 @@ static int dissect_mqtt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi
if (show_msg_as_text)
{
proto_tree_add_item(mqtt_tree, hf_mqtt_will_msg_text, tvb, offset, mqtt_str_len, ENC_UTF_8|ENC_NA);
proto_tree_add_item(mqtt_tree, hf_mqtt_will_msg_text, tvb, offset, mqtt_str_len, ENC_UTF_8);
}
else
{
@ -1106,7 +1106,7 @@ static int dissect_mqtt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi
proto_tree_add_item_ret_uint(mqtt_tree, hf_mqtt_username_len, tvb, offset, 2, ENC_BIG_ENDIAN, &mqtt_str_len);
offset += 2;
proto_tree_add_item(mqtt_tree, hf_mqtt_username, tvb, offset, mqtt_str_len, ENC_UTF_8|ENC_NA);
proto_tree_add_item(mqtt_tree, hf_mqtt_username, tvb, offset, mqtt_str_len, ENC_UTF_8);
offset += mqtt_str_len;
}
@ -1115,7 +1115,7 @@ static int dissect_mqtt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi
proto_tree_add_item_ret_uint(mqtt_tree, hf_mqtt_passwd_len, tvb, offset, 2, ENC_BIG_ENDIAN, &mqtt_str_len);
offset += 2;
proto_tree_add_item(mqtt_tree, hf_mqtt_passwd, tvb, offset, mqtt_str_len, ENC_UTF_8|ENC_NA);
proto_tree_add_item(mqtt_tree, hf_mqtt_passwd, tvb, offset, mqtt_str_len, ENC_UTF_8);
}
break;
@ -1211,7 +1211,7 @@ static int dissect_mqtt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi
mqtt_payload_len = tvb_reported_length(tvb) - offset;
if (show_msg_as_text)
{
proto_tree_add_item(mqtt_tree, hf_mqtt_pubmsg_text, tvb, offset, mqtt_payload_len, ENC_UTF_8|ENC_NA);
proto_tree_add_item(mqtt_tree, hf_mqtt_pubmsg_text, tvb, offset, mqtt_payload_len, ENC_UTF_8);
}
else
{
@ -1308,7 +1308,7 @@ static int dissect_mqtt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi
if (mqtt_str_len > 0)
{
proto_tree_add_item(mqtt_tree, hf_mqtt_topic, tvb, offset, mqtt_str_len, ENC_UTF_8|ENC_NA);
proto_tree_add_item(mqtt_tree, hf_mqtt_topic, tvb, offset, mqtt_str_len, ENC_UTF_8);
offset += mqtt_str_len;
}
else

40
epan/dissectors/packet-mrcpv2.c
View File

@ -508,82 +508,82 @@ dissect_mrcpv2_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
case REQUEST_LINE:
{
col_set_str(pinfo->cinfo, COL_INFO, "Request: ");
line_item = proto_tree_add_item(mrcpv2_tree, hf_mrcpv2_Request_Line, tvb, offset, linelen, ENC_UTF_8|ENC_NA);
line_item = proto_tree_add_item(mrcpv2_tree, hf_mrcpv2_Request_Line, tvb, offset, linelen, ENC_UTF_8);
request_line_item = proto_item_add_subtree(line_item, ett_Request_Line);
/* version */
str_len = (gint)strlen(field1);
proto_tree_add_item(request_line_item, hf_mrcpv2_version, tvb, offset, str_len, ENC_UTF_8|ENC_NA);
proto_tree_add_item(request_line_item, hf_mrcpv2_version, tvb, offset, str_len, ENC_UTF_8);
offset += str_len + 1; /* add SP */
/* message length */
str_len = (gint)strlen(field2);
proto_tree_add_item(request_line_item, hf_mrcpv2_message_length, tvb, offset, str_len, ENC_UTF_8|ENC_NA);
proto_tree_add_item(request_line_item, hf_mrcpv2_message_length, tvb, offset, str_len, ENC_UTF_8);
offset += str_len + 1; /* add SP */
/* method name */
col_append_str(pinfo->cinfo, COL_INFO, field3);
str_len = (gint)strlen(field3);
proto_tree_add_item(request_line_item, hf_mrcpv2_Method, tvb, offset, str_len, ENC_UTF_8|ENC_NA);
proto_tree_add_item(request_line_item, hf_mrcpv2_Method, tvb, offset, str_len, ENC_UTF_8);
offset += str_len + 1; /* add SP */
/* request ID */
str_len = (gint)strlen(field4);
proto_tree_add_item(request_line_item, hf_mrcpv2_request_id, tvb, offset, str_len, ENC_UTF_8|ENC_NA);
proto_tree_add_item(request_line_item, hf_mrcpv2_request_id, tvb, offset, str_len, ENC_UTF_8);
/*offset += str_len + 2;*/ /* add CRLF */
}
break;
case RESPONSE_LINE:
{
col_set_str(pinfo->cinfo, COL_INFO, "Response: ");
line_item = proto_tree_add_item(mrcpv2_tree, hf_mrcpv2_Response_Line, tvb, offset, linelen, ENC_UTF_8|ENC_NA);
line_item = proto_tree_add_item(mrcpv2_tree, hf_mrcpv2_Response_Line, tvb, offset, linelen, ENC_UTF_8);
response_line_item = proto_item_add_subtree(line_item, ett_Response_Line);
/* version */
str_len = (gint)strlen(field1);
proto_tree_add_item(response_line_item, hf_mrcpv2_version, tvb, offset, str_len, ENC_UTF_8|ENC_NA);
proto_tree_add_item(response_line_item, hf_mrcpv2_version, tvb, offset, str_len, ENC_UTF_8);
offset += str_len + 1; /* add SP */
/* message length */
str_len = (gint)strlen(field2);
proto_tree_add_item(response_line_item, hf_mrcpv2_message_length, tvb, offset, str_len, ENC_UTF_8|ENC_NA);
proto_tree_add_item(response_line_item, hf_mrcpv2_message_length, tvb, offset, str_len, ENC_UTF_8);
offset += str_len + 1; /* add SP */
/* request ID */
str_len = (gint)strlen(field3);
proto_tree_add_item(response_line_item, hf_mrcpv2_request_id, tvb, offset, str_len, ENC_UTF_8|ENC_NA);
proto_tree_add_item(response_line_item, hf_mrcpv2_request_id, tvb, offset, str_len, ENC_UTF_8);
offset += str_len + 1; /* add SP */
/* status code */
str_len = (gint)strlen(field4);
status_code_item = proto_tree_add_item(response_line_item, hf_mrcpv2_status_code, tvb, offset,
str_len, ENC_UTF_8|ENC_NA);
str_len, ENC_UTF_8);
proto_item_append_text(status_code_item, " %s", str_to_str(field4, status_code_vals, "Unknown Status Code"));
offset += str_len + 1; /* add SP */
/* request state */
col_append_fstr(pinfo->cinfo, COL_INFO, "(%s) %s", field4, field5);
str_len = (gint)strlen(field5);
proto_tree_add_item(response_line_item, hf_mrcpv2_request_state, tvb, offset, str_len, ENC_UTF_8|ENC_NA);
proto_tree_add_item(response_line_item, hf_mrcpv2_request_state, tvb, offset, str_len, ENC_UTF_8);
/*offset += str_len + 2;*/ /* add CRLF */
}
break;
case EVENT_LINE:
{
col_set_str(pinfo->cinfo, COL_INFO, "Event: ");
line_item = proto_tree_add_item(mrcpv2_tree, hf_mrcpv2_Event_Line, tvb, offset, linelen, ENC_UTF_8|ENC_NA);
line_item = proto_tree_add_item(mrcpv2_tree, hf_mrcpv2_Event_Line, tvb, offset, linelen, ENC_UTF_8);
event_line_item = proto_item_add_subtree(line_item, ett_Event_Line);
/* version */
str_len = (gint)strlen(field1);
proto_tree_add_item(event_line_item, hf_mrcpv2_version, tvb, offset, str_len, ENC_UTF_8|ENC_NA);
proto_tree_add_item(event_line_item, hf_mrcpv2_version, tvb, offset, str_len, ENC_UTF_8);
offset += str_len + 1; /* add SP */
/* message length */
str_len = (gint)strlen(field2);
proto_tree_add_item(event_line_item, hf_mrcpv2_message_length, tvb, offset, str_len, ENC_UTF_8|ENC_NA);
proto_tree_add_item(event_line_item, hf_mrcpv2_message_length, tvb, offset, str_len, ENC_UTF_8);
offset += str_len + 1; /* add SP */
/* event name */
col_append_str(pinfo->cinfo, COL_INFO, field3);
str_len = (gint)strlen(field3);
proto_tree_add_item(event_line_item, hf_mrcpv2_Event, tvb, offset, str_len, ENC_UTF_8|ENC_NA);
proto_tree_add_item(event_line_item, hf_mrcpv2_Event, tvb, offset, str_len, ENC_UTF_8);
offset += str_len + 1; /* add SP */
/* request ID */
str_len = (gint)strlen(field4);
proto_tree_add_item(event_line_item, hf_mrcpv2_request_id, tvb, offset, str_len, ENC_UTF_8|ENC_NA);
proto_tree_add_item(event_line_item, hf_mrcpv2_request_id, tvb, offset, str_len, ENC_UTF_8);
offset += str_len + 1; /* add SP */
/* request state */
str_len = (gint)strlen(field5);
proto_tree_add_item(event_line_item, hf_mrcpv2_request_state, tvb, offset, str_len, ENC_UTF_8|ENC_NA);
proto_tree_add_item(event_line_item, hf_mrcpv2_request_state, tvb, offset, str_len, ENC_UTF_8);
/*offset += str_len + 2;*/ /* add CRLF */
}
break;
@ -591,7 +591,7 @@ dissect_mrcpv2_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
/* mark whole packet as unknown and return */
col_set_str(pinfo->cinfo, COL_INFO, "UNKNOWN message");
proto_tree_add_item(mrcpv2_tree, hf_mrcpv2_Unknown_Message, tvb, offset, tvb_len, ENC_UTF_8|ENC_NA);
proto_tree_add_item(mrcpv2_tree, hf_mrcpv2_Unknown_Message, tvb, offset, tvb_len, ENC_UTF_8);
return tvb_len;
}
}
@ -621,7 +621,7 @@ dissect_mrcpv2_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
colon_offset = tvb_find_guint8(tvb, offset, linelen, ':');
if (colon_offset == -1)
{ /* header type should end with ':' */
proto_tree_add_item(mrcpv2_tree, hf_mrcpv2_Unknown_Header, tvb, offset, linelen, ENC_UTF_8|ENC_NA);
proto_tree_add_item(mrcpv2_tree, hf_mrcpv2_Unknown_Header, tvb, offset, linelen, ENC_UTF_8);
continue;
}
header_name = tvb_get_string_enc(pinfo->pool, tvb, offset, colon_offset - offset, ENC_ASCII);
@ -937,7 +937,7 @@ dissect_mrcpv2_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_string(mrcpv2_tree, hf_mrcpv2_Weight, tvb, offset, linelen, header_value);
break;
default:
proto_tree_add_item(mrcpv2_tree, hf_mrcpv2_Unknown_Header, tvb, offset, linelen, ENC_UTF_8|ENC_NA);
proto_tree_add_item(mrcpv2_tree, hf_mrcpv2_Unknown_Header, tvb, offset, linelen, ENC_UTF_8);
break;
}
}

18
epan/dissectors/packet-msrp.c
View File

@ -550,9 +550,9 @@ dissect_msrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
guint32 msrp_status_code = -1;
gboolean msrp_status_code_valid;
proto_item* pi;
th = proto_tree_add_item(msrp_tree,hf_msrp_response_line,tvb,0,linelen,ENC_UTF_8|ENC_NA);
th = proto_tree_add_item(msrp_tree,hf_msrp_response_line,tvb,0,linelen,ENC_UTF_8);
reqresp_tree = proto_item_add_subtree(th, ett_msrp_reqresp);
proto_tree_add_item(reqresp_tree,hf_msrp_transactionID,tvb,token_2_start,token_2_len,ENC_UTF_8|ENC_NA);
proto_tree_add_item(reqresp_tree,hf_msrp_transactionID,tvb,token_2_start,token_2_len,ENC_UTF_8);
msrp_status_code_valid = ws_strtou32(
tvb_get_string_enc(pinfo->pool, tvb, token_3_start, token_3_len, ENC_UTF_8|ENC_NA),
NULL, & msrp_status_code);
@ -560,10 +560,10 @@ dissect_msrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
if (!msrp_status_code_valid)
expert_add_info(pinfo, pi, &ei_msrp_status_code_invalid);
}else{
th = proto_tree_add_item(msrp_tree,hf_msrp_request_line,tvb,0,linelen,ENC_UTF_8|ENC_NA);
th = proto_tree_add_item(msrp_tree,hf_msrp_request_line,tvb,0,linelen,ENC_UTF_8);
reqresp_tree = proto_item_add_subtree(th, ett_msrp_reqresp);
proto_tree_add_item(reqresp_tree,hf_msrp_transactionID,tvb,token_2_start,token_2_len,ENC_UTF_8|ENC_NA);
proto_tree_add_item(reqresp_tree,hf_msrp_method,tvb,token_3_start,token_3_len,ENC_UTF_8|ENC_NA);
proto_tree_add_item(reqresp_tree,hf_msrp_transactionID,tvb,token_2_start,token_2_len,ENC_UTF_8);
proto_tree_add_item(reqresp_tree,hf_msrp_method,tvb,token_3_start,token_3_len,ENC_UTF_8);
}
/* Conversation setup info */
@ -675,7 +675,7 @@ dissect_msrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
/* Create new tree & tvb for data */
next_tvb = tvb_new_subset_remaining(tvb, next_offset);
ti = proto_tree_add_item(msrp_tree, hf_msrp_data, tvb,
next_offset, -1, ENC_UTF_8|ENC_NA);
next_offset, -1, ENC_UTF_8);
msrp_data_tree = proto_item_add_subtree(ti, ett_msrp_data);
/* give the content type parameters to sub dissectors */
@ -703,12 +703,12 @@ dissect_msrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
/* End line */
ti = proto_tree_add_item(msrp_tree,hf_msrp_end_line,tvb,end_line_offset,end_line_len,ENC_UTF_8|ENC_NA);
ti = proto_tree_add_item(msrp_tree,hf_msrp_end_line,tvb,end_line_offset,end_line_len,ENC_UTF_8);
msrp_end_tree = proto_item_add_subtree(ti, ett_msrp_end_line);
proto_tree_add_item(msrp_end_tree,hf_msrp_transactionID,tvb,end_line_offset + 7,token_2_len,ENC_UTF_8|ENC_NA);
proto_tree_add_item(msrp_end_tree,hf_msrp_transactionID,tvb,end_line_offset + 7,token_2_len,ENC_UTF_8);
/* continuation-flag */
proto_tree_add_item(msrp_end_tree,hf_msrp_cnt_flg,tvb,end_line_offset+end_line_len-1,1,ENC_UTF_8|ENC_NA);
proto_tree_add_item(msrp_end_tree,hf_msrp_cnt_flg,tvb,end_line_offset+end_line_len-1,1,ENC_UTF_8);
if (global_msrp_raw_text && tree) {
raw_tree = proto_tree_add_subtree(tree, tvb, 0, -1, ett_msrp, NULL, "Message Session Relay Protocol(as raw text)");

2
epan/dissectors/packet-nas_5gs.c
View File

@ -4785,7 +4785,7 @@ de_nas_5gs_sm_pdu_dn_req_cont(tvbuff_t *tvb, proto_tree *tree, packet_info *pinf
guint32 offset, guint len,
gchar *add_string _U_, int string_len _U_)
{
proto_tree_add_item(tree, hf_nas_5gs_sm_dm_spec_id, tvb, offset, len, ENC_UTF_8|ENC_NA);
proto_tree_add_item(tree, hf_nas_5gs_sm_dm_spec_id, tvb, offset, len, ENC_UTF_8);
return len;
}

2
epan/dissectors/packet-nat-pmp.c
View File

@ -508,7 +508,7 @@ dissect_portcontrol_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gui
break;
case OPT_DESCRIPTION:
proto_tree_add_item(option_sub_tree, hf_option_description, tvb, offset, option_length, ENC_UTF_8|ENC_NA);
proto_tree_add_item(option_sub_tree, hf_option_description, tvb, offset, option_length, ENC_UTF_8);
break;
case OPT_PREFIX64:

266
epan/dissectors/packet-netflow.c
View File

@ -5787,18 +5787,18 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
case 82: /* IF_NAME */
ti = proto_tree_add_item(pdutree, hf_cflow_if_name,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case 83: /* IF_DESCR */
ti = proto_tree_add_item(pdutree, hf_cflow_if_descr,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case 84: /* SAMPLER_NAME */
/* "Deprecated in favor of 335 selectorName" */
ti = proto_tree_add_item(pdutree, hf_cflow_sampler_name,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case 85: /* BYTES_PERMANENT */
@ -5887,7 +5887,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
case 94: /* NBAR applicationDesc */
ti = proto_tree_add_item(pdutree, hf_cflow_nbar_appl_desc,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case 95: /* NBAR applicationId */
@ -5899,7 +5899,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
case 96: /* NBAR applicationName */
ti = proto_tree_add_item(pdutree, hf_cflow_nbar_appl_name,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case 98: /* postIpDiffServCodePoint */
@ -6018,7 +6018,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
case 147: /* wlanSSID */
ti = proto_tree_add_item(pdutree, hf_cflow_wlan_ssid,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case 148: /* flowId */
@ -6401,7 +6401,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
case 236: /* VRFname */
ti = proto_tree_add_item(pdutree, hf_cflow_vrfname,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case 237: /* postMplsTopLabelExp */
@ -6456,7 +6456,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
case 247: /* metroEvcId */
ti = proto_tree_add_item(pdutree, hf_cflow_metro_evc_id,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case 248: /* metroEvcType */
@ -6656,7 +6656,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
case 284:
ti = proto_tree_add_item(pdutree, hf_cflow_nat_pool_name,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case 285:
@ -6676,17 +6676,17 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
case 288:
ti = proto_tree_add_item(pdutree, hf_cflow_p2p_technology,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case 289:
ti = proto_tree_add_item(pdutree, hf_cflow_tunnel_technology,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case 290:
ti = proto_tree_add_item(pdutree, hf_cflow_encrypted_technology,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case 292:
@ -6727,7 +6727,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
case 300:
ti = proto_tree_add_item(pdutree, hf_cflow_observation_domain_name,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case 301: /* selectionSequenceId */
@ -6963,7 +6963,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
case 335: /* selectorName */
ti = proto_tree_add_item(pdutree, hf_cflow_selector_name,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case 336: /* upperCILimit */
@ -7003,7 +7003,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
case 340: /* informationElementDescription */
ti = proto_tree_add_item(pdutree, hf_cflow_information_element_description,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case 341: /* informationElementName */
@ -7048,7 +7048,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
case 348: /* virtualStationInterfaceName */
ti = proto_tree_add_item(pdutree, hf_cflow_virtual_station_interface_name,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case 349: /* virtualStationUUID */
@ -7058,7 +7058,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
case 350: /* virtualStationName */
ti = proto_tree_add_item(pdutree, hf_cflow_virtual_station_name,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case 351: /* layer2SegmentId */
@ -7169,22 +7169,22 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
case 371: /* userName */
ti = proto_tree_add_item(pdutree, hf_cflow_user_name,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case 372: /* applicationCategoryName */
ti = proto_tree_add_item(pdutree, hf_cflow_application_category_name,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case 373: /* applicationSubCategoryName */
ti = proto_tree_add_item(pdutree, hf_cflow_application_sub_category_name,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case 374: /* applicationGroupName */
ti = proto_tree_add_item(pdutree, hf_cflow_application_group_name,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case 375: /* originalFlowsPresent */
@ -7554,37 +7554,37 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
case 450: /* mibContextName */
ti = proto_tree_add_item(pdutree, hf_cflow_mib_context_name,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case 451: /* mibObjectName */
ti = proto_tree_add_item(pdutree, hf_cflow_mib_object_name,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case 452: /* mibObjectDescription */
ti = proto_tree_add_item(pdutree, hf_cflow_mib_object_description,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case 453: /* mibObjectSyntax */
ti = proto_tree_add_item(pdutree, hf_cflow_mib_object_syntax,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case 454: /* mibModuleName */
ti = proto_tree_add_item(pdutree, hf_cflow_mib_module_name,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case 455: /* mobileIMSI */
ti = proto_tree_add_item(pdutree, hf_cflow_mobile_imsi,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case 456: /* mobileMSISDN */
ti = proto_tree_add_item(pdutree, hf_cflow_mobile_msisdn,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case 457: /* httpStatusCode */
@ -7599,22 +7599,22 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
case 459: /* httpRequestMethod */
ti = proto_tree_add_item(pdutree, hf_cflow_http_request_method,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case 460: /* httpRequestHost */
ti = proto_tree_add_item(pdutree, hf_cflow_http_request_host,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case 461: /* httpRequestTarget */
ti = proto_tree_add_item(pdutree, hf_cflow_http_request_target,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case 462: /* httpMessageVersion */
ti = proto_tree_add_item(pdutree, hf_cflow_http_message_version,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case 463: /* natInstanceID */
@ -7644,17 +7644,17 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
case 468: /* httpUserAgent */
ti = proto_tree_add_item(pdutree, hf_cflow_http_user_agent,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case 469: /* httpContentType */
ti = proto_tree_add_item(pdutree, hf_cflow_http_content_type,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case 470: /* httpReasonPhrase */
ti = proto_tree_add_item(pdutree, hf_cflow_http_reason_phrase,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case 471: /* maxSessionEntries */
@ -7985,7 +7985,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
break;
case 24629: /* natContextName */
ti = proto_tree_add_item(pdutree, hf_cflow_nat_context_name,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case 24630: /* natAssignTime */
ts.secs = tvb_get_ntohl(tvb, offset);
@ -10748,11 +10748,11 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
break;
case ((VENDOR_NETSCALER << 16) | 130):
ti = proto_tree_add_item(pdutree, hf_pie_netscaler_httprequrl,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NETSCALER << 16) | 131):
ti = proto_tree_add_item(pdutree, hf_pie_netscaler_httpreqcookie,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NETSCALER << 16) | 132):
ti = proto_tree_add_item(pdutree, hf_pie_netscaler_flowflags,
@ -10768,7 +10768,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
break;
case ((VENDOR_NETSCALER << 16) | 135):
ti = proto_tree_add_item(pdutree, hf_pie_netscaler_syslogmessage,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NETSCALER << 16) | 136):
ti = proto_tree_add_item(pdutree, hf_pie_netscaler_syslogtimestamp,
@ -10776,19 +10776,19 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
break;
case ((VENDOR_NETSCALER << 16) | 140):
ti = proto_tree_add_item(pdutree, hf_pie_netscaler_httpreqreferer,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NETSCALER << 16) | 141):
ti = proto_tree_add_item(pdutree, hf_pie_netscaler_httpreqmethod,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NETSCALER << 16) | 142):
ti = proto_tree_add_item(pdutree, hf_pie_netscaler_httpreqhost,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NETSCALER << 16) | 143):
ti = proto_tree_add_item(pdutree, hf_pie_netscaler_httprequseragent,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NETSCALER << 16) | 144):
ti = proto_tree_add_item(pdutree, hf_pie_netscaler_httprspstatus,
@ -10816,7 +10816,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
break;
case ((VENDOR_NETSCALER << 16) | 152):
ti = proto_tree_add_item(pdutree, hf_pie_netscaler_appname,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NETSCALER << 16) | 153):
ti = proto_tree_add_item(pdutree, hf_pie_netscaler_httpreqrcvfb,
@ -10852,23 +10852,23 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
break;
case ((VENDOR_NETSCALER << 16) | 163):
ti = proto_tree_add_item(pdutree, hf_pie_netscaler_httpclientinteractionstarttime,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NETSCALER << 16) | 164):
ti = proto_tree_add_item(pdutree, hf_pie_netscaler_httpclientrenderendtime,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NETSCALER << 16) | 165):
ti = proto_tree_add_item(pdutree, hf_pie_netscaler_httpclientrenderstarttime,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NETSCALER << 16) | 167):
ti = proto_tree_add_item(pdutree, hf_pie_netscaler_apptemplatename,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NETSCALER << 16) | 168):
ti = proto_tree_add_item(pdutree, hf_pie_netscaler_httpclientinteractionendtime,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NETSCALER << 16) | 169):
ti = proto_tree_add_item(pdutree, hf_pie_netscaler_httpresrcvlb,
@ -10896,23 +10896,23 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
break;
case ((VENDOR_NETSCALER << 16) | 175):
ti = proto_tree_add_item(pdutree, hf_pie_netscaler_dbusername,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NETSCALER << 16) | 176):
ti = proto_tree_add_item(pdutree, hf_pie_netscaler_dbdatabasename,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NETSCALER << 16) | 177):
ti = proto_tree_add_item(pdutree, hf_pie_netscaler_dbclthostname,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NETSCALER << 16) | 178):
ti = proto_tree_add_item(pdutree, hf_pie_netscaler_dbreqstring,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NETSCALER << 16) | 179):
ti = proto_tree_add_item(pdutree, hf_pie_netscaler_dbrespstatusstring,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NETSCALER << 16) | 180):
ti = proto_tree_add_item(pdutree, hf_pie_netscaler_dbrespstatus,
@ -10928,31 +10928,31 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
break;
case ((VENDOR_NETSCALER << 16) | 183):
ti = proto_tree_add_item(pdutree, hf_pie_netscaler_httpcontenttype,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NETSCALER << 16) | 185):
ti = proto_tree_add_item(pdutree, hf_pie_netscaler_httpreqauthorization,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NETSCALER << 16) | 186):
ti = proto_tree_add_item(pdutree, hf_pie_netscaler_httpreqvia,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NETSCALER << 16) | 187):
ti = proto_tree_add_item(pdutree, hf_pie_netscaler_httpreslocation,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NETSCALER << 16) | 188):
ti = proto_tree_add_item(pdutree, hf_pie_netscaler_httpressetcookie,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NETSCALER << 16) | 189):
ti = proto_tree_add_item(pdutree, hf_pie_netscaler_httpressetcookie2,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NETSCALER << 16) | 190):
ti = proto_tree_add_item(pdutree, hf_pie_netscaler_httpreqxforwardedfor,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NETSCALER << 16) | 192):
ti = proto_tree_add_item(pdutree, hf_pie_netscaler_connectionchainid,
@ -10968,7 +10968,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
break;
case ((VENDOR_NETSCALER << 16) | 201):
ti = proto_tree_add_item(pdutree, hf_pie_netscaler_icaclientversion,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NETSCALER << 16) | 202):
ti = proto_tree_add_item(pdutree, hf_pie_netscaler_icaclienttype,
@ -10980,15 +10980,15 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
break;
case ((VENDOR_NETSCALER << 16) | 204):
ti = proto_tree_add_item(pdutree, hf_pie_netscaler_icaclienthostname,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NETSCALER << 16) | 205):
ti = proto_tree_add_item(pdutree, hf_pie_netscaler_aaausername,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NETSCALER << 16) | 207):
ti = proto_tree_add_item(pdutree, hf_pie_netscaler_icadomainname,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NETSCALER << 16) | 208):
ti = proto_tree_add_item(pdutree, hf_pie_netscaler_icaclientlauncher,
@ -11000,7 +11000,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
break;
case ((VENDOR_NETSCALER << 16) | 210):
ti = proto_tree_add_item(pdutree, hf_pie_netscaler_icaservername,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NETSCALER << 16) | 214):
ti = proto_tree_add_item(pdutree, hf_pie_netscaler_icasessionreconnects,
@ -11104,7 +11104,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
break;
case ((VENDOR_NETSCALER << 16) | 238):
ti = proto_tree_add_item(pdutree, hf_pie_netscaler_icaapplicationname,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NETSCALER << 16) | 239):
/* XXX - what format is this? */
@ -11137,7 +11137,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
break;
case ((VENDOR_NETSCALER << 16) | 246):
ti = proto_tree_add_item(pdutree, hf_pie_netscaler_icaappmodulepath,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NETSCALER << 16) | 247):
ti = proto_tree_add_item(pdutree, hf_pie_netscaler_icadeviceserialno,
@ -11153,7 +11153,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
break;
case ((VENDOR_NETSCALER << 16) | 250):
ti = proto_tree_add_item(pdutree, hf_pie_netscaler_icausername,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NETSCALER << 16) | 251):
ti = proto_tree_add_item(pdutree, hf_pie_netscaler_licensetype,
@ -11223,7 +11223,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
break;
case ((VENDOR_NETSCALER << 16) | 267):
ti = proto_tree_add_item(pdutree, hf_pie_netscaler_httpdomainname,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NETSCALER << 16) | 268):
ti = proto_tree_add_item(pdutree, hf_pie_netscaler_cacheredirclientconnectioncoreid,
@ -11250,11 +11250,11 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
break;
case ((VENDOR_BARRACUDA << 16) | 4):
ti = proto_tree_add_item(pdutree, hf_pie_barracuda_fwrule,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_BARRACUDA << 16) | 5):
ti = proto_tree_add_item(pdutree, hf_pie_barracuda_servicename,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_BARRACUDA << 16) | 6):
ti = proto_tree_add_item(pdutree, hf_pie_barracuda_reason,
@ -11262,7 +11262,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
break;
case ((VENDOR_BARRACUDA << 16) | 7):
ti = proto_tree_add_item(pdutree, hf_pie_barracuda_reasontext,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_BARRACUDA << 16) | 8):
ti = proto_tree_add_item(pdutree, hf_pie_barracuda_bindipv4address,
@ -11289,7 +11289,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
/* START Gigamon */
case ((VENDOR_GIGAMON << 16) | 1):
ti = proto_tree_add_item(pdutree, hf_pie_gigamon_httprequrl,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_GIGAMON << 16) | 2):
@ -11299,32 +11299,32 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
case ((VENDOR_GIGAMON << 16) | 101):
ti = proto_tree_add_item(pdutree, hf_pie_gigamon_sslcertificateissuercommonname,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_GIGAMON << 16) | 102):
ti = proto_tree_add_item(pdutree, hf_pie_gigamon_sslcertificatesubjectcommonname,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_GIGAMON << 16) | 103):
ti = proto_tree_add_item(pdutree, hf_pie_gigamon_sslcertificateissuer,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_GIGAMON << 16) | 104):
ti = proto_tree_add_item(pdutree, hf_pie_gigamon_sslcertificatesubject,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_GIGAMON << 16) | 105):
ti = proto_tree_add_item(pdutree, hf_pie_gigamon_sslcertificatevalidnotbefore,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_GIGAMON << 16) | 106):
ti = proto_tree_add_item(pdutree, hf_pie_gigamon_sslcertificatevalidnotafter,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_GIGAMON << 16) | 107):
@ -11349,12 +11349,12 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
case ((VENDOR_GIGAMON << 16) | 111):
ti = proto_tree_add_item(pdutree, hf_pie_gigamon_sslcertificatesubjectaltname,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_GIGAMON << 16) | 112):
ti = proto_tree_add_item(pdutree, hf_pie_gigamon_sslservernameindication,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_GIGAMON << 16) | 113):
@ -11394,12 +11394,12 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
case ((VENDOR_GIGAMON << 16) | 204):
ti = proto_tree_add_item(pdutree, hf_pie_gigamon_dnsqueryname,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_GIGAMON << 16) | 205):
ti = proto_tree_add_item(pdutree, hf_pie_gigamon_dnsresponsename,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_GIGAMON << 16) | 206):
@ -11419,7 +11419,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
case ((VENDOR_GIGAMON << 16) | 209):
ti = proto_tree_add_item(pdutree, hf_pie_gigamon_dnsbits,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_GIGAMON << 16) | 210):
@ -11469,12 +11469,12 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
case ((VENDOR_GIGAMON << 16) | 219):
ti = proto_tree_add_item(pdutree, hf_pie_gigamon_dnsresponserdata,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_GIGAMON << 16) | 220):
ti = proto_tree_add_item(pdutree, hf_pie_gigamon_dnsauthorityname,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_GIGAMON << 16) | 221):
@ -11499,12 +11499,12 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
case ((VENDOR_GIGAMON << 16) | 225):
ti = proto_tree_add_item(pdutree, hf_pie_gigamon_dnsauthorityrdata,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_GIGAMON << 16) | 226):
ti = proto_tree_add_item(pdutree, hf_pie_gigamon_dnsadditionalname,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_GIGAMON << 16) | 227):
@ -11529,7 +11529,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
case ((VENDOR_GIGAMON << 16) | 231):
ti = proto_tree_add_item(pdutree, hf_pie_gigamon_dnsadditionalrdata,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
/* END Gigamon */
@ -11561,7 +11561,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
break;
case ((VENDOR_CISCO << 16) | 8234):
ti = proto_tree_add_item(pdutree, hf_pie_cisco_c3pl_class_name,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_CISCO << 16) | 8235):
ti = proto_tree_add_item(pdutree, hf_pie_cisco_c3pl_class_type,
@ -11573,7 +11573,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
break;
case ((VENDOR_CISCO << 16) | 8237):
ti = proto_tree_add_item(pdutree, hf_pie_cisco_c3pl_policy_name,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_CISCO << 16) | 8238):
ti = proto_tree_add_item(pdutree, hf_pie_cisco_c3pl_policy_type,
@ -11637,7 +11637,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
break;
case ((VENDOR_CISCO << 16) | 9357):
cti = proto_tree_add_item(pdutree, hf_pie_cisco_application_http_uri_statistics,
tvb, offset, length - 3, ENC_UTF_8|ENC_NA);
tvb, offset, length - 3, ENC_UTF_8);
string_tree = proto_item_add_subtree(cti, ett_str_len);
proto_tree_add_item(string_tree, hf_pie_cisco_application_http_uri_statistics_count,
tvb, offset + (length - 2), 2, ENC_BIG_ENDIAN);
@ -11646,15 +11646,15 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
break;
case ((VENDOR_CISCO << 16) | 12232):
ti = proto_tree_add_item(pdutree, hf_pie_cisco_application_category_name,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_CISCO << 16) | 12233):
ti = proto_tree_add_item(pdutree, hf_pie_cisco_application_sub_category_name,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_CISCO << 16) | 12234):
ti = proto_tree_add_item(pdutree, hf_pie_cisco_application_group_name,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_CISCO << 16) | 12235):
cti = proto_tree_add_item(pdutree, hf_pie_cisco_application_http_host,
@ -11700,7 +11700,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
/* START Niagara Networks */
case ((VENDOR_NIAGARA_NETWORKS << 16) | 100):
ti = proto_tree_add_item(pdutree, hf_pie_niagara_networks_sslservernameindication,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NIAGARA_NETWORKS << 16) | 101):
@ -11710,7 +11710,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
case ((VENDOR_NIAGARA_NETWORKS << 16) | 102):
ti = proto_tree_add_item(pdutree, hf_pie_niagara_networks_sslserverversiontext,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NIAGARA_NETWORKS << 16) | 103):
@ -11720,12 +11720,12 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
case ((VENDOR_NIAGARA_NETWORKS << 16) | 104):
ti = proto_tree_add_item(pdutree, hf_pie_niagara_networks_sslserverciphertext,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NIAGARA_NETWORKS << 16) | 105):
ti = proto_tree_add_item(pdutree, hf_pie_niagara_networks_sslconnectionencryptiontype,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NIAGARA_NETWORKS << 16) | 106):
@ -11740,47 +11740,47 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
case ((VENDOR_NIAGARA_NETWORKS << 16) | 108):
ti = proto_tree_add_item(pdutree, hf_pie_niagara_networks_sslcertificateissuer,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NIAGARA_NETWORKS << 16) | 109):
ti = proto_tree_add_item(pdutree, hf_pie_niagara_networks_sslcertificateissuername,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NIAGARA_NETWORKS << 16) | 110):
ti = proto_tree_add_item(pdutree, hf_pie_niagara_networks_sslcertificatesubject,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NIAGARA_NETWORKS << 16) | 111):
ti = proto_tree_add_item(pdutree, hf_pie_niagara_networks_sslcertificatesubjectname,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NIAGARA_NETWORKS << 16) | 112):
ti = proto_tree_add_item(pdutree, hf_pie_niagara_networks_sslcertificatevalidnotbefore,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NIAGARA_NETWORKS << 16) | 113):
ti = proto_tree_add_item(pdutree, hf_pie_niagara_networks_sslcertificatevalidnotafter,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NIAGARA_NETWORKS << 16) | 114):
ti = proto_tree_add_item(pdutree, hf_pie_niagara_networks_sslcertificateserialnumber,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NIAGARA_NETWORKS << 16) | 115):
ti = proto_tree_add_item(pdutree, hf_pie_niagara_networks_sslcertificatesignaturealgorithm,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NIAGARA_NETWORKS << 16) | 116):
ti = proto_tree_add_item(pdutree, hf_pie_niagara_networks_sslcertificatesignaturealgorithmtext,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NIAGARA_NETWORKS << 16) | 117):
@ -11790,22 +11790,22 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
case ((VENDOR_NIAGARA_NETWORKS << 16) | 118):
ti = proto_tree_add_item(pdutree, hf_pie_niagara_networks_sslcertificatesubjectpublicalgorithm,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NIAGARA_NETWORKS << 16) | 119):
ti = proto_tree_add_item(pdutree, hf_pie_niagara_networks_sslcertificatesubjectpublicalgorithmtext,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NIAGARA_NETWORKS << 16) | 120):
ti = proto_tree_add_item(pdutree, hf_pie_niagara_networks_sslcertificatesubjectalgorithmtext,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NIAGARA_NETWORKS << 16) | 121):
ti = proto_tree_add_item(pdutree, hf_pie_niagara_networks_sslcertificatesubjectalternativename,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NIAGARA_NETWORKS << 16) | 122):
@ -11830,12 +11830,12 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
case ((VENDOR_NIAGARA_NETWORKS << 16) | 203):
ti = proto_tree_add_item(pdutree, hf_pie_niagara_networks_dnsqueryname,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NIAGARA_NETWORKS << 16) | 204):
ti = proto_tree_add_item(pdutree, hf_pie_niagara_networks_dnsresponsename,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NIAGARA_NETWORKS << 16) | 205):
@ -11845,22 +11845,22 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
case ((VENDOR_NIAGARA_NETWORKS << 16) | 206):
ti = proto_tree_add_item(pdutree, hf_pie_niagara_networks_dnsresponseipv4addr,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NIAGARA_NETWORKS << 16) | 207):
ti = proto_tree_add_item(pdutree, hf_pie_niagara_networks_dnsresponseipv4addrtext,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NIAGARA_NETWORKS << 16) | 208):
ti = proto_tree_add_item(pdutree, hf_pie_niagara_networks_dnsresponseipv6addr,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NIAGARA_NETWORKS << 16) | 209):
ti = proto_tree_add_item(pdutree, hf_pie_niagara_networks_dnsresponseipv6addrtext,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NIAGARA_NETWORKS << 16) | 210):
@ -11895,7 +11895,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
case ((VENDOR_NIAGARA_NETWORKS << 16) | 216):
ti = proto_tree_add_item(pdutree, hf_pie_niagara_networks_dnsquerytypetext,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NIAGARA_NETWORKS << 16) | 217):
@ -11905,7 +11905,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
case ((VENDOR_NIAGARA_NETWORKS << 16) | 218):
ti = proto_tree_add_item(pdutree, hf_pie_niagara_networks_dnsqueryclasstext,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NIAGARA_NETWORKS << 16) | 219):
@ -11915,7 +11915,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
case ((VENDOR_NIAGARA_NETWORKS << 16) | 220):
ti = proto_tree_add_item(pdutree, hf_pie_niagara_networks_dnsresponsetypetext,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NIAGARA_NETWORKS << 16) | 221):
@ -11925,7 +11925,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
case ((VENDOR_NIAGARA_NETWORKS << 16) | 222):
ti = proto_tree_add_item(pdutree, hf_pie_niagara_networks_dnsresponseclasstext,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NIAGARA_NETWORKS << 16) | 223):
@ -11940,7 +11940,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
case ((VENDOR_NIAGARA_NETWORKS << 16) | 225):
ti = proto_tree_add_item(pdutree, hf_pie_niagara_networks_dnsauthorityname,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NIAGARA_NETWORKS << 16) | 226):
@ -11950,7 +11950,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
case ((VENDOR_NIAGARA_NETWORKS << 16) | 227):
ti = proto_tree_add_item(pdutree, hf_pie_niagara_networks_dnsauthoritytypetext,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NIAGARA_NETWORKS << 16) | 228):
@ -11960,7 +11960,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
case ((VENDOR_NIAGARA_NETWORKS << 16) | 229):
ti = proto_tree_add_item(pdutree, hf_pie_niagara_networks_dnsauthorityclasstext,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NIAGARA_NETWORKS << 16) | 230):
@ -11975,12 +11975,12 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
case ((VENDOR_NIAGARA_NETWORKS << 16) | 232):
ti = proto_tree_add_item(pdutree, hf_pie_niagara_networks_dnsauthorityrdata,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NIAGARA_NETWORKS << 16) | 233):
ti = proto_tree_add_item(pdutree, hf_pie_niagara_networks_dnsadditionalname,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NIAGARA_NETWORKS << 16) | 234):
@ -11990,7 +11990,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
case ((VENDOR_NIAGARA_NETWORKS << 16) | 235):
ti = proto_tree_add_item(pdutree, hf_pie_niagara_networks_dnsadditionaltypetext,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NIAGARA_NETWORKS << 16) | 236):
@ -12000,7 +12000,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
case ((VENDOR_NIAGARA_NETWORKS << 16) | 237):
ti = proto_tree_add_item(pdutree, hf_pie_niagara_networks_dnsadditionalclasstext,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NIAGARA_NETWORKS << 16) | 238):
@ -12015,7 +12015,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
case ((VENDOR_NIAGARA_NETWORKS << 16) | 240):
ti = proto_tree_add_item(pdutree, hf_pie_niagara_networks_dnsadditionalrdata,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NIAGARA_NETWORKS << 16) | 300):
@ -12025,7 +12025,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
case ((VENDOR_NIAGARA_NETWORKS << 16) | 301):
ti = proto_tree_add_item(pdutree, hf_pie_niagara_networks_radiuspackettypecodetext,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NIAGARA_NETWORKS << 16) | 302):
@ -12115,7 +12115,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
case ((VENDOR_NIAGARA_NETWORKS << 16) | 319):
ti = proto_tree_add_item(pdutree, hf_pie_niagara_networks_radiusvsaname,
tvb, offset, length, ENC_UTF_8|ENC_NA);
tvb, offset, length, ENC_UTF_8);
break;
case ((VENDOR_NIAGARA_NETWORKS << 16) | 320):

2
epan/dissectors/packet-netperfmeter.c
View File

@ -315,7 +315,7 @@ dissect_npm_add_flow_message(tvbuff_t *message_tvb, proto_tree *message_tree, pr
proto_tree_add_item(message_tree, hf_addflow_streamid, message_tvb, 16, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(message_tree, hf_addflow_protocol, message_tvb, 18, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(message_tree, hf_addflow_flags, message_tvb, 19, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(message_tree, hf_addflow_description, message_tvb, 20, 32, ENC_UTF_8|ENC_NA);
proto_tree_add_item(message_tree, hf_addflow_description, message_tvb, 20, 32, ENC_UTF_8);
proto_tree_add_double_format_value(message_tree, hf_addflow_ordered, message_tvb, 52, 4,
100.0 * tvb_get_ntohl(message_tvb, 52) / (double)0xffffffff, "%1.3f%%",

2
epan/dissectors/packet-nflog.c
View File

@ -199,7 +199,7 @@ dissect_nflog(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U
case WS_NFULA_PREFIX:
if (value_len >= 1) {
proto_tree_add_item(tlv_tree, hf_nflog_tlv_prefix,
tvb, offset + 4, value_len, ENC_NA);
tvb, offset + 4, value_len, ENC_ASCII);
handled = TRUE;
}
break;

2
epan/dissectors/packet-pana.c
View File

@ -370,7 +370,7 @@ dissect_avps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *avp_tree)
}
case PANA_UTF8STRING: {
proto_tree_add_item(single_avp_tree, hf_pana_avp_data_string, tvb,
offset, avp_data_length, ENC_UTF_8|ENC_NA);
offset, avp_data_length, ENC_UTF_8);
break;
}
case PANA_OCTET_STRING: {

6
epan/dissectors/packet-pfcp.c
View File

@ -6340,7 +6340,7 @@ dissect_pfcp_framed_route(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre
* MUST NOT affect operation of the protocol. It is recommended that
* the message contain UTF-8 encoded 10646 [7] characters.
*/
proto_tree_add_item(tree, hf_pfcp_framed_route, tvb, 0, length, ENC_UTF_8|ENC_NA);
proto_tree_add_item(tree, hf_pfcp_framed_route, tvb, 0, length, ENC_UTF_8);
}
/*
@ -6366,7 +6366,7 @@ dissect_pfcp_framed_ipv6_route(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree
* RFC 3162
* "...It is intended to be human readable..."
*/
proto_tree_add_item(tree, hf_pfcp_framed_ipv6_route, tvb, 0, length, ENC_UTF_8|ENC_NA);
proto_tree_add_item(tree, hf_pfcp_framed_ipv6_route, tvb, 0, length, ENC_UTF_8);
}
/*
@ -8543,7 +8543,7 @@ static void
dissect_pfcp_group_id(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint16 length, guint8 message_type _U_, pfcp_session_args_t *args _U_)
{
/* Octet 5 to (n+4) Group ID */
proto_tree_add_item(tree, hf_pfcp_group_id, tvb, 0, length, ENC_UTF_8|ENC_NA);
proto_tree_add_item(tree, hf_pfcp_group_id, tvb, 0, length, ENC_UTF_8);
}
/*

4
epan/dissectors/packet-pktap.c
View File

@ -171,7 +171,7 @@ dissect_pktap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U
ENC_LITTLE_ENDIAN);
offset += 4;
proto_tree_add_item(pktap_tree, hf_pktap_cmdname, tvb, offset, 20,
ENC_UTF_8|ENC_NA);
ENC_UTF_8);
offset += 20;
proto_tree_add_item(pktap_tree, hf_pktap_svc_class, tvb, offset, 4,
ENC_LITTLE_ENDIAN);
@ -186,7 +186,7 @@ dissect_pktap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U
ENC_LITTLE_ENDIAN);
offset += 4;
proto_tree_add_item(pktap_tree, hf_pktap_ecmdname, tvb, offset, 20,
ENC_UTF_8|ENC_NA);
ENC_UTF_8);
/*offset += 20;*/
if (rectype == PKT_REC_PACKET) {

2
epan/dissectors/packet-ppcap.c
View File

@ -221,7 +221,7 @@ dissect_ppcap_payload_type(tvbuff_t *tvb, proto_tree * ppcap_tree1, int offset,
*payload_type = PPCAP_GTPV2;
}
proto_tree_add_item(ppcap_tree1, hf_ppcap_payload_type, tvb, offset, msg_len, ENC_UTF_8|ENC_NA);
proto_tree_add_item(ppcap_tree1, hf_ppcap_payload_type, tvb, offset, msg_len, ENC_UTF_8);
if (msg_len%4)
msg_len = msg_len+(4-(msg_len%4));

4
epan/dissectors/packet-rtmpt.c
View File

@ -896,7 +896,7 @@ dissect_amf0_property_list(tvbuff_t *tvb, gint offset, proto_tree *tree, guint *
proto_tree_add_uint(name_tree, hf_amf_stringlength, tvb, offset, 2, iStringLength);
offset += 2;
proto_tree_add_item(name_tree, hf_amf_string, tvb, offset, iStringLength, ENC_UTF_8|ENC_NA);
proto_tree_add_item(name_tree, hf_amf_string, tvb, offset, iStringLength, ENC_UTF_8);
offset += iStringLength;
/* value-type: property value */
@ -1504,7 +1504,7 @@ dissect_amf3_value_type(tvbuff_t *tvb, gint offset, proto_tree *tree, proto_item
iStringLength = iIntegerValue >> 1;
proto_tree_add_uint(val_tree, hf_amf_xmllength, tvb, iValueOffset, iValueLength, iStringLength);
iValueOffset += iValueLength;
proto_tree_add_item(val_tree, hf_amf_xml, tvb, iValueOffset, iStringLength, ENC_UTF_8|ENC_NA);
proto_tree_add_item(val_tree, hf_amf_xml, tvb, iValueOffset, iStringLength, ENC_UTF_8);
} else {
/* the upper 28 bits of the integer value are a string reference index */
proto_tree_add_uint(val_tree, hf_amf_object_reference, tvb, iValueOffset, iValueLength, iIntegerValue >> 1);

2
epan/dissectors/packet-sabp.c
View File

@ -1782,7 +1782,7 @@ dissect_sabp_cb_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if (unpacked_tvb != NULL){
if (tree != NULL){
proto_tree *cbs_page_subtree = proto_item_add_subtree(cbs_page_item, ett_sabp_cbs_page_content);
proto_tree_add_item(cbs_page_subtree, hf_sabp_cbs_page_content, unpacked_tvb, 0, len, ENC_UTF_8|ENC_NA);
proto_tree_add_item(cbs_page_subtree, hf_sabp_cbs_page_content, unpacked_tvb, 0, len, ENC_UTF_8);
}
}

86
epan/dissectors/packet-sdp.c
View File

@ -585,7 +585,7 @@ dissect_sdp_owner(tvbuff_t *tvb, proto_item *ti) {
return;
proto_tree_add_item(sdp_owner_tree, hf_owner_username, tvb, offset, tokenlen,
ENC_UTF_8|ENC_NA);
ENC_UTF_8);
offset = next_offset + 1;
/* Find the session id */
@ -594,7 +594,7 @@ dissect_sdp_owner(tvbuff_t *tvb, proto_item *ti) {
return;
proto_tree_add_item(sdp_owner_tree, hf_owner_sessionid, tvb, offset,
tokenlen, ENC_UTF_8|ENC_NA);
tokenlen, ENC_UTF_8);
offset = next_offset + 1;
/* Find the version */
@ -603,7 +603,7 @@ dissect_sdp_owner(tvbuff_t *tvb, proto_item *ti) {
return;
proto_tree_add_item(sdp_owner_tree, hf_owner_version, tvb, offset, tokenlen,
ENC_UTF_8|ENC_NA);
ENC_UTF_8);
offset = next_offset + 1;
/* Find the network type */
@ -612,7 +612,7 @@ dissect_sdp_owner(tvbuff_t *tvb, proto_item *ti) {
return;
proto_tree_add_item(sdp_owner_tree, hf_owner_network_type, tvb, offset,
tokenlen, ENC_UTF_8|ENC_NA);
tokenlen, ENC_UTF_8);
offset = next_offset + 1;
/* Find the address type */
@ -621,11 +621,11 @@ dissect_sdp_owner(tvbuff_t *tvb, proto_item *ti) {
return;
proto_tree_add_item(sdp_owner_tree, hf_owner_address_type, tvb, offset,
tokenlen, ENC_UTF_8|ENC_NA);
tokenlen, ENC_UTF_8);
offset = next_offset + 1;
/* Find the address */
proto_tree_add_item(sdp_owner_tree, hf_owner_address, tvb, offset, -1, ENC_UTF_8|ENC_NA);
proto_tree_add_item(sdp_owner_tree, hf_owner_address, tvb, offset, -1, ENC_UTF_8);
}
/*
@ -651,7 +651,7 @@ dissect_sdp_connection_info(packet_info *pinfo, tvbuff_t *tvb, proto_item* ti, s
proto_tree_add_item(sdp_connection_info_tree,
hf_connection_info_network_type, tvb, offset, tokenlen,
ENC_UTF_8|ENC_NA);
ENC_UTF_8);
offset = next_offset + 1;
/* Find the address type */
@ -697,7 +697,7 @@ dissect_sdp_connection_info(packet_info *pinfo, tvbuff_t *tvb, proto_item* ti, s
proto_tree_add_item(sdp_connection_info_tree,
hf_connection_info_connection_address, tvb, offset,
tokenlen, ENC_UTF_8|ENC_NA);
tokenlen, ENC_UTF_8);
if (next_offset != -1) {
offset = next_offset + 1;
next_offset = tvb_find_guint8(tvb, offset, -1, '/');
@ -707,11 +707,11 @@ dissect_sdp_connection_info(packet_info *pinfo, tvbuff_t *tvb, proto_item* ti, s
tokenlen = next_offset - offset;
}
proto_tree_add_item(sdp_connection_info_tree,
hf_connection_info_ttl, tvb, offset, tokenlen, ENC_UTF_8|ENC_NA);
hf_connection_info_ttl, tvb, offset, tokenlen, ENC_UTF_8);
if (next_offset != -1) {
offset = next_offset + 1;
proto_tree_add_item(sdp_connection_info_tree,
hf_connection_info_num_addr, tvb, offset, -1, ENC_UTF_8|ENC_NA);
hf_connection_info_num_addr, tvb, offset, -1, ENC_UTF_8);
}
}
}
@ -737,7 +737,7 @@ dissect_sdp_bandwidth(tvbuff_t *tvb, proto_item *ti) {
tokenlen = next_offset - offset;
item = proto_tree_add_item(sdp_bandwidth_tree, hf_bandwidth_modifier, tvb, offset,
tokenlen, ENC_UTF_8|ENC_NA);
tokenlen, ENC_UTF_8);
if (tvb_strneql(tvb, offset, "CT", 2) == 0) {
proto_item_append_text(item, " [Conference Total(total bandwidth of all RTP sessions)]");
unit_is_kbs = TRUE;
@ -753,7 +753,7 @@ dissect_sdp_bandwidth(tvbuff_t *tvb, proto_item *ti) {
offset = next_offset + 1;
item = proto_tree_add_item(sdp_bandwidth_tree, hf_bandwidth_value, tvb, offset, -1,
ENC_UTF_8|ENC_NA);
ENC_UTF_8);
if (unit_is_kbs == TRUE)
proto_item_append_text(item, " kb/s");
if (unit_is_bps == TRUE)
@ -774,11 +774,11 @@ static void dissect_sdp_time(tvbuff_t *tvb, proto_item* ti) {
return;
proto_tree_add_item(sdp_time_tree, hf_time_start, tvb, offset, tokenlen,
ENC_UTF_8|ENC_NA);
ENC_UTF_8);
/* get stop time */
offset = next_offset + 1;
proto_tree_add_item(sdp_time_tree, hf_time_stop, tvb, offset, -1, ENC_UTF_8|ENC_NA);
proto_tree_add_item(sdp_time_tree, hf_time_stop, tvb, offset, -1, ENC_UTF_8);
}
static void dissect_sdp_repeat_time(tvbuff_t *tvb, proto_item* ti) {
@ -796,7 +796,7 @@ static void dissect_sdp_repeat_time(tvbuff_t *tvb, proto_item* ti) {
return;
proto_tree_add_item(sdp_repeat_time_tree, hf_repeat_time_interval, tvb,
offset, tokenlen, ENC_UTF_8|ENC_NA);
offset, tokenlen, ENC_UTF_8);
/* get duration */
offset = next_offset + 1;
@ -805,7 +805,7 @@ static void dissect_sdp_repeat_time(tvbuff_t *tvb, proto_item* ti) {
return;
proto_tree_add_item(sdp_repeat_time_tree, hf_repeat_time_duration, tvb,
offset, tokenlen, ENC_UTF_8|ENC_NA);
offset, tokenlen, ENC_UTF_8);
/* get offsets */
do {
@ -815,7 +815,7 @@ static void dissect_sdp_repeat_time(tvbuff_t *tvb, proto_item* ti) {
if (tokenlen == 0)
break;
proto_tree_add_item(sdp_repeat_time_tree, hf_repeat_time_offset,
tvb, offset, tokenlen, ENC_UTF_8|ENC_NA);
tvb, offset, tokenlen, ENC_UTF_8);
optional = TRUE;
} while (next_offset != -1);
@ -838,14 +838,14 @@ dissect_sdp_timezone(tvbuff_t *tvb, proto_item* ti) {
break;
proto_tree_add_item(sdp_timezone_tree, hf_timezone_time, tvb, offset,
tokenlen, ENC_UTF_8|ENC_NA);
tokenlen, ENC_UTF_8);
offset = next_offset + 1;
tokenlen = find_next_optional_token_in_line(tvb, sdp_timezone_tree,
&offset, &next_offset, optional);
if (tokenlen == 0)
break;
proto_tree_add_item(sdp_timezone_tree, hf_timezone_offset, tvb, offset,
tokenlen, ENC_UTF_8|ENC_NA);
tokenlen, ENC_UTF_8);
offset = next_offset + 1;
optional = TRUE;
} while (next_offset != -1);
@ -869,11 +869,11 @@ static void dissect_sdp_encryption_key(tvbuff_t *tvb, proto_item * ti) {
tokenlen = next_offset - offset;
proto_tree_add_item(sdp_encryption_key_tree, hf_encryption_key_type,
tvb, offset, tokenlen, ENC_UTF_8|ENC_NA);
tvb, offset, tokenlen, ENC_UTF_8);
offset = next_offset + 1;
proto_tree_add_item(sdp_encryption_key_tree, hf_encryption_key_data,
tvb, offset, -1, ENC_UTF_8|ENC_NA);
tvb, offset, -1, ENC_UTF_8);
}
static void dissect_key_mgmt(tvbuff_t *tvb, packet_info * pinfo, proto_item * ti) {
@ -956,7 +956,7 @@ static void dissect_sdp_session_attribute(tvbuff_t *tvb, packet_info * pinfo, pr
if (tokenlen == 0)
return;
proto_tree_add_item(sdp_session_attribute_tree, hf_ipbcp_version, tvb, offset, tokenlen, ENC_UTF_8|ENC_NA);
proto_tree_add_item(sdp_session_attribute_tree, hf_ipbcp_version, tvb, offset, tokenlen, ENC_UTF_8);
offset = tvb_ws_mempbrk_pattern_guint8(tvb, offset, -1,&pbrk_alpha, NULL);
@ -968,18 +968,18 @@ static void dissect_sdp_session_attribute(tvbuff_t *tvb, packet_info * pinfo, pr
if (tokenlen == -1)
return;
proto_tree_add_item(sdp_session_attribute_tree, hf_ipbcp_type, tvb, offset, tokenlen, ENC_UTF_8|ENC_NA);
proto_tree_add_item(sdp_session_attribute_tree, hf_ipbcp_type, tvb, offset, tokenlen, ENC_UTF_8);
} else if (strcmp((const char *)field_name, "key-mgmt") == 0) {
tvbuff_t *key_tvb;
proto_item *key_ti;
key_tvb = tvb_new_subset_remaining(tvb, offset);
key_ti = proto_tree_add_item(sdp_session_attribute_tree, hf_key_mgmt_att_value, key_tvb, 0, -1, ENC_UTF_8|ENC_NA);
key_ti = proto_tree_add_item(sdp_session_attribute_tree, hf_key_mgmt_att_value, key_tvb, 0, -1, ENC_UTF_8);
dissect_key_mgmt(key_tvb, pinfo, key_ti);
} else {
proto_tree_add_item(sdp_session_attribute_tree, hf_session_attribute_value,
tvb, offset, -1, ENC_UTF_8|ENC_NA);
tvb, offset, -1, ENC_UTF_8);
}
}
@ -1061,7 +1061,7 @@ dissect_sdp_media(tvbuff_t *tvb, packet_info* pinfo, proto_item *ti,
/* TODO: this puts the (optional) number of ports in the tree, but we don't
actually use it for building the extra RTP flows, which we should. */
proto_tree_add_item(sdp_media_tree, hf_media_portcount, tvb, offset,
tokenlen, ENC_UTF_8|ENC_NA);
tokenlen, ENC_UTF_8);
offset = next_offset + 1;
} else {
tokenlen = find_next_token_in_line(tvb, sdp_media_tree, &offset, &next_offset);
@ -1124,11 +1124,11 @@ dissect_sdp_media(tvbuff_t *tvb, packet_info* pinfo, proto_item *ti,
}
} else {
proto_tree_add_item(sdp_media_tree, hf_media_format, tvb, offset,
tokenlen, ENC_UTF_8|ENC_NA);
tokenlen, ENC_UTF_8);
}
} else {
proto_tree_add_item(sdp_media_tree, hf_media_format, tvb, offset,
tokenlen, ENC_UTF_8|ENC_NA);
tokenlen, ENC_UTF_8);
}
optional = TRUE;
} while (next_offset != -1);
@ -1646,7 +1646,7 @@ static void dissect_sdp_media_attribute(tvbuff_t *tvb, packet_info *pinfo, proto
tokenlen = colon_offset - offset;
pi = proto_tree_add_item(sdp_media_attribute_tree,
hf_media_attribute_field,
tvb, offset, tokenlen, ENC_UTF_8|ENC_NA);
tvb, offset, tokenlen, ENC_UTF_8);
/*??field_name = tvb_get_string_enc(pinfo->pool, tvb, offset, tokenlen, ENC_ASCII);*/
sdp_media_attrbute_code = find_sdp_media_attribute_names(tvb, offset, tokenlen);
@ -1691,7 +1691,7 @@ static void dissect_sdp_media_attribute(tvbuff_t *tvb, packet_info *pinfo, proto
tokenlen = next_offset - offset;
proto_tree_add_item(sdp_media_attribute_tree, hf_media_encoding_name, tvb,
offset, tokenlen, ENC_UTF_8|ENC_NA);
offset, tokenlen, ENC_UTF_8);
if (!ws_strtou8(payload_type, NULL, &pt) || pt >= SDP_NO_OF_PT) {
return; /* Invalid */
@ -1709,7 +1709,7 @@ static void dissect_sdp_media_attribute(tvbuff_t *tvb, packet_info *pinfo, proto
}
tokenlen = next_offset - offset;
pi = proto_tree_add_item(sdp_media_attribute_tree, hf_media_sample_rate, tvb,
offset, tokenlen, ENC_UTF_8|ENC_NA);
offset, tokenlen, ENC_UTF_8);
transport_info->sample_rate[pt] = 0;
if (!ws_strtou32(tvb_get_string_enc(pinfo->pool, tvb, offset, tokenlen, ENC_UTF_8|ENC_NA),
NULL, &transport_info->sample_rate[pt])) {
@ -1804,7 +1804,7 @@ static void dissect_sdp_media_attribute(tvbuff_t *tvb, packet_info *pinfo, proto
tokenlen = next_offset - offset;
fmtp_item = proto_tree_add_item(sdp_media_attribute_tree,
hf_media_format_specific_parameter, tvb,
offset, tokenlen, ENC_UTF_8|ENC_NA);
offset, tokenlen, ENC_UTF_8);
fmtp_tree = proto_item_add_subtree(fmtp_item, ett_sdp_fmtp);
@ -1936,7 +1936,7 @@ static void dissect_sdp_media_attribute(tvbuff_t *tvb, packet_info *pinfo, proto
if (tokenlen == 0)
return;
parameter_item = proto_tree_add_item(sdp_media_attribute_tree, hf_sdp_crypto_crypto_suite,
tvb, offset, tokenlen, ENC_UTF_8|ENC_NA);
tvb, offset, tokenlen, ENC_UTF_8);
if (tvb_strncaseeql(tvb, offset, "AES_CM_128_HMAC_SHA1_80", tokenlen) == 0) {
/* XXX This may only work in simple cases */
@ -2027,7 +2027,7 @@ static void dissect_sdp_media_attribute(tvbuff_t *tvb, packet_info *pinfo, proto
/*lifetime = ["2^"] 1*(DIGIT) ; see section 6.1 for "2^" */
tokenlen = next_offset - offset;
proto_tree_add_item(parameter_tree, hf_sdp_crypto_lifetime,
tvb, offset, tokenlen, ENC_UTF_8|ENC_NA);
tvb, offset, tokenlen, ENC_UTF_8);
offset = next_offset + 1;
}
/* mki = mki-value ":" mki-length
@ -2041,7 +2041,7 @@ static void dissect_sdp_media_attribute(tvbuff_t *tvb, packet_info *pinfo, proto
}
if (next_offset != -1) {
tokenlen = next_offset - offset;
proto_tree_add_item(parameter_tree, hf_sdp_crypto_mki, tvb, offset, tokenlen, ENC_UTF_8|ENC_NA);
proto_tree_add_item(parameter_tree, hf_sdp_crypto_mki, tvb, offset, tokenlen, ENC_UTF_8);
offset = next_offset + 1;
/* mki-length = 1*3DIGIT ; range 1..128. */
@ -2053,7 +2053,7 @@ static void dissect_sdp_media_attribute(tvbuff_t *tvb, packet_info *pinfo, proto
mki_len_valid = ws_strtou32(tvb_get_string_enc(pinfo->pool, tvb, offset, tokenlen,
ENC_UTF_8|ENC_NA), NULL, &transport_info->mki_len);
pi = proto_tree_add_item(parameter_tree, hf_sdp_crypto_mki_length,
tvb, offset, tokenlen, ENC_UTF_8|ENC_NA);
tvb, offset, tokenlen, ENC_UTF_8);
if (!mki_len_valid)
expert_add_info(pinfo, pi, &ei_sdp_invalid_crypto_mki_length);
}
@ -2071,19 +2071,19 @@ static void dissect_sdp_media_attribute(tvbuff_t *tvb, packet_info *pinfo, proto
/* Remember the value and add it to tree */
sdp_data->ed137_type = attribute_value;
proto_tree_add_item(sdp_media_attribute_tree, hf_media_attribute_value,
tvb, offset, -1, ENC_UTF_8|ENC_NA);
tvb, offset, -1, ENC_UTF_8);
break;
case SDP_ED137_TXRXMODE:
/* Remember the value and add it to tree */
sdp_data->ed137_txrxmode = attribute_value;
proto_tree_add_item(sdp_media_attribute_tree, hf_media_attribute_value,
tvb, offset, -1, ENC_UTF_8|ENC_NA);
tvb, offset, -1, ENC_UTF_8);
break;
case SDP_ED137_FID:
/* Remember the value and add it to tree */
sdp_data->ed137_fid = attribute_value;
proto_tree_add_item(sdp_media_attribute_tree, hf_media_attribute_value,
tvb, offset, -1, ENC_UTF_8|ENC_NA);
tvb, offset, -1, ENC_UTF_8);
break;
case SDP_RTCP :
if (media_desc) {
@ -2091,19 +2091,19 @@ static void dissect_sdp_media_attribute(tvbuff_t *tvb, packet_info *pinfo, proto
media_desc->control_port = 0; /* Just use default, if not legal port */
}
proto_tree_add_item(sdp_media_attribute_tree, hf_media_attribute_value,
tvb, offset, -1, ENC_UTF_8|ENC_NA);
tvb, offset, -1, ENC_UTF_8);
break;
case SDP_RTCP_MUX :
if (media_desc) {
media_desc->control_port = media_desc->media_port;
}
proto_tree_add_item(sdp_media_attribute_tree, hf_media_attribute_value,
tvb, offset, -1, ENC_UTF_8|ENC_NA);
tvb, offset, -1, ENC_UTF_8);
break;
default:
/* No special treatment for values of this attribute type, just add as one item. */
proto_tree_add_item(sdp_media_attribute_tree, hf_media_attribute_value,
tvb, offset, -1, ENC_UTF_8|ENC_NA);
tvb, offset, -1, ENC_UTF_8);
break;
}
}
@ -2646,7 +2646,7 @@ dissect_sdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
type = tvb_get_guint8(tvb, offset);
delim = tvb_get_guint8(tvb, offset + 1);
if (delim != '=') {
proto_item *ti2 = proto_tree_add_item(sdp_tree, hf_invalid, tvb, offset, linelen, ENC_UTF_8|ENC_NA);
proto_item *ti2 = proto_tree_add_item(sdp_tree, hf_invalid, tvb, offset, linelen, ENC_UTF_8);
expert_add_info(pinfo, ti2, &ei_sdp_invalid_line_equal);
offset = next_offset;
continue;

48
epan/dissectors/packet-sip.c
View File

@ -1561,7 +1561,7 @@ dfilter_store_sip_from_addr(tvbuff_t *tvb,proto_tree *tree,guint parameter_offse
{
proto_item *pi;
pi = proto_tree_add_item(tree, hf_sip_from_addr, tvb, parameter_offset, parameter_len, ENC_UTF_8|ENC_NA);
pi = proto_tree_add_item(tree, hf_sip_from_addr, tvb, parameter_offset, parameter_len, ENC_UTF_8);
proto_item_set_generated(pi);
}
@ -1906,7 +1906,7 @@ display_sip_uri (tvbuff_t *tvb, proto_tree *sip_element_tree, packet_info *pinfo
proto_tree_add_item(sip_element_tree, *(uri->hf_sip_display), tvb, uri_offsets->display_name_start,
uri_offsets->display_name_end - uri_offsets->display_name_start + 1, ENC_UTF_8|ENC_NA);
ti = proto_tree_add_item(sip_element_tree, hf_sip_display, tvb, uri_offsets->display_name_start,
uri_offsets->display_name_end - uri_offsets->display_name_start + 1, ENC_UTF_8|ENC_NA);
uri_offsets->display_name_end - uri_offsets->display_name_start + 1, ENC_UTF_8);
proto_item_set_hidden(ti);
}
@ -2094,7 +2094,7 @@ dissect_sip_contact_item(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gi
current_offset = queried_offset;
}
proto_tree_add_item(tree, hf_sip_contact_param, tvb, contact_params_start_offset ,
current_offset - contact_params_start_offset, ENC_UTF_8|ENC_NA);
current_offset - contact_params_start_offset, ENC_UTF_8);
/* need to check for an 'expires' parameter
* TODO: this should be done in a common way for all headers,
@ -2400,7 +2400,7 @@ dissect_sip_sec_mechanism(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, g
length = semi_colon_offset-current_offset;
proto_tree_add_item(tree, hf_sip_sec_mechanism, tvb,
start_offset, length,
ENC_UTF_8|ENC_NA);
ENC_UTF_8);
current_offset = current_offset + length + 1;
@ -2436,17 +2436,17 @@ dissect_sip_sec_mechanism(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, g
if (g_ascii_strcasecmp(param_name, "alg") == 0){
proto_tree_add_item(tree, hf_sip_sec_mechanism_alg, tvb,
equals_offset+1, semi_colon_offset-equals_offset-1,
ENC_UTF_8|ENC_NA);
ENC_UTF_8);
}else if (g_ascii_strcasecmp(param_name, "ealg") == 0){
proto_tree_add_item(tree, hf_sip_sec_mechanism_ealg, tvb,
equals_offset+1, semi_colon_offset-equals_offset-1,
ENC_UTF_8|ENC_NA);
ENC_UTF_8);
}else if (g_ascii_strcasecmp(param_name, "prot") == 0){
proto_tree_add_item(tree, hf_sip_sec_mechanism_prot, tvb,
equals_offset+1, semi_colon_offset-equals_offset-1,
ENC_UTF_8|ENC_NA);
ENC_UTF_8);
}else if (g_ascii_strcasecmp(param_name, "spi-c") == 0){
if (!value) {
@ -2645,7 +2645,7 @@ static void dissect_sip_via_header(tvbuff_t *tvb, proto_tree *tree, gint start_o
current_offset = tvb_ws_mempbrk_pattern_guint8(tvb, current_offset, line_end_offset - current_offset, &pbrk_tab_sp_fslash, &c);
if (current_offset != -1){
proto_tree_add_item(tree, hf_sip_via_transport, tvb, transport_start_offset,
current_offset - transport_start_offset, ENC_UTF_8|ENC_NA);
current_offset - transport_start_offset, ENC_UTF_8);
/* Check if we have more transport parameters */
if(c=='/'){
current_offset++;
@ -2697,10 +2697,10 @@ static void dissect_sip_via_header(tvbuff_t *tvb, proto_tree *tree, gint start_o
/* Add address to tree */
if (ipv6_address == TRUE) {
proto_tree_add_item(tree, hf_sip_via_sent_by_address, tvb, address_start_offset + 1,
current_offset - address_start_offset - 2, ENC_UTF_8|ENC_NA);
current_offset - address_start_offset - 2, ENC_UTF_8);
} else {
proto_tree_add_item(tree, hf_sip_via_sent_by_address, tvb, address_start_offset,
current_offset - address_start_offset, ENC_UTF_8|ENC_NA);
current_offset - address_start_offset, ENC_UTF_8);
}
/* Transport port number may follow ([space] : [space])*/
@ -2994,7 +2994,7 @@ static void dissect_sip_session_id_header(tvbuff_t *tvb, proto_tree *tree, gint
if(g_ascii_strcasecmp(name, "logme") == 0){
proto_tree_add_boolean(tree, hf_sip_session_id_logme, tvb, current_offset, logme_end_offset - current_offset, 1);
} else if(current_offset != line_end_offset){
proto_tree_add_item(tree, hf_sip_session_id_param, tvb, current_offset,line_end_offset - current_offset, ENC_UTF_8|ENC_NA);
proto_tree_add_item(tree, hf_sip_session_id_param, tvb, current_offset,line_end_offset - current_offset, ENC_UTF_8);
}
}
semi_colon_offset = tvb_find_guint8(tvb, current_offset, line_end_offset - current_offset, ';');
@ -3002,13 +3002,13 @@ static void dissect_sip_session_id_header(tvbuff_t *tvb, proto_tree *tree, gint
} else {
/* Display generic parameter */
proto_tree_add_item(tree, hf_sip_session_id_param, tvb, current_offset,
line_end_offset - current_offset, ENC_UTF_8|ENC_NA);
line_end_offset - current_offset, ENC_UTF_8);
}
g_byte_array_free(uuid, TRUE);
} else {
/* Display generic parameter */
proto_tree_add_item(tree, hf_sip_session_id_param, tvb, current_offset,
line_end_offset - current_offset, ENC_UTF_8|ENC_NA);
line_end_offset - current_offset, ENC_UTF_8);
}
}
@ -3556,7 +3556,7 @@ dissect_sip_common(tvbuff_t *tvb, int offset, int remaining_length, packet_info
case REQUEST_LINE:
if (sip_tree) {
ti_a = proto_tree_add_item(sip_tree, hf_Request_Line, tvb,
offset, linelen, ENC_UTF_8|ENC_NA);
offset, linelen, ENC_UTF_8);
reqresp_tree = proto_item_add_subtree(ti_a, ett_sip_reqresp);
}
@ -3566,7 +3566,7 @@ dissect_sip_common(tvbuff_t *tvb, int offset, int remaining_length, packet_info
case STATUS_LINE:
if (sip_tree) {
ti_a = proto_tree_add_item(sip_tree, hf_sip_Status_Line, tvb,
offset, linelen, ENC_UTF_8|ENC_NA);
offset, linelen, ENC_UTF_8);
reqresp_tree = proto_item_add_subtree(ti_a, ett_sip_reqresp);
}
dfilter_sip_status_line(tvb, reqresp_tree, pinfo, linelen, offset);
@ -3587,7 +3587,7 @@ dissect_sip_common(tvbuff_t *tvb, int offset, int remaining_length, packet_info
offset = next_offset;
th = proto_tree_add_item(sip_tree, hf_sip_msg_hdr, tvb, offset,
remaining_length, ENC_UTF_8|ENC_NA);
remaining_length, ENC_UTF_8);
proto_item_set_text(th, "Message Header");
hdr_tree = proto_item_add_subtree(th, ett_sip_hdr);
@ -3745,9 +3745,9 @@ dissect_sip_common(tvbuff_t *tvb, int offset, int remaining_length, packet_info
parameter_end_offset = line_end_offset;
parameter_len = parameter_end_offset - parameter_offset;
proto_tree_add_item(sip_element_tree, hf_sip_to_tag, tvb, parameter_offset,
parameter_len, ENC_UTF_8|ENC_NA);
parameter_len, ENC_UTF_8);
item = proto_tree_add_item(sip_element_tree, hf_sip_tag, tvb, parameter_offset,
parameter_len, ENC_UTF_8|ENC_NA);
parameter_len, ENC_UTF_8);
proto_item_set_hidden(item);
/* Tag indicates in-dialog messages, in case we have a INVITE, SUBSCRIBE or REFER, mark it */
@ -3807,9 +3807,9 @@ dissect_sip_common(tvbuff_t *tvb, int offset, int remaining_length, packet_info
parameter_end_offset = line_end_offset;
parameter_len = parameter_end_offset - parameter_offset;
proto_tree_add_item(sip_element_tree, hf_sip_from_tag, tvb, parameter_offset,
parameter_len, ENC_UTF_8|ENC_NA);
parameter_len, ENC_UTF_8);
item = proto_tree_add_item(sip_element_tree, hf_sip_tag, tvb, parameter_offset,
parameter_len, ENC_UTF_8|ENC_NA);
parameter_len, ENC_UTF_8);
proto_item_set_hidden(item);
}
}/* hdr_tree */
@ -3983,7 +3983,7 @@ dissect_sip_common(tvbuff_t *tvb, int offset, int remaining_length, packet_info
gint turi_start_offset = hparam_offset + 12;
gint turi_end_offset = tvb_find_guint8(tvb, turi_start_offset, -1,'\"');
if (turi_end_offset != -1)
proto_tree_add_item(tc_uri_item_tree, hf_sip_tc_turi, tvb, turi_start_offset,(turi_end_offset - turi_start_offset),ENC_UTF_8|ENC_NA);
proto_tree_add_item(tc_uri_item_tree, hf_sip_tc_turi, tvb, turi_start_offset,(turi_end_offset - turi_start_offset),ENC_UTF_8);
else
break; /* malformed */
}
@ -4080,7 +4080,7 @@ dissect_sip_common(tvbuff_t *tvb, int offset, int remaining_length, packet_info
if (cseq_tree)
{
proto_tree_add_item(cseq_tree, hf_sip_cseq_method, tvb,
value_offset + sub_value_offset, strlen_to_copy, ENC_UTF_8|ENC_NA);
value_offset + sub_value_offset, strlen_to_copy, ENC_UTF_8);
}
}
}
@ -4161,7 +4161,7 @@ dissect_sip_common(tvbuff_t *tvb, int offset, int remaining_length, packet_info
{
proto_tree_add_item(rack_tree, hf_sip_rack_cseq_method, tvb,
value_offset + sub_value_offset,
(int)value_len-sub_value_offset, ENC_UTF_8|ENC_NA);
(int)value_len-sub_value_offset, ENC_UTF_8);
}
break;
@ -4364,7 +4364,7 @@ dissect_sip_common(tvbuff_t *tvb, int offset, int remaining_length, packet_info
/* Set sip.auth as a hidden field/filter */
ti_c = proto_tree_add_item(hdr_tree, hf_sip_auth, tvb,
offset, next_offset-offset,
ENC_UTF_8|ENC_NA);
ENC_UTF_8);
proto_item_set_hidden(ti_c);
/* Check if we have any parameters */

2
epan/dissectors/packet-sna.c
View File

@ -2289,7 +2289,7 @@ dissect_control_0e(tvbuff_t *tvb, proto_tree *tree)
if (len <= 0)
return;
proto_tree_add_item(tree, hf_sna_control_0e_value, tvb, 3, len, ENC_EBCDIC|ENC_NA);
proto_tree_add_item(tree, hf_sna_control_0e_value, tvb, 3, len, ENC_EBCDIC);
}
static void

8
epan/dissectors/packet-steam-ihs-discovery.c
View File

@ -519,7 +519,7 @@ steamdiscover_dissect_body_status(tvbuff_t *tvb, packet_info *pinfo, proto_tree
STEAMDISCOVER_ENSURE_WIRETYPE(PROTOBUF_WIRETYPE_LENGTHDELIMITED);
value = get_varint64(pb.tvb, pb.offset, pb.bytes_left, &len);
proto_tree_add_item(tree, hf_steam_ihs_discovery_body_status_hostname, pb.tvb,
pb.offset+len, (gint)value, ENC_UTF_8|ENC_NA);
pb.offset+len, (gint)value, ENC_UTF_8);
hostname = tvb_get_string_enc(pinfo->pool, pb.tvb, pb.offset+len, (gint)value, ENC_UTF_8);
if(hostname && strlen(hostname)) {
col_add_fstr(pinfo->cinfo, COL_INFO, "%s from %s", hf_steam_ihs_discovery_header_msgtype_strings[STEAMDISCOVER_MSGTYPE_CLIENTBROADCASTMSGSTATUS].strptr, hostname);
@ -604,7 +604,7 @@ steamdiscover_dissect_body_status(tvbuff_t *tvb, packet_info *pinfo, proto_tree
STEAMDISCOVER_ENSURE_WIRETYPE(PROTOBUF_WIRETYPE_LENGTHDELIMITED);
value = get_varint64(pb.tvb, pb.offset, pb.bytes_left, &len);
proto_tree_add_item(tree, hf_steam_ihs_discovery_body_status_macaddresses, pb.tvb,
pb.offset+len, (gint)value, ENC_UTF_8|ENC_NA);
pb.offset+len, (gint)value, ENC_UTF_8);
len += (gint)value;
break;
default:
@ -659,7 +659,7 @@ steamdiscover_dissect_body_authrequest(tvbuff_t *tvb, packet_info *pinfo, proto_
STEAMDISCOVER_ENSURE_WIRETYPE(PROTOBUF_WIRETYPE_LENGTHDELIMITED);
value = get_varint64(pb.tvb, pb.offset, pb.bytes_left, &len);
proto_tree_add_item(tree, hf_steam_ihs_discovery_body_authrequest_devicename, pb.tvb,
pb.offset+len, (gint)value, ENC_UTF_8|ENC_NA);
pb.offset+len, (gint)value, ENC_UTF_8);
devicename = tvb_get_string_enc(pinfo->pool, pb.tvb, pb.offset+len, (gint)value, ENC_UTF_8);
if (devicename && strlen(devicename)) {
col_append_fstr(pinfo->cinfo, COL_INFO, " from %s", devicename);
@ -767,7 +767,7 @@ steamdiscover_dissect_body_streamingrequest(tvbuff_t *tvb, packet_info *pinfo, p
case STEAMDISCOVER_FN_STREAMINGREQUEST_DEVICEVERSION:
STEAMDISCOVER_ENSURE_WIRETYPE(PROTOBUF_WIRETYPE_LENGTHDELIMITED);
value = get_varint64(pb.tvb, pb.offset, pb.bytes_left, &len);
proto_tree_add_item(tree, hf_steam_ihs_discovery_body_streamingrequest_deviceversion, pb.tvb, pb.offset+len, (gint)value, ENC_UTF_8|ENC_NA);
proto_tree_add_item(tree, hf_steam_ihs_discovery_body_streamingrequest_deviceversion, pb.tvb, pb.offset+len, (gint)value, ENC_UTF_8);
len += (gint)value;
break;
case STEAMDISCOVER_FN_STREAMINGREQUEST_STREAMDESKTOP:

2
epan/dissectors/packet-stun.c
View File

@ -1441,7 +1441,7 @@ dissect_stun_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboole
break;
case SOFTWARE:
proto_tree_add_item(att_tree, hf_stun_att_software, tvb, offset, att_length, ENC_UTF_8|ENC_NA);
proto_tree_add_item(att_tree, hf_stun_att_software, tvb, offset, att_length, ENC_UTF_8);
break;
case CACHE_TIMEOUT:

2
epan/dissectors/packet-sua.c
View File

@ -590,7 +590,7 @@ dissect_info_string_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto
return;
}
proto_tree_add_item(parameter_tree, hf_sua_info_string, parameter_tvb, INFO_STRING_OFFSET, info_string_length, ENC_UTF_8|ENC_NA);
proto_tree_add_item(parameter_tree, hf_sua_info_string, parameter_tvb, INFO_STRING_OFFSET, info_string_length, ENC_UTF_8);
proto_item_append_text(parameter_item, " (%.*s)", info_string_length,
tvb_format_text(pinfo->pool, parameter_tvb, INFO_STRING_OFFSET, info_string_length));
}

4
epan/dissectors/packet-syslog.c
View File

@ -190,7 +190,7 @@ dissect_syslog_message(proto_tree* tree, tvbuff_t* tvb, guint offset)
if (tvb_get_guint24(tvb, offset, ENC_BIG_ENDIAN) == 0xefbbbf) {
proto_tree_add_item(tree, hf_syslog_msgid_bom, tvb, offset, 3, ENC_BIG_ENDIAN);
offset += 3;
proto_tree_add_item(tree, hf_syslog_msgid_utf8, tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_UTF_8|ENC_NA);
proto_tree_add_item(tree, hf_syslog_msgid_utf8, tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_UTF_8);
} else {
proto_tree_add_item(tree, hf_syslog_msgid, tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_ASCII|ENC_NA);
}
@ -293,7 +293,7 @@ dissect_syslog(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _
msg_off, pri);
}
ti = proto_tree_add_item(syslog_tree, hf_syslog_msg, tvb, msg_off,
msg_len, ENC_UTF_8|ENC_NA);
msg_len, ENC_UTF_8);
syslog_message_tree = proto_item_add_subtree(ti, ett_syslog_msg);
/* RFC5424 defines a version field which is currently defined as '1'

10
epan/dissectors/packet-systemd-journal.c
View File

@ -369,7 +369,7 @@ dissect_systemd_journal_line_entry(tvbuff_t *tvb, packet_info *pinfo _U_, proto_
default:
{
proto_item *expert_ti = proto_tree_add_item(sje_tree, hf_sj_unhandled_field_type, tvb, offset, line_len,
ENC_UTF_8|ENC_NA);
ENC_UTF_8);
expert_add_info(pinfo, expert_ti, &ei_unhandled_field_type);
break;
}
@ -386,8 +386,8 @@ dissect_systemd_journal_line_entry(tvbuff_t *tvb, packet_info *pinfo _U_, proto_
proto_item *unk_ti = proto_tree_add_none_format(sje_tree, hf_sj_unknown_field, tvb, offset, line_len,
"Unknown text field: %s", tvb_get_string_enc(pinfo->pool, tvb, offset, eq_off - offset - 1, ENC_UTF_8));
proto_tree *unk_tree = proto_item_add_subtree(unk_ti, ett_systemd_unknown_field);
proto_tree_add_item(unk_tree, hf_sj_unknown_field_name, tvb, offset, eq_off - offset - 1, ENC_UTF_8|ENC_NA);
proto_tree_add_item(unk_tree, hf_sj_unknown_field_value, tvb, eq_off, val_len, ENC_UTF_8|ENC_NA);
proto_tree_add_item(unk_tree, hf_sj_unknown_field_name, tvb, offset, eq_off - offset - 1, ENC_UTF_8);
proto_tree_add_item(unk_tree, hf_sj_unknown_field_value, tvb, eq_off, val_len, ENC_UTF_8);
offset = next_offset;
continue;
}
@ -413,8 +413,8 @@ dissect_systemd_journal_line_entry(tvbuff_t *tvb, packet_info *pinfo _U_, proto_
proto_item *unk_ti = proto_tree_add_none_format(sje_tree, hf_sj_unknown_field, tvb, offset, line_len,
"Unknown data field: %s", tvb_format_text(pinfo->pool, tvb, offset, eq_off - offset - 1));
proto_tree *unk_tree = proto_item_add_subtree(unk_ti, ett_systemd_unknown_field);
proto_item *expert_ti = proto_tree_add_item(unk_tree, hf_sj_unknown_field_name, tvb, offset, offset + noeql_len, ENC_UTF_8|ENC_NA);
proto_tree_add_item(unk_tree, hf_sj_unknown_field_data, tvb, data_off, (int) data_len, ENC_UTF_8|ENC_NA);
proto_item *expert_ti = proto_tree_add_item(unk_tree, hf_sj_unknown_field_name, tvb, offset, offset + noeql_len, ENC_UTF_8);
proto_tree_add_item(unk_tree, hf_sj_unknown_field_data, tvb, data_off, (int) data_len, ENC_UTF_8);
expert_add_info(pinfo, expert_ti, &ei_nonbinary_field);
}
}

4
epan/dissectors/packet-tcpros.c
View File

@ -83,7 +83,7 @@ dissect_ros_connection_header_field(tvbuff_t *tvb, proto_tree *tree, packet_info
proto_tree_add_item(field_tree, hf_tcpros_connection_header_field_length, tvb, offset, SIZE_OF_LENGTH_FIELD, ENC_LITTLE_ENDIAN);
offset += SIZE_OF_LENGTH_FIELD;
ti = proto_tree_add_item(field_tree, hf_tcpros_connection_header_field_data, tvb, offset, fLen, ENC_UTF_8|ENC_NA);
ti = proto_tree_add_item(field_tree, hf_tcpros_connection_header_field_data, tvb, offset, fLen, ENC_UTF_8);
/** Look for the '=' separator */
sep = (tvb_find_guint8(tvb, offset, fLen, '=') - offset);
@ -93,7 +93,7 @@ dissect_ros_connection_header_field(tvbuff_t *tvb, proto_tree *tree, packet_info
const guint8* field;
field_tree = proto_item_add_subtree(ti, ett_tcpros);
proto_tree_add_item_ret_string(field_tree, hf_tcpros_connection_header_field_name, tvb, offset, sep, ENC_UTF_8|ENC_NA, pinfo->pool, &field);
proto_tree_add_item(field_tree, hf_tcpros_connection_header_field_value, tvb, offset+sep+1, fLen - sep - 1, ENC_UTF_8|ENC_NA);
proto_tree_add_item(field_tree, hf_tcpros_connection_header_field_value, tvb, offset+sep+1, fLen - sep - 1, ENC_UTF_8);
col_append_str(pinfo->cinfo, COL_INFO, field);
}

10
epan/dissectors/packet-thrift.c
View File

@ -731,7 +731,7 @@ dissect_thrift_string_as_preferred(tvbuff_t *tvb, packet_info *pinfo, proto_tree
proto_tree_add_item(tree, hf_thrift_string, tvb, *offset, str_len, ENC_UTF_16 | ENC_BIG_ENDIAN);
break;
case DECODE_BINARY_AS_UTF8:
proto_tree_add_item(tree, hf_thrift_string, tvb, *offset, str_len, ENC_UTF_8|ENC_NA);
proto_tree_add_item(tree, hf_thrift_string, tvb, *offset, str_len, ENC_UTF_8);
break;
case DECODE_BINARY_AS_ASCII:
proto_tree_add_item(tree, hf_thrift_string, tvb, *offset, str_len, ENC_ASCII|ENC_NA);
@ -742,7 +742,7 @@ dissect_thrift_string_as_preferred(tvbuff_t *tvb, packet_info *pinfo, proto_tree
* If not entirely captured, consider it as a binary. */
if (tvb_captured_length_remaining(tvb, *offset) >= str_len &&
(str_len == 0 || thrift_binary_utf8_isprint(tvb, *offset, str_len, TRUE) > 0)) {
proto_tree_add_item(tree, hf_thrift_string, tvb, *offset, str_len, ENC_UTF_8|ENC_NA);
proto_tree_add_item(tree, hf_thrift_string, tvb, *offset, str_len, ENC_UTF_8);
break;
}
/* otherwise, continue with type BINARY */
@ -2659,7 +2659,7 @@ dissect_thrift_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int o
offset += seqid_len;
proto_tree_add_int(sub_tree, hf_thrift_str_len, tvb, offset, str_len_len, str_len);
offset += str_len_len;
proto_tree_add_item(sub_tree, hf_thrift_method, tvb, offset, str_len, ENC_UTF_8|ENC_NA);
proto_tree_add_item(sub_tree, hf_thrift_method, tvb, offset, str_len, ENC_UTF_8);
offset = offset + str_len;
} else if (thrift_opt->tprotocol & PROTO_THRIFT_STRICT) {
/* Strict: proto_id|version|mtype|length|name|seqid */
@ -2670,7 +2670,7 @@ dissect_thrift_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int o
offset += TBP_THRIFT_MTYPE_LEN;
proto_tree_add_item(sub_tree, hf_thrift_str_len, tvb, offset, TBP_THRIFT_LENGTH_LEN, ENC_BIG_ENDIAN);
offset += TBP_THRIFT_LENGTH_LEN;
proto_tree_add_item(sub_tree, hf_thrift_method, tvb, offset, str_len, ENC_UTF_8|ENC_NA);
proto_tree_add_item(sub_tree, hf_thrift_method, tvb, offset, str_len, ENC_UTF_8);
offset = offset + str_len;
proto_tree_add_item(sub_tree, hf_thrift_seq_id, tvb, offset, TBP_THRIFT_SEQ_ID_LEN, ENC_BIG_ENDIAN);
offset += TBP_THRIFT_SEQ_ID_LEN;
@ -2678,7 +2678,7 @@ dissect_thrift_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int o
/* Old: length|name|mtype|seqid */
proto_tree_add_item(sub_tree, hf_thrift_str_len, tvb, offset, TBP_THRIFT_LENGTH_LEN, ENC_BIG_ENDIAN);
offset += TBP_THRIFT_LENGTH_LEN;
proto_tree_add_item(sub_tree, hf_thrift_method, tvb, offset, str_len, ENC_UTF_8|ENC_NA);
proto_tree_add_item(sub_tree, hf_thrift_method, tvb, offset, str_len, ENC_UTF_8);
offset = offset + str_len;
mtype_pi = proto_tree_add_bits_item(sub_tree, hf_thrift_mtype, tvb, (offset << OCTETS_TO_BITS_SHIFT) + 5, 3, ENC_BIG_ENDIAN);
offset += TBP_THRIFT_MTYPE_LEN;

20
epan/dissectors/packet-tn3270.c
View File

@ -1697,7 +1697,7 @@ add_data_until_next_order_code(proto_tree *tn3270_tree, tvbuff_t *tvb, gint offs
if (datalen > 0) {
/* XXX: Need to handle "Format Control Orders" ?? */
proto_tree_add_item(tn3270_tree, hf_tn3270_field_data, tvb, offset,
datalen, ENC_EBCDIC|ENC_NA);
datalen, ENC_EBCDIC);
}
return datalen;
@ -1888,7 +1888,7 @@ dissect_load_format_storage(proto_tree *tn3270_tree, tvbuff_t *tvb, gint offset,
if (operand == LOAD_FORMAT_STORAGE_OPERAND_ADD) {
gint fmtln = sf_body_length - (offset - start);
proto_tree_add_item(tn3270_tree, hf_tn3270_load_format_storage_format_data,
tvb, offset, fmtln, ENC_EBCDIC|ENC_NA);
tvb, offset, fmtln, ENC_EBCDIC);
offset += fmtln;
}
@ -2126,7 +2126,7 @@ dissect_present_absolute_format(proto_tree *tn3270_tree, tvbuff_t *tvb, gint off
hf_tn3270_format_name,
tvb, offset,
sf_body_length - (offset - start),
ENC_EBCDIC|ENC_NA);
ENC_EBCDIC);
offset += (sf_body_length - (offset - start));
return (offset - start);
@ -2166,7 +2166,7 @@ dissect_present_relative_format(proto_tree *tn3270_tree, tvbuff_t *tvb, gint off
hf_tn3270_format_name,
tvb, offset,
sf_body_length - (offset - start),
ENC_EBCDIC|ENC_NA);
ENC_EBCDIC);
offset += (sf_body_length - (offset - start));
return (offset - start);
@ -2507,7 +2507,7 @@ dissect_type_1_text(proto_tree *tn3270_tree, tvbuff_t *tvb, gint offset,
hf_tn3270_field_data,
tvb, offset,
sf_body_length - (offset - start),
ENC_EBCDIC|ENC_NA);
ENC_EBCDIC);
offset += (sf_body_length - (offset - start));
return (offset - start);
@ -3220,7 +3220,7 @@ dissect_query_reply_cooperative(proto_tree *tn3270_tree, tvbuff_t *tvb, gint off
hf_tn3270_field_data,
tvb, offset,
sf_body_length - (offset-start),
ENC_EBCDIC|ENC_NA);
ENC_EBCDIC);
offset += (sf_body_length - (offset - start));
/* Uses same Self-Defining Parm as OEM Auxiliary Device */
@ -3472,7 +3472,7 @@ dissect_query_reply_extended_drawing_routine(proto_tree *tn3270_tree, tvbuff_t *
gint start = offset;
proto_tree_add_item(tn3270_tree, hf_tn3270_field_data ,tvb, offset,
sf_body_length, ENC_EBCDIC|ENC_NA);
sf_body_length, ENC_EBCDIC);
offset += sf_body_length;
@ -3953,7 +3953,7 @@ dissect_query_reply_rpq_names(proto_tree *tn3270_tree, tvbuff_t *tvb, gint offse
hf_tn3270_rpq_name,
tvb, offset,
(rpql - 1),
ENC_EBCDIC|ENC_NA);
ENC_EBCDIC);
offset += (rpql-1);
offset += dissect_unknown_data(tn3270_tree, tvb, offset, start, sf_body_length);
@ -4448,7 +4448,7 @@ process_outbound_structured_field(proto_tree *sf_tree, packet_info *pinfo, tvbuf
hf_tn3270_format_group,
tvb, offset,
(sf_body_length - (offset - start)),
ENC_EBCDIC|ENC_NA);
ENC_EBCDIC);
offset += (sf_body_length - (offset - start));
break;
case SF_OB_SET_WINDOW_ORIGIN:
@ -5062,7 +5062,7 @@ dissect_tn3270e_header(proto_tree *tn3270_tree, tvbuff_t *tvb, gint offset)
case TN3270E_SCS_DATA:
case TN3270E_SSCP_LU_DATA:
case TN3270E_UNBIND:
proto_tree_add_item(tn3270e_hdr_tree, hf_tn3270_tn3270e_header_data, tvb, offset, -1, ENC_EBCDIC|ENC_NA);
proto_tree_add_item(tn3270e_hdr_tree, hf_tn3270_tn3270e_header_data, tvb, offset, -1, ENC_EBCDIC);
offset += tvb_reported_length_remaining(tvb, offset);
break;
default:

34
epan/dissectors/packet-tn5250.c
View File

@ -3126,7 +3126,7 @@ dissect_twobyte_length_and_data(proto_tree *tn5250_tree, tvbuff_t *tvb, gint off
if (tvb_reported_length_remaining(tvb, offset) >= length) {
proto_tree_add_item(tn5250_tree, hf_tn5250_field_data, tvb, offset,
length, ENC_EBCDIC|ENC_NA);
length, ENC_EBCDIC);
offset+=length;
} else {
offset += dissect_unknown_data(tn5250_tree, tvb, offset, start, length);
@ -3346,7 +3346,7 @@ dissect_create_window(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offset)
break;
}
proto_tree_add_item(tn5250_tree, hf_tn5250_wdsf_cw_tf_text, tvb, offset,
(length - 6), ENC_EBCDIC|ENC_NA);
(length - 6), ENC_EBCDIC);
offset += (guint32)((length - 6));
break;
default:
@ -3565,7 +3565,7 @@ dissect_define_selection(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offset)
}
proto_tree_add_item(tn5250_tree, hf_tn5250_wdsf_ds_ct_text, tvb, offset,
(length - (offset - minor_structure_start)),
ENC_EBCDIC|ENC_NA);
ENC_EBCDIC);
offset += (guint32)((length - (offset - minor_structure_start)));
break;
case DS_MENU_BAR_SEPARATOR:
@ -3832,7 +3832,7 @@ dissect_wdsf_structured_field(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offse
break;
}
proto_tree_add_item(tn5250_tree, hf_tn5250_field_data, tvb, offset,
(length - 6), ENC_EBCDIC|ENC_NA);
(length - 6), ENC_EBCDIC);
offset += (guint32)((length - 6));
break;
case PROGRAMMABLE_MOUSE_BUTTONS:
@ -3900,7 +3900,7 @@ dissect_tn5250_ra_data(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offset)
if (offset > start) {
proto_tree_add_item(tn5250_tree, hf_tn5250_repeated_character,
tvb, start, (offset - start), ENC_EBCDIC|ENC_NA);
tvb, start, (offset - start), ENC_EBCDIC);
}
return (offset - start);
@ -4212,7 +4212,7 @@ dissect_write_single_structured_field(proto_tree *tn5250_tree, tvbuff_t *tvb,
offset += tn5250_add_hf_items(tn5250_tree, tvb, offset,
wsc_image_control_fields);
proto_tree_add_item(tn5250_tree, hf_tn5250_wssf_ifc_imagefax_name, tvb, offset,
(length - (start + offset)), ENC_EBCDIC|ENC_NA);
(length - (start + offset)), ENC_EBCDIC);
if (length > (start + offset))
offset += (guint32)(length - (start + offset));
break;
@ -4221,7 +4221,7 @@ dissect_write_single_structured_field(proto_tree *tn5250_tree, tvbuff_t *tvb,
offset += tn5250_add_hf_items(tn5250_tree, tvb, offset,
wsc_image_download_fields);
proto_tree_add_item(tn5250_tree, hf_tn5250_wssf_ifd_imagefax_name, tvb, offset,
namelength, ENC_EBCDIC|ENC_NA);
namelength, ENC_EBCDIC);
offset += namelength;
proto_tree_add_item(tn5250_tree, hf_tn5250_wssf_ifd_imagefax_data, tvb, offset,
(length - (start + offset)), ENC_NA);
@ -4585,7 +4585,7 @@ dissect_write_structured_field(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offs
switch (type) {
case PASS_THROUGH:
proto_tree_add_item(tn5250_tree, hf_tn5250_field_data, tvb, offset,
(sf_length - (start + offset)), ENC_EBCDIC|ENC_NA);
(sf_length - (start + offset)), ENC_EBCDIC);
offset += (guint32)(sf_length - (start + offset));
break;
case TN5250_QUERY:
@ -4608,7 +4608,7 @@ dissect_write_structured_field(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offs
break;
}
proto_tree_add_item(tn5250_tree, hf_tn5250_dawt_message, tvb, offset,
(length - 2), ENC_EBCDIC|ENC_NA);
(length - 2), ENC_EBCDIC);
offset += length;
}
break;
@ -4625,7 +4625,7 @@ dissect_write_structured_field(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offs
break;
}
proto_tree_add_item(tn5250_tree, hf_tn5250_dckf_prompt_text, tvb,
offset, (length - 2), ENC_EBCDIC|ENC_NA);
offset, (length - 2), ENC_EBCDIC);
offset += length;
}
break;
@ -4658,7 +4658,7 @@ dissect_write_structured_field(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offs
break;
}
proto_tree_add_item(tn5250_tree, hf_tn5250_wts_cld_li, tvb, offset,
(length - used), ENC_EBCDIC|ENC_NA);
(length - used), ENC_EBCDIC);
break;
case DEFINE_SPECIAL_CHARACTERS:
offset += tn5250_add_hf_items(tn5250_tree, tvb, offset,
@ -4677,7 +4677,7 @@ dissect_write_structured_field(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offs
break;
}
proto_tree_add_item(tn5250_tree, hf_tn5250_dorm_mt, tvb, offset,
(length - 2), ENC_EBCDIC|ENC_NA);
(length - 2), ENC_EBCDIC);
offset += length;
}
break;
@ -4696,7 +4696,7 @@ dissect_write_structured_field(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offs
* each of these entries is 5 bytes long?
*/
proto_tree_add_item(tn5250_tree, hf_tn5250_dpt_ec, tvb, offset,
4, ENC_EBCDIC|ENC_NA);
4, ENC_EBCDIC);
offset += 4;
}
break;
@ -4909,7 +4909,7 @@ dissect_tn5250_data_until_next_command(proto_tree *tn5250_tree, tvbuff_t *tvb, g
if (offset > start) {
proto_tree_add_item(tn5250_tree, hf_tn5250_field_data,
tvb, start, (offset - start), ENC_EBCDIC|ENC_NA);
tvb, start, (offset - start), ENC_EBCDIC);
}
return (offset - start);
@ -4957,7 +4957,7 @@ dissect_outbound_stream(proto_tree *tn5250_tree, packet_info *pinfo, tvbuff_t *t
offset++;
proto_tree_add_item(cc_tree, hf_tn5250_field_data, tvb, offset,
tvb_reported_length_remaining(tvb, offset) - 1,
ENC_EBCDIC|ENC_NA);
ENC_EBCDIC);
offset += (guint32)(tvb_reported_length_remaining(tvb, offset) - 1);
proto_tree_add_item(cc_tree, hf_tn5250_fa, tvb, offset, 1, ENC_BIG_ENDIAN);
offset++;
@ -5000,7 +5000,7 @@ dissect_outbound_stream(proto_tree *tn5250_tree, packet_info *pinfo, tvbuff_t *t
offset++;
offset += dissect_tn5250_orders_and_data(cc_tree, tvb, offset);
proto_tree_add_item(cc_tree, hf_tn5250_field_data, tvb, offset,
(length - 2), ENC_EBCDIC|ENC_NA);
(length - 2), ENC_EBCDIC);
offset++;
break;
case ROLL:
@ -5093,7 +5093,7 @@ dissect_inbound_stream(proto_tree *tn5250_tree, packet_info *pinfo, tvbuff_t *tv
if (tvb_reported_length_remaining(tvb, offset)) {
proto_tree_add_item(tn5250_tree, hf_tn5250_field_data, tvb, offset,
tvb_reported_length_remaining(tvb, offset),
ENC_EBCDIC|ENC_NA);
ENC_EBCDIC);
offset += tvb_reported_length_remaining(tvb, offset);
}

2
epan/dissectors/packet-websocket.c
View File

@ -331,7 +331,7 @@ dissect_websocket_control_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t
if (length >= 2) {
proto_tree_add_item(subtree, hf_ws_payload_close_status_code, tvb, offset, 2, ENC_BIG_ENDIAN);
if (length > 2)
proto_tree_add_item(subtree, hf_ws_payload_close_reason, tvb, offset+2, length-2, ENC_UTF_8|ENC_NA);
proto_tree_add_item(subtree, hf_ws_payload_close_reason, tvb, offset+2, length-2, ENC_UTF_8);
}
break;

2
epan/dissectors/packet-wifi-dpp.c
View File

@ -346,7 +346,7 @@ dissect_wifi_dpp_attributes(packet_info *pinfo _U_, proto_tree *tree,
break;
case DPP_CODE_IDENTIFIER:
proto_tree_add_item(specific_attr, hf_wifi_dpp_code_identifier, tvb, offset, attribute_len, ENC_UTF_8|ENC_NA);
proto_tree_add_item(specific_attr, hf_wifi_dpp_code_identifier, tvb, offset, attribute_len, ENC_UTF_8);
break;
case DPP_ENCRYPTED_KEY:

2
epan/dissectors/packet-wow.c
View File

@ -527,7 +527,7 @@ parse_logon_challenge_client_to_server(packet_info *pinfo, tvbuff_t *tvb, proto_
proto_tree_add_item(wow_tree,
hf_wow_srp_i, tvb,
offset, srp_i_len,
ENC_UTF_8|ENC_NA);
ENC_UTF_8);
}
static void

12
epan/dissectors/packet-woww.c
View File

@ -4599,7 +4599,7 @@ parse_SMSG_CHAR_ENUM(ptvcursor_t* ptv)
ptvcursor_current_offset(ptv),
&character_name_length, ENC_UTF_8);
ptvcursor_add(ptv, hf_woww_character_name, character_name_length, ENC_UTF_8|ENC_NA);
ptvcursor_add(ptv, hf_woww_character_name, character_name_length, ENC_UTF_8);
guint32 race = 0;
ptvcursor_add_ret_uint(ptv, hf_woww_character_race, 1, ENC_NA, &race);
@ -4670,7 +4670,7 @@ add_body_fields(guint32 opcode,
ptvcursor_add(ptv, hf_woww_server_id, 4, ENC_LITTLE_ENDIAN);
len = get_null_terminated_string_length(tvb, ptvcursor_current_offset(ptv));
ptvcursor_add(ptv, hf_woww_account_name, len, ENC_UTF_8|ENC_NA);
ptvcursor_add(ptv, hf_woww_account_name, len, ENC_UTF_8);
ptvcursor_add(ptv, hf_woww_challenge_seed, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(ptv, hf_woww_client_proof, 20, ENC_NA);
@ -4737,10 +4737,10 @@ add_body_fields(guint32 opcode,
ptvcursor_add(ptv, hf_woww_character_guid, 8, ENC_LITTLE_ENDIAN);
len = get_null_terminated_string_length(tvb, ptvcursor_current_offset(ptv));
ptvcursor_add(ptv, hf_woww_character_name, len, ENC_UTF_8|ENC_NA);
ptvcursor_add(ptv, hf_woww_character_name, len, ENC_UTF_8);
len = get_null_terminated_string_length(tvb, ptvcursor_current_offset(ptv));
ptvcursor_add(ptv, hf_woww_realm_name, len, ENC_UTF_8|ENC_NA);
ptvcursor_add(ptv, hf_woww_realm_name, len, ENC_UTF_8);
ptvcursor_add(ptv, hf_woww_character_race, 4, ENC_LITTLE_ENDIAN);
ptvcursor_add(ptv, hf_woww_character_gender, 4, ENC_LITTLE_ENDIAN);
@ -4751,12 +4751,12 @@ add_body_fields(guint32 opcode,
ptvcursor_add(ptv, hf_woww_character_guid, 8, ENC_LITTLE_ENDIAN);
len = get_null_terminated_string_length(tvb, ptvcursor_current_offset(ptv));
ptvcursor_add(ptv, hf_woww_character_name, len, ENC_UTF_8|ENC_NA);
ptvcursor_add(ptv, hf_woww_character_name, len, ENC_UTF_8);
break;
case CMSG_CHAR_CREATE:
len = get_null_terminated_string_length(tvb, ptvcursor_current_offset(ptv));
ptvcursor_add(ptv, hf_woww_character_name, len, ENC_UTF_8|ENC_NA);
ptvcursor_add(ptv, hf_woww_character_name, len, ENC_UTF_8);
ptvcursor_add(ptv, hf_woww_character_race, 1, ENC_NA);
ptvcursor_add(ptv, hf_woww_character_class, 1, ENC_NA);