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

Use ENC_NA as encoding for proto_tree_add_item() calls which directly reference an hf item (in hf[] with types: 

FT_NONE
   FT_BYTES
   FT_IPV6
   FT_IPXNET
   FT_OID

Note: Encoding field set to ENC_NA only if the field was previously TRUE|FALSE|ENC_LITTLE_ENDIAN|ENC_BIG_ENDIAN

svn path=/trunk/; revision=39260
This commit is contained in:
Bill Meier 2011-10-04 22:44:31 +00:00
parent 039fc59cb1
commit 94f36ca4ff
293 changed files with 2394 additions and 2394 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -155,7 +155,7 @@ static void dissect_2dparityfec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t
proto_tree_add_item(tree_2dparityfec, hf_2dparityfec_offset, tvb, offset, 1, FALSE); offset += 1;
proto_tree_add_item(tree_2dparityfec, hf_2dparityfec_na, tvb, offset, 1, FALSE); offset += 1;
proto_tree_add_item(tree_2dparityfec, hf_2dparityfec_snbase_ext, tvb, offset, 1, FALSE); offset += 1;
proto_tree_add_item(tree_2dparityfec, hf_2dparityfec_payload, tvb, offset, -1, FALSE);
proto_tree_add_item(tree_2dparityfec, hf_2dparityfec_payload, tvb, offset, -1, ENC_NA);
}
}

8
epan/dissectors/packet-3com-njack.c
View File

@ -374,7 +374,7 @@ dissect_portsettings(tvbuff_t *tvb, proto_tree *port_tree, guint32 offset)
* Auto MDI-X
*/
proto_tree_add_item(port_tree, hf_njack_tlv_data,
tvb, offset, 8, ENC_BIG_ENDIAN);
tvb, offset, 8, ENC_NA);
return offset;
}
@ -502,7 +502,7 @@ dissect_tlvs(tvbuff_t *tvb, proto_tree *njack_tree, guint32 offset)
default:
if (tlv_length != 0) {
proto_tree_add_item(tlv_tree, hf_njack_tlv_data,
tvb, offset, tlv_length, ENC_BIG_ENDIAN);
tvb, offset, tlv_length, ENC_NA);
offset += tlv_length;
}
break;
@ -601,7 +601,7 @@ dissect_njack(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
4, ENC_LITTLE_ENDIAN);
offset += 4;
proto_tree_add_item(njack_tree, hf_njack_set_authdata, tvb, offset,
16, ENC_BIG_ENDIAN);
16, ENC_NA);
offset += 16;
offset = dissect_tlvs(tvb, njack_tree, offset);
break;
@ -633,7 +633,7 @@ dissect_njack(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
remaining = tvb_reported_length_remaining(tvb, offset);
if (remaining > 0) {
proto_tree_add_item(njack_tree, hf_njack_tlv_data,
tvb, offset, remaining, ENC_BIG_ENDIAN);
tvb, offset, remaining, ENC_NA);
offset += remaining;
}
break;

4
epan/dissectors/packet-aim-generic.c
View File

@ -413,7 +413,7 @@ static int dissect_aim_generic_clientver_req(tvbuff_t *tvb, packet_info *pinfo _
static int dissect_aim_generic_clientver_repl(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *gen_tree)
{
proto_tree_add_item(gen_tree, hf_generic_client_ver_req_hash, tvb, 0, 16, FALSE);
proto_tree_add_item(gen_tree, hf_generic_client_ver_req_hash, tvb, 0, 16, ENC_NA);
return 16;
}
@ -424,7 +424,7 @@ static int dissect_aim_generic_ext_status_repl(tvbuff_t *tvb, packet_info *pinfo
proto_tree_add_item(gen_tree, hf_generic_ext_status_type, tvb, offset, 2, FALSE); offset += 2;
proto_tree_add_item(gen_tree, hf_generic_ext_status_flags, tvb, offset, 1, FALSE); offset += 1;
proto_tree_add_item(gen_tree, hf_generic_ext_status_length, tvb, offset, 1, FALSE); length = tvb_get_guint8(tvb, offset); offset += 1;
proto_tree_add_item(gen_tree, hf_generic_ext_status_data, tvb, offset, length, FALSE); offset += 1;
proto_tree_add_item(gen_tree, hf_generic_ext_status_data, tvb, offset, length, ENC_NA); offset += 1;
return offset;
}

12
epan/dissectors/packet-aim-messaging.c
View File

@ -305,7 +305,7 @@ dissect_aim_tlv_value_rendezvous(proto_item *ti, guint16 valueid _U_, tvbuff_t *
proto_tree_add_item(entry, hf_aim_rendezvous_msg_type, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
proto_tree_add_item(entry, hf_aim_icbm_cookie, tvb, offset, 8, ENC_BIG_ENDIAN);
proto_tree_add_item(entry, hf_aim_icbm_cookie, tvb, offset, 8, ENC_NA);
offset += 8;
offset = dissect_aim_capability(entry, tvb, offset);
@ -324,7 +324,7 @@ dissect_aim_msg_outgoing(tvbuff_t *tvb, packet_info *pinfo, proto_tree *msg_tree
int buddyname_length;
/* ICBM Cookie */
proto_tree_add_item(msg_tree, hf_aim_icbm_cookie, tvb, offset, 8, ENC_BIG_ENDIAN);
proto_tree_add_item(msg_tree, hf_aim_icbm_cookie, tvb, offset, 8, ENC_NA);
offset += 8;
/* Message Channel ID */
@ -359,7 +359,7 @@ dissect_aim_msg_incoming(tvbuff_t *tvb, packet_info *pinfo, proto_tree *msg_tree
guint16 channel_id;
/* ICBM Cookie */
proto_tree_add_item(msg_tree, hf_aim_icbm_cookie, tvb, offset, 8, ENC_BIG_ENDIAN);
proto_tree_add_item(msg_tree, hf_aim_icbm_cookie, tvb, offset, 8, ENC_NA);
offset += 8;
/* Message Channel ID */
@ -414,7 +414,7 @@ static int
dissect_aim_msg_minityping(tvbuff_t *tvb, packet_info *pinfo, proto_tree *msg_tree)
{
int offset = 0;
proto_tree_add_item(msg_tree,hf_aim_icbm_notification_cookie, tvb, offset, 8, ENC_BIG_ENDIAN); offset+=8;
proto_tree_add_item(msg_tree,hf_aim_icbm_notification_cookie, tvb, offset, 8, ENC_NA); offset+=8;
proto_tree_add_item(msg_tree,hf_aim_icbm_notification_channel, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2;
offset = dissect_aim_buddyname(tvb, pinfo, offset, msg_tree);
proto_tree_add_item(msg_tree,hf_aim_icbm_notification_type, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2;
@ -581,7 +581,7 @@ dissect_aim_msg_ack(tvbuff_t *tvb, packet_info *pinfo, proto_tree *msg_tree)
{
int offset = 0;
proto_tree_add_item(msg_tree,hf_aim_icbm_cookie, tvb, offset, 8, ENC_BIG_ENDIAN); offset+=8;
proto_tree_add_item(msg_tree,hf_aim_icbm_cookie, tvb, offset, 8, ENC_NA); offset+=8;
proto_tree_add_item(msg_tree, hf_aim_message_channel_id, tvb, offset, 2,
ENC_BIG_ENDIAN); offset += 2;
@ -597,7 +597,7 @@ dissect_aim_msg_client_err(tvbuff_t *tvb, packet_info *pinfo, proto_tree *msg_tr
int offset = 0;
guint16 channel, reason;
proto_tree_add_item(msg_tree,hf_aim_icbm_cookie, tvb, offset, 8, ENC_BIG_ENDIAN); offset+=8;
proto_tree_add_item(msg_tree,hf_aim_icbm_cookie, tvb, offset, 8, ENC_NA); offset+=8;
channel = tvb_get_ntohs(tvb, offset);
proto_tree_add_item(msg_tree,hf_aim_icbm_channel, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2;
offset = dissect_aim_buddyname(tvb, pinfo, offset, msg_tree);

16
epan/dissectors/packet-aim-sst.c
View File

@ -57,14 +57,14 @@ static int dissect_aim_sst_buddy_down_req (tvbuff_t *tvb, packet_info *pinfo _U_
int offset = dissect_aim_buddyname(tvb, pinfo, 0, tree);
guint8 md5_size;
proto_tree_add_item(tree, hf_aim_sst_unknown, tvb, offset, 4, FALSE);
proto_tree_add_item(tree, hf_aim_sst_unknown, tvb, offset, 4, ENC_NA);
offset+=4;
proto_tree_add_item(tree, hf_aim_sst_md5_hash_size, tvb, offset, 1, FALSE);
md5_size = tvb_get_guint8(tvb, offset);
offset++;
proto_tree_add_item(tree, hf_aim_sst_md5_hash, tvb, offset, md5_size, FALSE);
proto_tree_add_item(tree, hf_aim_sst_md5_hash, tvb, offset, md5_size, ENC_NA);
offset+=md5_size;
return offset;
@ -76,14 +76,14 @@ static int dissect_aim_sst_buddy_down_repl (tvbuff_t *tvb, packet_info *pinfo _U
guint8 md5_size;
guint16 icon_size;
proto_tree_add_item(tree, hf_aim_sst_unknown, tvb, offset, 3, FALSE);
proto_tree_add_item(tree, hf_aim_sst_unknown, tvb, offset, 3, ENC_NA);
offset+=3;
proto_tree_add_item(tree, hf_aim_sst_md5_hash_size, tvb, offset, 1, FALSE);
md5_size = tvb_get_guint8(tvb, offset);
offset++;
proto_tree_add_item(tree, hf_aim_sst_md5_hash, tvb, offset, md5_size, FALSE);
proto_tree_add_item(tree, hf_aim_sst_md5_hash, tvb, offset, md5_size, ENC_NA);
offset+=md5_size;
@ -93,7 +93,7 @@ static int dissect_aim_sst_buddy_down_repl (tvbuff_t *tvb, packet_info *pinfo _U
if (icon_size)
{
proto_tree_add_item(tree, hf_aim_sst_icon, tvb, offset, icon_size, FALSE);
proto_tree_add_item(tree, hf_aim_sst_icon, tvb, offset, icon_size, ENC_NA);
}
offset+=icon_size;
@ -106,14 +106,14 @@ static int dissect_aim_sst_buddy_up_repl (tvbuff_t *tvb, packet_info *pinfo _U_,
int offset = 0;
guint8 md5_size;
proto_tree_add_item(tree, hf_aim_sst_unknown, tvb, offset, 4, FALSE);
proto_tree_add_item(tree, hf_aim_sst_unknown, tvb, offset, 4, ENC_NA);
offset+=4;
proto_tree_add_item(tree, hf_aim_sst_md5_hash_size, tvb, offset, 1, FALSE);
md5_size = tvb_get_guint8(tvb, offset);
offset++;
proto_tree_add_item(tree, hf_aim_sst_md5_hash, tvb, offset, md5_size, FALSE);
proto_tree_add_item(tree, hf_aim_sst_md5_hash, tvb, offset, md5_size, ENC_NA);
offset+=md5_size;
return offset;
@ -133,7 +133,7 @@ static int dissect_aim_sst_buddy_up_req (tvbuff_t *tvb, packet_info *pinfo _U_,
if (icon_size)
{
proto_tree_add_item(tree, hf_aim_sst_icon, tvb, offset, icon_size, FALSE);
proto_tree_add_item(tree, hf_aim_sst_icon, tvb, offset, icon_size, ENC_NA);
}
offset+=icon_size;

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

@ -69,14 +69,14 @@ dissect_airopeek(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
ti = proto_tree_add_item(tree, proto_airopeek, tvb, 0, -1, ENC_BIG_ENDIAN);
airopeek_tree = proto_item_add_subtree(ti, ett_airopeek);
proto_tree_add_item(airopeek_tree, hf_airopeek_unknown1, tvb, 0, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(airopeek_tree, hf_airopeek_unknown1, tvb, 0, 2, ENC_NA);
proto_tree_add_item(airopeek_tree, hf_airopeek_unknown2, tvb, 2, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(airopeek_tree, hf_airopeek_unknown3, tvb, 4, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(airopeek_tree, hf_airopeek_unknown4, tvb, 6, 5, ENC_BIG_ENDIAN);
proto_tree_add_item(airopeek_tree, hf_airopeek_unknown4, tvb, 6, 5, ENC_NA);
proto_tree_add_item(airopeek_tree, hf_airopeek_timestamp, tvb, 11, 4, ENC_BIG_ENDIAN);
proto_tree_add_item(airopeek_tree, hf_airopeek_unknown5, tvb, 15, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(airopeek_tree, hf_airopeek_unknown5, tvb, 15, 2, ENC_NA);
proto_tree_add_item(airopeek_tree, hf_airopeek_channel, tvb, 17, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(airopeek_tree, hf_airopeek_unknown6, tvb, 18, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(airopeek_tree, hf_airopeek_unknown6, tvb, 18, 2, ENC_NA);
}
next_tvb = tvb_new_subset_remaining(tvb, 20);
pinfo->pseudo_header->ieee_802_11.fcs_len = 4;

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

@ -410,7 +410,7 @@ static emem_tree_t* legs_by_osaid = NULL;
static emem_tree_t* legs_by_bearer = NULL;
static const gchar* dissect_fields_unknown(packet_info* pinfo _U_, tvbuff_t *tvb, proto_tree *tree, int offset, int len, alcap_message_info_t* msg_info _U_) {
proto_item* pi = proto_tree_add_item(tree,hf_alcap_unknown,tvb,offset,len,ENC_BIG_ENDIAN);
proto_item* pi = proto_tree_add_item(tree,hf_alcap_unknown,tvb,offset,len,ENC_NA);
proto_item_set_expert_flags(pi, PI_UNDECODED, PI_WARN);
return NULL;
}
@ -458,7 +458,7 @@ static const gchar* dissect_fields_cau(packet_info* pinfo, tvbuff_t *tvb, proto_
if (len > 2) {
int diag_len = tvb_get_guint8(tvb,offset);
pi = proto_tree_add_item(tree,hf_alcap_cau_diag, tvb, offset,len-2,ENC_BIG_ENDIAN);
pi = proto_tree_add_item(tree,hf_alcap_cau_diag, tvb, offset,len-2,ENC_NA);
tree = proto_item_add_subtree(pi,ett_cau_diag);
proto_tree_add_item(tree, hf_alcap_cau_diag_len, tvb, offset, 1, ENC_BIG_ENDIAN);
@ -591,7 +591,7 @@ static const gchar* dissect_fields_dnsea(packet_info* pinfo _U_, tvbuff_t *tvb,
msg_info->dest_nsap = tvb_bytes_to_str(tvb,offset,20);
proto_tree_add_item(tree, hf_alcap_dnsea, tvb, offset, 20, ENC_BIG_ENDIAN);
proto_tree_add_item(tree, hf_alcap_dnsea, tvb, offset, 20, ENC_NA);
dissect_nsap(tvb, offset,20, tree);
return NULL;
@ -612,7 +612,7 @@ static const gchar* dissect_fields_onsea(packet_info* pinfo _U_, tvbuff_t *tvb,
msg_info->orig_nsap = tvb_bytes_to_str(tvb,offset,20);
proto_tree_add_item(tree, hf_alcap_onsea, tvb, offset, 20, ENC_BIG_ENDIAN);
proto_tree_add_item(tree, hf_alcap_onsea, tvb, offset, 20, ENC_NA);
dissect_nsap(tvb, offset,20, tree);
return NULL;
@ -707,7 +707,7 @@ static const gchar* dissect_fields_sugr(packet_info* pinfo _U_, tvbuff_t *tvb, p
msg_info->sugr = tvb_get_ntohl(tvb,offset);
proto_tree_add_item(tree, hf_alcap_sugr, tvb, offset, 4, ENC_BIG_ENDIAN);
proto_tree_add_item(tree, hf_alcap_sugr, tvb, offset, 4, ENC_NA);
return NULL;
}
@ -756,7 +756,7 @@ static const gchar* dissect_fields_ssia(packet_info* pinfo _U_, tvbuff_t *tvb, p
proto_tree_add_item(tree, hf_alcap_ssia_max_len, tvb, offset+4,2,ENC_BIG_ENDIAN);
proto_tree_add_item(tree, hf_alcap_ssia_oui, tvb, offset+5,3,ENC_BIG_ENDIAN);
proto_tree_add_item(tree, hf_alcap_ssia_oui, tvb, offset+5,3,ENC_NA);
return NULL;
}
@ -874,7 +874,7 @@ static const gchar* dissect_fields_ssiae(packet_info* pinfo _U_, tvbuff_t *tvb,
proto_tree_add_item(tree, hf_alcap_ssiae_max_len, tvb, offset+4,2,ENC_BIG_ENDIAN);
proto_tree_add_item(tree, hf_alcap_ssiae_oui, tvb, offset+5,3,ENC_BIG_ENDIAN);
proto_tree_add_item(tree, hf_alcap_ssiae_oui, tvb, offset+5,3,ENC_NA);
return NULL;
}
@ -910,7 +910,7 @@ static const gchar* dissect_fields_pssiae(packet_info* pinfo _U_, tvbuff_t *tvb,
proto_tree_add_item(tree, hf_alcap_pssiae_max_len, tvb, offset+4,2,ENC_BIG_ENDIAN);
proto_tree_add_item(tree, hf_alcap_pssiae_oui, tvb, offset+5,3,ENC_BIG_ENDIAN);
proto_tree_add_item(tree, hf_alcap_pssiae_oui, tvb, offset+5,3,ENC_NA);
return NULL;
}
@ -1211,7 +1211,7 @@ static const gchar* dissect_fields_sut(packet_info* pinfo _U_, tvbuff_t *tvb, pr
sut_len = tvb_get_guint8(tvb,offset);
proto_tree_add_item(tree, hf_alcap_sut_len, tvb, offset, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(tree, hf_alcap_sut, tvb, offset, sut_len, ENC_BIG_ENDIAN);
proto_tree_add_item(tree, hf_alcap_sut, tvb, offset, sut_len, ENC_NA);
return NULL;
}
@ -1391,7 +1391,7 @@ static void dissect_alcap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
col_set_str(pinfo->cinfo, COL_INFO, msg_type->abbr);
pi = proto_tree_add_item(alcap_tree,hf_alcap_compat,tvb,5,1,ENC_BIG_ENDIAN);
pi = proto_tree_add_item(alcap_tree,hf_alcap_compat,tvb,5,1,ENC_NA);
compat_tree = proto_item_add_subtree(pi,ett_compat);
proto_tree_add_item(compat_tree,hf_alcap_compat_pass_on_sni,tvb,5,1,ENC_BIG_ENDIAN);
proto_tree_add_item(compat_tree,hf_alcap_compat_pass_on_ii,tvb,5,1,ENC_BIG_ENDIAN);
@ -1411,7 +1411,7 @@ static void dissect_alcap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
pi = proto_tree_add_item(alcap_tree,hf_alcap_param_id,tvb,offset,1,ENC_BIG_ENDIAN);
param_tree = proto_item_add_subtree(pi,param_info->ett);
pi = proto_tree_add_item(param_tree,hf_alcap_compat,tvb,offset+1,1,ENC_BIG_ENDIAN);
pi = proto_tree_add_item(param_tree,hf_alcap_compat,tvb,offset+1,1,ENC_NA);
compat_tree = proto_item_add_subtree(pi,ett_compat);
proto_tree_add_item(compat_tree,hf_alcap_compat_pass_on_sni,tvb,offset+1,1,ENC_BIG_ENDIAN);
proto_tree_add_item(compat_tree,hf_alcap_compat_pass_on_ii,tvb,offset+1,1,ENC_BIG_ENDIAN);

192
epan/dissectors/packet-amqp.c
View File

@ -2332,7 +2332,7 @@ dissect_amqp_0_10_xid (tvbuff_t *tvb,
THROW(ReportedBoundsError);
proto_tree_add_item(xid_tree,
hf_amqp_0_10_dtx_xid_global_id,
tvb, offset + 1, len8, ENC_BIG_ENDIAN);
tvb, offset + 1, len8, ENC_NA);
AMQP_INCREMENT(offset, (1 + len8), max_length);
}
if (flag1 & 0x04) {
@ -2342,7 +2342,7 @@ dissect_amqp_0_10_xid (tvbuff_t *tvb,
THROW(ReportedBoundsError);
proto_tree_add_item(xid_tree,
hf_amqp_0_10_dtx_xid_branch_id,
tvb, offset + 1, len8, ENC_BIG_ENDIAN);
tvb, offset + 1, len8, ENC_NA);
AMQP_INCREMENT(offset, (1 + len8), max_length);
}
}
@ -2374,7 +2374,7 @@ dissect_amqp_0_10_connection(tvbuff_t *tvb,
proto_tree_add_item(tree, hf_amqp_0_10_connection_method,
tvb, offset+1, 1, ENC_BIG_ENDIAN);
ti = proto_tree_add_item(tree, hf_amqp_method_arguments,
tvb, offset + 2, length - 2, ENC_BIG_ENDIAN);
tvb, offset + 2, length - 2, ENC_NA);
args_tree = proto_item_add_subtree(ti, ett_args);
AMQP_INCREMENT(offset, 2, length);
/*
@ -2401,7 +2401,7 @@ dissect_amqp_0_10_connection(tvbuff_t *tvb,
hf_amqp_method_connection_start_server_properties,
tvb,
offset,
arg_length, ENC_BIG_ENDIAN);
arg_length, ENC_NA);
dissect_amqp_0_10_map (tvb,
offset,
offset + arg_length,
@ -2417,7 +2417,7 @@ dissect_amqp_0_10_connection(tvbuff_t *tvb,
hf_amqp_0_10_method_connection_start_mechanisms,
tvb,
offset,
arg_length, ENC_BIG_ENDIAN);
arg_length, ENC_NA);
dissect_amqp_0_10_array (tvb,
offset,
offset + arg_length,
@ -2433,7 +2433,7 @@ dissect_amqp_0_10_connection(tvbuff_t *tvb,
hf_amqp_0_10_method_connection_start_locales,
tvb,
offset,
arg_length, ENC_BIG_ENDIAN);
arg_length, ENC_NA);
dissect_amqp_0_10_array (tvb,
offset,
offset + arg_length,
@ -2454,7 +2454,7 @@ dissect_amqp_0_10_connection(tvbuff_t *tvb,
hf_amqp_method_connection_start_ok_client_properties,
tvb,
offset,
arg_length, ENC_BIG_ENDIAN);
arg_length, ENC_NA);
dissect_amqp_0_10_map (tvb,
offset,
offset + arg_length,
@ -2475,7 +2475,7 @@ dissect_amqp_0_10_connection(tvbuff_t *tvb,
proto_tree_add_item(args_tree,
hf_amqp_method_connection_start_ok_response,
tvb, offset + 4, tvb_get_ntohl(tvb, offset),
ENC_BIG_ENDIAN);
ENC_NA);
AMQP_INCREMENT(offset, 4 + tvb_get_ntohl(tvb, offset), length);
}
if (flag1 & 0x08) {
@ -2496,7 +2496,7 @@ dissect_amqp_0_10_connection(tvbuff_t *tvb,
proto_tree_add_item(args_tree,
hf_amqp_method_connection_secure_challenge,
tvb, offset + 4, tvb_get_ntohl(tvb, offset),
ENC_BIG_ENDIAN);
ENC_NA);
AMQP_INCREMENT(offset, 4 + tvb_get_ntohl(tvb, offset), length);
}
break;
@ -2509,7 +2509,7 @@ dissect_amqp_0_10_connection(tvbuff_t *tvb,
proto_tree_add_item(args_tree,
hf_amqp_method_connection_secure_ok_response,
tvb, offset + 4, tvb_get_ntohl(tvb, offset),
ENC_BIG_ENDIAN);
ENC_NA);
AMQP_INCREMENT(offset, 4 + tvb_get_ntohl(tvb, offset), length);
}
break;
@ -2593,7 +2593,7 @@ dissect_amqp_0_10_connection(tvbuff_t *tvb,
hf_amqp_0_10_method_connection_open_capabilities,
tvb,
offset,
arg_length, ENC_BIG_ENDIAN);
arg_length, ENC_NA);
dissect_amqp_0_10_array (tvb,
offset,
offset + arg_length,
@ -2620,7 +2620,7 @@ dissect_amqp_0_10_connection(tvbuff_t *tvb,
hf_amqp_0_10_method_connection_open_ok_known_hosts,
tvb,
offset,
arg_length, ENC_BIG_ENDIAN);
arg_length, ENC_NA);
dissect_amqp_0_10_array (tvb,
offset,
offset + arg_length,
@ -2649,7 +2649,7 @@ dissect_amqp_0_10_connection(tvbuff_t *tvb,
hf_amqp_0_10_method_connection_redirect_known_hosts,
tvb,
offset,
arg_length, ENC_BIG_ENDIAN);
arg_length, ENC_NA);
dissect_amqp_0_10_array (tvb,
offset,
offset + arg_length,
@ -2715,7 +2715,7 @@ dissect_amqp_0_10_session(tvbuff_t *tvb,
AMQP_INCREMENT(offset, 2, length);
ti = proto_tree_add_item(tree, hf_amqp_method_arguments,
tvb, offset, length - 2, ENC_BIG_ENDIAN);
tvb, offset, length - 2, ENC_NA);
args_tree = proto_item_add_subtree(ti, ett_args);
/*
* The flag bits are a simple bit string, not a net-byte-order
@ -2739,7 +2739,7 @@ dissect_amqp_0_10_session(tvbuff_t *tvb,
AMQP_INCREMENT(offset, 2, length);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_session_attach_name,
tvb, offset, size, ENC_BIG_ENDIAN);
tvb, offset, size, ENC_NA);
AMQP_INCREMENT(offset, size, length);
}
/*
@ -2760,7 +2760,7 @@ dissect_amqp_0_10_session(tvbuff_t *tvb,
AMQP_INCREMENT(offset, 2, length);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_session_attach_name,
tvb, offset, size, ENC_BIG_ENDIAN);
tvb, offset, size, ENC_NA);
AMQP_INCREMENT(offset, size, length);
}
break;
@ -2774,7 +2774,7 @@ dissect_amqp_0_10_session(tvbuff_t *tvb,
AMQP_INCREMENT(offset, 2, length);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_session_attach_name,
tvb, offset, size, ENC_BIG_ENDIAN);
tvb, offset, size, ENC_NA);
AMQP_INCREMENT(offset, size, length);
}
if (flag1 & 0x02) {
@ -2828,7 +2828,7 @@ dissect_amqp_0_10_session(tvbuff_t *tvb,
THROW(ReportedBoundsError);
ti = proto_tree_add_item(args_tree,
hf_amqp_0_10_method_session_commands,
tvb, offset, size + 2, ENC_BIG_ENDIAN);
tvb, offset, size + 2, ENC_NA);
AMQP_INCREMENT(offset, 2, length);
format_amqp_0_10_sequence_set(tvb, offset, size, ti);
AMQP_INCREMENT(offset, size + 2, length);
@ -2840,7 +2840,7 @@ dissect_amqp_0_10_session(tvbuff_t *tvb,
THROW(ReportedBoundsError);
ti = proto_tree_add_item(args_tree,
hf_amqp_0_10_method_session_fragments,
tvb, offset, array_size + 4, ENC_BIG_ENDIAN);
tvb, offset, array_size + 4, ENC_NA);
AMQP_INCREMENT(offset, 4, length);
dissect_amqp_0_10_array(tvb,
offset,
@ -2861,7 +2861,7 @@ dissect_amqp_0_10_session(tvbuff_t *tvb,
THROW(ReportedBoundsError);
ti = proto_tree_add_item(args_tree,
hf_amqp_0_10_method_session_commands,
tvb, offset, size + 2, ENC_BIG_ENDIAN);
tvb, offset, size + 2, ENC_NA);
AMQP_INCREMENT(offset, 2, length);
format_amqp_0_10_sequence_set(tvb, offset, size, ti);
AMQP_INCREMENT(offset, size + 2, length);
@ -2873,7 +2873,7 @@ dissect_amqp_0_10_session(tvbuff_t *tvb,
THROW(ReportedBoundsError);
ti = proto_tree_add_item(args_tree,
hf_amqp_0_10_method_session_fragments,
tvb, offset, array_size + 4, ENC_BIG_ENDIAN);
tvb, offset, array_size + 4, ENC_NA);
AMQP_INCREMENT(offset, 4, length);
dissect_amqp_0_10_array(tvb,
offset,
@ -2894,7 +2894,7 @@ dissect_amqp_0_10_session(tvbuff_t *tvb,
THROW(ReportedBoundsError);
ti = proto_tree_add_item(args_tree,
hf_amqp_0_10_method_session_commands,
tvb, offset, size + 2, ENC_BIG_ENDIAN);
tvb, offset, size + 2, ENC_NA);
AMQP_INCREMENT(offset, 2, length);
format_amqp_0_10_sequence_set(tvb, offset, size, ti);
AMQP_INCREMENT(offset, size, length);
@ -2917,7 +2917,7 @@ dissect_amqp_0_10_session(tvbuff_t *tvb,
THROW(ReportedBoundsError);
ti = proto_tree_add_item(args_tree,
hf_amqp_0_10_method_session_commands,
tvb, offset, size + 2, ENC_BIG_ENDIAN);
tvb, offset, size + 2, ENC_NA);
AMQP_INCREMENT(offset, 2, length);
format_amqp_0_10_sequence_set(tvb, offset, size, ti);
AMQP_INCREMENT(offset, size, length);
@ -2948,7 +2948,7 @@ dissect_amqp_0_10_session(tvbuff_t *tvb,
THROW(ReportedBoundsError);
ti = proto_tree_add_item(args_tree,
hf_amqp_0_10_method_session_commands,
tvb, offset, size + 2, ENC_BIG_ENDIAN);
tvb, offset, size + 2, ENC_NA);
AMQP_INCREMENT(offset, 2, length);
format_amqp_0_10_sequence_set(tvb, offset, size, ti);
AMQP_INCREMENT(offset, size + 2, length);
@ -2998,7 +2998,7 @@ dissect_amqp_0_10_execution(tvbuff_t *tvb,
AMQP_INCREMENT(offset, 2, length);
ti = proto_tree_add_item(tree, hf_amqp_method_arguments,
tvb, offset, length - 4, ENC_BIG_ENDIAN);
tvb, offset, length - 4, ENC_NA);
args_tree = proto_item_add_subtree(ti, ett_args);
/*
* The flag bits are a simple bit string, not a net-byte-order
@ -3035,7 +3035,7 @@ dissect_amqp_0_10_execution(tvbuff_t *tvb,
THROW(ReportedBoundsError);
ti = proto_tree_add_item(args_tree,
hf_amqp_0_10_undissected_struct32,
tvb, offset, struct_size, ENC_BIG_ENDIAN);
tvb, offset, struct_size, ENC_NA);
dissect_amqp_0_10_struct32(tvb, ti, offset, struct_size);
AMQP_INCREMENT(offset, struct_size, length);
}
@ -3133,7 +3133,7 @@ dissect_amqp_0_10_execution(tvbuff_t *tvb,
hf_amqp_0_10_method_execution_error_info,
tvb,
offset,
struct_size, ENC_BIG_ENDIAN);
struct_size, ENC_NA);
dissect_amqp_0_10_map (tvb,
offset,
offset + struct_size,
@ -3185,7 +3185,7 @@ dissect_amqp_0_10_message(tvbuff_t *tvb,
AMQP_INCREMENT(offset, 2, length);
ti = proto_tree_add_item(tree, hf_amqp_method_arguments,
tvb, offset, length - 4, ENC_BIG_ENDIAN);
tvb, offset, length - 4, ENC_NA);
args_tree = proto_item_add_subtree(ti, ett_args);
/*
* The flag bits are a simple bit string, not a net-byte-order
@ -3236,7 +3236,7 @@ dissect_amqp_0_10_message(tvbuff_t *tvb,
THROW(ReportedBoundsError);
ti = proto_tree_add_item(args_tree,
hf_amqp_0_10_method_message_accept_transfers,
tvb, offset, size + 2, ENC_BIG_ENDIAN);
tvb, offset, size + 2, ENC_NA);
AMQP_INCREMENT(offset, 2, length);
format_amqp_0_10_sequence_set(tvb, offset, size, ti);
AMQP_INCREMENT(offset, size, length);
@ -3252,7 +3252,7 @@ dissect_amqp_0_10_message(tvbuff_t *tvb,
THROW_ON(((offset + 2 + size) > length), ReportedBoundsError);
ti = proto_tree_add_item(args_tree,
hf_amqp_0_10_method_message_accept_transfers,
tvb, offset, size + 2, ENC_BIG_ENDIAN);
tvb, offset, size + 2, ENC_NA);
AMQP_INCREMENT(offset, 2, length);
format_amqp_0_10_sequence_set(tvb, offset, size, ti);
AMQP_INCREMENT(offset, size, length);
@ -3282,7 +3282,7 @@ dissect_amqp_0_10_message(tvbuff_t *tvb,
THROW_ON(((offset + 2 + size) > length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_message_accept_transfers,
tvb, offset, size + 2, ENC_BIG_ENDIAN);
tvb, offset, size + 2, ENC_NA);
AMQP_INCREMENT(offset, 2, length);
format_amqp_0_10_sequence_set(tvb, offset, size, ti);
AMQP_INCREMENT(offset, size, length);
@ -3304,7 +3304,7 @@ dissect_amqp_0_10_message(tvbuff_t *tvb,
THROW_ON(((offset + 2 + size) > length), ReportedBoundsError);
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_message_accept_transfers,
tvb, offset, size + 2, ENC_BIG_ENDIAN);
tvb, offset, size + 2, ENC_NA);
AMQP_INCREMENT(offset, 2, length);
format_amqp_0_10_sequence_set(tvb, offset, size, ti);
AMQP_INCREMENT(offset, size, length);
@ -3397,7 +3397,7 @@ dissect_amqp_0_10_message(tvbuff_t *tvb,
hf_amqp_0_10_method_message_subscribe_args,
tvb,
offset,
4 + map_size, ENC_BIG_ENDIAN);
4 + map_size, ENC_NA);
dissect_amqp_0_10_map (tvb,
offset + 4,
offset + 4 + map_size,
@ -3580,7 +3580,7 @@ dissect_amqp_0_10_dtx(tvbuff_t *tvb,
return;
ti = proto_tree_add_item(tree, hf_amqp_method_arguments,
tvb, offset, length - 4, ENC_BIG_ENDIAN);
tvb, offset, length - 4, ENC_NA);
args_tree = proto_item_add_subtree(ti, ett_args);
/*
@ -3607,7 +3607,7 @@ dissect_amqp_0_10_dtx(tvbuff_t *tvb,
hf_amqp_0_10_dtx_xid,
tvb,
offset - 2,
xid_length + 2, ENC_BIG_ENDIAN);
xid_length + 2, ENC_NA);
dissect_amqp_0_10_xid (tvb,
offset,
xid_length,
@ -3637,7 +3637,7 @@ dissect_amqp_0_10_dtx(tvbuff_t *tvb,
hf_amqp_0_10_dtx_xid,
tvb,
offset - 2,
xid_length + 2, ENC_BIG_ENDIAN);
xid_length + 2, ENC_NA);
dissect_amqp_0_10_xid (tvb,
offset,
xid_length,
@ -3666,7 +3666,7 @@ dissect_amqp_0_10_dtx(tvbuff_t *tvb,
hf_amqp_0_10_dtx_xid,
tvb,
offset - 2,
xid_length + 2, ENC_BIG_ENDIAN);
xid_length + 2, ENC_NA);
dissect_amqp_0_10_xid (tvb,
offset,
xid_length,
@ -3695,7 +3695,7 @@ dissect_amqp_0_10_dtx(tvbuff_t *tvb,
hf_amqp_0_10_dtx_xid,
tvb,
offset - 2,
xid_length + 2, ENC_BIG_ENDIAN);
xid_length + 2, ENC_NA);
dissect_amqp_0_10_xid (tvb,
offset,
xid_length,
@ -3715,7 +3715,7 @@ dissect_amqp_0_10_dtx(tvbuff_t *tvb,
hf_amqp_0_10_dtx_xid,
tvb,
offset - 2,
xid_length + 2, ENC_BIG_ENDIAN);
xid_length + 2, ENC_NA);
dissect_amqp_0_10_xid (tvb,
offset,
xid_length,
@ -3773,7 +3773,7 @@ dissect_amqp_0_10_exchange(tvbuff_t *tvb,
AMQP_INCREMENT(offset, 2, length);
ti = proto_tree_add_item(tree, hf_amqp_method_arguments,
tvb, offset, length - 4, ENC_BIG_ENDIAN);
tvb, offset, length - 4, ENC_NA);
args_tree = proto_item_add_subtree(ti, ett_args);
/*
@ -3836,7 +3836,7 @@ dissect_amqp_0_10_exchange(tvbuff_t *tvb,
hf_amqp_0_10_method_exchange_declare_arguments,
tvb,
offset - 4,
map_length + 4, ENC_BIG_ENDIAN);
map_length + 4, ENC_NA);
dissect_amqp_0_10_map (tvb,
offset,
offset + map_length,
@ -3913,7 +3913,7 @@ dissect_amqp_0_10_exchange(tvbuff_t *tvb,
hf_amqp_0_10_method_exchange_declare_arguments,
tvb,
offset - 4,
map_length + 4, ENC_BIG_ENDIAN);
map_length + 4, ENC_NA);
dissect_amqp_0_10_map (tvb,
offset,
offset + map_length,
@ -3987,7 +3987,7 @@ dissect_amqp_0_10_exchange(tvbuff_t *tvb,
hf_amqp_0_10_method_exchange_declare_arguments,
tvb,
offset - 4,
map_length + 4, ENC_BIG_ENDIAN);
map_length + 4, ENC_NA);
dissect_amqp_0_10_map (tvb,
offset,
offset + map_length,
@ -4039,7 +4039,7 @@ dissect_amqp_0_10_queue(tvbuff_t *tvb,
AMQP_INCREMENT(offset, 2, length);
ti = proto_tree_add_item(tree, hf_amqp_method_arguments,
tvb, offset, length - 4, ENC_BIG_ENDIAN);
tvb, offset, length - 4, ENC_NA);
args_tree = proto_item_add_subtree(ti, ett_args);
/*
@ -4097,7 +4097,7 @@ dissect_amqp_0_10_queue(tvbuff_t *tvb,
hf_amqp_0_10_method_queue_declare_arguments,
tvb,
offset - 4,
map_length + 4, ENC_BIG_ENDIAN);
map_length + 4, ENC_NA);
dissect_amqp_0_10_map (tvb,
offset,
offset + map_length,
@ -4197,7 +4197,7 @@ dissect_amqp_0_10_file(tvbuff_t *tvb,
AMQP_INCREMENT(offset, 2, length);
ti = proto_tree_add_item(tree, hf_amqp_method_arguments,
tvb, offset, length - 4, ENC_BIG_ENDIAN);
tvb, offset, length - 4, ENC_NA);
args_tree = proto_item_add_subtree(ti, ett_args);
/*
@ -4283,7 +4283,7 @@ dissect_amqp_0_10_file(tvbuff_t *tvb,
hf_amqp_0_10_method_file_consume_arguments,
tvb,
offset - 4,
map_length + 4, ENC_BIG_ENDIAN);
map_length + 4, ENC_NA);
dissect_amqp_0_10_map (tvb,
offset,
offset + map_length,
@ -4535,7 +4535,7 @@ dissect_amqp_0_10_stream(tvbuff_t *tvb,
AMQP_INCREMENT(offset, 2, length);
ti = proto_tree_add_item(tree, hf_amqp_method_arguments,
tvb, offset, length - 4, ENC_BIG_ENDIAN);
tvb, offset, length - 4, ENC_NA);
args_tree = proto_item_add_subtree(ti, ett_args);
/*
@ -4623,7 +4623,7 @@ dissect_amqp_0_10_stream(tvbuff_t *tvb,
hf_amqp_0_10_method_stream_consume_arguments,
tvb,
offset - 4,
map_length + 4, ENC_BIG_ENDIAN);
map_length + 4, ENC_NA);
dissect_amqp_0_10_map (tvb,
offset,
offset + map_length,
@ -4953,7 +4953,7 @@ dissect_amqp_0_10_struct_message_properties(tvbuff_t *tvb,
len16 = tvb_get_ntohs(tvb, offset);
proto_tree_add_item(frag,
hf_amqp_0_10_struct_message_properties_correlation,
tvb, offset + 2, len16, ENC_BIG_ENDIAN);
tvb, offset + 2, len16, ENC_NA);
AMQP_INCREMENT(offset, (2 + len16), max_length);
}
if (flag1 & 0x08) {
@ -4963,7 +4963,7 @@ dissect_amqp_0_10_struct_message_properties(tvbuff_t *tvb,
AMQP_INCREMENT(offset, 2, max_length);
ti = proto_tree_add_item(frag,
hf_amqp_0_10_struct_message_properties_reply_to,
tvb, offset, len16, ENC_BIG_ENDIAN);
tvb, offset, len16, ENC_NA);
args_tree = proto_item_add_subtree(ti, ett_args);
subflags_item = proto_tree_add_item(args_tree,
hf_amqp_0_10_argument_packing_flags,
@ -5011,7 +5011,7 @@ dissect_amqp_0_10_struct_message_properties(tvbuff_t *tvb,
len16 = tvb_get_ntohs(tvb, offset);
proto_tree_add_item(frag,
hf_amqp_0_10_struct_message_properties_user_id,
tvb, offset + 2, len16, ENC_BIG_ENDIAN);
tvb, offset + 2, len16, ENC_NA);
AMQP_INCREMENT(offset, (2 + len16), max_length);
}
if (flag1 & 0x80) {
@ -5019,7 +5019,7 @@ dissect_amqp_0_10_struct_message_properties(tvbuff_t *tvb,
len16 = tvb_get_ntohs(tvb, offset);
proto_tree_add_item(frag,
hf_amqp_0_10_struct_message_properties_app_id,
tvb, offset + 2, len16, ENC_BIG_ENDIAN);
tvb, offset + 2, len16, ENC_NA);
AMQP_INCREMENT(offset, (2 + len16), max_length);
}
if (flag2 & 0x01) {
@ -5030,7 +5030,7 @@ dissect_amqp_0_10_struct_message_properties(tvbuff_t *tvb,
hf_amqp_0_10_struct_message_properties_application_headers,
tvb,
offset,
map_length, ENC_BIG_ENDIAN);
map_length, ENC_NA);
dissect_amqp_0_10_map (tvb,
offset,
offset + map_length,
@ -5091,7 +5091,7 @@ dissect_amqp_0_10_struct_exchange_query_result(tvbuff_t *tvb,
hf_amqp_0_10_method_exchange_declare_arguments,
tvb,
offset - 4,
map_length + 4, ENC_BIG_ENDIAN);
map_length + 4, ENC_NA);
dissect_amqp_0_10_map (tvb,
offset,
offset + map_length,
@ -5166,7 +5166,7 @@ dissect_amqp_0_10_struct_queue_query_result(tvbuff_t *tvb,
hf_amqp_0_10_method_queue_declare_arguments,
tvb,
offset - 4,
map_length + 4, ENC_BIG_ENDIAN);
map_length + 4, ENC_NA);
dissect_amqp_0_10_map (tvb,
offset,
offset + map_length,
@ -5239,7 +5239,7 @@ dissect_amqp_0_10_struct_file_properties(tvbuff_t *tvb,
hf_amqp_0_10_struct_file_properties_headers,
tvb,
offset,
map_length, ENC_BIG_ENDIAN);
map_length, ENC_NA);
dissect_amqp_0_10_map (tvb,
offset,
offset + map_length,
@ -5349,7 +5349,7 @@ dissect_amqp_0_10_struct_stream_properties(tvbuff_t *tvb,
hf_amqp_0_10_struct_stream_properties_headers,
tvb,
offset,
map_length, ENC_BIG_ENDIAN);
map_length, ENC_NA);
dissect_amqp_0_10_map (tvb,
offset,
offset + map_length,
@ -5436,7 +5436,7 @@ dissect_amqp_0_10_struct32(tvbuff_t *tvb,
THROW_ON(((consumed + size) > struct_length), ReportedBoundsError);
ti = proto_tree_add_item(result,
hf_amqp_0_10_struct_acquired_transfers,
tvb, offset, size + 2, ENC_BIG_ENDIAN);
tvb, offset, size + 2, ENC_NA);
format_amqp_0_10_sequence_set(tvb, offset + 2, size, ti);
}
break;
@ -5701,7 +5701,7 @@ dissect_amqp_0_10_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
ti = proto_tree_add_item(amqp_tree,
hf_amqp_0_10_undissected_struct32,
tvb, offset, struct_length, ENC_BIG_ENDIAN);
tvb, offset, struct_length, ENC_NA);
dissect_amqp_0_10_struct32(tvb, ti, offset, struct_length);
AMQP_INCREMENT(offset, struct_length, length);
} while (offset < length);
@ -5712,7 +5712,7 @@ dissect_amqp_0_10_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
col_set_fence(pinfo->cinfo, COL_INFO);
proto_tree_add_item(amqp_tree,
hf_amqp_0_10_message_body,
tvb, offset, length - 12, ENC_BIG_ENDIAN);
tvb, offset, length - 12, ENC_NA);
break;
default:
@ -5788,7 +5788,7 @@ dissect_amqp_0_9_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(amqp_tree, hf_amqp_method_connection_method_id,
tvb, 9, 2, ENC_BIG_ENDIAN);
ti = proto_tree_add_item(amqp_tree, hf_amqp_method_arguments,
tvb, 11, length - 4, ENC_BIG_ENDIAN);
tvb, 11, length - 4, ENC_NA);
args_tree = proto_item_add_subtree(ti, ett_args);
col_append_fstr(pinfo->cinfo, COL_INFO, "Connection.%s",
val_to_str( method_id, amqp_method_connection_methods, "Unknown (%u)"));
@ -5850,7 +5850,7 @@ dissect_amqp_0_9_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(amqp_tree, hf_amqp_method_channel_method_id,
tvb, 9, 2, ENC_BIG_ENDIAN);
ti = proto_tree_add_item(amqp_tree, hf_amqp_method_arguments,
tvb, 11, length - 4, ENC_BIG_ENDIAN);
tvb, 11, length - 4, ENC_NA);
args_tree = proto_item_add_subtree(ti, ett_args);
col_append_fstr(pinfo->cinfo, COL_INFO, "Channel.%s",
@ -5910,7 +5910,7 @@ dissect_amqp_0_9_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(amqp_tree, hf_amqp_method_access_method_id,
tvb, 9, 2, ENC_BIG_ENDIAN);
ti = proto_tree_add_item(amqp_tree, hf_amqp_method_arguments,
tvb, 11, length - 4, ENC_BIG_ENDIAN);
tvb, 11, length - 4, ENC_NA);
args_tree = proto_item_add_subtree(ti, ett_args);
switch (method_id) {
case AMQP_0_9_METHOD_ACCESS_REQUEST:
@ -5939,7 +5939,7 @@ dissect_amqp_0_9_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(amqp_tree, hf_amqp_method_exchange_method_id,
tvb, 9, 2, ENC_BIG_ENDIAN);
ti = proto_tree_add_item(amqp_tree, hf_amqp_method_arguments,
tvb, 11, length - 4, ENC_BIG_ENDIAN);
tvb, 11, length - 4, ENC_NA);
args_tree = proto_item_add_subtree(ti, ett_args);
col_append_fstr(pinfo->cinfo, COL_INFO, "Exchange.%s",
val_to_str( method_id, amqp_method_exchange_methods, "Unknown (%u)"));
@ -5981,7 +5981,7 @@ dissect_amqp_0_9_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(amqp_tree, hf_amqp_method_queue_method_id,
tvb, 9, 2, ENC_BIG_ENDIAN);
ti = proto_tree_add_item(amqp_tree, hf_amqp_method_arguments,
tvb, 11, length - 4, ENC_BIG_ENDIAN);
tvb, 11, length - 4, ENC_NA);
args_tree = proto_item_add_subtree(ti, ett_args);
col_append_fstr(pinfo->cinfo, COL_INFO, "Queue.%s",
val_to_str( method_id, amqp_method_queue_methods, "Unknown (%u)"));
@ -6040,7 +6040,7 @@ dissect_amqp_0_9_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(amqp_tree, hf_amqp_method_basic_method_id,
tvb, 9, 2, ENC_BIG_ENDIAN);
ti = proto_tree_add_item(amqp_tree, hf_amqp_method_arguments,
tvb, 11, length - 4, ENC_BIG_ENDIAN);
tvb, 11, length - 4, ENC_NA);
args_tree = proto_item_add_subtree(ti, ett_args);
col_append_fstr(pinfo->cinfo, COL_INFO, "Basic.%s",
@ -6120,7 +6120,7 @@ dissect_amqp_0_9_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(amqp_tree, hf_amqp_method_file_method_id,
tvb, 9, 2, ENC_BIG_ENDIAN);
ti = proto_tree_add_item(amqp_tree, hf_amqp_method_arguments,
tvb, 11, length - 4, ENC_BIG_ENDIAN);
tvb, 11, length - 4, ENC_NA);
args_tree = proto_item_add_subtree(ti, ett_args);
col_append_fstr(pinfo->cinfo, COL_INFO, "File.%s",
@ -6196,7 +6196,7 @@ dissect_amqp_0_9_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(amqp_tree, hf_amqp_method_stream_method_id,
tvb, 9, 2, ENC_BIG_ENDIAN);
ti = proto_tree_add_item(amqp_tree, hf_amqp_method_arguments,
tvb, 11, length - 4, ENC_BIG_ENDIAN);
tvb, 11, length - 4, ENC_NA);
args_tree = proto_item_add_subtree(ti, ett_args);
col_append_fstr(pinfo->cinfo, COL_INFO, "Stream.%s",
@ -6252,7 +6252,7 @@ dissect_amqp_0_9_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(amqp_tree, hf_amqp_method_tx_method_id,
tvb, 9, 2, ENC_BIG_ENDIAN);
ti = proto_tree_add_item(amqp_tree, hf_amqp_method_arguments,
tvb, 11, length - 4, ENC_BIG_ENDIAN);
tvb, 11, length - 4, ENC_NA);
args_tree = proto_item_add_subtree(ti, ett_args);
col_append_fstr(pinfo->cinfo, COL_INFO, "Tx.%s",
@ -6296,7 +6296,7 @@ dissect_amqp_0_9_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(amqp_tree, hf_amqp_method_dtx_method_id,
tvb, 9, 2, ENC_BIG_ENDIAN);
ti = proto_tree_add_item(amqp_tree, hf_amqp_method_arguments,
tvb, 11, length - 4, ENC_BIG_ENDIAN);
tvb, 11, length - 4, ENC_NA);
args_tree = proto_item_add_subtree(ti, ett_args);
col_append_fstr(pinfo->cinfo, COL_INFO, "Dtx.%s",
@ -6332,7 +6332,7 @@ dissect_amqp_0_9_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(amqp_tree, hf_amqp_method_tunnel_method_id,
tvb, 9, 2, ENC_BIG_ENDIAN);
ti = proto_tree_add_item(amqp_tree, hf_amqp_method_arguments,
tvb, 11, length - 4, ENC_BIG_ENDIAN);
tvb, 11, length - 4, ENC_NA);
args_tree = proto_item_add_subtree(ti, ett_args);
switch (method_id) {
case AMQP_0_9_METHOD_TUNNEL_REQUEST:
@ -6367,7 +6367,7 @@ dissect_amqp_0_9_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(amqp_tree, hf_amqp_header_property_flags,
tvb, 19, 2, ENC_BIG_ENDIAN);
ti = proto_tree_add_item(amqp_tree, hf_amqp_header_properties,
tvb, 21, length - 14, ENC_BIG_ENDIAN);
tvb, 21, length - 14, ENC_NA);
prop_tree = proto_item_add_subtree(ti, ett_props);
offset = 21;
switch (class_id) {
@ -6398,7 +6398,7 @@ dissect_amqp_0_9_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
break;
case AMQP_0_9_FRAME_TYPE_CONTENT_BODY:
proto_tree_add_item(amqp_tree, hf_amqp_payload,
tvb, 7, length, ENC_BIG_ENDIAN);
tvb, 7, length, ENC_NA);
col_append_str(pinfo->cinfo, COL_INFO, "Content-Body ");
col_set_fence(pinfo->cinfo, COL_INFO);
break;
@ -6431,18 +6431,18 @@ dissect_amqp_0_9_method_connection_start(tvbuff_t *tvb, packet_info *pinfo,
/* server-properties (table) */
ti = proto_tree_add_item(
args_tree, hf_amqp_method_connection_start_server_properties,
tvb, offset + 4, tvb_get_ntohl(tvb, offset), ENC_BIG_ENDIAN);
tvb, offset + 4, tvb_get_ntohl(tvb, offset), ENC_NA);
dissect_amqp_0_9_field_table(tvb, pinfo, offset + 4, tvb_get_ntohl(tvb, offset), ti);
offset += 4 + tvb_get_ntohl(tvb, offset);
/* mechanisms (longstr) */
proto_tree_add_item(args_tree, hf_amqp_0_9_method_connection_start_mechanisms,
tvb, offset + 4, tvb_get_ntohl(tvb, offset), ENC_BIG_ENDIAN);
tvb, offset + 4, tvb_get_ntohl(tvb, offset), ENC_NA);
offset += 4 + tvb_get_ntohl(tvb, offset);
/* locales (longstr) */
proto_tree_add_item(args_tree, hf_amqp_0_9_method_connection_start_locales,
tvb, offset + 4, tvb_get_ntohl(tvb, offset), ENC_BIG_ENDIAN);
tvb, offset + 4, tvb_get_ntohl(tvb, offset), ENC_NA);
offset += 4 + tvb_get_ntohl(tvb, offset);
return offset;
@ -6458,7 +6458,7 @@ dissect_amqp_0_9_method_connection_start_ok(tvbuff_t *tvb, packet_info *pinfo,
/* client-properties (table) */
ti = proto_tree_add_item(
args_tree, hf_amqp_method_connection_start_ok_client_properties,
tvb, offset + 4, tvb_get_ntohl(tvb, offset), ENC_BIG_ENDIAN);
tvb, offset + 4, tvb_get_ntohl(tvb, offset), ENC_NA);
dissect_amqp_0_9_field_table(tvb, pinfo, offset + 4, tvb_get_ntohl(tvb, offset), ti);
offset += 4 + tvb_get_ntohl(tvb, offset);
@ -6469,7 +6469,7 @@ dissect_amqp_0_9_method_connection_start_ok(tvbuff_t *tvb, packet_info *pinfo,
/* response (longstr) */
proto_tree_add_item(args_tree, hf_amqp_method_connection_start_ok_response,
tvb, offset + 4, tvb_get_ntohl(tvb, offset), ENC_BIG_ENDIAN);
tvb, offset + 4, tvb_get_ntohl(tvb, offset), ENC_NA);
offset += 4 + tvb_get_ntohl(tvb, offset);
/* locale (shortstr) */
@ -6488,7 +6488,7 @@ dissect_amqp_0_9_method_connection_secure(tvbuff_t *tvb,
{
/* challenge (longstr) */
proto_tree_add_item(args_tree, hf_amqp_method_connection_secure_challenge,
tvb, offset + 4, tvb_get_ntohl(tvb, offset), ENC_BIG_ENDIAN);
tvb, offset + 4, tvb_get_ntohl(tvb, offset), ENC_NA);
offset += 4 + tvb_get_ntohl(tvb, offset);
return offset;
@ -6502,7 +6502,7 @@ dissect_amqp_0_9_method_connection_secure_ok(tvbuff_t *tvb,
{
/* response (longstr) */
proto_tree_add_item(args_tree, hf_amqp_method_connection_secure_ok_response,
tvb, offset + 4, tvb_get_ntohl(tvb, offset), ENC_BIG_ENDIAN);
tvb, offset + 4, tvb_get_ntohl(tvb, offset), ENC_NA);
offset += 4 + tvb_get_ntohl(tvb, offset);
return offset;
@ -6672,7 +6672,7 @@ dissect_amqp_0_9_method_channel_open_ok(tvbuff_t *tvb _U_,
{
/* channel-id (longstr) */
proto_tree_add_item(args_tree, hf_amqp_method_channel_open_ok_channel_id,
tvb, offset + 4, tvb_get_ntohl(tvb, offset), ENC_BIG_ENDIAN);
tvb, offset + 4, tvb_get_ntohl(tvb, offset), ENC_NA);
offset += 4 + tvb_get_ntohl(tvb, offset);
return offset;
@ -6750,7 +6750,7 @@ dissect_amqp_0_9_method_channel_resume(tvbuff_t *tvb _U_,
{
/* channel-id (longstr) */
proto_tree_add_item(args_tree, hf_amqp_method_channel_resume_channel_id,
tvb, offset + 4, tvb_get_ntohl(tvb, offset), ENC_BIG_ENDIAN);
tvb, offset + 4, tvb_get_ntohl(tvb, offset), ENC_NA);
offset += 4 + tvb_get_ntohl(tvb, offset);
return offset;
@ -6877,7 +6877,7 @@ dissect_amqp_0_9_method_exchange_declare(tvbuff_t *tvb, packet_info *pinfo,
/* arguments (table) */
ti = proto_tree_add_item(
args_tree, hf_amqp_method_exchange_declare_arguments,
tvb, offset + 4, tvb_get_ntohl(tvb, offset), ENC_BIG_ENDIAN);
tvb, offset + 4, tvb_get_ntohl(tvb, offset), ENC_NA);
dissect_amqp_0_9_field_table(tvb, pinfo, offset + 4, tvb_get_ntohl(tvb, offset), ti);
offset += 4 + tvb_get_ntohl(tvb, offset);
@ -6928,7 +6928,7 @@ dissect_amqp_0_9_method_exchange_bind(tvbuff_t *tvb, packet_info *pinfo,
/* arguments (table) */
ti = proto_tree_add_item(
args_tree, hf_amqp_method_exchange_bind_arguments,
tvb, offset + 4, tvb_get_ntohl(tvb, offset), ENC_BIG_ENDIAN);
tvb, offset + 4, tvb_get_ntohl(tvb, offset), ENC_NA);
dissect_amqp_0_9_field_table(tvb, pinfo, offset + 4, tvb_get_ntohl(tvb, offset), ti);
offset += 4 + tvb_get_ntohl(tvb, offset);
@ -7021,7 +7021,7 @@ dissect_amqp_0_9_method_queue_declare(tvbuff_t *tvb, packet_info *pinfo,
/* arguments (table) */
ti = proto_tree_add_item(
args_tree, hf_amqp_method_queue_declare_arguments,
tvb, offset + 4, tvb_get_ntohl(tvb, offset), ENC_BIG_ENDIAN);
tvb, offset + 4, tvb_get_ntohl(tvb, offset), ENC_NA);
dissect_amqp_0_9_field_table(tvb, pinfo, offset + 4, tvb_get_ntohl(tvb, offset), ti);
offset += 4 + tvb_get_ntohl(tvb, offset);
@ -7087,7 +7087,7 @@ dissect_amqp_0_9_method_queue_bind(tvbuff_t *tvb, packet_info *pinfo,
/* arguments (table) */
ti = proto_tree_add_item(
args_tree, hf_amqp_method_queue_bind_arguments,
tvb, offset + 4, tvb_get_ntohl(tvb, offset), ENC_BIG_ENDIAN);
tvb, offset + 4, tvb_get_ntohl(tvb, offset), ENC_NA);
dissect_amqp_0_9_field_table(tvb, pinfo, offset + 4, tvb_get_ntohl(tvb, offset), ti);
offset += 4 + tvb_get_ntohl(tvb, offset);
@ -7133,7 +7133,7 @@ dissect_amqp_0_9_method_queue_unbind(tvbuff_t *tvb, packet_info *pinfo,
/* arguments (table) */
ti = proto_tree_add_item(
args_tree, hf_amqp_method_queue_unbind_arguments,
tvb, offset + 4, tvb_get_ntohl(tvb, offset), ENC_BIG_ENDIAN);
tvb, offset + 4, tvb_get_ntohl(tvb, offset), ENC_NA);
dissect_amqp_0_9_field_table(tvb, pinfo, offset + 4, tvb_get_ntohl(tvb, offset), ti);
offset += 4 + tvb_get_ntohl(tvb, offset);
@ -7305,7 +7305,7 @@ dissect_amqp_0_9_method_basic_consume(tvbuff_t *tvb, packet_info *pinfo,
/* filter (table) */
ti = proto_tree_add_item(
args_tree, hf_amqp_method_basic_consume_filter,
tvb, offset + 4, tvb_get_ntohl(tvb, offset), ENC_BIG_ENDIAN);
tvb, offset + 4, tvb_get_ntohl(tvb, offset), ENC_NA);
dissect_amqp_0_9_field_table(tvb, pinfo, offset + 4, tvb_get_ntohl(tvb, offset), ti);
offset += 4 + tvb_get_ntohl(tvb, offset);
@ -7647,7 +7647,7 @@ dissect_amqp_0_9_method_file_consume(tvbuff_t *tvb, packet_info *pinfo,
/* filter (table) */
ti = proto_tree_add_item(
args_tree, hf_amqp_method_file_consume_filter,
tvb, offset + 4, tvb_get_ntohl(tvb, offset), ENC_BIG_ENDIAN);
tvb, offset + 4, tvb_get_ntohl(tvb, offset), ENC_NA);
dissect_amqp_0_9_field_table(tvb, pinfo, offset + 4, tvb_get_ntohl(tvb, offset), ti);
offset += 4 + tvb_get_ntohl(tvb, offset);
@ -7959,7 +7959,7 @@ dissect_amqp_0_9_method_stream_consume(tvbuff_t *tvb, packet_info *pinfo,
/* filter (table) */
ti = proto_tree_add_item(
args_tree, hf_amqp_method_stream_consume_filter,
tvb, offset + 4, tvb_get_ntohl(tvb, offset), ENC_BIG_ENDIAN);
tvb, offset + 4, tvb_get_ntohl(tvb, offset), ENC_NA);
dissect_amqp_0_9_field_table(tvb, pinfo, offset + 4, tvb_get_ntohl(tvb, offset), ti);
offset += 4 + tvb_get_ntohl(tvb, offset);
@ -8208,7 +8208,7 @@ dissect_amqp_0_9_method_tunnel_request(tvbuff_t *tvb, packet_info *pinfo,
/* meta-data (table) */
ti = proto_tree_add_item(
args_tree, hf_amqp_method_tunnel_request_meta_data,
tvb, offset + 4, tvb_get_ntohl(tvb, offset), ENC_BIG_ENDIAN);
tvb, offset + 4, tvb_get_ntohl(tvb, offset), ENC_NA);
dissect_amqp_0_9_field_table(tvb, pinfo, offset + 4, tvb_get_ntohl(tvb, offset), ti);
offset += 4 + tvb_get_ntohl(tvb, offset);
@ -8247,7 +8247,7 @@ dissect_amqp_0_9_content_header_basic(tvbuff_t *tvb, packet_info *pinfo,
/* headers (table) */
ti = proto_tree_add_item(
prop_tree, hf_amqp_header_basic_headers,
tvb, offset + 4, tvb_get_ntohl(tvb, offset), ENC_BIG_ENDIAN);
tvb, offset + 4, tvb_get_ntohl(tvb, offset), ENC_NA);
dissect_amqp_0_9_field_table(tvb, pinfo, offset + 4, tvb_get_ntohl(tvb, offset), ti);
offset += 4 + tvb_get_ntohl(tvb, offset);
}
@ -8373,7 +8373,7 @@ dissect_amqp_0_9_content_header_file(tvbuff_t *tvb, packet_info *pinfo,
if (prop_flags & 0x8000) {
/* headers (table) */
ti = proto_tree_add_item(prop_tree, hf_amqp_header_file_headers,
tvb, offset + 4, tvb_get_ntohl(tvb, offset), ENC_BIG_ENDIAN);
tvb, offset + 4, tvb_get_ntohl(tvb, offset), ENC_NA);
dissect_amqp_0_9_field_table(tvb, pinfo, offset + 4, tvb_get_ntohl(tvb, offset), ti);
offset += 4 + tvb_get_ntohl(tvb, offset);
}
@ -8459,7 +8459,7 @@ dissect_amqp_0_9_content_header_stream(tvbuff_t *tvb, packet_info *pinfo,
if (prop_flags & 0x8000) {
/* headers (table) */
ti = proto_tree_add_item(prop_tree, hf_amqp_header_stream_headers,
tvb, offset + 4, tvb_get_ntohl(tvb, offset), ENC_BIG_ENDIAN);
tvb, offset + 4, tvb_get_ntohl(tvb, offset), ENC_NA);
dissect_amqp_0_9_field_table(tvb, pinfo, offset + 4, tvb_get_ntohl(tvb, offset), ti);
offset += 4 + tvb_get_ntohl(tvb, offset);
}
@ -8497,7 +8497,7 @@ dissect_amqp_0_9_content_header_tunnel(tvbuff_t *tvb, packet_info *pinfo,
if (prop_flags & 0x8000) {
/* headers (table) */
ti = proto_tree_add_item(prop_tree, hf_amqp_header_tunnel_headers,
tvb, offset + 4, tvb_get_ntohl(tvb, offset), ENC_BIG_ENDIAN);
tvb, offset + 4, tvb_get_ntohl(tvb, offset), ENC_NA);
dissect_amqp_0_9_field_table(tvb, pinfo, offset + 4, tvb_get_ntohl(tvb, offset), ti);
offset += 4 + tvb_get_ntohl(tvb, offset);
}

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

@ -162,7 +162,7 @@ dissect_arcnet_common (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree,
offset++;
if (has_offset) {
proto_tree_add_item (arcnet_tree, hf_arcnet_offset, tvb, offset, 2, ENC_BIG_ENDIAN);
proto_tree_add_item (arcnet_tree, hf_arcnet_offset, tvb, offset, 2, ENC_NA);
offset += 2;
}

124
epan/dissectors/packet-artnet.c
View File

@ -503,7 +503,7 @@ dissect_artnet_poll(tvbuff_t *tvb, guint offset, proto_tree *tree)
offset += 1;
proto_tree_add_item(tree, hf_artnet_filler, tvb,
offset, 1, ENC_BIG_ENDIAN);
offset, 1, ENC_NA);
offset += 1;
return offset;
@ -567,7 +567,7 @@ dissect_artnet_poll_reply(tvbuff_t *tvb, guint offset, proto_tree *tree)
tvb,
offset,
ARTNET_POLL_REPLY_PORT_INFO_LENGTH,
ENC_BIG_ENDIAN);
ENC_NA);
si = proto_item_add_subtree(hi, ett_artnet);
@ -581,7 +581,7 @@ dissect_artnet_poll_reply(tvbuff_t *tvb, guint offset, proto_tree *tree)
tvb,
offset,
ARTNET_POLL_REPLY_PORT_TYPES_LENGTH,
ENC_BIG_ENDIAN);
ENC_NA);
ti = proto_item_add_subtree(hi, ett_artnet);
@ -610,7 +610,7 @@ dissect_artnet_poll_reply(tvbuff_t *tvb, guint offset, proto_tree *tree)
tvb,
offset,
ARTNET_POLL_REPLY_GOOD_INPUT_LENGTH,
ENC_BIG_ENDIAN);
ENC_NA);
ti = proto_item_add_subtree(hi, ett_artnet);
@ -639,7 +639,7 @@ dissect_artnet_poll_reply(tvbuff_t *tvb, guint offset, proto_tree *tree)
tvb,
offset,
ARTNET_POLL_REPLY_GOOD_OUTPUT_LENGTH,
ENC_BIG_ENDIAN);
ENC_NA);
ti = proto_item_add_subtree(hi, ett_artnet);
@ -668,7 +668,7 @@ dissect_artnet_poll_reply(tvbuff_t *tvb, guint offset, proto_tree *tree)
tvb,
offset,
ARTNET_POLL_REPLY_SWIN_LENGTH,
ENC_BIG_ENDIAN);
ENC_NA);
ti = proto_item_add_subtree(hi, ett_artnet);
@ -697,7 +697,7 @@ dissect_artnet_poll_reply(tvbuff_t *tvb, guint offset, proto_tree *tree)
tvb,
offset,
ARTNET_POLL_REPLY_SWOUT_LENGTH,
ENC_BIG_ENDIAN);
ENC_NA);
ti = proto_item_add_subtree(hi, ett_artnet);
@ -737,7 +737,7 @@ dissect_artnet_poll_reply(tvbuff_t *tvb, guint offset, proto_tree *tree)
offset += 1;
proto_tree_add_item(tree, hf_artnet_spare, tvb,
offset, 4, ENC_BIG_ENDIAN);
offset, 4, ENC_NA);
offset += 4;
proto_tree_add_item(tree, hf_artnet_poll_reply_mac,
@ -789,7 +789,7 @@ dissect_artnet_output(tvbuff_t *tvb, guint offset, proto_tree *tree)
tvb,
offset,
length,
ENC_BIG_ENDIAN);
ENC_NA);
si = proto_item_add_subtree(hi, ett_artnet);
@ -829,7 +829,7 @@ dissect_artnet_output(tvbuff_t *tvb, guint offset, proto_tree *tree)
/* Add the real type hidden */
item = proto_tree_add_item(si, hf_artnet_output_data_filter, tvb,
offset, length, FALSE );
offset, length, ENC_NA );
PROTO_ITEM_SET_HIDDEN(item);
offset += length;
@ -842,7 +842,7 @@ dissect_artnet_address(tvbuff_t *tvb, guint offset, proto_tree *tree) {
guint8 swin,swout,swvideo,command;
proto_tree_add_item(tree, hf_artnet_filler, tvb,
offset, 2, ENC_BIG_ENDIAN);
offset, 2, ENC_NA);
offset += 2;
proto_tree_add_item(tree, hf_artnet_address_short_name,
@ -858,7 +858,7 @@ dissect_artnet_address(tvbuff_t *tvb, guint offset, proto_tree *tree) {
tvb,
offset,
ARTNET_ADDRESS_SWIN_LENGTH,
ENC_BIG_ENDIAN);
ENC_NA);
ti = proto_item_add_subtree(hi, ett_artnet);
@ -887,7 +887,7 @@ dissect_artnet_address(tvbuff_t *tvb, guint offset, proto_tree *tree) {
tvb,
offset,
ARTNET_ADDRESS_SWOUT_LENGTH,
ENC_BIG_ENDIAN);
ENC_NA);
si = proto_item_add_subtree(hi, ett_artnet);
@ -932,7 +932,7 @@ dissect_artnet_input(tvbuff_t *tvb, guint offset, proto_tree *tree) {
guint8 input;
proto_tree_add_item(tree, hf_artnet_filler, tvb,
offset, 2, ENC_BIG_ENDIAN);
offset, 2, ENC_NA);
offset += 2;
num_ports = tvb_get_letohs(tvb, offset);
@ -945,7 +945,7 @@ dissect_artnet_input(tvbuff_t *tvb, guint offset, proto_tree *tree) {
tvb,
offset,
ARTNET_INPUT_INPUT_LENGTH,
ENC_BIG_ENDIAN);
ENC_NA);
si = proto_item_add_subtree(hi, ett_artnet);
@ -978,7 +978,7 @@ dissect_artnet_video_setup(tvbuff_t *tvb, guint offset, proto_tree *tree ) {
guint8 control,font_height, last_font,first_font;
proto_tree_add_item(tree, hf_artnet_filler, tvb,
offset, 4, ENC_BIG_ENDIAN);
offset, 4, ENC_NA);
offset += 4;
control = tvb_get_guint8(tvb, offset);
@ -1008,7 +1008,7 @@ dissect_artnet_video_setup(tvbuff_t *tvb, guint offset, proto_tree *tree ) {
size = last_font * font_height;
proto_tree_add_item(tree, hf_artnet_video_setup_font_data, tvb,
offset, size, FALSE );
offset, size, ENC_NA );
offset += size;
@ -1019,19 +1019,19 @@ static guint
dissect_artnet_video_palette(tvbuff_t *tvb, guint offset, proto_tree *tree)
{
proto_tree_add_item(tree, hf_artnet_filler, tvb,
offset, 2, ENC_BIG_ENDIAN);
offset, 2, ENC_NA);
offset += 2;
proto_tree_add_item(tree, hf_artnet_video_palette_colour_red, tvb,
offset, 17, FALSE );
offset, 17, ENC_NA );
offset += 17;
proto_tree_add_item(tree, hf_artnet_video_palette_colour_green, tvb,
offset, 17, FALSE );
offset, 17, ENC_NA );
offset += 17;
proto_tree_add_item(tree, hf_artnet_video_palette_colour_blue, tvb,
offset, 17, FALSE );
offset, 17, ENC_NA );
offset += 17;
return offset;
@ -1043,7 +1043,7 @@ dissect_artnet_video_data(tvbuff_t *tvb, guint offset, proto_tree *tree) {
guint32 size;
proto_tree_add_item(tree, hf_artnet_filler, tvb,
offset, 2, ENC_BIG_ENDIAN);
offset, 2, ENC_NA);
offset += 2;
proto_tree_add_item(tree, hf_artnet_video_data_pos_x, tvb,
@ -1067,7 +1067,7 @@ dissect_artnet_video_data(tvbuff_t *tvb, guint offset, proto_tree *tree) {
size = len_x * len_y * 2;
proto_tree_add_item(tree, hf_artnet_video_data_data, tvb,
offset, size, FALSE );
offset, size, ENC_NA );
offset += size;
@ -1080,7 +1080,7 @@ dissect_artnet_firmware_master(tvbuff_t *tvb, guint offset, proto_tree *tree ) {
guint32 length;
proto_tree_add_item(tree, hf_artnet_filler, tvb,
offset, 2, ENC_BIG_ENDIAN);
offset, 2, ENC_NA);
offset += 2;
type = tvb_get_guint8(tvb, offset);
@ -1099,12 +1099,12 @@ dissect_artnet_firmware_master(tvbuff_t *tvb, guint offset, proto_tree *tree ) {
offset += 4;
proto_tree_add_item(tree, hf_artnet_spare, tvb,
offset, 20, FALSE );
offset, 20, ENC_NA );
offset += 20;
proto_tree_add_item(tree, hf_artnet_firmware_master_data, tvb,
offset, 1024, FALSE );
offset, 1024, ENC_NA );
offset += 1024;
@ -1116,7 +1116,7 @@ dissect_artnet_firmware_reply(tvbuff_t *tvb, guint offset, proto_tree *tree) {
guint8 type;
proto_tree_add_item(tree, hf_artnet_filler, tvb,
offset, 2, ENC_BIG_ENDIAN);
offset, 2, ENC_NA);
offset += 2;
type = tvb_get_guint8(tvb, offset);
@ -1125,7 +1125,7 @@ dissect_artnet_firmware_reply(tvbuff_t *tvb, guint offset, proto_tree *tree) {
offset += 1;
proto_tree_add_item(tree, hf_artnet_spare, tvb,
offset, 21, FALSE );
offset, 21, ENC_NA );
offset += 21;
@ -1138,11 +1138,11 @@ dissect_artnet_tod_request(tvbuff_t *tvb, guint offset, proto_tree *tree)
guint8 ad_count;
proto_tree_add_item(tree, hf_artnet_filler, tvb,
offset, 2, ENC_BIG_ENDIAN);
offset, 2, ENC_NA);
offset += 2;
proto_tree_add_item(tree, hf_artnet_spare, tvb,
offset, 8, ENC_BIG_ENDIAN);
offset, 8, ENC_NA);
offset += 8;
proto_tree_add_item(tree, hf_artnet_tod_request_command, tvb,
@ -1155,7 +1155,7 @@ dissect_artnet_tod_request(tvbuff_t *tvb, guint offset, proto_tree *tree)
offset += 1;
proto_tree_add_item(tree, hf_artnet_tod_request_address, tvb,
offset, ad_count, ENC_BIG_ENDIAN);
offset, ad_count, ENC_NA);
offset += ad_count;
return offset;
@ -1167,7 +1167,7 @@ dissect_artnet_tod_data(tvbuff_t *tvb, guint offset, proto_tree *tree)
guint8 i,uid_count;
proto_tree_add_item(tree, hf_artnet_filler, tvb,
offset, 1, ENC_BIG_ENDIAN);
offset, 1, ENC_NA);
offset += 1;
proto_tree_add_item(tree, hf_artnet_tod_data_port, tvb,
@ -1175,7 +1175,7 @@ dissect_artnet_tod_data(tvbuff_t *tvb, guint offset, proto_tree *tree)
offset += 1;
proto_tree_add_item(tree, hf_artnet_spare, tvb,
offset, 8, ENC_BIG_ENDIAN);
offset, 8, ENC_NA);
offset += 8;
proto_tree_add_item(tree, hf_artnet_tod_data_command_response, tvb,
@ -1202,7 +1202,7 @@ dissect_artnet_tod_data(tvbuff_t *tvb, guint offset, proto_tree *tree)
for( i = 0; i < uid_count; i++)
{
proto_tree_add_item(tree, hf_artnet_tod_data_tod, tvb,
offset, 6, ENC_BIG_ENDIAN);
offset, 6, ENC_NA);
offset += 6;
}
@ -1213,11 +1213,11 @@ static guint
dissect_artnet_tod_control(tvbuff_t *tvb, guint offset, proto_tree *tree)
{
proto_tree_add_item(tree, hf_artnet_filler, tvb,
offset, 2, ENC_BIG_ENDIAN);
offset, 2, ENC_NA);
offset += 2;
proto_tree_add_item(tree, hf_artnet_spare, tvb,
offset, 8, ENC_BIG_ENDIAN);
offset, 8, ENC_NA);
offset += 8;
proto_tree_add_item(tree, hf_artnet_tod_control_command, tvb,
@ -1239,11 +1239,11 @@ dissect_artnet_rdm(tvbuff_t *tvb, guint offset, proto_tree *tree, packet_info *
tvbuff_t *next_tvb = NULL;
proto_tree_add_item(tree, hf_artnet_filler, tvb,
offset, 2, ENC_BIG_ENDIAN);
offset, 2, ENC_NA);
offset += 2;
proto_tree_add_item(tree, hf_artnet_spare, tvb,
offset, 8, ENC_BIG_ENDIAN);
offset, 8, ENC_NA);
offset += 8;
proto_tree_add_item(tree, hf_artnet_rdm_command, tvb,
@ -1277,7 +1277,7 @@ dissect_artnet_ip_prog(tvbuff_t *tvb, guint offset, proto_tree *tree) {
proto_tree *flags_tree,*flags_item;
proto_tree_add_item(tree, hf_artnet_filler, tvb,
offset, 2, ENC_BIG_ENDIAN);
offset, 2, ENC_NA);
offset += 2;
command = tvb_get_guint8(tvb, offset);
@ -1295,7 +1295,7 @@ dissect_artnet_ip_prog(tvbuff_t *tvb, guint offset, proto_tree *tree) {
offset += 1;
proto_tree_add_item(tree, hf_artnet_filler, tvb,
offset, 1, ENC_BIG_ENDIAN);
offset, 1, ENC_NA);
offset += 1;
proto_tree_add_item(tree, hf_artnet_ip_prog_ip, tvb,
@ -1311,7 +1311,7 @@ dissect_artnet_ip_prog(tvbuff_t *tvb, guint offset, proto_tree *tree) {
offset += 2;
proto_tree_add_item(tree, hf_artnet_spare, tvb,
offset, 8, ENC_BIG_ENDIAN);
offset, 8, ENC_NA);
offset += 8;
return offset;
@ -1321,7 +1321,7 @@ static guint
dissect_artnet_ip_prog_reply(tvbuff_t *tvb, guint offset, proto_tree *tree)
{
proto_tree_add_item(tree, hf_artnet_filler, tvb,
offset, 4, ENC_BIG_ENDIAN);
offset, 4, ENC_NA);
offset += 4;
proto_tree_add_item(tree, hf_artnet_ip_prog_reply_ip, tvb,
@ -1337,7 +1337,7 @@ dissect_artnet_ip_prog_reply(tvbuff_t *tvb, guint offset, proto_tree *tree)
offset += 2;
proto_tree_add_item(tree, hf_artnet_spare, tvb,
offset, 8, ENC_BIG_ENDIAN);
offset, 8, ENC_NA);
offset += 8;
return offset;
@ -1348,7 +1348,7 @@ dissect_artnet_poll_server_reply(tvbuff_t *tvb, guint offset, proto_tree *tree)
{
/* no spec released for this packet at the moment */
proto_tree_add_item(tree, hf_artnet_filler, tvb,
offset, 182, ENC_BIG_ENDIAN);
offset, 182, ENC_NA);
offset += 182;
return offset;
@ -1377,7 +1377,7 @@ dissect_artnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
tvb,
offset,
ARTNET_HEADER_LENGTH ,
ENC_BIG_ENDIAN);
ENC_NA);
artnet_header_tree = proto_item_add_subtree(hi, ett_artnet);
}
@ -1419,7 +1419,7 @@ dissect_artnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
tvb,
offset,
ARTNET_POLL_LENGTH,
ENC_BIG_ENDIAN);
ENC_NA);
si = proto_item_add_subtree(hi, ett_artnet);
@ -1437,7 +1437,7 @@ dissect_artnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
tvb,
offset,
ARTNET_POLL_REPLY_LENGTH,
ENC_BIG_ENDIAN);
ENC_NA);
si = proto_item_add_subtree(hi, ett_artnet);
@ -1455,7 +1455,7 @@ dissect_artnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
tvb,
offset,
ARTNET_OUTPUT_LENGTH,
ENC_BIG_ENDIAN);
ENC_NA);
si = proto_item_add_subtree(hi, ett_artnet);
@ -1473,7 +1473,7 @@ dissect_artnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
tvb,
offset,
ARTNET_POLL_REPLY_LENGTH,
ENC_BIG_ENDIAN);
ENC_NA);
si = proto_item_add_subtree(hi, ett_artnet);
@ -1491,7 +1491,7 @@ dissect_artnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
tvb,
offset,
ARTNET_INPUT_LENGTH,
ENC_BIG_ENDIAN);
ENC_NA);
si = proto_item_add_subtree(hi, ett_artnet);
@ -1509,7 +1509,7 @@ dissect_artnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
tvb,
offset,
ARTNET_VIDEO_SETUP_LENGTH,
ENC_BIG_ENDIAN);
ENC_NA);
si = proto_item_add_subtree(hi, ett_artnet);
@ -1527,7 +1527,7 @@ dissect_artnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
tvb,
offset,
ARTNET_VIDEO_PALETTE_LENGTH,
ENC_BIG_ENDIAN);
ENC_NA);
si = proto_item_add_subtree(hi, ett_artnet);
@ -1545,7 +1545,7 @@ dissect_artnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
tvb,
offset,
ARTNET_VIDEO_DATA_LENGTH,
ENC_BIG_ENDIAN);
ENC_NA);
si = proto_item_add_subtree(hi, ett_artnet);
@ -1563,7 +1563,7 @@ dissect_artnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
tvb,
offset,
ARTNET_FIRMWARE_MASTER_LENGTH,
ENC_BIG_ENDIAN);
ENC_NA);
si = proto_item_add_subtree(hi, ett_artnet);
@ -1581,7 +1581,7 @@ dissect_artnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
tvb,
offset,
ARTNET_FIRMWARE_REPLY_LENGTH,
ENC_BIG_ENDIAN);
ENC_NA);
si = proto_item_add_subtree(hi, ett_artnet);
@ -1599,7 +1599,7 @@ dissect_artnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
tvb,
offset,
0,
ENC_BIG_ENDIAN);
ENC_NA);
si = proto_item_add_subtree(hi, ett_artnet);
@ -1617,7 +1617,7 @@ dissect_artnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
tvb,
offset,
0,
ENC_BIG_ENDIAN);
ENC_NA);
si = proto_item_add_subtree(hi, ett_artnet );
@ -1635,7 +1635,7 @@ dissect_artnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
tvb,
offset,
0,
FALSE );
ENC_NA );
si = proto_item_add_subtree(hi, ett_artnet );
size = dissect_artnet_tod_control( tvb, offset, si );
@ -1651,7 +1651,7 @@ dissect_artnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
tvb,
offset,
0,
ENC_BIG_ENDIAN);
ENC_NA);
si = proto_item_add_subtree(hi,ett_artnet);
size = dissect_artnet_rdm( tvb, offset, si, pinfo );
@ -1667,7 +1667,7 @@ dissect_artnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
tvb,
offset,
0,
ENC_BIG_ENDIAN);
ENC_NA);
si = proto_item_add_subtree(hi, ett_artnet );
size = dissect_artnet_ip_prog( tvb, offset, si);
@ -1684,7 +1684,7 @@ dissect_artnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
tvb,
offset,
0,
ENC_BIG_ENDIAN);
ENC_NA);
si = proto_item_add_subtree(hi, ett_artnet );
size = dissect_artnet_ip_prog_reply( tvb, offset, si );
@ -1701,7 +1701,7 @@ dissect_artnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
tvb,
offset,
0,
FALSE );
ENC_NA );
si = proto_item_add_subtree(hi, ett_artnet );
size = dissect_artnet_poll_server_reply( tvb, offset, si );

6
epan/dissectors/packet-aruba-papi.c
View File

@ -84,7 +84,7 @@ dissect_papi_debug(tvbuff_t *tvb, guint offset, proto_tree *tree)
proto_tree *debug_tree, *debug_sub_tree;
ti = proto_tree_add_item(tree, hf_papi_debug, tvb, offset, -1, FALSE);
ti = proto_tree_add_item(tree, hf_papi_debug, tvb, offset, -1, ENC_NA);
debug_tree = proto_item_add_subtree(ti, ett_papi);
while(offset < tvb_reported_length(tvb)) {
@ -120,7 +120,7 @@ dissect_papi_debug(tvbuff_t *tvb, guint offset, proto_tree *tree)
offset += 3;
break;
case 0x08:
ti = proto_tree_add_item(debug_tree, hf_papi_debug_bytes, tvb, offset+3, tvb_get_ntohs(tvb,offset+1), FALSE);
ti = proto_tree_add_item(debug_tree, hf_papi_debug_bytes, tvb, offset+3, tvb_get_ntohs(tvb,offset+1), ENC_NA);
debug_sub_tree = proto_item_add_subtree(ti, ett_papi);
proto_tree_add_item(debug_sub_tree, hf_papi_debug_bytes_length, tvb, offset+1, 2, FALSE);
offset += tvb_get_ntohs(tvb,offset+1) + 3;
@ -196,7 +196,7 @@ dissect_papi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(papi_tree, hf_papi_hdr_unknown, tvb, offset, 2, FALSE);
offset += 2;
proto_tree_add_item(papi_tree, hf_papi_hdr_checksum, tvb, offset, 16, FALSE);
proto_tree_add_item(papi_tree, hf_papi_hdr_checksum, tvb, offset, 16, ENC_NA);
offset += 16;
if(g_papi_debug)

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

@ -215,7 +215,7 @@ dissect_error_cause(tvbuff_t *cause_tvb, proto_tree *parameter_tree)
break;
}
if (padding_length > 0)
proto_tree_add_item(cause_tree, hf_cause_padding, cause_tvb, CAUSE_HEADER_OFFSET + length, padding_length, ENC_BIG_ENDIAN);
proto_tree_add_item(cause_tree, hf_cause_padding, cause_tvb, CAUSE_HEADER_OFFSET + length, padding_length, ENC_NA);
}
static void
@ -488,7 +488,7 @@ dissect_pool_handle_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tre
char* tmp;
handle_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH;
pi = proto_tree_add_item(parameter_tree, hf_pool_handle, parameter_tvb, POOL_HANDLE_OFFSET, handle_length, ENC_BIG_ENDIAN);
pi = proto_tree_add_item(parameter_tree, hf_pool_handle, parameter_tvb, POOL_HANDLE_OFFSET, handle_length, ENC_NA);
tmp = (gchar*)tvb_get_ephemeral_string(parameter_tvb, POOL_HANDLE_OFFSET, handle_length);
proto_item_append_text(pi, " (%s)", tmp);
@ -553,7 +553,7 @@ dissect_cookie_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, pr
cookie_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH;
if (cookie_length > 0)
proto_tree_add_item(parameter_tree, hf_cookie, parameter_tvb, COOKIE_OFFSET, cookie_length, ENC_BIG_ENDIAN);
proto_tree_add_item(parameter_tree, hf_cookie, parameter_tvb, COOKIE_OFFSET, cookie_length, ENC_NA);
proto_item_append_text(parameter_item, " (%u byte%s)", cookie_length, plurality(cookie_length, "", "s"));
}
@ -595,7 +595,7 @@ dissect_unknown_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, p
parameter_value_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH;
if (parameter_value_length > 0)
proto_tree_add_item(parameter_tree, hf_parameter_value, parameter_tvb, PARAMETER_VALUE_OFFSET, parameter_value_length, ENC_BIG_ENDIAN);
proto_tree_add_item(parameter_tree, hf_parameter_value, parameter_tvb, PARAMETER_VALUE_OFFSET, parameter_value_length, ENC_NA);
proto_item_append_text(parameter_item, " (type %u and %u byte%s value)", type, parameter_value_length, plurality(parameter_value_length, "", "s"));
}
@ -712,7 +712,7 @@ dissect_parameter(tvbuff_t *parameter_tvb, proto_tree *asap_tree)
};
if (padding_length > 0)
proto_tree_add_item(parameter_tree, hf_parameter_padding, parameter_tvb, PARAMETER_HEADER_OFFSET + length, padding_length, ENC_BIG_ENDIAN);
proto_tree_add_item(parameter_tree, hf_parameter_padding, parameter_tvb, PARAMETER_HEADER_OFFSET + length, padding_length, ENC_NA);
}
static void

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

@ -251,7 +251,7 @@ dissect_asf_payloads(tvbuff_t *tvb, proto_tree *tree,
break;
default:
proto_tree_add_item(ptree, hf_asf_payload_data, tvb,
offset + 4, plen - 4,ENC_BIG_ENDIAN);
offset + 4, plen - 4,ENC_NA);
break;
}
}
@ -274,7 +274,7 @@ dissect_asf_payload_authentication(tvbuff_t *tvb, proto_tree *tree,
val_to_str(alg, asf_authentication_type_vals, "Unknown (%u)"));
atree = proto_item_add_subtree(ti, ett_asf_alg_payload);
proto_tree_add_item(atree, hf_asf_auth_alg, tvb, offset, 1,ENC_BIG_ENDIAN);
proto_tree_add_item(atree, hf_asf_reserved, tvb, offset + 1, len - 1,ENC_BIG_ENDIAN);
proto_tree_add_item(atree, hf_asf_reserved, tvb, offset + 1, len - 1,ENC_NA);
}
static void
@ -291,7 +291,7 @@ dissect_asf_payload_integrity(tvbuff_t *tvb, proto_tree *tree,
val_to_str(alg, asf_integrity_type_vals, "Unknown (%u)"));
atree = proto_item_add_subtree(ti, ett_asf_alg_payload);
proto_tree_add_item(atree, hf_asf_integrity_alg, tvb, offset, 1,ENC_BIG_ENDIAN);
proto_tree_add_item(atree, hf_asf_reserved, tvb, offset + 1, len - 1,ENC_BIG_ENDIAN);
proto_tree_add_item(atree, hf_asf_reserved, tvb, offset + 1, len - 1,ENC_NA);
}
void

38
epan/dissectors/packet-assa_r3.c
View File

@ -3447,8 +3447,8 @@ static void dissect_r3_upstreamfields (tvbuff_t *tvb, guint32 start_offset _U_,
proto_tree_add_uint (declinedlog_tree, hf_r3_declinedlog_cred1type, tvb, offset, 1, cred1type);
proto_tree_add_uint (declinedlog_tree, hf_r3_declinedlog_cred2type, tvb, offset, 1, cred2type);
proto_tree_add_item (declinedlog_tree, hf_r3_declinedlog_cred1, tvb, offset + 9, 19, TRUE);
proto_tree_add_item (declinedlog_tree, hf_r3_declinedlog_cred2, tvb, offset + 28, 19, TRUE);
proto_tree_add_item (declinedlog_tree, hf_r3_declinedlog_cred1, tvb, offset + 9, 19, ENC_NA);
proto_tree_add_item (declinedlog_tree, hf_r3_declinedlog_cred2, tvb, offset + 28, 19, ENC_NA);
}
}
break;
@ -3598,7 +3598,7 @@ static void dissect_r3_upstreamcommand_dumpnvram (tvbuff_t *tvb, guint32 start_o
proto_tree_add_item (tree, hf_r3_nvramdump_record, tvb, start_offset + 0, 2, TRUE);
proto_tree_add_item (tree, hf_r3_nvramdump_length, tvb, start_offset + 2, 1, TRUE);
proto_tree_add_item (tree, hf_r3_nvramdump_data, tvb, start_offset + 3, tvb_get_guint8 (tvb, start_offset + 2), TRUE);
proto_tree_add_item (tree, hf_r3_nvramdump_data, tvb, start_offset + 3, tvb_get_guint8 (tvb, start_offset + 2), ENC_NA);
}
static void dissect_r3_upstreamcommand_rmtquthrequest (tvbuff_t *tvb, guint32 start_offset, guint32 length, packet_info *pinfo, proto_tree *tree)
@ -3633,7 +3633,7 @@ static void dissect_r3_upstreamcommand_queryconfig (tvbuff_t *tvb, guint32 start
switch (tvb_get_guint8 (tvb, offset + 2))
{
case CONFIGTYPE_NONE :
proto_tree_add_item (upstreamfield_tree, hf_r3_configitemdata, tvb, offset + 3, tvb_get_guint8 (tvb, offset + 0) - 3, TRUE);
proto_tree_add_item (upstreamfield_tree, hf_r3_configitemdata, tvb, offset + 3, tvb_get_guint8 (tvb, offset + 0) - 3, ENC_NA);
break;
case CONFIGTYPE_BOOL :
@ -3715,7 +3715,7 @@ static void dissect_r3_upstreamcommand_dumpnvramrle (tvbuff_t *tvb, guint32 star
{
proto_tree_add_item (tree, hf_r3_nvramdumprle_record, tvb, start_offset + 0, 2, TRUE);
proto_tree_add_item (tree, hf_r3_nvramdumprle_length, tvb, start_offset + 3, 1, TRUE);
proto_tree_add_item (tree, hf_r3_nvramdumprle_data, tvb, start_offset + 4, tvb_get_guint8 (tvb, start_offset + 3), TRUE);
proto_tree_add_item (tree, hf_r3_nvramdumprle_data, tvb, start_offset + 4, tvb_get_guint8 (tvb, start_offset + 3), ENC_NA);
}
static void dissect_r3_upstreamcommand_rmtdeclinedrecord (tvbuff_t *tvb, guint32 start_offset, guint32 length, packet_info *pinfo, proto_tree *tree)
@ -3752,8 +3752,8 @@ static void dissect_r3_upstreamcommand_dumpdeclinedlog (tvbuff_t *tvb, guint32 s
proto_tree_add_uint (declinedlog_tree, hf_r3_declinedlog_cred1type, tvb, start_offset, 1, cred1type); start_offset += 0;
proto_tree_add_uint (declinedlog_tree, hf_r3_declinedlog_cred2type, tvb, start_offset, 1, cred2type); start_offset += 1;
proto_tree_add_item (declinedlog_tree, hf_r3_declinedlog_cred1, tvb, start_offset, 19, TRUE); start_offset += 19;
proto_tree_add_item (declinedlog_tree, hf_r3_declinedlog_cred2, tvb, start_offset, 19, TRUE);
proto_tree_add_item (declinedlog_tree, hf_r3_declinedlog_cred1, tvb, start_offset, 19, ENC_NA); start_offset += 19;
proto_tree_add_item (declinedlog_tree, hf_r3_declinedlog_cred2, tvb, start_offset, 19, ENC_NA);
}
static void dissect_r3_upstreamcommand_rmtalarmrecord (tvbuff_t *tvb, guint32 start_offset, guint32 length, packet_info *pinfo, proto_tree *tree)
@ -4167,7 +4167,7 @@ static void dissect_r3_upstreammfgfield_peekpoke (tvbuff_t *tvb, guint32 start_o
proto_item_append_text (peekpoke_item, "Read (%u Bytes @ 0x%04x)", tvb_get_guint8 (tvb, start_offset + i + 3), tvb_get_letohs (tvb, start_offset + i + 1));
proto_item_set_len (peekpoke_item, 3 + 1 + tvb_get_guint8 (tvb, start_offset + i + 3));
proto_tree_add_item (peekpoke_tree, hf_r3_peekpoke_length, tvb, start_offset + i + 3, 1, TRUE);
proto_tree_add_item (peekpoke_tree, hf_r3_peekpoke_pokestring, tvb, start_offset + i + 4, tvb_get_guint8 (tvb, start_offset + i + 3), TRUE);
proto_tree_add_item (peekpoke_tree, hf_r3_peekpoke_pokestring, tvb, start_offset + i + 4, tvb_get_guint8 (tvb, start_offset + i + 3), ENC_NA);
i += tvb_get_guint8 (tvb, start_offset + i + 3) + 1;
break;
@ -4235,7 +4235,7 @@ static void dissect_r3_upstreammfgfield_capabilities (tvbuff_t *tvb, guint32 sta
for (i = start_offset; i < l; i += tvb_get_guint8 (tvb, start_offset + i))
{
proto_item *tmp_item = proto_tree_add_item (cf_tree, hf_r3_capabilities, tvb, start_offset + i, tvb_get_guint8 (tvb, start_offset + i), TRUE);
proto_item *tmp_item = proto_tree_add_item (cf_tree, hf_r3_capabilities, tvb, start_offset + i, tvb_get_guint8 (tvb, start_offset + i), ENC_NA);
proto_tree *tmp_tree = proto_item_add_subtree (tmp_item, ett_r3capabilities);
const gchar *fn;
@ -4365,7 +4365,7 @@ static void dissect_r3_upstreammfgfield_checksumresults (tvbuff_t *tvb, guint32
for (i = 0; i < l; i += tvb_get_guint8 (tvb, start_offset + i))
{
proto_item *res_item = proto_tree_add_item (cksum_tree, hf_r3_checksumresults, tvb, start_offset + i, tvb_get_guint8 (tvb, start_offset + i), TRUE);
proto_item *res_item = proto_tree_add_item (cksum_tree, hf_r3_checksumresults, tvb, start_offset + i, tvb_get_guint8 (tvb, start_offset + i), ENC_NA);
proto_tree *res_tree = proto_item_add_subtree (res_item, ett_r3checksumresultsfield);
const gchar *fn;
@ -4586,7 +4586,7 @@ static void dissect_r3_cmd_setconfig (tvbuff_t *tvb, guint32 start_offset, guint
switch (configMap [tvb_get_guint8 (payload_tvb, offset + 1)].configType)
{
case CONFIGTYPE_NONE :
proto_tree_add_item (sc_tree, hf_r3_configitemdata, payload_tvb, offset + 2, tvb_get_guint8 (payload_tvb, offset + 0) - 3, TRUE);
proto_tree_add_item (sc_tree, hf_r3_configitemdata, payload_tvb, offset + 2, tvb_get_guint8 (payload_tvb, offset + 0) - 3, ENC_NA);
break;
case CONFIGTYPE_BOOL :
@ -4631,7 +4631,7 @@ static void dissect_r3_cmd_getconfig (tvbuff_t *tvb, guint32 start_offset, guint
proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, TRUE);
proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, TRUE);
config_item = proto_tree_add_item (tree, hf_r3_configitems, tvb, start_offset + 2, cmdLen - 2, TRUE);
config_item = proto_tree_add_item (tree, hf_r3_configitems, tvb, start_offset + 2, cmdLen - 2, ENC_NA);
config_tree = proto_item_add_subtree (config_item, ett_r3configitem);
for (i = 2; i < cmdLen; i++)
@ -5063,7 +5063,7 @@ static void dissect_r3_cmd_downloadfirmware (tvbuff_t *tvb, guint32 start_offset
proto_item_append_text (dlfw_item, "DOWNLOADFIRMWARE_DATA, Address 0x%08x, %u Bytes)", tvb_get_letohl (payload_tvb, 5), tvb_get_guint8 (payload_tvb, 9));
proto_tree_add_item (dlfw_tree, hf_r3_firmwaredownload_address, payload_tvb, 5, 4, TRUE);
proto_tree_add_item (dlfw_tree, hf_r3_firmwaredownload_bytes, payload_tvb, 9, 1, TRUE);
proto_tree_add_item (dlfw_tree, hf_r3_firmwaredownload_data, payload_tvb, 10, tvb_get_guint8 (payload_tvb, 9), TRUE);
proto_tree_add_item (dlfw_tree, hf_r3_firmwaredownload_data, payload_tvb, 10, tvb_get_guint8 (payload_tvb, 9), ENC_NA);
break;
case DOWNLOADFIRMWARE_COMPLETE :
@ -5103,7 +5103,7 @@ static void dissect_r3_cmd_downloadfirmwaretimeout (tvbuff_t *tvb, guint32 start
proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, TRUE);
proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, TRUE);
proto_tree_add_item (tree, hf_r3_commanddata, payload_tvb, 0, -1, TRUE);
proto_tree_add_item (tree, hf_r3_commanddata, payload_tvb, 0, -1, ENC_NA);
DISSECTOR_ASSERT (0); /* ### Need nice warning here */
}
@ -5206,7 +5206,7 @@ static void dissect_r3_cmdmfg_setcryptkey (tvbuff_t *tvb, guint32 start_offset,
{
proto_tree_add_item (tree, hf_r3_commandmfglength, tvb, start_offset + 0, 1, TRUE);
proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, TRUE);
proto_tree_add_item (tree, hf_r3_mfgsetcryptkey, tvb, start_offset + 2, -1, TRUE);
proto_tree_add_item (tree, hf_r3_mfgsetcryptkey, tvb, start_offset + 2, -1, ENC_NA);
}
static void dissect_r3_cmdmfg_dumpnvram (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree)
@ -5413,7 +5413,7 @@ static void dissect_r3_cmdmfg_peekpoke (tvbuff_t *tvb, guint32 start_offset, gui
proto_item_append_text (peekpoke_item, "Write (%d Bytes @ 0x%04x)", tvb_get_guint8 (tvb, start_offset + i + 3), tvb_get_letohs (tvb, start_offset + i + 1));
proto_item_set_len (peekpoke_item, 3 + 1 + tvb_get_guint8 (tvb, start_offset + i + 3));
proto_tree_add_item (peekpoke_tree, hf_r3_peekpoke_length, tvb, start_offset + i + 3, 1, TRUE);
proto_tree_add_item (peekpoke_tree, hf_r3_peekpoke_pokestring, tvb, start_offset + i + 4, tvb_get_guint8 (tvb, start_offset + i + 3), TRUE);
proto_tree_add_item (peekpoke_tree, hf_r3_peekpoke_pokestring, tvb, start_offset + i + 4, tvb_get_guint8 (tvb, start_offset + i + 3), ENC_NA);
i += tvb_get_guint8 (tvb, start_offset + i + 3) + 1;
break;
@ -5610,7 +5610,7 @@ static gint dissect_r3_packet (tvbuff_t *tvb, guint start_offset, packet_info *p
*/
if (r3_tree)
{
proto_item *header_item = proto_tree_add_item (r3_tree, hf_r3_header, tvb, start_offset + 0, 5, TRUE);
proto_item *header_item = proto_tree_add_item (r3_tree, hf_r3_header, tvb, start_offset + 0, 5, ENC_NA);
proto_tree *header_tree = proto_item_add_subtree (header_item, ett_r3header);
proto_tree_add_item (header_tree, hf_r3_sigil, tvb, start_offset + 0, 1, TRUE);
@ -5631,7 +5631,7 @@ static gint dissect_r3_packet (tvbuff_t *tvb, guint start_offset, packet_info *p
if (r3_tree)
{
payload_item = proto_tree_add_item (r3_tree, hf_r3_payload, payload_tvb, 0, -1, TRUE);
payload_item = proto_tree_add_item (r3_tree, hf_r3_payload, payload_tvb, 0, -1, ENC_NA);
payload_tree = proto_item_add_subtree (payload_item, ett_r3payload);
}
@ -5655,7 +5655,7 @@ static gint dissect_r3_packet (tvbuff_t *tvb, guint start_offset, packet_info *p
*/
if (r3_tree)
{
proto_item *tail_item = proto_tree_add_item (r3_tree, hf_r3_tail, tvb, offset + 5, 3, TRUE);
proto_item *tail_item = proto_tree_add_item (r3_tree, hf_r3_tail, tvb, offset + 5, 3, ENC_NA);
proto_tree *tail_tree = proto_item_add_subtree (tail_item, ett_r3tail);
guint32 packetCRC = tvb_get_letohs (tvb, offset + 5);
guint32 packetXor = tvb_get_guint8 (tvb, offset + 7);

38
epan/dissectors/packet-atalk.c
View File

@ -1084,10 +1084,10 @@ dissect_asp_reply_get_status(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
ofs = offset +tvb_get_ntohs(tvb, offset +AFPSTATUS_ICONOFF);
if (ofs)
proto_tree_add_item(tree, hf_asp_server_icon, tvb, ofs, 256, ENC_BIG_ENDIAN);
proto_tree_add_item(tree, hf_asp_server_icon, tvb, ofs, 256, ENC_NA);
if (sign_ofs) {
proto_tree_add_item(tree, hf_asp_server_signature, tvb, sign_ofs, 16, ENC_BIG_ENDIAN);
proto_tree_add_item(tree, hf_asp_server_signature, tvb, sign_ofs, 16, ENC_NA);
}
if (adr_ofs) {
@ -1140,7 +1140,7 @@ dissect_asp_reply_get_status(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
ofs++;
proto_tree_add_item(sub_tree, hf_asp_server_addr_type, tvb, ofs, 1, ENC_BIG_ENDIAN);
ofs++;
proto_tree_add_item(sub_tree, hf_asp_server_addr_value,tvb, ofs, len, ENC_BIG_ENDIAN);
proto_tree_add_item(sub_tree, hf_asp_server_addr_value,tvb, ofs, len, ENC_NA);
ofs += len;
}
}
@ -1176,7 +1176,7 @@ dissect_asp_reply_get_status(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
/* -----------------------------
PAP protocol cf. inside appletalk chap. 10
*/
#define PAD(x) { proto_tree_add_item(pap_tree, hf_pap_pad, tvb, offset, x, ENC_BIG_ENDIAN); offset += x; }
#define PAD(x) { proto_tree_add_item(pap_tree, hf_pap_pad, tvb, offset, x, ENC_NA); offset += x; }
static void
dissect_pap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
@ -1355,13 +1355,13 @@ dissect_asp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
case ASPFUNC_CLOSE:
proto_tree_add_item(asp_tree, hf_asp_session_id, tvb, offset, 1, ENC_BIG_ENDIAN);
offset++;
proto_tree_add_item(asp_tree, hf_asp_zero_value, tvb, offset, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(asp_tree, hf_asp_zero_value, tvb, offset, 2, ENC_NA);
offset +=2;
break;
case ASPFUNC_STAT:
proto_tree_add_item(asp_tree, hf_asp_zero_value, tvb, offset, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(asp_tree, hf_asp_zero_value, tvb, offset, 1, ENC_NA);
offset++;
proto_tree_add_item(asp_tree, hf_asp_zero_value, tvb, offset, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(asp_tree, hf_asp_zero_value, tvb, offset, 2, ENC_NA);
offset += 2;
break;
case ASPFUNC_ATTN:
@ -1411,15 +1411,15 @@ dissect_asp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
offset += 2;
break;
case ASPFUNC_CLOSE:
proto_tree_add_item(asp_tree, hf_asp_zero_value, tvb, offset, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(asp_tree, hf_asp_zero_value, tvb, offset, 1, ENC_NA);
offset++;
proto_tree_add_item(asp_tree, hf_asp_zero_value, tvb, offset, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(asp_tree, hf_asp_zero_value, tvb, offset, 1, ENC_NA);
offset++;
proto_tree_add_item(asp_tree, hf_asp_zero_value, tvb, offset, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(asp_tree, hf_asp_zero_value, tvb, offset, 2, ENC_NA);
offset += 2;
break;
case ASPFUNC_STAT:
proto_tree_add_item(asp_tree, hf_asp_zero_value, tvb, offset, 4, ENC_BIG_ENDIAN);
proto_tree_add_item(asp_tree, hf_asp_zero_value, tvb, offset, 4, ENC_NA);
offset += 4;
dissect_asp_reply_get_status(tvb, pinfo, asp_tree, offset);
break;
@ -1435,7 +1435,7 @@ dissect_asp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
break;
case ASPFUNC_TICKLE:
case ASPFUNC_WRTCONT:
proto_tree_add_item(asp_tree, hf_asp_zero_value, tvb, offset, 4, ENC_BIG_ENDIAN);
proto_tree_add_item(asp_tree, hf_asp_zero_value, tvb, offset, 4, ENC_NA);
/* fall */
case ASPFUNC_ATTN: /* FIXME capture and spec disagree */
default:
@ -1491,7 +1491,7 @@ dissect_atp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
case 7: /* start_index = 0 */
case 8:
case 9:
proto_tree_add_item(zip_tree, hf_zip_zero_value, tvb, offset, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(zip_tree, hf_zip_zero_value, tvb, offset, 1, ENC_NA);
offset++;
proto_tree_add_item(zip_tree, hf_zip_start_index, tvb, offset, 2, ENC_BIG_ENDIAN);
break;
@ -1508,7 +1508,7 @@ dissect_atp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(zip_tree, hf_zip_last_flag, tvb, offset, 1, ENC_BIG_ENDIAN);
offset++;
proto_tree_add_item(zip_tree, hf_zip_zero_value, tvb, offset, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(zip_tree, hf_zip_zero_value, tvb, offset, 1, ENC_NA);
offset++;
count = tvb_get_ntohs(tvb, offset);
ti = proto_tree_add_item(zip_tree, hf_zip_count, tvb, offset, 2, ENC_BIG_ENDIAN);
@ -1576,7 +1576,7 @@ dissect_ddp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(flag_tree, hf_zip_flags_only_one_zone,tvb, offset, 1,ENC_BIG_ENDIAN);
offset++;
proto_tree_add_item(zip_tree, hf_zip_zero_value, tvb, offset, 4, ENC_BIG_ENDIAN);
proto_tree_add_item(zip_tree, hf_zip_zero_value, tvb, offset, 4, ENC_NA);
offset += 4;
len = tvb_get_guint8(tvb, offset);
@ -1586,7 +1586,7 @@ dissect_ddp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
len = tvb_get_guint8(tvb, offset);
proto_tree_add_item(zip_tree, hf_zip_multicast_length,tvb, offset, 1,ENC_BIG_ENDIAN);
offset++;
proto_tree_add_item(zip_tree, hf_zip_multicast_address,tvb, offset, len,ENC_BIG_ENDIAN);
proto_tree_add_item(zip_tree, hf_zip_multicast_address,tvb, offset, len,ENC_NA);
offset += len;
proto_tree_add_item(zip_tree, hf_zip_zone_name, tvb, offset, 1,ENC_BIG_ENDIAN);
@ -1611,9 +1611,9 @@ dissect_ddp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
break;
case 5 : /* GetNetInfo request */
proto_tree_add_item(zip_tree, hf_zip_zero_value, tvb, offset, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(zip_tree, hf_zip_zero_value, tvb, offset, 1, ENC_NA);
offset++;
proto_tree_add_item(zip_tree, hf_zip_zero_value, tvb, offset, 4, ENC_BIG_ENDIAN);
proto_tree_add_item(zip_tree, hf_zip_zero_value, tvb, offset, 4, ENC_NA);
offset += 4;
proto_tree_add_item(zip_tree, hf_zip_zone_name, tvb, offset, 1,ENC_BIG_ENDIAN);
break;
@ -1640,7 +1640,7 @@ dissect_ddp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
len = tvb_get_guint8(tvb, offset);
proto_tree_add_item(zip_tree, hf_zip_multicast_length,tvb, offset, 1,ENC_BIG_ENDIAN);
offset++;
proto_tree_add_item(zip_tree, hf_zip_multicast_address,tvb, offset, len,ENC_BIG_ENDIAN);
proto_tree_add_item(zip_tree, hf_zip_multicast_address,tvb, offset, len,ENC_NA);
offset += len;
if ((flag & 0x80) != 0)
proto_tree_add_item(zip_tree, hf_zip_default_zone, tvb, offset, 1,ENC_BIG_ENDIAN);

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

@ -125,8 +125,8 @@ dissect_ayiya(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
tv.secs = tvb_get_ntohl(tvb, 4);
tv.nsecs = 0;
proto_tree_add_time(ayiya_tree, hf_epoch, tvb, 4, 4, &tv);
proto_tree_add_item(ayiya_tree, hf_identity, tvb, 8, idlen, FALSE);
proto_tree_add_item(ayiya_tree, hf_signature, tvb, 8+idlen, siglen, FALSE);
proto_tree_add_item(ayiya_tree, hf_identity, tvb, 8, idlen, ENC_NA);
proto_tree_add_item(ayiya_tree, hf_signature, tvb, 8+idlen, siglen, ENC_NA);
}
offset = ayiya_len;
switch (opcode) {

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

@ -269,7 +269,7 @@ dissect_bacnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* Other MAC formats should be included here */
proto_tree_add_item(bacnet_tree,
hf_bacnet_dadr_tmp, tvb, offset,
bacnet_dlen, FALSE);
bacnet_dlen, ENC_NA);
offset += bacnet_dlen;
} else {
proto_tree_add_uint_format_value(bacnet_tree,
@ -318,7 +318,7 @@ dissect_bacnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* Other MAC formats should be included here */
proto_tree_add_item(bacnet_tree,
hf_bacnet_sadr_tmp, tvb, offset,
bacnet_slen, FALSE);
bacnet_slen, ENC_NA);
offset += bacnet_slen;
} else {
proto_tree_add_uint_format_value(bacnet_tree,

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

@ -195,10 +195,10 @@ dissect_banana_element(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int
offset += 8;
break;
case BE_LG_INT:
proto_tree_add_item(tree, hf_banana_lg_int, tvb, start_offset, offset - start_offset, FALSE);
proto_tree_add_item(tree, hf_banana_lg_int, tvb, start_offset, offset - start_offset, ENC_NA);
break;
case BE_LG_NEG_INT:
proto_tree_add_item(tree, hf_banana_lg_neg_int, tvb, start_offset, offset - start_offset, FALSE);
proto_tree_add_item(tree, hf_banana_lg_neg_int, tvb, start_offset, offset - start_offset, ENC_NA);
break;
case BE_PB:
if (val_len > 1) {

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

@ -2551,7 +2551,7 @@ dissect_bgp_update(tvbuff_t *tvb, proto_tree *tree)
/* snarf each cluster identifier */
while (q < end) {
proto_tree_add_item(cluster_list_tree, hf_bgp_cluster_list,
tvb, q - 3 + aoff, 4, FALSE);
tvb, q - 3 + aoff, 4, ENC_NA);
q += 4;
}
@ -2778,7 +2778,7 @@ dissect_bgp_update(tvbuff_t *tvb, proto_tree *tree)
q + 8, 4, FALSE);
if (ssa_v3_len)
proto_tree_add_item(subtree3, hf_bgp_ssa_l2tpv3_cookie, tvb,
q + 12, ssa_v3_len, FALSE);
q + 12, ssa_v3_len, ENC_NA);
q += ssa_len + 4; /* 4 from type and length */
break;
case BGP_SSA_mGRE:
@ -2786,7 +2786,7 @@ dissect_bgp_update(tvbuff_t *tvb, proto_tree *tree)
case BGP_SSA_MPLS:
default:
proto_tree_add_item(subtree3, hf_bgp_ssa_value, tvb,
q + 4, ssa_len, FALSE);
q + 4, ssa_len, ENC_NA);
q += ssa_len + 4; /* 4 from type and length */
break;
case BGP_SSA_L2TPv3_IN_IPSec:

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

@ -474,7 +474,7 @@ static int dissect_bencoding_rec(tvbuff_t *tvb, packet_info *pinfo _U_,
switch (op) {
case 'd':
if (tree) {
td = proto_tree_add_item(tree, hf_bittorrent_bdict, tvb, offset, oplen, ENC_BIG_ENDIAN);
td = proto_tree_add_item(tree, hf_bittorrent_bdict, tvb, offset, oplen, ENC_NA);
dtree = proto_item_add_subtree(td, ett_bittorrent_bdict);
}
@ -507,7 +507,7 @@ static int dissect_bencoding_rec(tvbuff_t *tvb, packet_info *pinfo _U_,
}
if (dtree) {
ti = proto_tree_add_item(dtree, hf_bittorrent_bdict_entry, tvb, offset+used, op1len+op2len, ENC_BIG_ENDIAN);
ti = proto_tree_add_item(dtree, hf_bittorrent_bdict_entry, tvb, offset+used, op1len+op2len, ENC_NA);
itree = proto_item_add_subtree(ti, ett_bittorrent_bdict_entry);
dissect_bencoding_str(tvb, pinfo, offset+used, length, itree, ti, 1);
@ -524,7 +524,7 @@ static int dissect_bencoding_rec(tvbuff_t *tvb, packet_info *pinfo _U_,
case 'l':
if (tree) {
ti = proto_tree_add_item(tree, hf_bittorrent_blist, tvb, offset, oplen, ENC_BIG_ENDIAN);
ti = proto_tree_add_item(tree, hf_bittorrent_blist, tvb, offset, oplen, ENC_NA);
itree = proto_item_add_subtree(ti, ett_bittorrent_blist);
}
@ -638,9 +638,9 @@ static void dissect_bittorrent_message (tvbuff_t *tvb, packet_info *pinfo, proto
}
if (isamp) {
ti = proto_tree_add_item(tree, hf_azureus_msg, tvb, offset, length + BITTORRENT_HEADER_LENGTH, ENC_BIG_ENDIAN);
ti = proto_tree_add_item(tree, hf_azureus_msg, tvb, offset, length + BITTORRENT_HEADER_LENGTH, ENC_NA);
} else {
ti = proto_tree_add_item(tree, hf_bittorrent_msg, tvb, offset, length + BITTORRENT_HEADER_LENGTH, ENC_BIG_ENDIAN);
ti = proto_tree_add_item(tree, hf_bittorrent_msg, tvb, offset, length + BITTORRENT_HEADER_LENGTH, ENC_NA);
}
mtree = proto_item_add_subtree(ti, ett_bittorrent_msg);
@ -701,7 +701,7 @@ static void dissect_bittorrent_message (tvbuff_t *tvb, packet_info *pinfo, proto
case BITTORRENT_MESSAGE_EXTENDED:
/* extended message content */
proto_tree_add_item(mtree, hf_bittorrent_extended, tvb, offset, length, ENC_BIG_ENDIAN);
proto_tree_add_item(mtree, hf_bittorrent_extended, tvb, offset, length, ENC_NA);
break;
case BITTORRENT_MESSAGE_HAVE:
@ -714,7 +714,7 @@ static void dissect_bittorrent_message (tvbuff_t *tvb, packet_info *pinfo, proto
break;
case BITTORRENT_MESSAGE_BITFIELD:
proto_tree_add_item(mtree, hf_bittorrent_bitfield_data, tvb, offset, length, ENC_BIG_ENDIAN);
proto_tree_add_item(mtree, hf_bittorrent_bitfield_data, tvb, offset, length, ENC_NA);
proto_item_append_text(ti, ", Len:0x%x", length);
col_append_fstr(pinfo->cinfo, COL_INFO, ", Len:0x%x", length);
@ -729,7 +729,7 @@ static void dissect_bittorrent_message (tvbuff_t *tvb, packet_info *pinfo, proto
proto_tree_add_item(mtree, hf_bittorrent_piece_begin, tvb, offset, 4, piece_begin);
offset += 4;
length -= 4;
proto_tree_add_item(mtree, hf_bittorrent_piece_data, tvb, offset, length, ENC_BIG_ENDIAN);
proto_tree_add_item(mtree, hf_bittorrent_piece_data, tvb, offset, length, ENC_NA);
proto_item_append_text(ti, ", Idx:0x%x,Begin:0x%x,Len:0x%x", piece_index, piece_begin, length);
col_append_fstr(pinfo->cinfo, COL_INFO, ", Idx:0x%x,Begin:0x%x,Len:0x%x", piece_index, piece_begin, length);
@ -767,12 +767,12 @@ static void dissect_bittorrent_welcome (tvbuff_t *tvb, packet_info *pinfo _U_, p
proto_tree_add_item(tree, hf_bittorrent_prot_name_len, tvb, offset, 1, ENC_BIG_ENDIAN); offset+=1;
proto_tree_add_item(tree, hf_bittorrent_prot_name, tvb, offset, 19, ENC_BIG_ENDIAN); offset += 19;
proto_tree_add_item(tree, hf_bittorrent_reserved, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8;
proto_tree_add_item(tree, hf_bittorrent_reserved, tvb, offset, 8, ENC_NA); offset += 8;
proto_tree_add_item(tree, hf_bittorrent_sha1_hash, tvb, offset, 20, ENC_BIG_ENDIAN);
proto_tree_add_item(tree, hf_bittorrent_sha1_hash, tvb, offset, 20, ENC_NA);
offset += 20;
proto_tree_add_item(tree, hf_bittorrent_peer_id, tvb, offset, 20, ENC_BIG_ENDIAN);
proto_tree_add_item(tree, hf_bittorrent_peer_id, tvb, offset, 20, ENC_NA);
if(decode_client_information) {
for(i = 0; peer_id[i].name != NULL; ++i)
{

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

@ -152,7 +152,7 @@ dissect_bmc_cbs_message(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
proto_tree_add_item(tree, hf_bmc_data_coding_scheme, tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1;
proto_tree_add_item(tree, hf_bmc_cb_data, tvb, offset, tvb_length_remaining(tvb,offset), ENC_BIG_ENDIAN);
proto_tree_add_item(tree, hf_bmc_cb_data, tvb, offset, tvb_length_remaining(tvb,offset), ENC_NA);
offset = tvb_length(tvb);
return offset;
@ -183,7 +183,7 @@ dissect_bmc_schedule_message(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
if (length_of_cbs_schedule_period & 0x7)
new_message_bitmap_len += 1;
proto_tree_add_item(tree, hf_bmc_new_message_bitmap, tvb, offset, new_message_bitmap_len, ENC_BIG_ENDIAN);
proto_tree_add_item(tree, hf_bmc_new_message_bitmap, tvb, offset, new_message_bitmap_len, ENC_NA);
offset += new_message_bitmap_len;
ti = proto_tree_add_text(tree, tvb, offset, 0, "Message Description" );
@ -236,10 +236,10 @@ dissect_bmc_cbs41_message(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre
{
gint offset=1;
proto_tree_add_item(tree, hf_bmc_broadcast_address, tvb, offset, 5, ENC_BIG_ENDIAN);
proto_tree_add_item(tree, hf_bmc_broadcast_address, tvb, offset, 5, ENC_NA);
offset += 5;
proto_tree_add_item(tree, hf_bmc_cb_data41, tvb, offset, tvb_length_remaining(tvb,offset), ENC_BIG_ENDIAN);
proto_tree_add_item(tree, hf_bmc_cb_data41, tvb, offset, tvb_length_remaining(tvb,offset), ENC_NA);
offset = tvb_length(tvb);
return offset;

30
epan/dissectors/packet-bootp.c
View File

@ -1388,7 +1388,7 @@ bootp_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree, int voff,
vti = proto_tree_add_uint_format_value(bp_tree, hf_bootp_option_type,
tvb, voff, 1, 0, "(0) Padding");
v_tree = proto_item_add_subtree(vti, ett_bootp_option);
proto_tree_add_item(v_tree, hf_bootp_option_padding, tvb, voff, i, ENC_BIG_ENDIAN);
proto_tree_add_item(v_tree, hf_bootp_option_padding, tvb, voff, i, ENC_NA);
}
}
consumed = i;
@ -2306,7 +2306,7 @@ bootp_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree, int voff,
if ((basictype_consumed == 0) && (option_handled == FALSE) &&
(opt->phf == NULL) && (optlen > 0)) {
proto_tree_add_item(v_tree, hf_bootp_option_value, tvb, voff+2, optlen, ENC_BIG_ENDIAN);
proto_tree_add_item(v_tree, hf_bootp_option_value, tvb, voff+2, optlen, ENC_NA);
}
return consumed;
@ -2382,7 +2382,7 @@ bootp_dhcp_decode_agent_info(packet_info *pinfo, proto_item *v_ti, proto_tree *v
}
if ( (subopt < 1 ) || (subopt >= array_length(o82_opt)) ) {
proto_tree_add_item(o82_v_tree, hf_bootp_option82_value, tvb, suboptoff, subopt_len, ENC_BIG_ENDIAN);
proto_tree_add_item(o82_v_tree, hf_bootp_option82_value, tvb, suboptoff, subopt_len, ENC_NA);
} else if (o82_opt[subopt].ftype == special) {
switch(subopt)
{
@ -2438,7 +2438,7 @@ bootp_dhcp_decode_agent_info(packet_info *pinfo, proto_item *v_ti, proto_tree *v
}
break;
default:
proto_tree_add_item(o82_v_tree, hf_bootp_option82_value, tvb, suboptoff, datalen, ENC_BIG_ENDIAN);
proto_tree_add_item(o82_v_tree, hf_bootp_option82_value, tvb, suboptoff, datalen, ENC_NA);
suboptoff += datalen;
break;
}
@ -2448,7 +2448,7 @@ bootp_dhcp_decode_agent_info(packet_info *pinfo, proto_item *v_ti, proto_tree *v
if (o82_opt[subopt].phf != NULL)
proto_tree_add_item(o82_v_tree, *o82_opt[subopt].phf, tvb, suboptoff, subopt_len, ENC_BIG_ENDIAN);
else
proto_tree_add_item(o82_v_tree, hf_bootp_option82_value, tvb, suboptoff, subopt_len, ENC_BIG_ENDIAN);
proto_tree_add_item(o82_v_tree, hf_bootp_option82_value, tvb, suboptoff, subopt_len, ENC_NA);
break;
}
}
@ -2549,7 +2549,7 @@ dissect_vendor_pxeclient_suboption(packet_info *pinfo, proto_item *v_ti, proto_t
if ( subopt == 71 ) { /* 71 {"PXE boot item", special} */
/* case special */
/* I may need to decode that properly one day */
proto_tree_add_item(o43pxeclient_v_tree, hf_bootp_option43_pxeclient_boot_item, tvb, suboptoff, subopt_len, ENC_BIG_ENDIAN);
proto_tree_add_item(o43pxeclient_v_tree, hf_bootp_option43_pxeclient_boot_item, tvb, suboptoff, subopt_len, ENC_NA);
} else if ((subopt < 1) || (subopt >= array_length(o43pxeclient_opt))) {
expert_add_info_format(pinfo, vti, PI_PROTOCOL, PI_ERROR, "Unknown suboption %d (%d bytes)", subopt, subopt_len);
} else if (o43pxeclient_opt[subopt].ftype == special) {
@ -2557,7 +2557,7 @@ dissect_vendor_pxeclient_suboption(packet_info *pinfo, proto_item *v_ti, proto_t
if (o43pxeclient_opt[subopt].phf != NULL)
proto_tree_add_item(o43pxeclient_v_tree, *o43pxeclient_opt[subopt].phf, tvb, suboptoff, subopt_len, ENC_BIG_ENDIAN);
else
proto_tree_add_item(o43pxeclient_v_tree, hf_bootp_option43_value, tvb, suboptoff, subopt_len, ENC_BIG_ENDIAN);
proto_tree_add_item(o43pxeclient_v_tree, hf_bootp_option43_value, tvb, suboptoff, subopt_len, ENC_NA);
} else {
if (bootp_handle_basic_types(pinfo, o43pxeclient_v_tree, vti, tvb, o43pxeclient_opt[subopt].ftype,
suboptoff, subopt_len, o43pxeclient_opt[subopt].phf, &default_hfs) == 0)
@ -2840,7 +2840,7 @@ dissect_vendor_cablelabs_suboption(packet_info *pinfo, proto_item *v_ti, proto_t
}
if ( (subopt < 1 ) || (subopt >= array_length(o43cablelabs_opt)) ) {
proto_tree_add_item(o43cl_v_tree, hf_bootp_option43_value, tvb, suboptoff, subopt_len, ENC_BIG_ENDIAN);
proto_tree_add_item(o43cl_v_tree, hf_bootp_option43_value, tvb, suboptoff, subopt_len, ENC_NA);
} else if (o43cablelabs_opt[subopt].ftype == special) {
switch(subopt)
{
@ -2868,7 +2868,7 @@ dissect_vendor_cablelabs_suboption(packet_info *pinfo, proto_item *v_ti, proto_t
if (o43cablelabs_opt[subopt].phf != NULL)
proto_tree_add_item(o43cl_v_tree, *o43cablelabs_opt[subopt].phf, tvb, suboptoff, subopt_len, ENC_BIG_ENDIAN);
else
proto_tree_add_item(o43cl_v_tree, hf_bootp_option43_value, tvb, suboptoff, subopt_len, ENC_BIG_ENDIAN);
proto_tree_add_item(o43cl_v_tree, hf_bootp_option43_value, tvb, suboptoff, subopt_len, ENC_NA);
}
}
else {
@ -3059,7 +3059,7 @@ dissect_netware_ip_suboption(packet_info *pinfo, proto_item *v_ti, proto_tree *v
break;
default:
if (o63_opt[subopt].phf == NULL)
proto_tree_add_item(o63_v_tree, hf_bootp_option63_value, tvb, suboptoff, subopt_len, ENC_BIG_ENDIAN);
proto_tree_add_item(o63_v_tree, hf_bootp_option63_value, tvb, suboptoff, subopt_len, ENC_NA);
break;
}
}
@ -3135,9 +3135,9 @@ dissect_vendor_tr111_suboption(packet_info *pinfo, proto_item *v_ti, proto_tree
if (o125_tr111_opt[subopt].phf != NULL)
proto_tree_add_item(v_tree, *o125_tr111_opt[subopt].phf, tvb, suboptoff, subopt_len, ENC_BIG_ENDIAN);
else
proto_tree_add_item(v_tree, hf_bootp_option125_value, tvb, suboptoff, subopt_len, ENC_BIG_ENDIAN);
proto_tree_add_item(v_tree, hf_bootp_option125_value, tvb, suboptoff, subopt_len, ENC_NA);
} else if (o125_tr111_opt[subopt].phf == NULL)
proto_tree_add_item(v_tree, hf_bootp_option125_value, tvb, suboptoff, subopt_len, ENC_BIG_ENDIAN);
proto_tree_add_item(v_tree, hf_bootp_option125_value, tvb, suboptoff, subopt_len, ENC_NA);
}
}
@ -3216,13 +3216,13 @@ dissect_vendor_cl_suboption(packet_info *pinfo, proto_item *v_ti, proto_tree *v_
if (o125_cl_opt[subopt].phf != NULL)
proto_tree_add_item(o125_v_tree, *o125_cl_opt[subopt].phf, tvb, suboptoff, subopt_len, ENC_BIG_ENDIAN);
else
proto_tree_add_item(o125_v_tree, hf_bootp_option125_value, tvb, suboptoff, subopt_len, ENC_BIG_ENDIAN);
proto_tree_add_item(o125_v_tree, hf_bootp_option125_value, tvb, suboptoff, subopt_len, ENC_NA);
dissect_docsis_cm_cap(o125_v_tree, tvb, optoff, subopt_len+2, TRUE);
break;
default:
if (o125_cl_opt[subopt].phf == NULL)
proto_tree_add_item(o125_v_tree, hf_bootp_option125_value, tvb, suboptoff, subopt_len, ENC_BIG_ENDIAN);
proto_tree_add_item(o125_v_tree, hf_bootp_option125_value, tvb, suboptoff, subopt_len, ENC_NA);
break;
}
}
@ -4705,7 +4705,7 @@ dissect_bootp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_bytes_format_value(bp_tree, hf_bootp_hw_addr, tvb, 28, 16,
NULL, "%s", tvb_arphrdaddr_to_str(tvb, 28, hlen, htype));
if ((16 - hlen) > 0)
proto_tree_add_item(bp_tree, hf_bootp_hw_addr_padding, tvb, 28+hlen, 16-hlen, ENC_BIG_ENDIAN);
proto_tree_add_item(bp_tree, hf_bootp_hw_addr_padding, tvb, 28+hlen, 16-hlen, ENC_NA);
} else {
proto_tree_add_text(bp_tree, tvb,
28, 16, "Client address not given");

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

@ -663,7 +663,7 @@ dissect_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(mstp_tree, hf_bpdu_mst_config_revision_level, tvb,
BPDU_MST_CONFIG_REVISION_LEVEL, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(mstp_tree, hf_bpdu_mst_config_digest, tvb,
BPDU_MST_CONFIG_DIGEST, 16, ENC_BIG_ENDIAN);
BPDU_MST_CONFIG_DIGEST, 16, ENC_NA);
switch(msti_format) {

72
epan/dissectors/packet-bssap.c
View File

@ -719,7 +719,7 @@ dissect_bssap_cell_global_id(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo
guint8 ie_len;
ie_len = tvb_get_guint8(tvb,offset+1);
item = proto_tree_add_item(tree, hf_bssap_cell_global_id_ie, tvb, offset, ie_len+2, ENC_BIG_ENDIAN);
item = proto_tree_add_item(tree, hf_bssap_cell_global_id_ie, tvb, offset, ie_len+2, ENC_NA);
ie_tree = proto_item_add_subtree(item, ett_bssap_cell_global_id);
proto_tree_add_item(ie_tree, hf_bssap_plus_ie, tvb, offset, 1, ENC_BIG_ENDIAN);
@ -731,7 +731,7 @@ dissect_bssap_cell_global_id(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo
* of the cell global id IE defined in 3GPP TS 48.018 (not including
* 3GPP TS 48.018 IEI and 3GPP TS 48.018 length indicator).
*/
cgi_item= proto_tree_add_item(ie_tree, hf_bssap_cell_global_id, tvb, offset, ie_len, ENC_BIG_ENDIAN);
cgi_item= proto_tree_add_item(ie_tree, hf_bssap_cell_global_id, tvb, offset, ie_len, ENC_NA);
cgi_tree = proto_item_add_subtree(cgi_item, ett_bssap_cgi);
/* octets 3-8 Octets 3 to 8 contain the value part (starting with octet 2) of the
* Routing Area Identification IE defined in 3GPP TS 24.008, not
@ -758,7 +758,7 @@ dissect_bssap_channel_needed(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo
guint8 ie_len;
ie_len = tvb_get_guint8(tvb,offset+1);
item = proto_tree_add_item(tree, hf_bssap_channel_needed_ie, tvb, offset, ie_len+2, ENC_BIG_ENDIAN);
item = proto_tree_add_item(tree, hf_bssap_channel_needed_ie, tvb, offset, ie_len+2, ENC_NA);
ie_tree = proto_item_add_subtree(item, ett_bssap_channel_needed);
proto_tree_add_item(ie_tree, hf_bssap_plus_ie, tvb, offset, 1, ENC_BIG_ENDIAN);
@ -787,7 +787,7 @@ dissect_bssap_dlink_tunnel_payload_control_and_info(tvbuff_t *tvb, packet_info *
guint8 prot_disc;
ie_len = tvb_get_guint8(tvb,offset+1);
item = proto_tree_add_item(tree, hf_bssap_dlink_tnl_pld_cntrl_amd_inf_ie, tvb, offset, ie_len+2, ENC_BIG_ENDIAN);
item = proto_tree_add_item(tree, hf_bssap_dlink_tnl_pld_cntrl_amd_inf_ie, tvb, offset, ie_len+2, ENC_NA);
ie_tree = proto_item_add_subtree(item, ett_bssap_dlink_tnl_pld_cntrl_amd_inf);
proto_tree_add_item(ie_tree, hf_bssap_plus_ie, tvb, offset, 1, ENC_BIG_ENDIAN);
@ -848,7 +848,7 @@ dissect_bssap_emlpp_priority(tvbuff_t *tvb, proto_tree *tree, int offset)
guint8 ie_len;
ie_len = tvb_get_guint8(tvb,offset+1);
item = proto_tree_add_item(tree, hf_bssap_emlpp_prio_ie, tvb, offset, ie_len+2, ENC_BIG_ENDIAN);
item = proto_tree_add_item(tree, hf_bssap_emlpp_prio_ie, tvb, offset, ie_len+2, ENC_NA);
ie_tree = proto_item_add_subtree(item, ett_bssap_emlpp_prio);
proto_tree_add_item(ie_tree, hf_bssap_plus_ie, tvb, offset, 1, ENC_BIG_ENDIAN);
@ -879,7 +879,7 @@ dissect_bssap_gprs_erroneous_msg(tvbuff_t *tvb, proto_tree *tree, int offset)
guint8 ie_len;
ie_len = tvb_get_guint8(tvb,offset+1);
item = proto_tree_add_item(tree, hf_bssap_gprs_erroneous_msg_ie, tvb, offset, ie_len+2, ENC_BIG_ENDIAN);
item = proto_tree_add_item(tree, hf_bssap_gprs_erroneous_msg_ie, tvb, offset, ie_len+2, ENC_NA);
ie_tree = proto_item_add_subtree(item, ett_bssap_erroneous_msg);
proto_tree_add_item(ie_tree, hf_bssap_plus_ie, tvb, offset, 1, ENC_BIG_ENDIAN);
@ -888,7 +888,7 @@ dissect_bssap_gprs_erroneous_msg(tvbuff_t *tvb, proto_tree *tree, int offset)
offset++;
/* Erroneous message including the message type. */
proto_tree_add_item(ie_tree, hf_bssap_plus_ie_data, tvb, offset, ie_len, ENC_BIG_ENDIAN);
proto_tree_add_item(ie_tree, hf_bssap_plus_ie_data, tvb, offset, ie_len, ENC_NA);
return offset + ie_len;
@ -910,7 +910,7 @@ dissect_bssap_gprs_location_update_type(tvbuff_t *tvb, proto_tree *tree, int off
guint8 ie_len;
ie_len = tvb_get_guint8(tvb,offset+1);
item = proto_tree_add_item(tree, hf_bssap_gprs_loc_upd_type_ie, tvb, offset, ie_len+2, ENC_BIG_ENDIAN);
item = proto_tree_add_item(tree, hf_bssap_gprs_loc_upd_type_ie, tvb, offset, ie_len+2, ENC_NA);
ie_tree = proto_item_add_subtree(item, ett_bssap_gprs_loc_upd);
proto_tree_add_item(ie_tree, hf_bssap_plus_ie, tvb, offset, 1, ENC_BIG_ENDIAN);
@ -955,7 +955,7 @@ dissect_bssap_Gs_cause(tvbuff_t *tvb, proto_tree *tree, int offset)
guint8 ie_len;
ie_len = tvb_get_guint8(tvb,offset+1);
item = proto_tree_add_item(tree, hf_bssap_Gs_cause_ie, tvb, offset, ie_len+2, ENC_BIG_ENDIAN);
item = proto_tree_add_item(tree, hf_bssap_Gs_cause_ie, tvb, offset, ie_len+2, ENC_NA);
ie_tree = proto_item_add_subtree(item, ett_bassp_Gs_cause);
proto_tree_add_item(ie_tree, hf_bssap_plus_ie, tvb, offset, 1, ENC_BIG_ENDIAN);
@ -980,7 +980,7 @@ dissect_bssap_imei(tvbuff_t *tvb, proto_tree *tree, int offset)
const char *digit_str;
ie_len = tvb_get_guint8(tvb,offset+1);
item = proto_tree_add_item(tree, hf_bssap_imei_ie, tvb, offset, ie_len+2, ENC_BIG_ENDIAN);
item = proto_tree_add_item(tree, hf_bssap_imei_ie, tvb, offset, ie_len+2, ENC_NA);
ie_tree = proto_item_add_subtree(item, ett_bassp_imei);
proto_tree_add_item(ie_tree, hf_bssap_plus_ie, tvb, offset, 1, ENC_BIG_ENDIAN);
@ -1008,7 +1008,7 @@ dissect_bssap_imesiv(tvbuff_t *tvb, proto_tree *tree, int offset)
const char *digit_str;
ie_len = tvb_get_guint8(tvb,offset+1);
item = proto_tree_add_item(tree, hf_bssap_imesiv_ie, tvb, offset, ie_len+2, ENC_BIG_ENDIAN);
item = proto_tree_add_item(tree, hf_bssap_imesiv_ie, tvb, offset, ie_len+2, ENC_NA);
ie_tree = proto_item_add_subtree(item, ett_bassp_imesiv);
proto_tree_add_item(ie_tree, hf_bssap_plus_ie, tvb, offset, 1, ENC_BIG_ENDIAN);
@ -1042,7 +1042,7 @@ dissect_bssap_imsi(tvbuff_t *tvb, proto_tree *tree, int offset)
const char *digit_str;
ie_len = tvb_get_guint8(tvb,offset+1);
item = proto_tree_add_item(tree, hf_bssap_imsi_ie, tvb, offset, ie_len+2, ENC_BIG_ENDIAN);
item = proto_tree_add_item(tree, hf_bssap_imsi_ie, tvb, offset, ie_len+2, ENC_NA);
ie_tree = proto_item_add_subtree(item, ett_bssap_imsi);
proto_tree_add_item(ie_tree, hf_bssap_plus_ie, tvb, offset, 1, ENC_BIG_ENDIAN);
@ -1073,7 +1073,7 @@ dissect_bssap_imsi_det_from_gprs_serv_type(tvbuff_t *tvb, proto_tree *tree, int
guint8 ie_len;
ie_len = tvb_get_guint8(tvb,offset+1);
item = proto_tree_add_item(tree, hf_bssap_imsi_det_from_gprs_serv_type_ie, tvb, offset, ie_len+2, ENC_BIG_ENDIAN);
item = proto_tree_add_item(tree, hf_bssap_imsi_det_from_gprs_serv_type_ie, tvb, offset, ie_len+2, ENC_NA);
ie_tree = proto_item_add_subtree(item, ett_bssap_imsi_det_from_gprs_serv_type);
proto_tree_add_item(ie_tree, hf_bssap_plus_ie, tvb, offset, 1, ENC_BIG_ENDIAN);
@ -1096,14 +1096,14 @@ dissect_bssap_imsi_det_from_non_gprs_serv_type(tvbuff_t *tvb, proto_tree *tree,
guint8 ie_len;
ie_len = tvb_get_guint8(tvb,offset+1);
item = proto_tree_add_item(tree, hf_bssap_imsi_det_from_non_gprs_serv_type_ie, tvb, offset, ie_len+2, ENC_BIG_ENDIAN);
item = proto_tree_add_item(tree, hf_bssap_imsi_det_from_non_gprs_serv_type_ie, tvb, offset, ie_len+2, ENC_NA);
ie_tree = proto_item_add_subtree(item, ett_bssap_imsi_det_from_non_gprs_serv_type);
proto_tree_add_item(ie_tree, hf_bssap_plus_ie, tvb, offset, 1, ENC_BIG_ENDIAN);
offset++;
proto_tree_add_item(ie_tree, hf_bssap_plus_ie_len, tvb, offset, 1, ENC_BIG_ENDIAN);
offset++;
proto_tree_add_item(ie_tree, hf_bssap_plus_ie_data, tvb, offset, ie_len, ENC_BIG_ENDIAN);
proto_tree_add_item(ie_tree, hf_bssap_plus_ie_data, tvb, offset, ie_len, ENC_NA);
return offset + ie_len;
@ -1131,7 +1131,7 @@ dissect_bssap_info_req(tvbuff_t *tvb, proto_tree *tree, int offset)
guint8 ie_len;
ie_len = tvb_get_guint8(tvb,offset+1);
item = proto_tree_add_item(tree, hf_bssap_info_req_ie, tvb, offset, ie_len+2, ENC_BIG_ENDIAN);
item = proto_tree_add_item(tree, hf_bssap_info_req_ie, tvb, offset, ie_len+2, ENC_NA);
ie_tree = proto_item_add_subtree(item, ett_bssap_info_req);
proto_tree_add_item(ie_tree, hf_bssap_plus_ie, tvb, offset, 1, ENC_BIG_ENDIAN);
@ -1154,7 +1154,7 @@ dissect_bssap_loc_area_id(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, i
guint8 ie_len;
ie_len = tvb_get_guint8(tvb,offset+1);
item = proto_tree_add_item(tree, hf_bssap_loc_area_id_ie, tvb, offset, ie_len+2, ENC_BIG_ENDIAN);
item = proto_tree_add_item(tree, hf_bssap_loc_area_id_ie, tvb, offset, ie_len+2, ENC_NA);
ie_tree = proto_item_add_subtree(item, ett_bssap_loc_area_id);
proto_tree_add_item(ie_tree, hf_bssap_plus_ie, tvb, offset, 1, ENC_BIG_ENDIAN);
@ -1180,7 +1180,7 @@ dissect_bssap_location_information_age(tvbuff_t *tvb, proto_tree *tree, int offs
guint8 ie_len;
ie_len = tvb_get_guint8(tvb,offset+1);
item = proto_tree_add_item(tree, hf_bssap_loc_inf_age_ie, tvb, offset, ie_len+2, ENC_BIG_ENDIAN);
item = proto_tree_add_item(tree, hf_bssap_loc_inf_age_ie, tvb, offset, ie_len+2, ENC_NA);
ie_tree = proto_item_add_subtree(item, ett_bssap_loc_inf_age);
proto_tree_add_item(ie_tree, hf_bssap_plus_ie, tvb, offset, 1, ENC_BIG_ENDIAN);
@ -1213,7 +1213,7 @@ dissect_bssap_MM_information(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo
guint8 ie_len;
ie_len = tvb_get_guint8(tvb,offset+1);
item = proto_tree_add_item(tree, hf_bssap_mm_information_ie, tvb, offset, ie_len+2, ENC_BIG_ENDIAN);
item = proto_tree_add_item(tree, hf_bssap_mm_information_ie, tvb, offset, ie_len+2, ENC_NA);
ie_tree = proto_item_add_subtree(item, ett_bssap_mm_information);
proto_tree_add_item(ie_tree, hf_bssap_plus_ie, tvb, offset, 1, ENC_BIG_ENDIAN);
@ -1241,7 +1241,7 @@ dissect_bssap_mobile_id(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, int
guint ie_len;
ie_len = tvb_get_guint8(tvb,offset+1);
item = proto_tree_add_item(tree, hf_bssap_mobile_id_ie, tvb, offset, ie_len+2, ENC_BIG_ENDIAN);
item = proto_tree_add_item(tree, hf_bssap_mobile_id_ie, tvb, offset, ie_len+2, ENC_NA);
ie_tree = proto_item_add_subtree(item, ett_bssap_mobile_id);
proto_tree_add_item(ie_tree, hf_bssap_plus_ie, tvb, offset, 1, ENC_BIG_ENDIAN);
@ -1267,7 +1267,7 @@ dissect_bssap_mobile_stn_cls_mrk1(tvbuff_t *tvb, proto_tree *tree, packet_info *
guint8 ie_len;
ie_len = tvb_get_guint8(tvb,offset+1);
item = proto_tree_add_item(tree, hf_bssap_mobile_stn_cls_mrk1_ie, tvb, offset, ie_len+2, ENC_BIG_ENDIAN);
item = proto_tree_add_item(tree, hf_bssap_mobile_stn_cls_mrk1_ie, tvb, offset, ie_len+2, ENC_NA);
ie_tree = proto_item_add_subtree(item, ett_bssap_mobile_stn_cls_mrk1);
proto_tree_add_item(ie_tree, hf_bssap_plus_ie, tvb, offset, 1, ENC_BIG_ENDIAN);
@ -1304,7 +1304,7 @@ dissect_bssap_mobile_station_state(tvbuff_t *tvb, proto_tree *tree, int offset)
guint8 ie_len;
ie_len = tvb_get_guint8(tvb,offset+1);
item = proto_tree_add_item(tree, hf_bssap_mobile_station_state_ie, tvb, offset, ie_len+2, ENC_BIG_ENDIAN);
item = proto_tree_add_item(tree, hf_bssap_mobile_station_state_ie, tvb, offset, ie_len+2, ENC_NA);
ie_tree = proto_item_add_subtree(item, ett_bssap_mobile_station_state);
proto_tree_add_item(ie_tree, hf_bssap_plus_ie, tvb, offset, 1, ENC_BIG_ENDIAN);
@ -1326,7 +1326,7 @@ dissect_bssap_ptmsi(tvbuff_t *tvb, proto_tree *tree, int offset)
guint8 ie_len;
ie_len = tvb_get_guint8(tvb,offset+1);
item = proto_tree_add_item(tree, hf_bssap_ptmsi_ie, tvb, offset, ie_len+2, ENC_BIG_ENDIAN);
item = proto_tree_add_item(tree, hf_bssap_ptmsi_ie, tvb, offset, ie_len+2, ENC_NA);
ie_tree = proto_item_add_subtree(item, ett_bssap_ptmsi);
proto_tree_add_item(ie_tree, hf_bssap_plus_ie, tvb, offset, 1, ENC_BIG_ENDIAN);
@ -1336,7 +1336,7 @@ dissect_bssap_ptmsi(tvbuff_t *tvb, proto_tree *tree, int offset)
/* The PTMSI consists of 4 octets. It can be coded using a full hexadecimal representation
* (see 3GPP TS 23.003).
*/
proto_tree_add_item(ie_tree, hf_bssap_ptmsi, tvb, offset, ie_len, ENC_BIG_ENDIAN);
proto_tree_add_item(ie_tree, hf_bssap_ptmsi, tvb, offset, ie_len, ENC_NA);
return offset + ie_len;
@ -1350,7 +1350,7 @@ dissect_bssap_reject_cause(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo,
guint8 ie_len;
ie_len = tvb_get_guint8(tvb,offset+1);
item = proto_tree_add_item(tree, hf_bssap_reject_cause_ie, tvb, offset, ie_len+2, ENC_BIG_ENDIAN);
item = proto_tree_add_item(tree, hf_bssap_reject_cause_ie, tvb, offset, ie_len+2, ENC_NA);
ie_tree = proto_item_add_subtree(item, ett_bssap_reject_cause);
proto_tree_add_item(ie_tree, hf_bssap_plus_ie, tvb, offset, 1, ENC_BIG_ENDIAN);
@ -1376,7 +1376,7 @@ dissect_bssap_service_area_id(tvbuff_t *tvb, proto_tree *tree, int offset)
guint8 ie_len;
ie_len = tvb_get_guint8(tvb,offset+1);
item = proto_tree_add_item(tree, hf_bssap_service_area_id_ie, tvb, offset, ie_len+2, ENC_BIG_ENDIAN);
item = proto_tree_add_item(tree, hf_bssap_service_area_id_ie, tvb, offset, ie_len+2, ENC_NA);
ie_tree = proto_item_add_subtree(item, ett_bssap_service_area_id);
proto_tree_add_item(ie_tree, hf_bssap_plus_ie, tvb, offset, 1, ENC_BIG_ENDIAN);
@ -1387,7 +1387,7 @@ dissect_bssap_service_area_id(tvbuff_t *tvb, proto_tree *tree, int offset)
* of the SAI IE defined in 3GPP TS 25.413 (not including
* 3GPP TS 25.413 IEI and 3GPP TS 25.413 length indicator).
*/
proto_tree_add_item(ie_tree, hf_bssap_plus_ie_data, tvb, offset, ie_len, ENC_BIG_ENDIAN);
proto_tree_add_item(ie_tree, hf_bssap_plus_ie_data, tvb, offset, ie_len, ENC_NA);
return offset + ie_len;
@ -1410,7 +1410,7 @@ dissect_bssap_sgsn_number(tvbuff_t *tvb, proto_tree *tree, int offset)
const char *digit_str;
ie_len = tvb_get_guint8(tvb,offset+1);
item = proto_tree_add_item(tree, hf_bssap_sgsn_nr_ie, tvb, offset, ie_len+2, ENC_BIG_ENDIAN);
item = proto_tree_add_item(tree, hf_bssap_sgsn_nr_ie, tvb, offset, ie_len+2, ENC_NA);
ie_tree = proto_item_add_subtree(item, ett_bssap_sgsn_nr);
proto_tree_add_item(ie_tree, hf_bssap_plus_ie, tvb, offset, 1, ENC_BIG_ENDIAN);
@ -1444,7 +1444,7 @@ dissect_bssap_tmsi(tvbuff_t *tvb, proto_tree *tree, int offset)
guint8 ie_len;
ie_len = tvb_get_guint8(tvb,offset+1);
item = proto_tree_add_item(tree, hf_bssap_tmsi_ie, tvb, offset, ie_len+2, ENC_BIG_ENDIAN);
item = proto_tree_add_item(tree, hf_bssap_tmsi_ie, tvb, offset, ie_len+2, ENC_NA);
ie_tree = proto_item_add_subtree(item, ett_bssap_tmsi);
proto_tree_add_item(ie_tree, hf_bssap_plus_ie, tvb, offset, 1, ENC_BIG_ENDIAN);
@ -1454,7 +1454,7 @@ dissect_bssap_tmsi(tvbuff_t *tvb, proto_tree *tree, int offset)
/* The TMSI consists of 4 octets. It can be coded using a full hexadecimal representation
* (see 3GPP TS 23.003).
*/
proto_tree_add_item(ie_tree, hf_bssap_tmsi, tvb, offset, ie_len, ENC_BIG_ENDIAN);
proto_tree_add_item(ie_tree, hf_bssap_tmsi, tvb, offset, ie_len, ENC_NA);
return offset + ie_len;
@ -1474,7 +1474,7 @@ dissect_bssap_tmsi_status(tvbuff_t *tvb, proto_tree *tree, int offset)
guint8 ie_len;
ie_len = tvb_get_guint8(tvb,offset+1);
item = proto_tree_add_item(tree, hf_bssap_tmsi_status_ie, tvb, offset, ie_len+2, ENC_BIG_ENDIAN);
item = proto_tree_add_item(tree, hf_bssap_tmsi_status_ie, tvb, offset, ie_len+2, ENC_NA);
ie_tree = proto_item_add_subtree(item, ett_bssap_tmsi_status);
proto_tree_add_item(ie_tree, hf_bssap_plus_ie, tvb, offset, 1, ENC_BIG_ENDIAN);
@ -1512,7 +1512,7 @@ dissect_bssap_ulink_tunnel_payload_control_and_info(tvbuff_t *tvb, packet_info *
guint8 prot_disc;
ie_len = tvb_get_guint8(tvb,offset+1);
item = proto_tree_add_item(tree, hf_bssap_ulink_tnl_pld_cntrl_amd_inf_ie, tvb, offset, ie_len+2, ENC_BIG_ENDIAN);
item = proto_tree_add_item(tree, hf_bssap_ulink_tnl_pld_cntrl_amd_inf_ie, tvb, offset, ie_len+2, ENC_NA);
ie_tree = proto_item_add_subtree(item, ett_bssap_ulink_tnl_pld_cntrl_amd_inf);
proto_tree_add_item(ie_tree, hf_bssap_plus_ie, tvb, offset, 1, ENC_BIG_ENDIAN);
@ -1561,7 +1561,7 @@ dissect_bssap_vlr_number(tvbuff_t *tvb, proto_tree *tree, int offset)
const char *digit_str;
ie_len = tvb_get_guint8(tvb,offset+1);
item = proto_tree_add_item(tree, hf_bssap_vlr_number_ie, tvb, offset, ie_len+2, ENC_BIG_ENDIAN);
item = proto_tree_add_item(tree, hf_bssap_vlr_number_ie, tvb, offset, ie_len+2, ENC_NA);
ie_tree = proto_item_add_subtree(item, ett_bssap_vlr_number);
proto_tree_add_item(ie_tree, hf_bssap_plus_ie, tvb, offset, 1, ENC_BIG_ENDIAN);
@ -1599,7 +1599,7 @@ dissect_bssap_global_cn_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
guint8 ie_len;
ie_len = tvb_get_guint8(tvb,offset+1);
item = proto_tree_add_item(tree, hf_bssap_global_cn_id_ie, tvb, offset, ie_len+2, ENC_BIG_ENDIAN);
item = proto_tree_add_item(tree, hf_bssap_global_cn_id_ie, tvb, offset, ie_len+2, ENC_NA);
ie_tree = proto_item_add_subtree(item, ett_bssap_global_cn);
proto_tree_add_item(ie_tree, hf_bssap_plus_ie, tvb, offset, 1, ENC_BIG_ENDIAN);
@ -1613,12 +1613,12 @@ dissect_bssap_global_cn_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
* the most significant bit is bit 8 of octet 6. If the CN-Id does not fill the field reserved for it,
* the rest of the bits are set to '0'.
*/
global_cn_id_item = proto_tree_add_item(ie_tree, hf_bssap_global_cn_id, tvb, offset, ie_len, ENC_BIG_ENDIAN);
global_cn_id_item = proto_tree_add_item(ie_tree, hf_bssap_global_cn_id, tvb, offset, ie_len, ENC_NA);
global_cn_id_tree = proto_item_add_subtree(global_cn_id_item, ett_bssap_global_cn_id);
/* Octet 3 - 5 PLMN-Id Coded as octets 2 to 4 of the Location Area Identification IE,
* defined in 3GPP TS 24.008 (not including 3GPP TS 24.008 IEI and LAC).
*/
plmn_item = proto_tree_add_item(global_cn_id_tree, hf_bssap_plmn_id, tvb, offset, 3, ENC_BIG_ENDIAN);
plmn_item = proto_tree_add_item(global_cn_id_tree, hf_bssap_plmn_id, tvb, offset, 3, ENC_NA);
plmn_tree = proto_item_add_subtree(plmn_item, ett_bssap_plmn);
dissect_e212_mcc_mnc(tvb, pinfo, plmn_tree, offset, TRUE);
offset = offset + 3;

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

@ -986,7 +986,7 @@ de_bssgp_omc_id(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32
curr_offset = offset;
/* octet 3-22 For the OMC identity, see 3GPP TS 12.20 */
proto_tree_add_item(tree, hf_bssgp_omc_id, tvb, curr_offset, len, ENC_BIG_ENDIAN);
proto_tree_add_item(tree, hf_bssgp_omc_id, tvb, curr_offset, len, ENC_NA);
return len;
}
@ -1332,7 +1332,7 @@ de_bssgp_trigger_id(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gui
curr_offset = offset;
proto_tree_add_item(tree, hf_bssgp_trigger_id, tvb, curr_offset, len, ENC_BIG_ENDIAN);
proto_tree_add_item(tree, hf_bssgp_trigger_id, tvb, curr_offset, len, ENC_NA);
return(len);
}
@ -2641,7 +2641,7 @@ de_bssgp_src_to_trg_transp_cont(tvbuff_t *tvb, proto_tree *tree, packet_info *pi
* In inter-RAT handovers ... RANAP specification 3GPP TS 25.413, excluding RANAP tag.
* In inter-RAT handover to E-UTRAN ... encoding is defined in 3GPP TS 36.413
*/
proto_tree_add_item(tree, hf_bssgp_src_to_trg_transp_cont, tvb, curr_offset, len, ENC_BIG_ENDIAN);
proto_tree_add_item(tree, hf_bssgp_src_to_trg_transp_cont, tvb, curr_offset, len, ENC_NA);
return(len);
}
@ -2664,7 +2664,7 @@ de_bssgp_trg_to_src_transp_cont(tvbuff_t *tvb, proto_tree *tree, packet_info *pi
* RRCConnectionReconfiguration radio interface message (as
* defined in 3GPP TS 36.331)
*/
proto_tree_add_item(tree, hf_bssgp_trg_to_src_transp_cont, tvb, curr_offset, len, ENC_BIG_ENDIAN);
proto_tree_add_item(tree, hf_bssgp_trg_to_src_transp_cont, tvb, curr_offset, len, ENC_NA);
return(len);
}
@ -2853,7 +2853,7 @@ de_bssgp_ps_ho_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guin
* radio interface message as defined in 3GPP TS 44.060 (carrying
* the PS Handover to A/Gb Mode Payload)
*/
proto_tree_add_item(tree, hf_bssgp_ps_ho_cmd, tvb, curr_offset, len, ENC_BIG_ENDIAN);
proto_tree_add_item(tree, hf_bssgp_ps_ho_cmd, tvb, curr_offset, len, ENC_NA);
return(len);

12
epan/dissectors/packet-bt-utp.c
View File

@ -274,7 +274,7 @@ dissect_utp_extension(tvbuff_t *tvb, packet_info _U_*pinfo, proto_tree *tree, in
switch(*extension_type){
case EXT_SELECTION_ACKS: /* 1 */
{
ti = proto_tree_add_item(tree, hf_bt_utp_extension, tvb, offset, -1, FALSE);
ti = proto_tree_add_item(tree, hf_bt_utp_extension, tvb, offset, -1, ENC_NA);
ext_tree = proto_item_add_subtree(ti, ett_bt_utp_extension);
proto_tree_add_item(ext_tree, hf_bt_utp_next_extension_type, tvb, offset, 1, FALSE);
@ -286,14 +286,14 @@ dissect_utp_extension(tvbuff_t *tvb, packet_info _U_*pinfo, proto_tree *tree, in
proto_item_append_text(ti, " Selection Acks, Len=%d", extension_length);
offset += 1;
proto_tree_add_item(ext_tree, hf_bt_utp_extension_bitmask, tvb, offset, extension_length, FALSE);
proto_tree_add_item(ext_tree, hf_bt_utp_extension_bitmask, tvb, offset, extension_length, ENC_NA);
offset += extension_length;
proto_item_set_len(ti, 1 + 1 + extension_length);
break;
}
case EXT_EXTENSION_BITS: /* 2 */
{
ti = proto_tree_add_item(tree, hf_bt_utp_extension, tvb, offset, -1, FALSE);
ti = proto_tree_add_item(tree, hf_bt_utp_extension, tvb, offset, -1, ENC_NA);
ext_tree = proto_item_add_subtree(ti, ett_bt_utp_extension);
proto_tree_add_item(ext_tree, hf_bt_utp_next_extension_type, tvb, offset, 1, FALSE);
@ -305,13 +305,13 @@ dissect_utp_extension(tvbuff_t *tvb, packet_info _U_*pinfo, proto_tree *tree, in
proto_item_append_text(ti, " Extension Bits, Len=%d", extension_length);
offset += 1;
proto_tree_add_item(ext_tree, hf_bt_utp_extension_bitmask, tvb, offset, extension_length, FALSE);
proto_tree_add_item(ext_tree, hf_bt_utp_extension_bitmask, tvb, offset, extension_length, ENC_NA);
offset += extension_length;
proto_item_set_len(ti, 1 + 1 + extension_length);
break;
}
default:
ti = proto_tree_add_item(tree, hf_bt_utp_extension, tvb, offset, -1, FALSE);
ti = proto_tree_add_item(tree, hf_bt_utp_extension, tvb, offset, -1, ENC_NA);
ext_tree = proto_item_add_subtree(ti, ett_bt_utp_extension);
proto_tree_add_item(ext_tree, hf_bt_utp_next_extension_type, tvb, offset, 1, FALSE);
@ -323,7 +323,7 @@ dissect_utp_extension(tvbuff_t *tvb, packet_info _U_*pinfo, proto_tree *tree, in
proto_item_append_text(ti, " Unknown, Len=%d", extension_length);
offset += 1;
proto_tree_add_item(ext_tree, hf_bt_utp_extension_unknown, tvb, offset, extension_length, FALSE);
proto_tree_add_item(ext_tree, hf_bt_utp_extension_unknown, tvb, offset, extension_length, ENC_NA);
offset += extension_length;
proto_item_set_len(ti, 1 + 1 + extension_length);
break;

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

@ -301,7 +301,7 @@ dissect_getampassocrequest(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, pr
static int
dissect_ampassoc(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
proto_tree_add_item(tree, hf_btamp_amp_assoc, tvb, offset, tvb_length_remaining(tvb, offset), TRUE);
proto_tree_add_item(tree, hf_btamp_amp_assoc, tvb, offset, tvb_length_remaining(tvb, offset), ENC_NA);
offset+=tvb_length_remaining(tvb, offset);
return offset;
@ -487,7 +487,7 @@ static void dissect_btamp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
break;
default:
proto_tree_add_item(btamp_cmd_tree, hf_btamp_cmd_data, tvb, offset, -1, TRUE);
proto_tree_add_item(btamp_cmd_tree, hf_btamp_cmd_data, tvb, offset, -1, ENC_NA);
offset+=tvb_length_remaining(tvb, offset);
break;
}

26
epan/dissectors/packet-bthci_cmd.c
View File

@ -818,7 +818,7 @@ dissect_bthci_cmd_bd_addr(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, pro
for(i=6; i; i--)
bd_addr[6-i] = tvb_get_guint8(tvb, offset+i-1);
item = proto_tree_add_item(tree, hf_bthci_cmd_bd_addr, tvb, offset, 6, ENC_LITTLE_ENDIAN);
item = proto_tree_add_item(tree, hf_bthci_cmd_bd_addr, tvb, offset, 6, ENC_NA);
proto_item_append_text(item, "%02x%02x:%02x:%02x%02x%02x (%s)",
bd_addr[0], bd_addr[1], bd_addr[2], bd_addr[3], bd_addr[4], bd_addr[5],
get_ether_name(bd_addr));
@ -923,7 +923,7 @@ dissect_bthci_ext_inquiry_response(tvbuff_t *tvb, int offset, packet_info *pinfo
j=0;
while(j<(length-1))
{
proto_tree_add_item(ti_eir_struct_subtree, hf_bthci_cmd_sc_uuid128, tvb, offset+i+j+2, 16, ENC_LITTLE_ENDIAN);
proto_tree_add_item(ti_eir_struct_subtree, hf_bthci_cmd_sc_uuid128, tvb, offset+i+j+2, 16, ENC_NA);
j+=16;
}
break;
@ -936,7 +936,7 @@ dissect_bthci_ext_inquiry_response(tvbuff_t *tvb, int offset, packet_info *pinfo
proto_tree_add_item(ti_eir_struct_subtree, hf_bthci_cmd_tx_power, tvb, offset+i+2, 1, ENC_LITTLE_ENDIAN);
default:
proto_tree_add_item(ti_eir_struct_subtree, hf_bthci_cmd_eir_data, tvb, offset+i+2, length-1, ENC_LITTLE_ENDIAN);
proto_tree_add_item(ti_eir_struct_subtree, hf_bthci_cmd_eir_data, tvb, offset+i+2, length-1, ENC_NA);
break;
}
i += length+1;
@ -1056,7 +1056,7 @@ dissect_link_control_cmd(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, prot
case 0x000b: /* Link Key Request Reply */
offset = dissect_bthci_cmd_bd_addr(tvb, offset, pinfo, tree);
proto_tree_add_item(tree, hf_bthci_cmd_link_key, tvb, offset, 16, ENC_LITTLE_ENDIAN);
proto_tree_add_item(tree, hf_bthci_cmd_link_key, tvb, offset, 16, ENC_NA);
offset+=16;
break;
@ -1224,7 +1224,7 @@ dissect_link_control_cmd(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, prot
break;
default:
proto_tree_add_item(tree, hf_bthci_cmd_params, tvb, offset, -1, ENC_LITTLE_ENDIAN);
proto_tree_add_item(tree, hf_bthci_cmd_params, tvb, offset, -1, ENC_NA);
offset+=tvb_length_remaining(tvb, offset);
break;
}
@ -1364,7 +1364,7 @@ dissect_link_policy_cmd(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto
break;
default:
proto_tree_add_item(tree, hf_bthci_cmd_params, tvb, offset, -1, ENC_LITTLE_ENDIAN);
proto_tree_add_item(tree, hf_bthci_cmd_params, tvb, offset, -1, ENC_NA);
offset+=tvb_length_remaining(tvb, offset);
break;
@ -1530,7 +1530,7 @@ dissect_host_controller_baseband_cmd(tvbuff_t *tvb, int offset, packet_info *pin
offset++;
for (i=0; i<num8; i++) {
dissect_bthci_cmd_bd_addr(tvb, offset+(i*22), pinfo, tree);
proto_tree_add_item(tree, hf_bthci_cmd_link_key, tvb, offset+6+(i*22), 16, ENC_LITTLE_ENDIAN);
proto_tree_add_item(tree, hf_bthci_cmd_link_key, tvb, offset+6+(i*22), 16, ENC_NA);
}
break;
@ -1714,7 +1714,7 @@ dissect_host_controller_baseband_cmd(tvbuff_t *tvb, int offset, packet_info *pin
break;
case 0x003f: /* Set AFH Host Channel Classification */
proto_tree_add_item(tree, hf_bthci_cmd_afh_ch_classification, tvb, offset, 10, ENC_LITTLE_ENDIAN);
proto_tree_add_item(tree, hf_bthci_cmd_afh_ch_classification, tvb, offset, 10, ENC_NA);
offset+=10;
break;
@ -1797,7 +1797,7 @@ dissect_host_controller_baseband_cmd(tvbuff_t *tvb, int offset, packet_info *pin
break;
default:
proto_tree_add_item(tree, hf_bthci_cmd_params, tvb, offset, -1, ENC_LITTLE_ENDIAN);
proto_tree_add_item(tree, hf_bthci_cmd_params, tvb, offset, -1, ENC_NA);
offset+=tvb_length_remaining(tvb, offset);
break;
@ -1816,7 +1816,7 @@ dissect_informational_parameters_cmd(tvbuff_t *tvb, int offset, packet_info *pin
break;
default:
proto_tree_add_item(tree, hf_bthci_cmd_params, tvb, offset, -1, ENC_LITTLE_ENDIAN);
proto_tree_add_item(tree, hf_bthci_cmd_params, tvb, offset, -1, ENC_NA);
offset+=tvb_length_remaining(tvb, offset);
break;
@ -1846,7 +1846,7 @@ dissect_status_parameters_cmd(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
break;
default:
proto_tree_add_item(tree, hf_bthci_cmd_params, tvb, offset, -1, ENC_LITTLE_ENDIAN);
proto_tree_add_item(tree, hf_bthci_cmd_params, tvb, offset, -1, ENC_NA);
offset+=tvb_length_remaining(tvb, offset);
break;
@ -1869,7 +1869,7 @@ dissect_testing_cmd(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre
break;
default:
proto_tree_add_item(tree, hf_bthci_cmd_params, tvb, offset, -1, ENC_LITTLE_ENDIAN);
proto_tree_add_item(tree, hf_bthci_cmd_params, tvb, offset, -1, ENC_NA);
offset+=tvb_length_remaining(tvb, offset);
break;
@ -1942,7 +1942,7 @@ dissect_bthci_cmd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
break;
default:
proto_tree_add_item(bthci_cmd_tree, hf_bthci_cmd_params, tvb, 3, -1, ENC_LITTLE_ENDIAN);
proto_tree_add_item(bthci_cmd_tree, hf_bthci_cmd_params, tvb, 3, -1, ENC_NA);
break;
}
}

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

@ -614,7 +614,7 @@ dissect_bthci_evt_bd_addr(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, pro
for(i=6; i; i--)
bd_addr[6-i] = tvb_get_guint8(tvb, offset+i-1);
handle_item = proto_tree_add_item(tree, hf_bthci_evt_bd_addr, tvb, offset, 6, ENC_LITTLE_ENDIAN);
handle_item = proto_tree_add_item(tree, hf_bthci_evt_bd_addr, tvb, offset, 6, ENC_NA);
proto_item_append_text(handle_item, "%02x%02x:%02x:%02x%02x%02x (%s)",
bd_addr[0], bd_addr[1], bd_addr[2], bd_addr[3], bd_addr[4], bd_addr[5],
get_ether_name(bd_addr));
@ -840,7 +840,7 @@ dissect_bthci_evt_link_key_notification(tvbuff_t *tvb, int offset, packet_info *
{
offset = dissect_bthci_evt_bd_addr(tvb, offset, pinfo, tree);
proto_tree_add_item(tree, hf_bthci_evt_link_key, tvb, offset, 16, ENC_LITTLE_ENDIAN);
proto_tree_add_item(tree, hf_bthci_evt_link_key, tvb, offset, 16, ENC_NA);
offset+=16;
proto_tree_add_item(tree, hf_bthci_evt_key_type, tvb, offset, 1, ENC_LITTLE_ENDIAN);
@ -861,7 +861,7 @@ dissect_bthci_evt_return_link_keys(tvbuff_t *tvb, int offset, packet_info *pinfo
while(evt_num_keys--){
offset = dissect_bthci_evt_bd_addr(tvb, offset, pinfo, tree);
proto_tree_add_item(tree, hf_bthci_evt_link_key, tvb, offset, 16, ENC_LITTLE_ENDIAN);
proto_tree_add_item(tree, hf_bthci_evt_link_key, tvb, offset, 16, ENC_NA);
offset+=16;
}
@ -1260,7 +1260,7 @@ dissect_bthci_evt_ext_inquiry_response(tvbuff_t *tvb, int offset, packet_info *p
j=0;
while(j<(length-1))
{
proto_tree_add_item(ti_eir_struct_subtree, hf_bthci_evt_sc_uuid128, tvb, offset+i+j+2, 16, ENC_LITTLE_ENDIAN);
proto_tree_add_item(ti_eir_struct_subtree, hf_bthci_evt_sc_uuid128, tvb, offset+i+j+2, 16, ENC_NA);
j+=16;
}
break;
@ -1273,7 +1273,7 @@ dissect_bthci_evt_ext_inquiry_response(tvbuff_t *tvb, int offset, packet_info *p
proto_tree_add_item(ti_eir_struct_subtree, hf_bthci_evt_transmit_power_level, tvb, offset+i+2, 1, ENC_LITTLE_ENDIAN);
default:
proto_tree_add_item(ti_eir_struct_subtree, hf_bthci_evt_eir_data, tvb, offset+i+2, length-1, ENC_LITTLE_ENDIAN);
proto_tree_add_item(ti_eir_struct_subtree, hf_bthci_evt_eir_data, tvb, offset+i+2, length-1, ENC_NA);
break;
}
i += length+1;
@ -1855,7 +1855,7 @@ dissect_bthci_evt_command_complete(tvbuff_t *tvb, int offset, packet_info *pinfo
proto_tree_add_item(tree, hf_bthci_evt_status, tvb, offset, 1, ENC_LITTLE_ENDIAN);
offset++;
proto_tree_add_item(tree, hf_bthci_evt_local_supported_cmds, tvb, offset, 64, ENC_LITTLE_ENDIAN);
proto_tree_add_item(tree, hf_bthci_evt_local_supported_cmds, tvb, offset, 64, ENC_NA);
offset+=64;
break;
@ -1998,7 +1998,7 @@ dissect_bthci_evt_command_complete(tvbuff_t *tvb, int offset, packet_info *pinfo
break;
default:
proto_tree_add_item(tree, hf_bthci_evt_ret_params, tvb, offset, -1, ENC_LITTLE_ENDIAN);
proto_tree_add_item(tree, hf_bthci_evt_ret_params, tvb, offset, -1, ENC_NA);
offset+=tvb_length_remaining(tvb, offset);
break;
}
@ -2537,7 +2537,7 @@ dissect_bthci_evt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
break;
default:
proto_tree_add_item(bthci_evt_tree, hf_bthci_evt_params, tvb, 2, -1, ENC_LITTLE_ENDIAN);
proto_tree_add_item(bthci_evt_tree, hf_bthci_evt_params, tvb, 2, -1, ENC_NA);
break;
}

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

@ -63,7 +63,7 @@ dissect_btsco(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
proto_tree_add_item(btsco_tree, hf_btsco_length, tvb, offset, 1, TRUE);
offset++;
proto_tree_add_item(btsco_tree, hf_btsco_data, tvb, offset, -1, TRUE);
proto_tree_add_item(btsco_tree, hf_btsco_data, tvb, offset, -1, ENC_NA);
}

16
epan/dissectors/packet-btl2cap.c
View File

@ -698,7 +698,7 @@ dissect_inforesponse(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tr
break;
default:
proto_tree_add_item(tree, hf_btl2cap_cmd_data, tvb, offset, -1, TRUE);
proto_tree_add_item(tree, hf_btl2cap_cmd_data, tvb, offset, -1, ENC_NA);
offset+=tvb_length_remaining(tvb, offset);
break;
@ -880,13 +880,13 @@ dissect_b_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree
/* not a known fixed PSM, try to find a registered service to a dynamic PSM */
if(service != NULL && !dissector_try_uint(l2cap_service_dissector_table, *service, next_tvb, pinfo, tree)) {
/* unknown protocol. declare as data */
proto_tree_add_item(btl2cap_tree, hf_btl2cap_payload, tvb, offset, length, TRUE);
proto_tree_add_item(btl2cap_tree, hf_btl2cap_payload, tvb, offset, length, ENC_NA);
}
}
offset+=tvb_length_remaining(tvb, offset);
}
else {
proto_tree_add_item(btl2cap_tree, hf_btl2cap_payload, tvb, offset, length, TRUE);
proto_tree_add_item(btl2cap_tree, hf_btl2cap_payload, tvb, offset, length, ENC_NA);
offset+=tvb_length_remaining(tvb, offset);
}
}
@ -1025,12 +1025,12 @@ dissect_i_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree
/* not a known fixed PSM, try to find a registered service to a dynamic PSM */
if(service != NULL && !dissector_try_uint(l2cap_service_dissector_table, *service, next_tvb, pinfo, tree)) {
/* unknown protocol. declare as data */
proto_tree_add_item(btl2cap_tree, hf_btl2cap_payload, next_tvb, 0, tvb_length(next_tvb), TRUE);
proto_tree_add_item(btl2cap_tree, hf_btl2cap_payload, next_tvb, 0, tvb_length(next_tvb), ENC_NA);
}
}
}
else {
proto_tree_add_item(btl2cap_tree, hf_btl2cap_payload, next_tvb, 0, tvb_length(next_tvb), TRUE);
proto_tree_add_item(btl2cap_tree, hf_btl2cap_payload, next_tvb, 0, tvb_length(next_tvb), ENC_NA);
}
}
offset+=(tvb_length_remaining(tvb, offset) - 2);
@ -1235,7 +1235,7 @@ dissect_btl2cap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
break;
default:
proto_tree_add_item(btl2cap_cmd_tree, hf_btl2cap_cmd_data, tvb, offset, -1, TRUE);
proto_tree_add_item(btl2cap_cmd_tree, hf_btl2cap_cmd_data, tvb, offset, -1, ENC_NA);
offset+=tvb_length_remaining(tvb, offset);
break;
}
@ -1258,7 +1258,7 @@ dissect_btl2cap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if(!service || !dissector_try_uint(l2cap_service_dissector_table, *service, next_tvb, pinfo, tree)) {
/* unknown protocol. declare as data */
proto_tree_add_item(btl2cap_tree, hf_btl2cap_payload, tvb, offset, length, TRUE);
proto_tree_add_item(btl2cap_tree, hf_btl2cap_payload, tvb, offset, length, ENC_NA);
}
}
offset+=tvb_length_remaining(tvb, offset);
@ -1297,7 +1297,7 @@ dissect_btl2cap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if(next_tvb && !dissector_try_uint(l2cap_cid_dissector_table, (guint32) cid,
next_tvb, pinfo, tree)){
/* unknown protocol. declare as data */
proto_tree_add_item(btl2cap_tree, hf_btl2cap_payload, tvb, offset, length, TRUE);
proto_tree_add_item(btl2cap_tree, hf_btl2cap_payload, tvb, offset, length, ENC_NA);
}
}
else /* if(cid >= BTL2CAP_FIXED_CID_MAX) */ { /* Connection oriented channel */

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

@ -372,7 +372,7 @@ dissect_headers(proto_tree *tree, tvbuff_t *tvb, int offset, packet_info *pinfo)
proto_tree_add_item(hdr_tree, hf_hdr_length, tvb, offset, 2, FALSE);
offset += 2;
handle_item = proto_tree_add_item(hdr_tree, hf_hdr_val_byte_seq, tvb, offset, item_length - 3, FALSE);
handle_item = proto_tree_add_item(hdr_tree, hf_hdr_val_byte_seq, tvb, offset, item_length - 3, ENC_NA);
if( ((hdr_id == 0x46) || (hdr_id == 0x4a)) && (item_length == 19) ) { /* target or who */
for( i=0; target_vals[i].strptr != NULL; i++) {

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

@ -988,7 +988,7 @@ dissect_btspp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
tvb_length(tvb) > length ? "...":"");
}
proto_tree_add_item(st, hf_data, tvb, 0, -1, ENC_LITTLE_ENDIAN);
proto_tree_add_item(st, hf_data, tvb, 0, -1, ENC_NA);
}
void

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

@ -218,7 +218,7 @@ dissect_bvlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
offset += 2;
proto_tree_add_item(bdt_tree,
hf_bvlc_bdt_mask, tvb, offset, 4,
FALSE);
ENC_NA);
offset += 4;
}
/* We check this if we get a BDT-packet somewhere */

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

@ -711,7 +711,7 @@ dissect_capwap_data_message_bindings_ieee80211(tvbuff_t *tvb, proto_tree *data_m
if (global_capwap_data_udp_port == pinfo->destport)
{
/* (WTP -> AC) IEEE 802.11 Frame Info */
data_message_binding_item = proto_tree_add_item(data_message_binding_tree, hf_capwap_header_wireless_data_ieee80211_fi,tvb, offset, 4, ENC_BIG_ENDIAN);
data_message_binding_item = proto_tree_add_item(data_message_binding_tree, hf_capwap_header_wireless_data_ieee80211_fi,tvb, offset, 4, ENC_NA);
sub_data_message_binding_tree = proto_item_add_subtree(data_message_binding_item, ett_capwap);
proto_tree_add_item(sub_data_message_binding_tree, hf_capwap_header_wireless_data_ieee80211_fi_rssi,tvb, offset, 1, ENC_BIG_ENDIAN);
@ -723,7 +723,7 @@ dissect_capwap_data_message_bindings_ieee80211(tvbuff_t *tvb, proto_tree *data_m
else
{
/* (AC -> WTP) IEEE 802.11 Destination Wlans */
data_message_binding_item = proto_tree_add_item(data_message_binding_tree, hf_capwap_header_wireless_data_ieee80211_dest_wlan,tvb, offset, 4, ENC_BIG_ENDIAN);
data_message_binding_item = proto_tree_add_item(data_message_binding_tree, hf_capwap_header_wireless_data_ieee80211_dest_wlan,tvb, offset, 4, ENC_NA);
sub_data_message_binding_tree = proto_item_add_subtree(data_message_binding_item, ett_capwap);
proto_tree_add_item(sub_data_message_binding_tree, hf_capwap_header_wireless_data_ieee80211_dw_wlan_id_bitmap,tvb, offset, 2, ENC_BIG_ENDIAN);
@ -771,7 +771,7 @@ dissect_capwap_ac_information(tvbuff_t *tvb, proto_tree *ac_information_type_tre
proto_tree_add_item(sub_ac_information_type_tree, hf_capwap_msg_element_type_ac_information_length, tvb, offset+6, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(sub_ac_information_type_tree, hf_capwap_msg_element_type_ac_information_value, tvb, offset+8, optlen, ENC_BIG_ENDIAN);
proto_tree_add_item(sub_ac_information_type_tree, hf_capwap_msg_element_type_ac_information_value, tvb, offset+8, optlen, ENC_NA);
switch (ac_information_type) {
case AC_INFORMATION_HARDWARE_VERSION:
proto_tree_add_item(sub_ac_information_type_tree, hf_capwap_msg_element_type_ac_information_hardware_version, tvb, offset+8, optlen, ENC_BIG_ENDIAN);
@ -807,7 +807,7 @@ dissect_capwap_wtp_descriptor(tvbuff_t *tvb, proto_tree *wtp_descriptor_type_tre
proto_tree_add_item(sub_wtp_descriptor_type_tree, hf_capwap_msg_element_type_wtp_descriptor_length, tvb, offset+6, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(sub_wtp_descriptor_type_tree, hf_capwap_msg_element_type_wtp_descriptor_value, tvb, offset+8, optlen, ENC_BIG_ENDIAN);
proto_tree_add_item(sub_wtp_descriptor_type_tree, hf_capwap_msg_element_type_wtp_descriptor_value, tvb, offset+8, optlen, ENC_NA);
switch (wtp_descriptor_type) {
case WTP_DESCRIPTOR_HARDWARE_VERSION:
@ -851,7 +851,7 @@ dissect_capwap_board_data(tvbuff_t *tvb, proto_tree *board_data_type_tree, guint
proto_tree_add_item(sub_board_data_type_tree, hf_capwap_msg_element_type_wtp_board_data_length, tvb, offset+2, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(sub_board_data_type_tree, hf_capwap_msg_element_type_wtp_board_data_value, tvb, offset+4, optlen, ENC_BIG_ENDIAN);
proto_tree_add_item(sub_board_data_type_tree, hf_capwap_msg_element_type_wtp_board_data_value, tvb, offset+4, optlen, ENC_NA);
switch (board_data_type) {
case BOARD_DATA_WTP_MODEL_NUMBER:
proto_tree_add_item(sub_board_data_type_tree, hf_capwap_msg_element_type_wtp_board_data_wtp_model_number, tvb, offset+4, optlen, ENC_BIG_ENDIAN);
@ -898,7 +898,7 @@ dissect_capwap_message_element_type(tvbuff_t *tvb, proto_tree *msg_element_type_
proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_length, tvb, offset+2, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_value, tvb, offset+4, optlen, ENC_BIG_ENDIAN);
proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_value, tvb, offset+4, optlen, ENC_NA);
switch (msg_element_type) {
case TYPE_AC_DESCRIPTOR: /* AC Descriptor (1) */
@ -908,7 +908,7 @@ dissect_capwap_message_element_type(tvbuff_t *tvb, proto_tree *msg_element_type_
proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ac_descriptor_max_wtp, tvb, offset+10, 2, ENC_BIG_ENDIAN);
/* AC Descriptor Security Flags... */
msg_element_type_item_flag = proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ac_descriptor_security, tvb, offset+12, 1, ENC_BIG_ENDIAN);
msg_element_type_item_flag = proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ac_descriptor_security, tvb, offset+12, 1, ENC_NA);
sub_msg_element_type_flag_tree = proto_item_add_subtree(msg_element_type_item_flag, ett_capwap);
proto_tree_add_boolean(sub_msg_element_type_flag_tree, hf_capwap_msg_element_type_ac_descriptor_security_r, tvb, offset+12, 1, ENC_BIG_ENDIAN);
@ -919,7 +919,7 @@ dissect_capwap_message_element_type(tvbuff_t *tvb, proto_tree *msg_element_type_
proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ac_descriptor_reserved, tvb, offset+14, 1, ENC_BIG_ENDIAN);
/* AC Descriptor DTLS Flags... */
msg_element_type_item_flag = proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ac_descriptor_dtls_policy, tvb, offset+15, 1, ENC_BIG_ENDIAN);
msg_element_type_item_flag = proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ac_descriptor_dtls_policy, tvb, offset+15, 1, ENC_NA);
sub_msg_element_type_flag_tree = proto_item_add_subtree(msg_element_type_item_flag, ett_capwap);
proto_tree_add_item(sub_msg_element_type_flag_tree, hf_capwap_msg_element_type_ac_descriptor_dtls_policy_r, tvb, offset+15, 1, ENC_BIG_ENDIAN);
@ -1023,7 +1023,7 @@ dissect_capwap_message_element_type(tvbuff_t *tvb, proto_tree *msg_element_type_
break;
case TYPE_SESSION_ID: /* Session ID (35) */
proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_session_id, tvb, offset+4, optlen, ENC_BIG_ENDIAN);
proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_session_id, tvb, offset+4, optlen, ENC_NA);
break;
case TYPE_STATISTICS_TIMER: /* Statistics Timer (36) */
@ -1033,7 +1033,7 @@ dissect_capwap_message_element_type(tvbuff_t *tvb, proto_tree *msg_element_type_
case TYPE_VENDOR_SPECIFIC_PAYLOAD: /* Vendor Specific Payload (37) */
proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_vsp_vendor_identifier, tvb, offset+4, 4, ENC_BIG_ENDIAN);
proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_vsp_vendor_element_id, tvb, offset+8, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_vsp_vendor_data, tvb, offset+10, optlen-6, ENC_BIG_ENDIAN);
proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_vsp_vendor_data, tvb, offset+10, optlen-6, ENC_NA);
break;
case TYPE_WTP_BOARD_DATA: /* WTP Board Data (38) */
@ -1076,7 +1076,7 @@ dissect_capwap_message_element_type(tvbuff_t *tvb, proto_tree *msg_element_type_
break;
case TYPE_WTP_FRAME_TUNNEL_MODE: /* WTP Frame Tunnel Mode (41) */
msg_element_type_item_flag = proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_wtp_frame_tunnel_mode, tvb, offset+4, 1, ENC_BIG_ENDIAN);
msg_element_type_item_flag = proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_wtp_frame_tunnel_mode, tvb, offset+4, 1, ENC_NA);
sub_msg_element_type_flag_tree = proto_item_add_subtree(msg_element_type_item_flag, ett_capwap);
proto_tree_add_item(sub_msg_element_type_flag_tree, hf_capwap_msg_element_type_wtp_frame_tunnel_mode_n, tvb, offset+4, 1, ENC_BIG_ENDIAN);
@ -1106,7 +1106,7 @@ dissect_capwap_message_element_type(tvbuff_t *tvb, proto_tree *msg_element_type_
case IEEE80211_RATE_SET: /* ieee80211 Rate Set (1034) */
proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ieee80211_rate_set_radio_id, tvb, offset+4, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ieee80211_rate_set_rate_set, tvb, offset+5, optlen-1, ENC_BIG_ENDIAN);
proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ieee80211_rate_set_rate_set, tvb, offset+5, optlen-1, ENC_NA);
break;
case IEEE80211_STATION_SESSION_KEY: /* ieee80211 Station Session Key (1038) */
@ -1114,14 +1114,14 @@ dissect_capwap_message_element_type(tvbuff_t *tvb, proto_tree *msg_element_type_
proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ieee80211_station_session_key_flags, tvb, offset+10, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ieee80211_station_session_key_flags_a, tvb, offset+10, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ieee80211_station_session_key_flags_c, tvb, offset+10, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ieee80211_station_session_key_pairwire_tsc, tvb, offset+12, 6, ENC_BIG_ENDIAN);
proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ieee80211_station_session_key_pairwire_rsc, tvb, offset+18, 6, ENC_BIG_ENDIAN);
proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ieee80211_station_session_key_key, tvb, offset+24, optlen-24, ENC_BIG_ENDIAN);
proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ieee80211_station_session_key_pairwire_tsc, tvb, offset+12, 6, ENC_NA);
proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ieee80211_station_session_key_pairwire_rsc, tvb, offset+18, 6, ENC_NA);
proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ieee80211_station_session_key_key, tvb, offset+24, optlen-24, ENC_NA);
break;
case IEEE80211_WTP_RADIO_INFORMATION: /* ieee80211 WTP Radio Information (1048) */
proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ieee80211_wtp_radio_info_radio_id, tvb, offset+4, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ieee80211_wtp_radio_info_radio_type_reserved, tvb, offset+5, 3, ENC_BIG_ENDIAN);
proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ieee80211_wtp_radio_info_radio_type_reserved, tvb, offset+5, 3, ENC_NA);
proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ieee80211_wtp_radio_info_radio_type_n, tvb, offset+8, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ieee80211_wtp_radio_info_radio_type_g, tvb, offset+8, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ieee80211_wtp_radio_info_radio_type_a, tvb, offset+8, 1, ENC_BIG_ENDIAN);
@ -1144,7 +1144,7 @@ dissect_capwap_message_element(tvbuff_t *tvb, proto_tree *capwap_control_tree, g
proto_item *ti;
proto_tree *capwap_message_element_tree;
ti = proto_tree_add_item(capwap_control_tree, hf_capwap_message_element, tvb, offset, tvb_reported_length(tvb) - offset, ENC_BIG_ENDIAN);
ti = proto_tree_add_item(capwap_control_tree, hf_capwap_message_element, tvb, offset, tvb_reported_length(tvb) - offset, ENC_NA);
capwap_message_element_tree = proto_item_add_subtree(ti, ett_capwap);
offset_end = tvb_reported_length(tvb);
@ -1165,7 +1165,7 @@ dissect_capwap_control_header(tvbuff_t *tvb, proto_tree *capwap_control_tree, gu
proto_tree *capwap_control_header_tree;
proto_tree *capwap_control_msg_type_tree;
ti = proto_tree_add_item(capwap_control_tree, hf_capwap_control_header, tvb, offset, 8, ENC_BIG_ENDIAN);
ti = proto_tree_add_item(capwap_control_tree, hf_capwap_control_header, tvb, offset, 8, ENC_NA);
capwap_control_header_tree = proto_item_add_subtree(ti, ett_capwap);
/* Message Type 32 bits */
@ -1203,7 +1203,7 @@ dissect_capwap_header(tvbuff_t *tvb, proto_tree *capwap_control_tree, guint offs
guint8 maclength, wirelesslength;
guint align = 0;
ti = proto_tree_add_item(capwap_control_tree, hf_capwap_header, tvb, offset+plen, tvb_get_bits8(tvb, (offset+plen)*8, 5), ENC_BIG_ENDIAN);
ti = proto_tree_add_item(capwap_control_tree, hf_capwap_header, tvb, offset+plen, tvb_get_bits8(tvb, (offset+plen)*8, 5), ENC_NA);
capwap_header_tree = proto_item_add_subtree(ti, ett_capwap);
/* Header Length : 5 Bits */
@ -1265,14 +1265,14 @@ dissect_capwap_header(tvbuff_t *tvb, proto_tree *capwap_control_tree, guint offs
} else if (maclength == 8) {
proto_tree_add_item(capwap_header_tree, hf_capwap_header_mac_eui64, tvb, offset+plen, maclength, ENC_BIG_ENDIAN);
} else {
proto_tree_add_item(capwap_header_tree, hf_capwap_header_mac_data, tvb, offset+plen, maclength, ENC_BIG_ENDIAN);
proto_tree_add_item(capwap_header_tree, hf_capwap_header_mac_data, tvb, offset+plen, maclength, ENC_NA);
}
plen += maclength;
/* 4 Bytes Alignment ? */
align = 4-((offset+plen)%4);
if (align != 4)
{
proto_tree_add_item(capwap_header_tree, hf_capwap_header_padding, tvb, offset+plen, align, ENC_BIG_ENDIAN);
proto_tree_add_item(capwap_header_tree, hf_capwap_header_padding, tvb, offset+plen, align, ENC_NA);
plen += align;
}
}
@ -1287,7 +1287,7 @@ dissect_capwap_header(tvbuff_t *tvb, proto_tree *capwap_control_tree, guint offs
}
proto_tree_add_item(capwap_header_tree, hf_capwap_header_wireless_length, tvb, offset+plen, 1, ENC_BIG_ENDIAN);
plen += 1;
proto_tree_add_item(capwap_header_tree, hf_capwap_header_wireless_data, tvb, offset+plen, wirelesslength, ENC_BIG_ENDIAN);
proto_tree_add_item(capwap_header_tree, hf_capwap_header_wireless_data, tvb, offset+plen, wirelesslength, ENC_NA);
/* Optional Wireless Specific Information for ieee80211 (wbid = 1) Section 4 of RFC5416 */
if (*payload_wbid == 1)
@ -1300,7 +1300,7 @@ dissect_capwap_header(tvbuff_t *tvb, proto_tree *capwap_control_tree, guint offs
align = 4-((offset+plen)%4);
if (align != 4)
{
proto_tree_add_item(capwap_header_tree, hf_capwap_header_padding, tvb, offset+plen, align, ENC_BIG_ENDIAN);
proto_tree_add_item(capwap_header_tree, hf_capwap_header_padding, tvb, offset+plen, align, ENC_NA);
plen += align;
}
}
@ -1315,7 +1315,7 @@ dissect_capwap_preamble(tvbuff_t *tvb, proto_tree *capwap_control_tree, guint of
proto_item *ti;
proto_tree *capwap_preamble_tree;
ti = proto_tree_add_item(capwap_control_tree, hf_capwap_preamble, tvb, offset+plen, -1, ENC_BIG_ENDIAN);
ti = proto_tree_add_item(capwap_control_tree, hf_capwap_preamble, tvb, offset+plen, -1, ENC_NA);
capwap_preamble_tree = proto_item_add_subtree(ti, ett_capwap);
proto_tree_add_uint(capwap_preamble_tree, hf_capwap_preamble_version, tvb, offset+plen, 1, hi_nibble(tvb_get_guint8(tvb, offset+plen)));

6
epan/dissectors/packet-catapult-dct2000.c
View File

@ -1569,7 +1569,7 @@ static void dissect_tty_lines(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre
int lines = 0;
/* Create tty tree. */
ti = proto_tree_add_item(tree, hf_catapult_dct2000_tty, tvb, offset, -1, FALSE);
ti = proto_tree_add_item(tree, hf_catapult_dct2000_tty, tvb, offset, -1, ENC_NA);
tty_tree = proto_item_add_subtree(ti, ett_catapult_dct2000_tty);
/* Show the tty lines one at a time. */
@ -2020,7 +2020,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* Look for and flag generic error messages */
if (strncmp(string, ">> ERR", 6) == 0) {
proto_item *error_ti = proto_tree_add_item(dct2000_tree, hf_catapult_dct2000_error_comment, tvb,
offset, -1, FALSE);
offset, -1, ENC_NA);
PROTO_ITEM_SET_GENERATED(error_ti);
expert_add_info_format(pinfo, string_ti, PI_SEQUENCE, PI_ERROR,
"%s", string);
@ -2368,7 +2368,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
- protocol rejected our data
Show remaining bytes as unparsed data */
proto_tree_add_item(dct2000_tree, hf_catapult_dct2000_unparsed_data,
tvb, offset, -1, FALSE);
tvb, offset, -1, ENC_NA);
col_add_fstr(pinfo->cinfo, COL_INFO,
"Not dissected (context=%s.%u t=%s %c prot=%s (v=%s))",

174
epan/dissectors/packet-cfm.c
View File

@ -385,7 +385,7 @@ static int dissect_cfm_ccm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
proto_tree *cfm_ccm_itu_tree;
ti = proto_tree_add_item(tree, hf_cfm_ccm_pdu, tvb, offset, -1, ENC_BIG_ENDIAN);
ti = proto_tree_add_item(tree, hf_cfm_ccm_pdu, tvb, offset, -1, ENC_NA);
cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu);
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN);
@ -403,7 +403,7 @@ static int dissect_cfm_ccm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
offset += 2;
/* dissect CCM MAID */
mi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_ccm_maid, tvb, offset, 48, ENC_BIG_ENDIAN);
mi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_ccm_maid, tvb, offset, 48, ENC_NA);
cfm_ccm_maid_tree = proto_item_add_subtree(mi, ett_cfm_ccm_maid);
maid_offset = offset;
proto_tree_add_item(cfm_ccm_maid_tree, hf_cfm_maid_md_name_format, tvb, maid_offset, 1, ENC_BIG_ENDIAN);
@ -422,12 +422,12 @@ static int dissect_cfm_ccm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
/* the MD name of type MAC should be 8 octets but if
* it isn't we are going to try and process it anyways.*/
proto_tree_add_item(cfm_ccm_maid_tree, hf_cfm_maid_md_name_hex,
tvb, maid_offset, cfm_maid_md_name_length, ENC_BIG_ENDIAN);
tvb, maid_offset, cfm_maid_md_name_length, ENC_NA);
} else {
proto_tree_add_item(cfm_ccm_maid_tree, hf_cfm_maid_md_name_mac,
tvb, maid_offset, 6, ENC_BIG_ENDIAN);
proto_tree_add_item(cfm_ccm_maid_tree, hf_cfm_maid_md_name_mac_id,
tvb, maid_offset+6, 2, ENC_BIG_ENDIAN);
tvb, maid_offset+6, 2, ENC_NA);
}
} else {
/* MD name format is regular string or DNS string */
@ -449,7 +449,7 @@ static int dissect_cfm_ccm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
tvb, maid_offset, cfm_maid_ma_name_length, ENC_BIG_ENDIAN);
} else {
proto_tree_add_item(cfm_ccm_maid_tree, hf_cfm_maid_ma_name_hex,
tvb, maid_offset, cfm_maid_ma_name_length, ENC_BIG_ENDIAN);
tvb, maid_offset, cfm_maid_ma_name_length, ENC_NA);
}
maid_offset += cfm_maid_ma_name_length;
offset += 48;
@ -457,20 +457,20 @@ static int dissect_cfm_ccm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
gint padding_length;
padding_length = offset - maid_offset;
proto_tree_add_item(cfm_ccm_maid_tree, hf_cfm_maid_padding,
tvb, maid_offset, padding_length, ENC_BIG_ENDIAN);
tvb, maid_offset, padding_length, ENC_NA);
}
/* Dissect 16 octets reserved for Y.1731, samples of the wrap-around frame counters */
wi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_ccm_itu_t_y1731, tvb, offset, 16, ENC_BIG_ENDIAN);
wi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_ccm_itu_t_y1731, tvb, offset, 16, ENC_NA);
cfm_ccm_itu_tree = proto_item_add_subtree(wi, ett_cfm_ccm_itu);
itu_offset = offset;
proto_tree_add_item(cfm_ccm_itu_tree, hf_cfm_itu_TxFCf, tvb, itu_offset, 4, ENC_BIG_ENDIAN);
proto_tree_add_item(cfm_ccm_itu_tree, hf_cfm_itu_TxFCf, tvb, itu_offset, 4, ENC_NA);
itu_offset += 4;
proto_tree_add_item(cfm_ccm_itu_tree, hf_cfm_itu_RxFCb, tvb, itu_offset, 4, ENC_BIG_ENDIAN);
proto_tree_add_item(cfm_ccm_itu_tree, hf_cfm_itu_RxFCb, tvb, itu_offset, 4, ENC_NA);
itu_offset += 4;
proto_tree_add_item(cfm_ccm_itu_tree, hf_cfm_itu_TxFCb, tvb, itu_offset, 4, ENC_BIG_ENDIAN);
proto_tree_add_item(cfm_ccm_itu_tree, hf_cfm_itu_TxFCb, tvb, itu_offset, 4, ENC_NA);
itu_offset += 4;
proto_tree_add_item(cfm_ccm_itu_tree, hf_cfm_itu_reserved, tvb, itu_offset, 4, ENC_BIG_ENDIAN);
proto_tree_add_item(cfm_ccm_itu_tree, hf_cfm_itu_reserved, tvb, itu_offset, 4, ENC_NA);
itu_offset += 4;
offset += 16;
@ -482,7 +482,7 @@ static int dissect_cfm_lbm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
proto_item *ti;
proto_tree *cfm_pdu_tree;
ti = proto_tree_add_item(tree, hf_cfm_lbm_pdu, tvb, offset, -1, ENC_BIG_ENDIAN);
ti = proto_tree_add_item(tree, hf_cfm_lbm_pdu, tvb, offset, -1, ENC_NA);
cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu);
proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN);
@ -499,7 +499,7 @@ static int dissect_cfm_lbr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
proto_item *ti;
proto_tree *cfm_pdu_tree;
ti = proto_tree_add_item(tree, hf_cfm_lbr_pdu, tvb, offset, -1, ENC_BIG_ENDIAN);
ti = proto_tree_add_item(tree, hf_cfm_lbr_pdu, tvb, offset, -1, ENC_NA);
cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu);
proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN);
@ -518,7 +518,7 @@ static int dissect_cfm_ltm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
proto_tree *cfm_pdu_tree;
proto_tree *cfm_flag_tree;
ti = proto_tree_add_item(tree, hf_cfm_ltm_pdu, tvb, offset, -1, ENC_BIG_ENDIAN);
ti = proto_tree_add_item(tree, hf_cfm_ltm_pdu, tvb, offset, -1, ENC_NA);
cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu);
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN);
@ -547,7 +547,7 @@ static int dissect_cfm_ltr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
proto_tree *cfm_pdu_tree;
proto_tree *cfm_flag_tree;
ti = proto_tree_add_item(tree, hf_cfm_ltr_pdu, tvb, offset, -1, ENC_BIG_ENDIAN);
ti = proto_tree_add_item(tree, hf_cfm_ltr_pdu, tvb, offset, -1, ENC_NA);
cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu);
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN);
@ -576,7 +576,7 @@ static int dissect_cfm_ais(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
proto_tree *cfm_pdu_tree;
proto_tree *cfm_flag_tree;
ti = proto_tree_add_item(tree, hf_cfm_ais_pdu, tvb, offset, -1, ENC_BIG_ENDIAN);
ti = proto_tree_add_item(tree, hf_cfm_ais_pdu, tvb, offset, -1, ENC_NA);
cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu);
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN);
@ -598,7 +598,7 @@ static int dissect_cfm_lck(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
proto_tree *cfm_pdu_tree;
proto_tree *cfm_flag_tree;
ti = proto_tree_add_item(tree, hf_cfm_lck_pdu, tvb, offset, -1, ENC_BIG_ENDIAN);
ti = proto_tree_add_item(tree, hf_cfm_lck_pdu, tvb, offset, -1, ENC_NA);
cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu);
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN);
@ -620,7 +620,7 @@ static int dissect_cfm_tst(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
proto_tree *cfm_pdu_tree;
proto_tree *cfm_flag_tree;
ti = proto_tree_add_item(tree, hf_cfm_tst_pdu, tvb, offset, -1, ENC_BIG_ENDIAN);
ti = proto_tree_add_item(tree, hf_cfm_tst_pdu, tvb, offset, -1, ENC_NA);
cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu);
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN);
@ -645,7 +645,7 @@ static int dissect_cfm_aps(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
proto_tree *cfm_pdu_tree;
proto_tree *cfm_flag_tree;
ti = proto_tree_add_item(tree, hf_cfm_aps_pdu, tvb, offset, -1, ENC_BIG_ENDIAN);
ti = proto_tree_add_item(tree, hf_cfm_aps_pdu, tvb, offset, -1, ENC_NA);
cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu);
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN);
@ -661,7 +661,7 @@ static int dissect_cfm_aps(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
* the TLV offset and perform a hex dump */
cfm_tlv_offset = tvb_get_guint8(tvb, 3);
if (cfm_tlv_offset > 0) {
proto_tree_add_item(cfm_pdu_tree, hf_cfm_aps_data, tvb, offset, cfm_tlv_offset, ENC_BIG_ENDIAN);
proto_tree_add_item(cfm_pdu_tree, hf_cfm_aps_data, tvb, offset, cfm_tlv_offset, ENC_NA);
offset += cfm_tlv_offset;
}
@ -677,7 +677,7 @@ static int dissect_cfm_raps(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t
proto_tree *cfm_flag_tree;
proto_tree *raps_flag_tree;
ti = proto_tree_add_item(tree, hf_cfm_raps_pdu, tvb, offset, -1, ENC_BIG_ENDIAN);
ti = proto_tree_add_item(tree, hf_cfm_raps_pdu, tvb, offset, -1, ENC_NA);
cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu);
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN);
@ -700,7 +700,7 @@ static int dissect_cfm_raps(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t
proto_tree_add_item(cfm_pdu_tree, hf_cfm_raps_node_id, tvb, offset, 6, ENC_BIG_ENDIAN);
offset += 6;
proto_tree_add_item(cfm_pdu_tree, hf_cfm_raps_reserved, tvb, offset, 24, ENC_BIG_ENDIAN);
proto_tree_add_item(cfm_pdu_tree, hf_cfm_raps_reserved, tvb, offset, 24, ENC_NA);
offset += 24;
return offset;
@ -714,7 +714,7 @@ static int dissect_cfm_mcc(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
proto_tree *cfm_pdu_tree;
proto_tree *cfm_flag_tree;
ti = proto_tree_add_item(tree, hf_cfm_mcc_pdu, tvb, offset, -1, ENC_BIG_ENDIAN);
ti = proto_tree_add_item(tree, hf_cfm_mcc_pdu, tvb, offset, -1, ENC_NA);
cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu);
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN);
@ -725,9 +725,9 @@ static int dissect_cfm_mcc(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1;
proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_oui, tvb, offset, 3, ENC_BIG_ENDIAN);
proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_oui, tvb, offset, 3, ENC_NA);
offset += 3;
proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_subtype, tvb, offset, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_subtype, tvb, offset, 1, ENC_NA);
offset += 1;
/* The MCC data field was not defined at the time of this code being written
@ -737,7 +737,7 @@ static int dissect_cfm_mcc(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
/* Remove OUI and subtype from the offset */
cfm_tlv_offset -= 4;
if (cfm_tlv_offset > 0) {
proto_tree_add_item(cfm_pdu_tree, hf_cfm_mcc_data, tvb, offset, cfm_tlv_offset, ENC_BIG_ENDIAN);
proto_tree_add_item(cfm_pdu_tree, hf_cfm_mcc_data, tvb, offset, cfm_tlv_offset, ENC_NA);
offset += cfm_tlv_offset;
}
@ -751,7 +751,7 @@ static int dissect_cfm_lmm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
proto_tree *cfm_pdu_tree;
proto_tree *cfm_flag_tree;
ti = proto_tree_add_item(tree, hf_cfm_lmm_pdu, tvb, offset, -1, ENC_BIG_ENDIAN);
ti = proto_tree_add_item(tree, hf_cfm_lmm_pdu, tvb, offset, -1, ENC_NA);
cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu);
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN);
@ -762,11 +762,11 @@ static int dissect_cfm_lmm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1;
proto_tree_add_item(cfm_pdu_tree, hf_cfm_lmm_lmr_TxFCf, tvb, offset, 4, ENC_BIG_ENDIAN);
proto_tree_add_item(cfm_pdu_tree, hf_cfm_lmm_lmr_TxFCf, tvb, offset, 4, ENC_NA);
offset += 4;
proto_tree_add_item(cfm_pdu_tree, hf_cfm_lmm_lmr_RxFCf, tvb, offset, 4, ENC_BIG_ENDIAN);
proto_tree_add_item(cfm_pdu_tree, hf_cfm_lmm_lmr_RxFCf, tvb, offset, 4, ENC_NA);
offset += 4;
proto_tree_add_item(cfm_pdu_tree, hf_cfm_lmm_lmr_TxFCb, tvb, offset, 4, ENC_BIG_ENDIAN);
proto_tree_add_item(cfm_pdu_tree, hf_cfm_lmm_lmr_TxFCb, tvb, offset, 4, ENC_NA);
offset += 4;
return offset;
@ -779,7 +779,7 @@ static int dissect_cfm_lmr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
proto_tree *cfm_pdu_tree;
proto_tree *cfm_flag_tree;
ti = proto_tree_add_item(tree, hf_cfm_lmr_pdu, tvb, offset, -1, ENC_BIG_ENDIAN);
ti = proto_tree_add_item(tree, hf_cfm_lmr_pdu, tvb, offset, -1, ENC_NA);
cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu);
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN);
@ -790,11 +790,11 @@ static int dissect_cfm_lmr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1;
proto_tree_add_item(cfm_pdu_tree, hf_cfm_lmm_lmr_TxFCf, tvb, offset, 4, ENC_BIG_ENDIAN);
proto_tree_add_item(cfm_pdu_tree, hf_cfm_lmm_lmr_TxFCf, tvb, offset, 4, ENC_NA);
offset += 4;
proto_tree_add_item(cfm_pdu_tree, hf_cfm_lmm_lmr_RxFCf, tvb, offset, 4, ENC_BIG_ENDIAN);
proto_tree_add_item(cfm_pdu_tree, hf_cfm_lmm_lmr_RxFCf, tvb, offset, 4, ENC_NA);
offset += 4;
proto_tree_add_item(cfm_pdu_tree, hf_cfm_lmm_lmr_TxFCb, tvb, offset, 4, ENC_BIG_ENDIAN);
proto_tree_add_item(cfm_pdu_tree, hf_cfm_lmm_lmr_TxFCb, tvb, offset, 4, ENC_NA);
offset += 4;
return offset;
@ -807,7 +807,7 @@ static int dissect_cfm_odm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
proto_tree *cfm_pdu_tree;
proto_tree *cfm_flag_tree;
ti = proto_tree_add_item(tree, hf_cfm_odm_pdu, tvb, offset, -1, ENC_BIG_ENDIAN);
ti = proto_tree_add_item(tree, hf_cfm_odm_pdu, tvb, offset, -1, ENC_NA);
cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu);
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN);
@ -818,9 +818,9 @@ static int dissect_cfm_odm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1;
proto_tree_add_item(cfm_pdu_tree, hf_cfm_odm_dmm_dmr_TxTimestampf, tvb, offset, 8, ENC_BIG_ENDIAN);
proto_tree_add_item(cfm_pdu_tree, hf_cfm_odm_dmm_dmr_TxTimestampf, tvb, offset, 8, ENC_NA);
offset += 8;
proto_tree_add_item(cfm_pdu_tree, hf_cfm_odm_dmm_dmr_RxTimestampf, tvb, offset, 8, ENC_BIG_ENDIAN);
proto_tree_add_item(cfm_pdu_tree, hf_cfm_odm_dmm_dmr_RxTimestampf, tvb, offset, 8, ENC_NA);
offset += 8;
return offset;
@ -833,7 +833,7 @@ static int dissect_cfm_dmm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
proto_tree *cfm_pdu_tree;
proto_tree *cfm_flag_tree;
ti = proto_tree_add_item(tree, hf_cfm_dmm_pdu, tvb, offset, -1, ENC_BIG_ENDIAN);
ti = proto_tree_add_item(tree, hf_cfm_dmm_pdu, tvb, offset, -1, ENC_NA);
cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu);
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN);
@ -844,13 +844,13 @@ static int dissect_cfm_dmm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1;
proto_tree_add_item(cfm_pdu_tree, hf_cfm_odm_dmm_dmr_TxTimestampf, tvb, offset, 8, ENC_BIG_ENDIAN);
proto_tree_add_item(cfm_pdu_tree, hf_cfm_odm_dmm_dmr_TxTimestampf, tvb, offset, 8, ENC_NA);
offset += 8;
proto_tree_add_item(cfm_pdu_tree, hf_cfm_odm_dmm_dmr_RxTimestampf, tvb, offset, 8, ENC_BIG_ENDIAN);
proto_tree_add_item(cfm_pdu_tree, hf_cfm_odm_dmm_dmr_RxTimestampf, tvb, offset, 8, ENC_NA);
offset += 8;
proto_tree_add_item(cfm_pdu_tree, hf_cfm_dmm_dmr_TxTimestampb, tvb, offset, 8, ENC_BIG_ENDIAN);
proto_tree_add_item(cfm_pdu_tree, hf_cfm_dmm_dmr_TxTimestampb, tvb, offset, 8, ENC_NA);
offset += 8;
proto_tree_add_item(cfm_pdu_tree, hf_cfm_dmm_dmr_RxTimestampb, tvb, offset, 8, ENC_BIG_ENDIAN);
proto_tree_add_item(cfm_pdu_tree, hf_cfm_dmm_dmr_RxTimestampb, tvb, offset, 8, ENC_NA);
offset += 8;
return offset;
@ -863,7 +863,7 @@ static int dissect_cfm_dmr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
proto_tree *cfm_pdu_tree;
proto_tree *cfm_flag_tree;
ti = proto_tree_add_item(tree, hf_cfm_dmr_pdu, tvb, offset, -1, ENC_BIG_ENDIAN);
ti = proto_tree_add_item(tree, hf_cfm_dmr_pdu, tvb, offset, -1, ENC_NA);
cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu);
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN);
@ -874,13 +874,13 @@ static int dissect_cfm_dmr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1;
proto_tree_add_item(cfm_pdu_tree, hf_cfm_odm_dmm_dmr_TxTimestampf, tvb, offset, 8, ENC_BIG_ENDIAN);
proto_tree_add_item(cfm_pdu_tree, hf_cfm_odm_dmm_dmr_TxTimestampf, tvb, offset, 8, ENC_NA);
offset += 8;
proto_tree_add_item(cfm_pdu_tree, hf_cfm_odm_dmm_dmr_RxTimestampf, tvb, offset, 8, ENC_BIG_ENDIAN);
proto_tree_add_item(cfm_pdu_tree, hf_cfm_odm_dmm_dmr_RxTimestampf, tvb, offset, 8, ENC_NA);
offset += 8;
proto_tree_add_item(cfm_pdu_tree, hf_cfm_dmm_dmr_TxTimestampb, tvb, offset, 8, ENC_BIG_ENDIAN);
proto_tree_add_item(cfm_pdu_tree, hf_cfm_dmm_dmr_TxTimestampb, tvb, offset, 8, ENC_NA);
offset += 8;
proto_tree_add_item(cfm_pdu_tree, hf_cfm_dmm_dmr_RxTimestampb, tvb, offset, 8, ENC_BIG_ENDIAN);
proto_tree_add_item(cfm_pdu_tree, hf_cfm_dmm_dmr_RxTimestampb, tvb, offset, 8, ENC_NA);
offset += 8;
return offset;
@ -894,7 +894,7 @@ static int dissect_cfm_exm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
proto_tree *cfm_pdu_tree;
proto_tree *cfm_flag_tree;
ti = proto_tree_add_item(tree, hf_cfm_exm_pdu, tvb, offset, -1, ENC_BIG_ENDIAN);
ti = proto_tree_add_item(tree, hf_cfm_exm_pdu, tvb, offset, -1, ENC_NA);
cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu);
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN);
@ -905,9 +905,9 @@ static int dissect_cfm_exm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1;
proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_oui, tvb, offset, 3, ENC_BIG_ENDIAN);
proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_oui, tvb, offset, 3, ENC_NA);
offset += 3;
proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_subtype, tvb, offset, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_subtype, tvb, offset, 1, ENC_NA);
offset += 1;
/* The EXM data field was not defined at the time of this code being written
@ -917,7 +917,7 @@ static int dissect_cfm_exm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
/* Remove OUI and subtype from the offset */
cfm_tlv_offset -= 4;
if (cfm_tlv_offset > 0) {
proto_tree_add_item(cfm_pdu_tree, hf_cfm_exm_exr_data, tvb, offset, cfm_tlv_offset, ENC_BIG_ENDIAN);
proto_tree_add_item(cfm_pdu_tree, hf_cfm_exm_exr_data, tvb, offset, cfm_tlv_offset, ENC_NA);
offset += cfm_tlv_offset;
}
@ -932,7 +932,7 @@ static int dissect_cfm_exr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
proto_tree *cfm_pdu_tree;
proto_tree *cfm_flag_tree;
ti = proto_tree_add_item(tree, hf_cfm_exr_pdu, tvb, offset, -1, ENC_BIG_ENDIAN);
ti = proto_tree_add_item(tree, hf_cfm_exr_pdu, tvb, offset, -1, ENC_NA);
cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu);
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN);
@ -943,9 +943,9 @@ static int dissect_cfm_exr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1;
proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_oui, tvb, offset, 3, ENC_BIG_ENDIAN);
proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_oui, tvb, offset, 3, ENC_NA);
offset += 3;
proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_subtype, tvb, offset, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_subtype, tvb, offset, 1, ENC_NA);
offset += 1;
/* The EXR data field was not defined at the time of this code being written
@ -955,7 +955,7 @@ static int dissect_cfm_exr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
/* Remove OUI and subtype from the offset */
cfm_tlv_offset -= 4;
if (cfm_tlv_offset > 0) {
proto_tree_add_item(cfm_pdu_tree, hf_cfm_exm_exr_data, tvb, offset, cfm_tlv_offset, ENC_BIG_ENDIAN);
proto_tree_add_item(cfm_pdu_tree, hf_cfm_exm_exr_data, tvb, offset, cfm_tlv_offset, ENC_NA);
offset += cfm_tlv_offset;
}
@ -970,7 +970,7 @@ static int dissect_cfm_vsm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
proto_tree *cfm_pdu_tree;
proto_tree *cfm_flag_tree;
ti = proto_tree_add_item(tree, hf_cfm_vsm_pdu, tvb, offset, -1, ENC_BIG_ENDIAN);
ti = proto_tree_add_item(tree, hf_cfm_vsm_pdu, tvb, offset, -1, ENC_NA);
cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu);
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN);
@ -981,9 +981,9 @@ static int dissect_cfm_vsm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1;
proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_oui, tvb, offset, 3, ENC_BIG_ENDIAN);
proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_oui, tvb, offset, 3, ENC_NA);
offset += 3;
proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_subtype, tvb, offset, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_subtype, tvb, offset, 1, ENC_NA);
offset += 1;
/* The VSM data field was not defined at the time of this code being written
@ -993,7 +993,7 @@ static int dissect_cfm_vsm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
/* Remove OUI and subtype from the offset */
cfm_tlv_offset -= 4;
if (cfm_tlv_offset > 0) {
proto_tree_add_item(cfm_pdu_tree, hf_cfm_vsm_vsr_data, tvb, offset, cfm_tlv_offset, ENC_BIG_ENDIAN);
proto_tree_add_item(cfm_pdu_tree, hf_cfm_vsm_vsr_data, tvb, offset, cfm_tlv_offset, ENC_NA);
offset += cfm_tlv_offset;
}
@ -1008,7 +1008,7 @@ static int dissect_cfm_vsr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
proto_tree *cfm_pdu_tree;
proto_tree *cfm_flag_tree;
ti = proto_tree_add_item(tree, hf_cfm_vsr_pdu, tvb, offset, -1, ENC_BIG_ENDIAN);
ti = proto_tree_add_item(tree, hf_cfm_vsr_pdu, tvb, offset, -1, ENC_NA);
cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu);
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN);
@ -1019,9 +1019,9 @@ static int dissect_cfm_vsr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1;
proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_oui, tvb, offset, 3, ENC_BIG_ENDIAN);
proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_oui, tvb, offset, 3, ENC_NA);
offset += 3;
proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_subtype, tvb, offset, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_subtype, tvb, offset, 1, ENC_NA);
offset += 1;
/* The VSR data field was not defined at the time of this code being written
@ -1031,7 +1031,7 @@ static int dissect_cfm_vsr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
/* Remove OUI and subtype from the offset */
cfm_tlv_offset -= 4;
if (cfm_tlv_offset > 0) {
proto_tree_add_item(cfm_pdu_tree, hf_cfm_vsm_vsr_data, tvb, offset, cfm_tlv_offset, ENC_BIG_ENDIAN);
proto_tree_add_item(cfm_pdu_tree, hf_cfm_vsm_vsr_data, tvb, offset, cfm_tlv_offset, ENC_NA);
offset += cfm_tlv_offset;
}
@ -1045,7 +1045,7 @@ static int dissect_cfm_slm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
proto_tree *cfm_pdu_tree;
proto_tree *cfm_flag_tree;
ti = proto_tree_add_item(tree, hf_cfm_slm_pdu, tvb, offset, -1, ENC_BIG_ENDIAN);
ti = proto_tree_add_item(tree, hf_cfm_slm_pdu, tvb, offset, -1, ENC_NA);
cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu);
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN);
@ -1056,11 +1056,11 @@ static int dissect_cfm_slm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1;
proto_tree_add_item(cfm_pdu_tree, hf_cfm_slm_src_mep, tvb, offset, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(cfm_pdu_tree, hf_cfm_slm_src_mep, tvb, offset, 2, ENC_NA);
offset += 2;
proto_tree_add_item(cfm_pdu_tree, hf_cfm_slr_rsp_mep, tvb, offset, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(cfm_pdu_tree, hf_cfm_slr_rsp_mep, tvb, offset, 2, ENC_NA);
offset += 2;
proto_tree_add_item(cfm_pdu_tree, hf_cfm_slm_testid, tvb, offset, 4, ENC_BIG_ENDIAN);
proto_tree_add_item(cfm_pdu_tree, hf_cfm_slm_testid, tvb, offset, 4, ENC_NA);
offset += 4;
proto_tree_add_item(cfm_pdu_tree, hf_cfm_slm_txfcf, tvb, offset, 4, ENC_BIG_ENDIAN);
offset += 4;
@ -1077,7 +1077,7 @@ static int dissect_cfm_slr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
proto_tree *cfm_pdu_tree;
proto_tree *cfm_flag_tree;
ti = proto_tree_add_item(tree, hf_cfm_slr_pdu, tvb, offset, -1, ENC_BIG_ENDIAN);
ti = proto_tree_add_item(tree, hf_cfm_slr_pdu, tvb, offset, -1, ENC_NA);
cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu);
fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN);
@ -1088,11 +1088,11 @@ static int dissect_cfm_slr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1;
proto_tree_add_item(cfm_pdu_tree, hf_cfm_slm_src_mep, tvb, offset, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(cfm_pdu_tree, hf_cfm_slm_src_mep, tvb, offset, 2, ENC_NA);
offset += 2;
proto_tree_add_item(cfm_pdu_tree, hf_cfm_slr_rsp_mep, tvb, offset, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(cfm_pdu_tree, hf_cfm_slr_rsp_mep, tvb, offset, 2, ENC_NA);
offset += 2;
proto_tree_add_item(cfm_pdu_tree, hf_cfm_slm_testid, tvb, offset, 4, ENC_BIG_ENDIAN);
proto_tree_add_item(cfm_pdu_tree, hf_cfm_slm_testid, tvb, offset, 4, ENC_NA);
offset += 4;
proto_tree_add_item(cfm_pdu_tree, hf_cfm_slm_txfcf, tvb, offset, 4, ENC_BIG_ENDIAN);
offset += 4;
@ -1220,7 +1220,7 @@ static void dissect_cfm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if ((cfm_tlv_offset == offset) && (cfm_tlv_offset > 3)) {
proto_tree *cfm_all_tlvs_tree;
guint8 cfm_tlv_type = 255;
ti = proto_tree_add_item(tree, hf_cfm_all_tlvs, tvb, cfm_tlv_offset, -1, ENC_BIG_ENDIAN);
ti = proto_tree_add_item(tree, hf_cfm_all_tlvs, tvb, cfm_tlv_offset, -1, ENC_NA);
cfm_all_tlvs_tree = proto_item_add_subtree(ti, ett_cfm_all_tlvs);
while (cfm_tlv_type != END_TLV)
@ -1269,7 +1269,7 @@ static void dissect_cfm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
tvb, tlv_data_offset, 1, ENC_BIG_ENDIAN);
tlv_data_offset += 1;
proto_tree_add_item(cfm_tlv_tree, hf_tlv_chassis_id,
tvb, tlv_data_offset, tlv_chassis_id_length, ENC_BIG_ENDIAN);
tvb, tlv_data_offset, tlv_chassis_id_length, ENC_NA);
tlv_data_offset += tlv_chassis_id_length;
}
@ -1283,7 +1283,7 @@ static void dissect_cfm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
tlv_data_offset += 1;
if (tlv_ma_domain_length > 0) {
proto_tree_add_item(cfm_tlv_tree, hf_tlv_ma_domain,
tvb, tlv_data_offset, tlv_ma_domain_length, ENC_BIG_ENDIAN);
tvb, tlv_data_offset, tlv_ma_domain_length, ENC_NA);
tlv_data_offset += tlv_ma_domain_length;
}
@ -1298,7 +1298,7 @@ static void dissect_cfm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
tlv_data_offset += 1;
if (tlv_management_addr_length > 0) {
proto_tree_add_item(cfm_tlv_tree, hf_tlv_management_addr,
tvb, tlv_data_offset, tlv_management_addr_length, ENC_BIG_ENDIAN);
tvb, tlv_data_offset, tlv_management_addr_length, ENC_NA);
tlv_data_offset += tlv_management_addr_length;
}
}
@ -1311,7 +1311,7 @@ static void dissect_cfm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
break;
case DATA_TLV:
proto_tree_add_item(cfm_tlv_tree, hf_tlv_data_value,
tvb, tlv_data_offset, cfm_tlv_length, ENC_BIG_ENDIAN);
tvb, tlv_data_offset, cfm_tlv_length, ENC_NA);
tlv_data_offset += cfm_tlv_length;
break;
case INTERF_STAT_TLV:
@ -1342,7 +1342,7 @@ static void dissect_cfm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
tvb, tlv_data_offset, 1, ENC_BIG_ENDIAN);
tlv_data_offset += 1;
proto_tree_add_item(cfm_tlv_tree, hf_tlv_reply_ing_egr_portid,
tvb, tlv_data_offset, tlv_reply_ingress_portid_length, ENC_BIG_ENDIAN);
tvb, tlv_data_offset, tlv_reply_ingress_portid_length, ENC_NA);
tlv_data_offset += tlv_reply_ingress_portid_length;
}
}
@ -1370,14 +1370,14 @@ static void dissect_cfm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
tvb, tlv_data_offset, 1, ENC_BIG_ENDIAN);
tlv_data_offset += 1;
proto_tree_add_item(cfm_tlv_tree, hf_tlv_reply_ing_egr_portid,
tvb, tlv_data_offset, tlv_reply_egress_portid_length, ENC_BIG_ENDIAN);
tvb, tlv_data_offset, tlv_reply_egress_portid_length, ENC_NA);
tlv_data_offset += tlv_reply_egress_portid_length;
}
}
break;
case LTM_EGR_ID_TLV:
proto_tree_add_item(cfm_tlv_tree, hf_tlv_ltm_egress_id_unique_identifier,
tvb, tlv_data_offset, 2, ENC_BIG_ENDIAN);
tvb, tlv_data_offset, 2, ENC_NA);
tlv_data_offset += 2;
proto_tree_add_item(cfm_tlv_tree, hf_tlv_ltm_egress_id_mac,
tvb, tlv_data_offset, 6, ENC_BIG_ENDIAN);
@ -1385,13 +1385,13 @@ static void dissect_cfm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
break;
case LTR_EGR_ID_TLV:
proto_tree_add_item(cfm_tlv_tree, hf_tlv_ltr_egress_last_id_unique_identifier,
tvb, tlv_data_offset, 2, ENC_BIG_ENDIAN);
tvb, tlv_data_offset, 2, ENC_NA);
tlv_data_offset += 2;
proto_tree_add_item(cfm_tlv_tree, hf_tlv_ltr_egress_last_id_mac,
tvb, tlv_data_offset, 6, ENC_BIG_ENDIAN);
tlv_data_offset += 6;
proto_tree_add_item(cfm_tlv_tree, hf_tlv_ltr_egress_next_id_unique_identifier,
tvb, tlv_data_offset, 2, ENC_BIG_ENDIAN);
tvb, tlv_data_offset, 2, ENC_NA);
tlv_data_offset += 2;
proto_tree_add_item(cfm_tlv_tree, hf_tlv_ltr_egress_next_id_mac,
tvb, tlv_data_offset, 6, ENC_BIG_ENDIAN);
@ -1403,13 +1403,13 @@ static void dissect_cfm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
*/
if (cfm_tlv_length > 3) {
proto_tree_add_item(cfm_tlv_tree, hf_tlv_org_spec_oui,
tvb, tlv_data_offset, 3, ENC_BIG_ENDIAN);
tvb, tlv_data_offset, 3, ENC_NA);
tlv_data_offset += 3;
proto_tree_add_item(cfm_tlv_tree, hf_tlv_org_spec_subtype,
tvb, tlv_data_offset, 1, ENC_BIG_ENDIAN);
tvb, tlv_data_offset, 1, ENC_NA);
tlv_data_offset += 1;
proto_tree_add_item(cfm_tlv_tree, hf_tlv_org_spec_value,
tvb, tlv_data_offset, cfm_tlv_length-4, ENC_BIG_ENDIAN);
tvb, tlv_data_offset, cfm_tlv_length-4, ENC_NA);
tlv_data_offset -= 4;
}
tlv_data_offset += cfm_tlv_length;
@ -1429,16 +1429,16 @@ static void dissect_cfm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
case 0:
case 2:
proto_tree_add_item(cfm_tlv_tree, hf_tlv_tst_test_pattern,
tvb, tlv_data_offset, cfm_tlv_length-1, ENC_BIG_ENDIAN);
tvb, tlv_data_offset, cfm_tlv_length-1, ENC_NA);
tlv_data_offset += cfm_tlv_length;
break;
case 1:
case 3:
proto_tree_add_item(cfm_tlv_tree, hf_tlv_tst_test_pattern,
tvb, tlv_data_offset, cfm_tlv_length-5, ENC_BIG_ENDIAN);
tvb, tlv_data_offset, cfm_tlv_length-5, ENC_NA);
tlv_data_offset += (cfm_tlv_length-5);
proto_tree_add_item(cfm_tlv_tree, hf_tlv_tst_CRC32,
tvb, tlv_data_offset, 4, ENC_BIG_ENDIAN);
tvb, tlv_data_offset, 4, ENC_NA);
tlv_data_offset += 4;
break;
}

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

@ -3824,7 +3824,7 @@ cigi2_add_collision_detection_segment_definition(tvbuff_t *tvb, proto_tree *tree
proto_tree_add_item(tree, hf_cigi2_collision_detection_segment_definition_segment_id, tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 4;
proto_tree_add_item(tree, hf_cigi2_collision_detection_segment_definition_collision_mask, tvb, offset, 4, ENC_BIG_ENDIAN);
proto_tree_add_item(tree, hf_cigi2_collision_detection_segment_definition_collision_mask, tvb, offset, 4, ENC_NA);
offset += 4;
proto_tree_add_float(tree, hf_cigi2_collision_detection_segment_definition_x_start, tvb, offset, 2, tvb_get_fixed_point(tvb, offset, ENC_BIG_ENDIAN));

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

@ -600,7 +600,7 @@ dissect_epath( tvbuff_t *tvb, proto_item *epath_item, int offset, int path_lengt
if ( !generate )
{
hidden_item = proto_tree_add_item(path_tree, hf_cip_epath,
tvb, offset, path_length, TRUE );
tvb, offset, path_length, ENC_NA );
PROTO_ITEM_SET_HIDDEN(hidden_item);
}

6
epan/dissectors/packet-cisco-erspan.c
View File

@ -168,7 +168,7 @@ dissect_erspan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
offset += 4;
proto_tree_add_item(erspan_tree, hf_erspan_unknown4, tvb,
offset, 2, ENC_BIG_ENDIAN);
offset, 2, ENC_NA);
offset += 2;
proto_tree_add_item(erspan_tree, hf_erspan_direction2, tvb,
@ -178,11 +178,11 @@ dissect_erspan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
offset += 2;
proto_tree_add_item(erspan_tree, hf_erspan_unknown6, tvb,
offset, 4, ENC_BIG_ENDIAN);
offset, 4, ENC_NA);
offset += 4;
}
proto_tree_add_item(erspan_tree, hf_erspan_unknown7, tvb, offset, 4,
ENC_BIG_ENDIAN);
ENC_NA);
offset += 4;
}
else {

6
epan/dissectors/packet-cisco-wids.c
View File

@ -91,18 +91,18 @@ dissect_cwids(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(cwids_tree, hf_cwids_version, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
proto_tree_add_item(cwids_tree, hf_cwids_unknown1, tvb, offset, 7, ENC_BIG_ENDIAN);
proto_tree_add_item(cwids_tree, hf_cwids_unknown1, tvb, offset, 7, ENC_NA);
offset += 7;
proto_tree_add_item(cwids_tree, hf_cwids_channel, tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1;
proto_tree_add_item(cwids_tree, hf_cwids_unknown2, tvb, offset, 6, ENC_BIG_ENDIAN);
proto_tree_add_item(cwids_tree, hf_cwids_unknown2, tvb, offset, 6, ENC_NA);
offset += 6;
proto_tree_add_item(cwids_tree, hf_cwids_reallength, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
capturelen = tvb_get_ntohs(tvb, offset);
proto_tree_add_item(cwids_tree, hf_cwids_capturelen, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
proto_tree_add_item(cwids_tree, hf_cwids_unknown3, tvb, offset, 8, ENC_BIG_ENDIAN);
proto_tree_add_item(cwids_tree, hf_cwids_unknown3, tvb, offset, 8, ENC_NA);
offset += 8;
wlan_tvb = tvb_new_subset(tvb, offset, capturelen, capturelen);

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

@ -358,13 +358,13 @@ dissect_classicstun(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_uint(classicstun_tree, hf_classicstun_type, tvb, 0, 2, msg_type);
proto_tree_add_uint(classicstun_tree, hf_classicstun_length, tvb, 2, 2, msg_length);
proto_tree_add_item(classicstun_tree, hf_classicstun_id, tvb, 4, 16, FALSE);
proto_tree_add_item(classicstun_tree, hf_classicstun_id, tvb, 4, 16, ENC_NA);
/* Remember this (in host order) so we can show clear xor'd addresses */
transaction_id_first_word = tvb_get_ntohl(tvb, 4);
if (msg_length > 0) {
ta = proto_tree_add_item(classicstun_tree, hf_classicstun_att, tvb, CLASSICSTUN_HDR_LEN, msg_length, FALSE);
ta = proto_tree_add_item(classicstun_tree, hf_classicstun_att, tvb, CLASSICSTUN_HDR_LEN, msg_length, ENC_NA);
att_type_tree = proto_item_add_subtree(ta, ett_classicstun_att_type);
offset = CLASSICSTUN_HDR_LEN;
@ -437,7 +437,7 @@ dissect_classicstun(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
case REALM:
if (att_length < 1)
break;
proto_tree_add_item(att_tree, classicstun_att_value, tvb, offset, att_length, FALSE);
proto_tree_add_item(att_tree, classicstun_att_value, tvb, offset, att_length, ENC_NA);
break;
case ERROR_CODE:
@ -471,7 +471,7 @@ dissect_classicstun(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
break;
case DATA:
proto_tree_add_item(att_tree, classicstun_att_data, tvb, offset, att_length, FALSE);
proto_tree_add_item(att_tree, classicstun_att_data, tvb, offset, att_length, ENC_NA);
break;
case UNKNOWN_ATTRIBUTES:

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

@ -703,7 +703,7 @@ dissect_collectd_signature (tvbuff_t *tvb, packet_info *pinfo,
proto_tree_add_uint (pt, hf_collectd_type, tvb, offset, 2, type);
proto_tree_add_uint (pt, hf_collectd_length, tvb, offset + 2, 2,
length);
proto_tree_add_item (pt, hf_collectd_data_sighash, tvb, offset + 4, 32, FALSE);
proto_tree_add_item (pt, hf_collectd_data_sighash, tvb, offset + 4, 32, ENC_NA);
proto_tree_add_item (pt, hf_collectd_data_username, tvb, offset + 36, length - 36, FALSE);
return (0);
@ -795,10 +795,10 @@ dissect_collectd_encrypted (tvbuff_t *tvb, packet_info *pinfo,
proto_tree_add_uint (pt, hf_collectd_data_username_len, tvb, offset + 4, 2, username_length);
proto_tree_add_item (pt, hf_collectd_data_username, tvb, offset + 6, username_length, FALSE);
proto_tree_add_item (pt, hf_collectd_data_initvec, tvb,
offset + (6 + username_length), 16, FALSE);
offset + (6 + username_length), 16, ENC_NA);
proto_tree_add_item (pt, hf_collectd_data_encrypted, tvb,
offset + (22 + username_length),
length - (22 + username_length), FALSE);
length - (22 + username_length), ENC_NA);
return (0);
} /* int dissect_collectd_encrypted */
@ -1254,7 +1254,7 @@ dissect_collectd (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_uint (pt, hf_collectd_length, tvb,
offset + 2, 2, part_length);
proto_tree_add_item (pt, hf_collectd_data, tvb,
offset + 4, part_length - 4, FALSE);
offset + 4, part_length - 4, ENC_NA);
expert_add_info_format (pinfo, pi,
PI_UNDECODED, PI_NOTE,

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

@ -76,7 +76,7 @@ dissect_data(tvbuff_t *tvb, packet_info *pinfo _U_ , proto_tree *tree)
plurality(bytes, "", "s"));
data_tree = proto_item_add_subtree(ti, ett_data);
proto_tree_add_item(data_tree, hf_data_data, data_tvb, 0, bytes, FALSE);
proto_tree_add_item(data_tree, hf_data_data, data_tvb, 0, bytes, ENC_NA);
if (show_as_text) {
proto_tree_add_item(data_tree, hf_data_text, data_tvb, 0, bytes, FALSE);

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

@ -80,7 +80,7 @@ static gint ett_dcc_trace = -1;
/* Utility macros */
#define D_SIGNATURE() \
proto_tree_add_item(dcc_optree, hf_dcc_signature, tvb, \
offset, sizeof(DCC_SIGNATURE), FALSE); \
offset, sizeof(DCC_SIGNATURE), ENC_NA); \
offset += sizeof(DCC_SIGNATURE);
#define D_LABEL(label,len) \
@ -130,7 +130,7 @@ static gint ett_dcc_trace = -1;
proto_tree_add_item(cktree, hf_dcc_ck_len, tvb, offset, 1, FALSE); \
offset += 1; \
proto_tree_add_item(cktree, hf_dcc_ck_sum, tvb, offset, \
sizeof(DCC_SUM), FALSE); \
sizeof(DCC_SUM), ENC_NA); \
offset += sizeof(DCC_SUM); \
}

4
epan/dissectors/packet-dcerpc-krb5rpc.c
View File

@ -88,7 +88,7 @@ krb5rpc_dissect_sendto_kdc_rqst (tvbuff_t * tvb, int offset,
offset =
dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep,
hf_krb5rpc_sendto_kdc_rqst_spare1, &spare1);
item = proto_tree_add_item (tree, hf_krb5rpc_krb5, tvb, offset, -1, TRUE);
item = proto_tree_add_item (tree, hf_krb5rpc_krb5, tvb, offset, -1, ENC_NA);
subtree = proto_item_add_subtree (item, ett_krb5rpc_krb5);
remain = tvb_length_remaining(tvb, offset);
@ -134,7 +134,7 @@ krb5rpc_dissect_sendto_kdc_resp (tvbuff_t * tvb, int offset,
hf_krb5rpc_sendto_kdc_resp_keysize, &keysize);
item = proto_tree_add_item (tree, hf_krb5rpc_krb5, tvb, offset, -1, TRUE);
item = proto_tree_add_item (tree, hf_krb5rpc_krb5, tvb, offset, -1, ENC_NA);
subtree = proto_item_add_subtree (item, ett_krb5rpc_krb5);
remain = tvb_length_remaining(tvb, offset);
krb5_tvb = tvb_new_subset (tvb, offset, remain, remain);

24
epan/dissectors/packet-dcerpc-netlogon.c
View File

@ -1071,7 +1071,7 @@ netlogon_dissect_LM_OWF_PASSWORD(tvbuff_t *tvb, int offset,
}
proto_tree_add_item(tree, hf_netlogon_lm_owf_password, tvb, offset, 16,
FALSE);
ENC_NA);
offset += 16;
return offset;
@ -1104,7 +1104,7 @@ netlogon_dissect_NT_OWF_PASSWORD(tvbuff_t *tvb, int offset,
}
proto_tree_add_item(tree, hf_netlogon_nt_owf_password, tvb, offset, 16,
FALSE);
ENC_NA);
offset += 16;
return offset;
@ -1154,7 +1154,7 @@ netlogon_dissect_CHALLENGE(tvbuff_t *tvb, int offset,
}
proto_tree_add_item(tree, hf_netlogon_challenge, tvb, offset, 8,
FALSE);
ENC_NA);
offset += 8;
return offset;
@ -1373,7 +1373,7 @@ netlogon_dissect_CREDENTIAL(tvbuff_t *tvb, int offset,
}
proto_tree_add_item(tree, hf_netlogon_credential, tvb, offset, 8,
FALSE);
ENC_NA);
offset += 8;
return offset;
@ -1525,7 +1525,7 @@ netlogon_dissect_USER_SESSION_KEY(tvbuff_t *tvb, int offset,
}
proto_tree_add_item(tree, hf_netlogon_user_session_key, tvb, offset, 16,
FALSE);
ENC_NA);
offset += 16;
return offset;
@ -2095,7 +2095,7 @@ netlogon_dissect_PAC(tvbuff_t *tvb, int offset,
hf_netlogon_pac_size, &pac_size);
proto_tree_add_item(tree, hf_netlogon_pac_data, tvb, offset, pac_size,
FALSE);
ENC_NA);
offset += pac_size;
return offset;
@ -2118,7 +2118,7 @@ netlogon_dissect_AUTH(tvbuff_t *tvb, int offset,
hf_netlogon_auth_size, &auth_size);
proto_tree_add_item(tree, hf_netlogon_auth_data, tvb, offset, auth_size,
FALSE);
ENC_NA);
offset += auth_size;
return offset;
@ -2696,7 +2696,7 @@ netlogon_dissect_ENCRYPTED_LM_OWF_PASSWORD(tvbuff_t *tvb, int offset,
}
proto_tree_add_item(tree, hf_netlogon_encrypted_lm_owf_password, tvb, offset, 16,
FALSE);
ENC_NA);
offset += 16;
return offset;
@ -2828,7 +2828,7 @@ netlogon_dissect_SENSITIVE_DATA(tvbuff_t *tvb, int offset,
hf_netlogon_sensitive_data_len, &data_len);
proto_tree_add_item(tree, hf_netlogon_sensitive_data, tvb, offset,
data_len, FALSE);
data_len, ENC_NA);
offset += data_len;
return offset;
@ -5767,7 +5767,7 @@ netlogon_dissect_BLOB_array(tvbuff_t *tvb, int offset,
hf_netlogon_blob_size, &len);
proto_tree_add_item(tree, hf_netlogon_blob, tvb, offset, len,
FALSE);
ENC_NA);
offset += len;
return offset;
@ -8014,7 +8014,7 @@ dissect_secchan_verf(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
* Create a new tree, and split into x components ...
*/
vf = proto_tree_add_item(tree, hf_netlogon_secchan_verf, tvb,
offset, -1, FALSE);
offset, -1, ENC_NA);
subtree = proto_item_add_subtree(vf, ett_secchan_verf);
proto_tree_add_item(subtree, hf_netlogon_secchan_verf_signalg, tvb,
@ -8023,7 +8023,7 @@ dissect_secchan_verf(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
offset+2, 2, TRUE);
/* 2 pad bytes */
proto_tree_add_item(subtree, hf_netlogon_secchan_verf_flag, tvb,
offset+6, 2, FALSE);
offset+6, 2, ENC_NA);
offset += 8;
offset = dissect_dcerpc_8bytes(tvb, offset, pinfo, subtree, drep,

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

@ -2844,7 +2844,7 @@ dissect_dcerpc_cn_bind (tvbuff_t *tvb, gint offset, packet_info *pinfo,
dcerpc_tvb_get_uuid (tvb, offset, hdr->drep, &if_id);
if (ctx_tree) {
iface_item = proto_tree_add_item(ctx_tree, hf_dcerpc_cn_bind_abstract_syntax, tvb, offset, 0, FALSE);
iface_item = proto_tree_add_item(ctx_tree, hf_dcerpc_cn_bind_abstract_syntax, tvb, offset, 0, ENC_NA);
iface_tree = proto_item_add_subtree(iface_item, ett_dcerpc_cn_iface);
uuid_str = guid_to_str((e_guid_t*)&if_id);
@ -2887,7 +2887,7 @@ dissect_dcerpc_cn_bind (tvbuff_t *tvb, gint offset, packet_info *pinfo,
dcerpc_tvb_get_uuid (tvb, offset, hdr->drep, &trans_id);
if (ctx_tree) {
trans_item = proto_tree_add_item(ctx_tree, hf_dcerpc_cn_bind_trans_syntax, tvb, offset, 0, FALSE);
trans_item = proto_tree_add_item(ctx_tree, hf_dcerpc_cn_bind_trans_syntax, tvb, offset, 0, ENC_NA);
trans_tree = proto_item_add_subtree(trans_item, ett_dcerpc_cn_trans_syntax);
uuid_str = guid_to_str((e_guid_t *) &trans_id);
@ -4729,7 +4729,7 @@ dissect_dcerpc_dg_auth (tvbuff_t *tvb, int offset, proto_tree *dcerpc_tree,
offset += 6; /* 6 bytes of padding */
else
offset += 2; /* 6 bytes of padding */
proto_tree_add_item (auth_tree, hf_dcerpc_krb5_av_key_auth_verifier, tvb, offset, 16, FALSE);
proto_tree_add_item (auth_tree, hf_dcerpc_krb5_av_key_auth_verifier, tvb, offset, 16, ENC_NA);
offset += 16;
break;

4
epan/dissectors/packet-dcom-dispatch.c
View File

@ -321,7 +321,7 @@ dissect_IDispatch_Invoke_rqst(tvbuff_t *tvb, int offset,
offset = u32TmpOffset;
dispparams_item = proto_tree_add_item(tree, hf_dispatch_dispparams, tvb, offset, 0, ENC_BIG_ENDIAN);
dispparams_item = proto_tree_add_item(tree, hf_dispatch_dispparams, tvb, offset, 0, ENC_NA);
dispparams_tree = proto_item_add_subtree (dispparams_item, ett_dispatch_params);
u32SubStart = offset;
@ -431,7 +431,7 @@ dissect_IDispatch_Invoke_resp(tvbuff_t *tvb, int offset,
}
/* ExcepInfo */
excepinfo_item = proto_tree_add_item(tree, hf_dispatch_excepinfo, tvb, offset, 0, ENC_BIG_ENDIAN);
excepinfo_item = proto_tree_add_item(tree, hf_dispatch_excepinfo, tvb, offset, 0, ENC_NA);
excepinfo_tree = proto_item_add_subtree (excepinfo_item, ett_dispatch_excepinfo);
u32SubStart = offset;

4
epan/dissectors/packet-dcom-remunkn.c
View File

@ -161,7 +161,7 @@ dissect_remunk_remqueryinterface_resp(tvbuff_t *tvb, int offset,
u32ItemIdx = 1;
while (u32ArraySize--) {
/* add subtree */
sub_item = proto_tree_add_item(tree, hf_remunk_qiresult, tvb, offset, 0, ENC_BIG_ENDIAN);
sub_item = proto_tree_add_item(tree, hf_remunk_qiresult, tvb, offset, 0, ENC_NA);
sub_tree = proto_item_add_subtree(sub_item, ett_remunk_rqi_result);
/* REMQIRESULT */
@ -251,7 +251,7 @@ dissect_remunk_remrelease_rqst(tvbuff_t *tvb, int offset,
u32ItemIdx = 1;
while (u32IntRefs--) {
/* add subtree */
sub_item = proto_tree_add_item(tree, hf_remunk_reminterfaceref, tvb, offset, 0, ENC_BIG_ENDIAN);
sub_item = proto_tree_add_item(tree, hf_remunk_reminterfaceref, tvb, offset, 0, ENC_NA);
sub_tree = proto_item_add_subtree(sub_item, ett_remunk_reminterfaceref);
u32SubStart = offset;

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

@ -717,7 +717,7 @@ dissect_dcom_extent(tvbuff_t *tvb, int offset,
u32Idx = 1;
while (u32ArraySize--) {
sub_item = proto_tree_add_item(tree, hf_dcom_extent, tvb, offset, 0, ENC_BIG_ENDIAN);
sub_item = proto_tree_add_item(tree, hf_dcom_extent, tvb, offset, 0, ENC_NA);
sub_tree = proto_item_add_subtree(sub_item, ett_dcom_extent);
u32SubStart = offset;
@ -1168,7 +1168,7 @@ dissect_dcom_SAFEARRAY(tvbuff_t *tvb, int offset, packet_info *pinfo,
/* XXX: which alignment do we need here? */
sub_item = proto_tree_add_item(tree, hf_dcom_safearray, tvb, offset, 0, ENC_BIG_ENDIAN);
sub_item = proto_tree_add_item(tree, hf_dcom_safearray, tvb, offset, 0, ENC_NA);
sub_tree = proto_item_add_subtree(sub_item, ett_dcom_safearray);
u32SubStart = offset;
@ -1781,7 +1781,7 @@ dissect_dcom_DUALSTRINGARRAY(tvbuff_t *tvb, gint offset, packet_info *pinfo,
while ( tvb_get_ntohs(tvb, offset) ) {
u32StringBindings++;
subsub_item = proto_tree_add_item(sub_tree, hf_dcom_dualstringarray_string, tvb, offset, 0, ENC_BIG_ENDIAN);
subsub_item = proto_tree_add_item(sub_tree, hf_dcom_dualstringarray_string, tvb, offset, 0, ENC_NA);
subsub_tree = proto_item_add_subtree(subsub_item, ett_dcom_dualstringarray_binding);
u32SubSubStart = offset;
@ -1828,7 +1828,7 @@ dissect_dcom_DUALSTRINGARRAY(tvbuff_t *tvb, gint offset, packet_info *pinfo,
while ( tvb_get_ntohs(tvb, offset) ) {
u32SecurityBindings++;
subsub_item = proto_tree_add_item(sub_tree, hf_dcom_dualstringarray_security, tvb, offset, 0, ENC_BIG_ENDIAN);
subsub_item = proto_tree_add_item(sub_tree, hf_dcom_dualstringarray_security, tvb, offset, 0, ENC_NA);
subsub_tree = proto_item_add_subtree(subsub_item, ett_dcom_dualstringarray_binding);
u32SubSubStart = offset;
@ -1874,7 +1874,7 @@ dissect_dcom_STDOBJREF(tvbuff_t *tvb, gint offset, packet_info *pinfo,
/* add subtree header */
sub_item = proto_tree_add_item(tree, hf_dcom_stdobjref, tvb, offset, 0, ENC_BIG_ENDIAN);
sub_item = proto_tree_add_item(tree, hf_dcom_stdobjref, tvb, offset, 0, ENC_NA);
sub_tree = proto_item_add_subtree(sub_item, ett_dcom_stdobjref);
offset = dissect_dcom_DWORD(tvb, offset, pinfo, sub_tree, drep,
@ -1921,7 +1921,7 @@ dissect_dcom_OBJREF(tvbuff_t *tvb, gint offset, packet_info *pinfo,
/* add subtree header */
sub_item = proto_tree_add_item(tree, hf_dcom_objref, tvb, offset, 0, ENC_BIG_ENDIAN);
sub_item = proto_tree_add_item(tree, hf_dcom_objref, tvb, offset, 0, ENC_NA);
sub_tree = proto_item_add_subtree(sub_item, ett_dcom_objref);
offset = dissect_dcom_DWORD(tvb, offset, pinfo, sub_tree, drep,

2
epan/dissectors/packet-dcp-etsi.c
View File

@ -508,7 +508,7 @@ dissect_pft(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
if (fcount > 1) { /* fragmented*/
gboolean save_fragmented = pinfo->fragmented;
guint16 real_len = tvb_length(tvb)-offset;
proto_tree_add_item (pft_tree, hf_edcp_pft_payload, tvb, offset, real_len, ENC_BIG_ENDIAN);
proto_tree_add_item (pft_tree, hf_edcp_pft_payload, tvb, offset, real_len, ENC_NA);
if(real_len != payload_len) {
if(li)
proto_item_append_text(li, " (length error (%d))", real_len);

4
epan/dissectors/packet-dec-dnart.c
View File

@ -817,7 +817,7 @@ do_hello_msg(
my_offset++;
ti_locala = proto_tree_add_item(tree, hf_dec_rt_elist, tvb,
my_offset, image_len, TRUE);
my_offset, image_len, ENC_NA);
list_tree = proto_item_add_subtree(ti_locala, ett_dec_rt_list);
while (image_len > 0) {
@ -1150,7 +1150,7 @@ handle_connect_contents(
guint16 grp_code, usr_code;
ti = proto_tree_add_item(tree, hf_dec_conn_contents,
tvb, my_offset, -1, TRUE);
tvb, my_offset, -1, ENC_NA);
contents_tree = proto_item_add_subtree(ti, ett_dec_sess_contents);
/* The destination end user */
dst_format = tvb_get_guint8(tvb, my_offset);

16
epan/dissectors/packet-dect.c
View File

@ -1323,12 +1323,12 @@ dissect_bfield(gboolean dect_packet_type _U_, guint8 ba,
if(blen)
{
bfieldti = proto_tree_add_item(DectTree, hf_dect_B, tvb, offset, blen, FALSE);
bfieldti = proto_tree_add_item(DectTree, hf_dect_B, tvb, offset, blen, ENC_NA);
BField = proto_item_add_subtree(bfieldti, ett_bfield);
proto_tree_add_none_format(BField, hf_dect_B_Data, tvb, offset, blen, "%s", bfield_str);
bfdescrdatati = proto_tree_add_item(BField, hf_dect_B_DescrambledData, tvb, offset, blen, FALSE);
bfdescrdatati = proto_tree_add_item(BField, hf_dect_B_DescrambledData, tvb, offset, blen, ENC_NA);
BFDescrData = proto_item_add_subtree(bfdescrdatati, ett_bfdescrdata);
}
@ -1439,7 +1439,7 @@ dissect_afield(gboolean dect_packet_type, guint8 *ba,
ta = (header & DECT_A_TA_MASK) >> DECT_A_TA_SHIFT;
*ba = (header & DECT_A_BA_MASK) >> DECT_A_BA_SHIFT;
afieldti = proto_tree_add_item(DectTree, hf_dect_A, tvb, offset, DECT_AFIELD_SIZE, FALSE);
afieldti = proto_tree_add_item(DectTree, hf_dect_A, tvb, offset, DECT_AFIELD_SIZE, ENC_NA);
AField = proto_item_add_subtree(afieldti, ett_afield);
/* Header */
@ -1490,7 +1490,7 @@ dissect_afield(gboolean dect_packet_type, guint8 *ba,
ep_strbuf_append_printf(afield_str,"RFPI: %s",tvb_bytes_to_str(tvb, offset, 5));
proto_tree_add_string(ColumnsTree, hf_dect_cc_AField, tvb, offset, 1, afield_str->str);
proto_tree_add_item(atailti, hf_dect_A_Tail_Nt, tvb, offset, 5, FALSE);
proto_tree_add_item(atailti, hf_dect_A_Tail_Nt, tvb, offset, 5, ENC_NA);
}
else if(ta==DECT_TA_QT)
{
@ -1660,7 +1660,7 @@ dissect_afield(gboolean dect_packet_type, guint8 *ba,
ep_strbuf_append_printf(afield_str,"Multi-Frame No.: %s",tvb_bytes_to_str(tvb, offset, 3));
proto_tree_add_string(ColumnsTree, hf_dect_cc_AField, tvb, offset, 1, afield_str->str);
proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_6_Mfn, tvb, offset, 3, FALSE);
proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_6_Mfn, tvb, offset, 3, ENC_NA);
offset+=3;
/* due to addition further down */
@ -1977,15 +1977,15 @@ dissect_dect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(DectTree, hf_dect_rssi, tvb, offset, 1, FALSE);
offset++;
proto_tree_add_item(DectTree, hf_dect_preamble, tvb, offset, 3, FALSE);
proto_tree_add_item(DectTree, hf_dect_preamble, tvb, offset, 3, ENC_NA);
offset+=3;
typeti=proto_tree_add_item(DectTree, hf_dect_type, tvb, offset, 2, FALSE);
typeti=proto_tree_add_item(DectTree, hf_dect_type, tvb, offset, 2, ENC_NA);
type=tvb_get_ntohs(tvb, offset);
offset+=2;
columnstreeti = proto_tree_add_item(DectTree, hf_dect_cc, tvb, 0, 0, FALSE);
columnstreeti = proto_tree_add_item(DectTree, hf_dect_cc, tvb, 0, 0, ENC_NA);
ColumnsTree = proto_item_add_subtree(columnstreeti, ett_afield);
switch(type) {

10
epan/dissectors/packet-dhcp-failover.c
View File

@ -462,7 +462,7 @@ dissect_dhcpfo_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* if there are any additional header bytes */
if (poffset != offset) {
proto_tree_add_item(dhcpfo_tree, hf_dhcpfo_additional_HB, tvb,
offset, poffset-offset, ENC_BIG_ENDIAN);
offset, poffset-offset, ENC_NA);
offset = poffset;
}
@ -471,7 +471,7 @@ dissect_dhcpfo_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
return; /* no payload */
/* create display subtree for the payload */
pi = proto_tree_add_item(dhcpfo_tree, hf_dhcpfo_payload_data,
tvb, poffset, length-poffset, ENC_BIG_ENDIAN);
tvb, poffset, length-poffset, ENC_NA);
payload_tree = proto_item_add_subtree(pi, ett_fo_payload);
while (offset < length) {
opcode = tvb_get_ntohs(tvb, offset);
@ -479,7 +479,7 @@ dissect_dhcpfo_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
oi = proto_tree_add_item(payload_tree,
hf_dhcpfo_dhcp_style_option, tvb, offset,
option_length+4, ENC_BIG_ENDIAN);
option_length+4, ENC_NA);
option_tree = proto_item_add_subtree(oi, ett_fo_option);
/*** DHCP-Style-Options ****/
@ -818,7 +818,7 @@ dissect_dhcpfo_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
case DHCP_FO_PD_VENDOR_OPTION:
proto_tree_add_item(option_tree,
hf_dhcpfo_vendor_option, tvb, offset,
option_length, ENC_BIG_ENDIAN);
option_length, ENC_NA);
break;
case DHCP_FO_PD_MAX_UNACKED_BNDUPD:
@ -857,7 +857,7 @@ dissect_dhcpfo_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
case DHCP_FO_PD_HASH_BUCKET_ASSIGNMENT:
proto_tree_add_item(option_tree,
hf_dhcpfo_hash_bucket_assignment, tvb,
offset, option_length, ENC_BIG_ENDIAN);
offset, option_length, ENC_NA);
break;
case DHCP_FO_PD_MESSAGE_DIGEST:

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

@ -1123,7 +1123,7 @@ dhcpv6_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree,
/* Right now, none of the options can be filtered at, so provide a hex
array for minimalistic filtering */
if (optlen)
proto_tree_add_item(subtree, hf_option_value, tvb, off, optlen, FALSE);
proto_tree_add_item(subtree, hf_option_value, tvb, off, optlen, ENC_NA);
switch (opttype) {
case OPTION_CLIENTID:

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

@ -395,7 +395,7 @@ dissect_diameter_avp(diam_ctx_t* c, tvbuff_t* tvb, int offset)
}
/* Add root of tree for this AVP */
avp_item = proto_tree_add_item(c->tree,hf_diameter_avp,tvb,offset,len,FALSE);
avp_item = proto_tree_add_item(c->tree,hf_diameter_avp,tvb,offset,len,ENC_NA);
avp_tree = proto_item_add_subtree(avp_item,a->ett);
pi = proto_tree_add_item(avp_tree,hf_diameter_avp_code,tvb,offset,4,FALSE);

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

@ -240,7 +240,7 @@ dissect_diameter_3gpp_msisdn(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
const char *digit_str;
int length = tvb_length(tvb);
item = proto_tree_add_item(tree, hf_diameter_3gpp_msisdn, tvb, offset, length, ENC_BIG_ENDIAN);
item = proto_tree_add_item(tree, hf_diameter_3gpp_msisdn, tvb, offset, length, ENC_NA);
sub_tree = proto_item_add_subtree(item,diameter_3gpp_msisdn_ett);
dissect_e164_cc(tvb, sub_tree, offset, TRUE);
@ -309,7 +309,7 @@ dissect_diameter_3gpp_tmgi(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
proto_tree *sub_tree;
int offset = 0;
item = proto_tree_add_item(tree, hf_diameter_3gpp_tmgi, tvb, offset, 6, ENC_BIG_ENDIAN);
item = proto_tree_add_item(tree, hf_diameter_3gpp_tmgi, tvb, offset, 6, ENC_NA);
sub_tree = proto_item_add_subtree(item,diameter_3gpp_tmgi_ett);
/* MBMS Service ID consisting of three octets. MBMS Service ID consists of a 6-digit

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

@ -253,7 +253,7 @@ dissect_distcc_doto(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int off
col_append_str(pinfo->cinfo, COL_INFO, "DOTO object ");
proto_tree_add_item(tree, hf_distcc_doto_object, tvb, offset, len, ENC_BIG_ENDIAN);
proto_tree_add_item(tree, hf_distcc_doto_object, tvb, offset, len, ENC_NA);
if(len!=parameter){
proto_tree_add_text(tree, tvb, 0, 0, "[Short DOTO PDU]");
}

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

@ -550,7 +550,7 @@ dissect_dlm3_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
tvb,
offset,
-1,
ENC_LITTLE_ENDIAN);
ENC_NA);
}
}
@ -641,7 +641,7 @@ dissect_dlm3_rcom_lock(tvbuff_t *tvb, proto_tree *tree,
offset += 2;
sub_item = proto_tree_add_item(tree,
hf_dlm3_rl_name, tvb, offset,
DLM3_RESNAME_MAXLEN, ENC_LITTLE_ENDIAN);
DLM3_RESNAME_MAXLEN, ENC_NA);
sub_tree = proto_item_add_subtree(sub_item,
ett_dlm3_rl_name);
@ -653,14 +653,14 @@ dissect_dlm3_rcom_lock(tvbuff_t *tvb, proto_tree *tree,
sub_offset += namelen;
proto_tree_add_item(sub_tree,
hf_dlm3_rl_name_padding, tvb, sub_offset,
DLM3_RESNAME_MAXLEN - namelen, ENC_LITTLE_ENDIAN);
DLM3_RESNAME_MAXLEN - namelen, ENC_NA);
offset += DLM3_RESNAME_MAXLEN;
if (((length - offset) > 0) && (exflags & DLM3_LKF_VALBLK))
proto_tree_add_item(tree,
hf_dlm3_rl_lvb, tvb, offset,
-1,
ENC_LITTLE_ENDIAN);
ENC_NA);
}
@ -735,7 +735,7 @@ dissect_dlm3_rcom(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
tvb,
offset,
-1,
ENC_LITTLE_ENDIAN);
ENC_NA);
offset += 0;
if (rc_type == DLM3_RCOM_LOCK) {

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

@ -2359,7 +2359,7 @@ dnp3_al_process_object(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree
/* Optional text */
file_data_size = al_ptaddr - (data_pos - offset - indexbytes);
if ((file_data_size) > 0) {
proto_tree_add_item(point_tree, hf_dnp3_al_file_data, tvb, data_pos, file_data_size, ENC_LITTLE_ENDIAN);
proto_tree_add_item(point_tree, hf_dnp3_al_file_data, tvb, data_pos, file_data_size, ENC_NA);
data_pos += file_data_size;
}
@ -2382,7 +2382,7 @@ dnp3_al_process_object(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree
/* File data */
file_data_size = al_ptaddr - (data_pos - offset - indexbytes);
if ((file_data_size) > 0) {
proto_tree_add_item(point_tree, hf_dnp3_al_file_data, tvb, data_pos, file_data_size, ENC_LITTLE_ENDIAN);
proto_tree_add_item(point_tree, hf_dnp3_al_file_data, tvb, data_pos, file_data_size, ENC_NA);
data_pos += file_data_size;
}

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

@ -1998,11 +1998,11 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
cur_offset += 2;
salt_len = tvb_get_guint8(tvb, cur_offset);
proto_tree_add_item(rr_tree, hf_dns_nsec3_salt_length, tvb, cur_offset++, 1, FALSE);
proto_tree_add_item(rr_tree, hf_dns_nsec3_salt_value, tvb, cur_offset, salt_len, FALSE);
proto_tree_add_item(rr_tree, hf_dns_nsec3_salt_value, tvb, cur_offset, salt_len, ENC_NA);
cur_offset += salt_len;
hash_len = tvb_get_guint8(tvb, cur_offset);
proto_tree_add_item(rr_tree, hf_dns_nsec3_hash_length, tvb, cur_offset++, 1, FALSE);
proto_tree_add_item(rr_tree, hf_dns_nsec3_hash_value, tvb, cur_offset, hash_len, FALSE);
proto_tree_add_item(rr_tree, hf_dns_nsec3_hash_value, tvb, cur_offset, hash_len, ENC_NA);
cur_offset += hash_len;
rr_len = data_len - (cur_offset - initial_offset);
cur_offset += dissect_type_bitmap(rr_tree, tvb, cur_offset, rr_len);
@ -2026,7 +2026,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
salt_len = tvb_get_guint8(tvb, cur_offset);
proto_tree_add_item(rr_tree, hf_dns_nsec3_salt_length, tvb, cur_offset, 1, FALSE);
cur_offset ++;
proto_tree_add_item(rr_tree, hf_dns_nsec3_salt_value, tvb, cur_offset, salt_len, FALSE);
proto_tree_add_item(rr_tree, hf_dns_nsec3_salt_value, tvb, cur_offset, salt_len, ENC_NA);
}
break;
@ -2377,7 +2377,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
if (rr_len < tsig_siglen)
goto bad_rr;
mac_item = proto_tree_add_item(rr_tree, hf_dns_tsig_mac, tvb, cur_offset, tsig_siglen, FALSE);
mac_item = proto_tree_add_item(rr_tree, hf_dns_tsig_mac, tvb, cur_offset, tsig_siglen, ENC_NA);
mac_tree = proto_item_add_subtree(mac_item, ett_dns_mac);
sub_tvb=tvb_new_subset(tvb, cur_offset, tsig_siglen, tsig_siglen);
@ -2415,7 +2415,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
if (tsig_otherlen != 0) {
if (rr_len < tsig_otherlen)
goto bad_rr;
proto_tree_add_item(rr_tree, hf_dns_tsig_other_data, tvb, cur_offset, tsig_otherlen, FALSE);
proto_tree_add_item(rr_tree, hf_dns_tsig_other_data, tvb, cur_offset, tsig_otherlen, ENC_NA);
cur_offset += tsig_otherlen;
rr_len -= tsig_otherlen;
}
@ -2667,7 +2667,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
if (rr_len < 1)
goto bad_rr;
if (rr_len != 0)
proto_tree_add_item(rr_tree, hf_dns_sshfp_fingerprint, tvb, cur_offset, rr_len, FALSE);
proto_tree_add_item(rr_tree, hf_dns_sshfp_fingerprint, tvb, cur_offset, rr_len, ENC_NA);
}
break;
@ -2714,13 +2714,13 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
if (rr_len < 1)
goto bad_rr;
proto_tree_add_item(rr_tree, hf_dns_hip_hit, tvb, cur_offset, hit_len, FALSE);
proto_tree_add_item(rr_tree, hf_dns_hip_hit, tvb, cur_offset, hit_len, ENC_NA);
cur_offset += hit_len;
rr_len -= hit_len;
if (rr_len < 1)
goto bad_rr;
proto_tree_add_item(rr_tree, hf_dns_hip_pk, tvb, cur_offset, pk_len, FALSE);
proto_tree_add_item(rr_tree, hf_dns_hip_pk, tvb, cur_offset, pk_len, ENC_NA);
cur_offset += pk_len;
rr_len -= pk_len;
@ -2746,7 +2746,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
if (data_len < 1)
goto bad_rr;
proto_tree_add_item(rr_tree, hf_dns_dhcid_rdata, tvb, cur_offset, data_len, FALSE);
proto_tree_add_item(rr_tree, hf_dns_dhcid_rdata, tvb, cur_offset, data_len, ENC_NA);
}
@ -2929,7 +2929,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
col_append_fstr(cinfo, COL_INFO, " %s", name);
if (data_len < 1)
goto bad_rr;
proto_tree_add_item(rr_tree, hf_dns_nsap_rdata, tvb, cur_offset, data_len, FALSE);
proto_tree_add_item(rr_tree, hf_dns_nsap_rdata, tvb, cur_offset, data_len, ENC_NA);
}
break;

78
epan/dissectors/packet-dplay.c
View File

@ -460,7 +460,7 @@ static gint dissect_sockaddr_in(proto_tree *tree, tvbuff_t *tvb, gint offset)
proto_tree_add_item(sa_tree, hf_dplay_saddr_af, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2;
proto_tree_add_item(sa_tree, hf_dplay_saddr_port, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2;
proto_tree_add_item(sa_tree, hf_dplay_saddr_ip, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4;
proto_tree_add_item(sa_tree, hf_dplay_saddr_padding, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8;
proto_tree_add_item(sa_tree, hf_dplay_saddr_padding, tvb, offset, 8, ENC_NA); offset += 8;
return offset;
}
@ -499,14 +499,14 @@ static gint dissect_session_desc(proto_tree *tree, tvbuff_t *tvb, gint offset)
proto_tree_add_item(tree, hf_dplay_game_guid, tvb, offset, 16, ENC_BIG_ENDIAN); offset += 16;
proto_tree_add_item(tree, hf_dplay_max_players, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4;
proto_tree_add_item(tree, hf_dplay_curr_players, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4;
proto_tree_add_item(tree, hf_dplay_sess_name_ptr, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4;
proto_tree_add_item(tree, hf_dplay_passwd_ptr, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4;
proto_tree_add_item(tree, hf_dplay_sess_desc_reserved_1, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4;
proto_tree_add_item(tree, hf_dplay_sess_desc_reserved_2, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4;
proto_tree_add_item(tree, hf_dplay_sess_desc_user_1, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4;
proto_tree_add_item(tree, hf_dplay_sess_desc_user_2, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4;
proto_tree_add_item(tree, hf_dplay_sess_desc_user_3, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4;
proto_tree_add_item(tree, hf_dplay_sess_desc_user_4, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4;
proto_tree_add_item(tree, hf_dplay_sess_name_ptr, tvb, offset, 4, ENC_NA); offset += 4;
proto_tree_add_item(tree, hf_dplay_passwd_ptr, tvb, offset, 4, ENC_NA); offset += 4;
proto_tree_add_item(tree, hf_dplay_sess_desc_reserved_1, tvb, offset, 4, ENC_NA); offset += 4;
proto_tree_add_item(tree, hf_dplay_sess_desc_reserved_2, tvb, offset, 4, ENC_NA); offset += 4;
proto_tree_add_item(tree, hf_dplay_sess_desc_user_1, tvb, offset, 4, ENC_NA); offset += 4;
proto_tree_add_item(tree, hf_dplay_sess_desc_user_2, tvb, offset, 4, ENC_NA); offset += 4;
proto_tree_add_item(tree, hf_dplay_sess_desc_user_3, tvb, offset, 4, ENC_NA); offset += 4;
proto_tree_add_item(tree, hf_dplay_sess_desc_user_4, tvb, offset, 4, ENC_NA); offset += 4;
return offset;
}
@ -530,7 +530,7 @@ static gint dissect_packed_player(proto_tree *tree, tvbuff_t *tvb, gint offset)
proto_tree_add_boolean(flags_tree, hf_dplay_pp_flag_sysplayer, tvb, offset, 4, flags);
offset += 4;
proto_tree_add_item(tree, hf_dplay_pp_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4;
proto_tree_add_item(tree, hf_dplay_pp_id, tvb, offset, 4, ENC_NA); offset += 4;
sn_len = tvb_get_letohl(tvb, offset);
proto_tree_add_item(tree, hf_dplay_pp_short_name_len, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4;
@ -543,10 +543,10 @@ static gint dissect_packed_player(proto_tree *tree, tvbuff_t *tvb, gint offset)
num_players = tvb_get_letohl(tvb, offset);
proto_tree_add_item(tree, hf_dplay_pp_num_players, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4;
proto_tree_add_item(tree, hf_dplay_pp_system_player, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4;
proto_tree_add_item(tree, hf_dplay_pp_system_player, tvb, offset, 4, ENC_NA); offset += 4;
proto_tree_add_item(tree, hf_dplay_pp_fixed_size, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4;
proto_tree_add_item(tree, hf_dplay_pp_dialect, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4;
proto_tree_add_item(tree, hf_dplay_pp_unknown_1, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4;
proto_tree_add_item(tree, hf_dplay_pp_unknown_1, tvb, offset, 4, ENC_NA); offset += 4;
if (sn_len)
offset = display_unicode_string(tree, hf_dplay_pp_short_name, tvb, offset);
@ -554,21 +554,21 @@ static gint dissect_packed_player(proto_tree *tree, tvbuff_t *tvb, gint offset)
if (ln_len)
offset = display_unicode_string(tree, hf_dplay_pp_long_name, tvb, offset);
proto_tree_add_item(tree, hf_dplay_pp_sp_data, tvb, offset, sd_len, ENC_BIG_ENDIAN);
proto_tree_add_item(tree, hf_dplay_pp_sp_data, tvb, offset, sd_len, ENC_NA);
offset += sd_len;
if (pd_len) {
proto_tree_add_item(tree, hf_dplay_pp_player_data, tvb, offset, pd_len, ENC_BIG_ENDIAN);
proto_tree_add_item(tree, hf_dplay_pp_player_data, tvb, offset, pd_len, ENC_NA);
offset += pd_len;
}
for (i=0; i < num_players; ++i) {
proto_tree_add_item(tree, hf_dplay_pp_player_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4;
proto_tree_add_item(tree, hf_dplay_pp_player_id, tvb, offset, 4, ENC_NA); offset += 4;
}
/* Size seems to miss the unknown empty dword */
if (size + 4 > offset) {
proto_tree_add_item(tree, hf_dplay_pp_parent_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4;
proto_tree_add_item(tree, hf_dplay_pp_parent_id, tvb, offset, 4, ENC_NA); offset += 4;
}
return offset;
@ -619,7 +619,7 @@ static gint dissect_dplay_super_packed_player(proto_tree *tree, tvbuff_t *tvb, g
proto_tree_add_boolean(flags_tree, hf_dplay_spp_flags_nameserver, tvb, offset, 4, flags);
proto_tree_add_boolean(flags_tree, hf_dplay_spp_flags_sysplayer, tvb, offset, 4, flags);
offset += 4;
proto_tree_add_item(tree, hf_dplay_spp_id, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4;
proto_tree_add_item(tree, hf_dplay_spp_id, tvb, offset, 4, ENC_NA); offset += 4;
info_mask = tvb_get_letohl(tvb, offset);
@ -646,7 +646,7 @@ static gint dissect_dplay_super_packed_player(proto_tree *tree, tvbuff_t *tvb, g
if (is_sysplayer) {
proto_tree_add_item(tree, hf_dplay_spp_dialect, tvb, offset, 4, ENC_LITTLE_ENDIAN);
} else {
proto_tree_add_item(tree, hf_dplay_spp_sys_player_id, tvb, offset, 4, ENC_BIG_ENDIAN);
proto_tree_add_item(tree, hf_dplay_spp_sys_player_id, tvb, offset, 4, ENC_NA);
}
offset += 4;
@ -662,7 +662,7 @@ static gint dissect_dplay_super_packed_player(proto_tree *tree, tvbuff_t *tvb, g
len = spp_get_value(pd_length_type, tvb, offset, &player_data_length);
proto_tree_add_item(tree, hf_dplay_spp_player_data_length, tvb, offset, len, ENC_LITTLE_ENDIAN);
offset += len;
proto_tree_add_item(tree, hf_dplay_spp_player_data, tvb, offset, player_data_length, ENC_BIG_ENDIAN);
proto_tree_add_item(tree, hf_dplay_spp_player_data, tvb, offset, player_data_length, ENC_NA);
offset += player_data_length;
}
@ -670,7 +670,7 @@ static gint dissect_dplay_super_packed_player(proto_tree *tree, tvbuff_t *tvb, g
len = spp_get_value(sp_length_type, tvb, offset, &sp_data_length);
proto_tree_add_item(tree, hf_dplay_spp_sp_data_length, tvb, offset, len, ENC_LITTLE_ENDIAN);
offset += len;
proto_tree_add_item(tree, hf_dplay_spp_sp_data, tvb, offset, sp_data_length, ENC_BIG_ENDIAN);
proto_tree_add_item(tree, hf_dplay_spp_sp_data, tvb, offset, sp_data_length, ENC_NA);
offset += sp_data_length;
}
@ -681,12 +681,12 @@ static gint dissect_dplay_super_packed_player(proto_tree *tree, tvbuff_t *tvb, g
proto_tree_add_item(tree, hf_dplay_spp_player_count, tvb, offset, len, ENC_LITTLE_ENDIAN);
offset += len;
for (i=0; i < player_count; ++i) {
proto_tree_add_item(tree, hf_dplay_spp_player_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4;
proto_tree_add_item(tree, hf_dplay_spp_player_id, tvb, offset, 4, ENC_NA); offset += 4;
}
}
if (have_parent_id) {
proto_tree_add_item(tree, hf_dplay_spp_parent_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4;
proto_tree_add_item(tree, hf_dplay_spp_parent_id, tvb, offset, 4, ENC_NA); offset += 4;
}
if (shortcut_count_type) {
@ -696,7 +696,7 @@ static gint dissect_dplay_super_packed_player(proto_tree *tree, tvbuff_t *tvb, g
proto_tree_add_item(tree, hf_dplay_spp_shortcut_count, tvb, offset, len, ENC_LITTLE_ENDIAN);
offset += len;
for (i=0; i < shortcut_count; ++i) {
proto_tree_add_item(tree, hf_dplay_spp_shortcut_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4;
proto_tree_add_item(tree, hf_dplay_spp_shortcut_id, tvb, offset, 4, ENC_NA); offset += 4;
}
}
@ -707,8 +707,8 @@ static gint dissect_security_desc(proto_tree *tree, tvbuff_t *tvb, gint offset)
{
proto_tree_add_item(tree, hf_dplay_sd_size, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4;
proto_tree_add_item(tree, hf_dplay_sd_flags, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4;
proto_tree_add_item(tree, hf_dplay_sd_sspi, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4;
proto_tree_add_item(tree, hf_dplay_sd_capi, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4;
proto_tree_add_item(tree, hf_dplay_sd_sspi, tvb, offset, 4, ENC_NA); offset += 4;
proto_tree_add_item(tree, hf_dplay_sd_capi, tvb, offset, 4, ENC_NA); offset += 4;
proto_tree_add_item(tree, hf_dplay_sd_capi_type, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4;
proto_tree_add_item(tree, hf_dplay_sd_enc_alg, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4;
return offset;
@ -794,7 +794,7 @@ static gint dissect_type07_message(proto_tree *tree, tvbuff_t *tvb, gint offset)
{
guint32 sspi_offset, capi_offset;
proto_tree_add_item(tree, hf_dplay_type_07_dpid, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4;
proto_tree_add_item(tree, hf_dplay_type_07_dpid, tvb, offset, 4, ENC_NA); offset += 4;
offset = dissect_security_desc(tree, tvb, offset);
sspi_offset = tvb_get_letohl(tvb, offset);
@ -819,9 +819,9 @@ static gint dissect_player_message(proto_tree *tree, tvbuff_t *tvb, gint offset)
{
guint32 pp_ofs;
proto_tree_add_item(tree, hf_dplay_multi_id_to, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4;
proto_tree_add_item(tree, hf_dplay_multi_player_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4;
proto_tree_add_item(tree, hf_dplay_multi_group_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4;
proto_tree_add_item(tree, hf_dplay_multi_id_to, tvb, offset, 4, ENC_NA); offset += 4;
proto_tree_add_item(tree, hf_dplay_multi_player_id, tvb, offset, 4, ENC_NA); offset += 4;
proto_tree_add_item(tree, hf_dplay_multi_group_id, tvb, offset, 4, ENC_NA); offset += 4;
pp_ofs = tvb_get_letohl(tvb, offset);
proto_tree_add_item(tree, hf_dplay_multi_create_offset, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4;
proto_tree_add_item(tree, hf_dplay_multi_password_offset, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4;
@ -836,12 +836,12 @@ static gint dissect_type0f_message(proto_tree *tree, tvbuff_t *tvb, gint offset)
{
guint32 data_size;
proto_tree_add_item(tree, hf_dplay_type_0f_id_to, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4;
proto_tree_add_item(tree, hf_dplay_type_0f_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4;
proto_tree_add_item(tree, hf_dplay_type_0f_id_to, tvb, offset, 4, ENC_NA); offset += 4;
proto_tree_add_item(tree, hf_dplay_type_0f_id, tvb, offset, 4, ENC_NA); offset += 4;
data_size = tvb_get_letohl(tvb, offset);
proto_tree_add_item(tree, hf_dplay_type_0f_data_size, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4;
proto_tree_add_item(tree, hf_dplay_type_0f_data_offset, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4;
proto_tree_add_item(tree, hf_dplay_type_0f_data, tvb, offset, data_size, ENC_BIG_ENDIAN);
proto_tree_add_item(tree, hf_dplay_type_0f_data, tvb, offset, data_size, ENC_NA);
offset += data_size;
return offset;
@ -851,9 +851,9 @@ static gint dissect_type13_message(proto_tree *tree, tvbuff_t *tvb, gint offset)
{
guint32 pp_ofs, pw_ofs;
proto_tree_add_item(tree, hf_dplay_type_13_id_to, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4;
proto_tree_add_item(tree, hf_dplay_type_13_player_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4;
proto_tree_add_item(tree, hf_dplay_type_13_group_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4;
proto_tree_add_item(tree, hf_dplay_type_13_id_to, tvb, offset, 4, ENC_NA); offset += 4;
proto_tree_add_item(tree, hf_dplay_type_13_player_id, tvb, offset, 4, ENC_NA); offset += 4;
proto_tree_add_item(tree, hf_dplay_type_13_group_id, tvb, offset, 4, ENC_NA); offset += 4;
pp_ofs = tvb_get_letohl(tvb, offset);
proto_tree_add_item(tree, hf_dplay_type_13_create_offset, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4;
pw_ofs = tvb_get_letohl(tvb, offset);
@ -919,7 +919,7 @@ static gint dissect_type15_message(proto_tree *tree, tvbuff_t *tvb, gint offset)
static gint dissect_ping_message(proto_tree *tree, tvbuff_t *tvb, gint offset)
{
proto_tree_add_item(tree, hf_dplay_ping_id_from, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4;
proto_tree_add_item(tree, hf_dplay_ping_id_from, tvb, offset, 4, ENC_NA); offset += 4;
proto_tree_add_item(tree, hf_dplay_ping_tick_count, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4;
return offset;
@ -929,7 +929,7 @@ static gint dissect_type1a_message(proto_tree *tree, tvbuff_t *tvb, gint offset)
{
guint32 sn_ofs, pw_ofs;
proto_tree_add_item(tree, hf_dplay_type_1a_id_to, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4;
proto_tree_add_item(tree, hf_dplay_type_1a_id_to, tvb, offset, 4, ENC_NA); offset += 4;
sn_ofs = tvb_get_letohl(tvb, offset);
proto_tree_add_item(tree, hf_dplay_type_1a_sess_name_ofs, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4;
pw_ofs = tvb_get_letohl(tvb, offset);
@ -1002,7 +1002,7 @@ static gint dissect_type29_message(proto_tree *tree, tvbuff_t *tvb, gint offset)
static gint dissect_type2f_message(proto_tree *tree, tvbuff_t *tvb, gint offset)
{
proto_tree_add_item(tree, hf_dplay_type_2f_dpid, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4;
proto_tree_add_item(tree, hf_dplay_type_2f_dpid, tvb, offset, 4, ENC_NA); offset += 4;
return offset;
}
@ -1150,7 +1150,7 @@ static void dissect_dplay_player_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tr
offset = dissect_sockaddr_in(data_tree, tvb, offset);
/* Now there's two dplay IDs iff the session desc does not have the
* "short player message" flag set */
proto_tree_add_item(data_tree, hf_dplay_player_msg, tvb, offset, -1, ENC_BIG_ENDIAN);
proto_tree_add_item(data_tree, hf_dplay_player_msg, tvb, offset, -1, ENC_NA);
}
}

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

@ -238,7 +238,7 @@ dissect_dsi_open_session(tvbuff_t *tvb, proto_tree *dsi_tree, gint offset, gint
proto_tree_add_item(tree, hf_dsi_replay_cache_size, tvb, offset, 4, FALSE);
break;
default:
proto_tree_add_item(tree, hf_dsi_open_option, tvb, offset, len, FALSE);
proto_tree_add_item(tree, hf_dsi_open_option, tvb, offset, len, ENC_NA);
}
dsi_length -= len + 2;
@ -396,10 +396,10 @@ dissect_dsi_reply_get_status(tvbuff_t *tvb, proto_tree *tree, gint offset)
ofs = offset +tvb_get_ntohs(tvb, offset +AFPSTATUS_ICONOFF);
if (ofs)
proto_tree_add_item(tree, hf_dsi_server_icon, tvb, ofs, 256, FALSE);
proto_tree_add_item(tree, hf_dsi_server_icon, tvb, ofs, 256, ENC_NA);
if (sign_ofs) {
proto_tree_add_item(tree, hf_dsi_server_signature, tvb, sign_ofs, 16, FALSE);
proto_tree_add_item(tree, hf_dsi_server_signature, tvb, sign_ofs, 16, ENC_NA);
}
if (adr_ofs) {
@ -465,7 +465,7 @@ dissect_dsi_reply_get_status(tvbuff_t *tvb, proto_tree *tree, gint offset)
ofs++;
proto_tree_add_item(sub_tree, hf_dsi_server_addr_type, tvb, ofs, 1, FALSE);
ofs++;
proto_tree_add_item(sub_tree, hf_dsi_server_addr_value,tvb, ofs, len, FALSE);
proto_tree_add_item(sub_tree, hf_dsi_server_addr_value,tvb, ofs, len, ENC_NA);
ofs += len;
}
}

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

@ -881,7 +881,7 @@ dissect_dtls_change_cipher_spec(tvbuff_t *tvb,
val_to_str_const(*conv_version, ssl_version_short_names, "SSL"),
val_to_str(content_type, ssl_31_content_type, "unknown"));
proto_tree_add_item(tree, hf_dtls_change_cipher_spec, tvb,
offset++, 1, FALSE);
offset++, 1, ENC_NA);
}
}
@ -1864,7 +1864,7 @@ dissect_dtls_hnd_finished(tvbuff_t *tvb, proto_tree *tree, guint32 offset,
switch(*conv_version) {
case SSL_VER_DTLS:
proto_tree_add_item(tree, hf_dtls_handshake_finished,
tvb, offset, 12, FALSE);
tvb, offset, 12, ENC_NA);
break;
}
}

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

@ -156,7 +156,7 @@ dissect_diagnostic_information_parameter(tvbuff_t *parameter_tvb, proto_tree *pa
guint16 diag_info_length;
diag_info_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH;
proto_tree_add_item(parameter_tree, hf_diag_info, parameter_tvb, PARAMETER_VALUE_OFFSET, diag_info_length, ENC_BIG_ENDIAN);
proto_tree_add_item(parameter_tree, hf_diag_info, parameter_tvb, PARAMETER_VALUE_OFFSET, diag_info_length, ENC_NA);
proto_item_append_text(parameter_item, " (%u byte%s)", diag_info_length, plurality(diag_info_length, "", "s"));
}
@ -192,7 +192,7 @@ dissect_heartbeat_data_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_
guint16 heartbeat_data_length;
heartbeat_data_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH;
proto_tree_add_item(parameter_tree, hf_heartbeat_data, parameter_tvb, HEARTBEAT_DATA_OFFSET, heartbeat_data_length, ENC_BIG_ENDIAN);
proto_tree_add_item(parameter_tree, hf_heartbeat_data, parameter_tvb, HEARTBEAT_DATA_OFFSET, heartbeat_data_length, ENC_NA);
proto_item_append_text(parameter_item, " (%u byte%s)", heartbeat_data_length, plurality(heartbeat_data_length, "", "s"));
}
@ -385,7 +385,7 @@ dissect_dlc_status_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree
/* FIXME: This can be done better */
parameter_value_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH;
if (parameter_value_length > 0)
proto_tree_add_item(parameter_tree, hf_states, parameter_tvb, PARAMETER_VALUE_OFFSET, parameter_value_length, ENC_BIG_ENDIAN);
proto_tree_add_item(parameter_tree, hf_states, parameter_tvb, PARAMETER_VALUE_OFFSET, parameter_value_length, ENC_NA);
}
static void
@ -395,7 +395,7 @@ dissect_unknown_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, p
parameter_value_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH;
if (parameter_value_length > 0)
proto_tree_add_item(parameter_tree, hf_parameter_value, parameter_tvb, PARAMETER_VALUE_OFFSET, parameter_value_length, ENC_BIG_ENDIAN);
proto_tree_add_item(parameter_tree, hf_parameter_value, parameter_tvb, PARAMETER_VALUE_OFFSET, parameter_value_length, ENC_NA);
proto_item_append_text(parameter_item, " with tag %u and %u byte%s value",
tvb_get_ntohs(parameter_tvb, PARAMETER_TAG_OFFSET), parameter_value_length, plurality(parameter_value_length, "", "s"));
}
@ -507,7 +507,7 @@ dissect_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *tree,
};
if (padding_length > 0)
proto_tree_add_item(parameter_tree, hf_parameter_padding, parameter_tvb, PARAMETER_HEADER_OFFSET + length, padding_length, ENC_BIG_ENDIAN);
proto_tree_add_item(parameter_tree, hf_parameter_padding, parameter_tvb, PARAMETER_HEADER_OFFSET + length, padding_length, ENC_NA);
}
static void

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

@ -1360,7 +1360,7 @@ dissect_cc_item(tvbuff_t *tvb, gint offset,
break;
default:
proto_tree_add_item(cc_item_tree, hf_dvbci_cc_data,
tvb, offset, dat_len, ENC_BIG_ENDIAN);
tvb, offset, dat_len, ENC_NA);
break;
}
offset += dat_len;
@ -2319,7 +2319,7 @@ dissect_dvbci_payload_cc(guint32 tag, gint len_field _U_,
break;
/* please note that payload != body */
proto_tree_add_item(tree, hf_dvbci_sac_body, tvb, offset,
tvb_reported_length_remaining(tvb, offset), ENC_BIG_ENDIAN);
tvb_reported_length_remaining(tvb, offset), ENC_NA);
break;
default:
break;
@ -2380,7 +2380,7 @@ dissect_dvbci_payload_ami(guint32 tag, gint len_field _U_,
offset++;
if (req_type==REQ_TYPE_FILE_HASH) {
proto_tree_add_item(tree, hf_dvbci_file_hash,
tvb, offset, 16, ENC_BIG_ENDIAN);
tvb, offset, 16, ENC_NA);
offset += 16;
}
if (tvb_reported_length_remaining(tvb, offset) <= 0)
@ -2397,7 +2397,7 @@ dissect_dvbci_payload_ami(guint32 tag, gint len_field _U_,
}
else if (req_type==REQ_TYPE_DATA) {
proto_tree_add_item(tree, hf_dvbci_ami_priv_data, tvb, offset,
tvb_reported_length_remaining(tvb, offset), ENC_BIG_ENDIAN);
tvb_reported_length_remaining(tvb, offset), ENC_NA);
}
break;
case T_FILE_ACKNOWLEDGE:
@ -2435,14 +2435,14 @@ dissect_dvbci_payload_ami(guint32 tag, gint len_field _U_,
offset += 4;
if (file_data_len > 0) {
proto_tree_add_item(tree, hf_dvbci_file_data,
tvb, offset, file_data_len, ENC_BIG_ENDIAN);
tvb, offset, file_data_len, ENC_NA);
}
}
else if (req_type==REQ_TYPE_DATA) {
if (tvb_reported_length_remaining(tvb, offset) <= 0)
break;
proto_tree_add_item(tree, hf_dvbci_ami_priv_data, tvb, offset,
tvb_reported_length_remaining(tvb, offset), ENC_BIG_ENDIAN);
tvb_reported_length_remaining(tvb, offset), ENC_NA);
}
else if (req_type==REQ_TYPE_REQ) {
if (tree) {
@ -2467,13 +2467,13 @@ dissect_dvbci_payload_ami(guint32 tag, gint len_field _U_,
case T_APP_ABORT_REQUEST:
if (tvb_reported_length_remaining(tvb, offset) > 0) {
proto_tree_add_item(tree, hf_dvbci_abort_req_code, tvb, offset,
tvb_reported_length_remaining(tvb, offset), ENC_BIG_ENDIAN);
tvb_reported_length_remaining(tvb, offset), ENC_NA);
}
break;
case T_APP_ABORT_ACK:
if (tvb_reported_length_remaining(tvb, offset) > 0) {
proto_tree_add_item(tree, hf_dvbci_abort_ack_code, tvb, offset,
tvb_reported_length_remaining(tvb, offset), ENC_BIG_ENDIAN);
tvb_reported_length_remaining(tvb, offset), ENC_NA);
}
break;
default:
@ -2666,7 +2666,7 @@ dissect_dvbci_payload_sas(guint32 tag, gint len_field _U_,
tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
proto_tree_add_item(tree, hf_dvbci_sas_msg,
tvb, offset, msg_len, ENC_BIG_ENDIAN);
tvb, offset, msg_len, ENC_NA);
break;
default:
break;

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

@ -249,7 +249,7 @@ dissect_v3_report(tvbuff_t *tvb, proto_tree *parent_tree, int offset)
int old_offset_a = offset;
item = proto_tree_add_item(parent_tree, hf_route,
tvb, offset, -1, FALSE);
tvb, offset, -1, ENC_NA);
tree = proto_item_add_subtree(item, ett_route);
m0 = 0xff;
@ -356,7 +356,7 @@ dissect_dvmrp_v3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int
proto_item *item;
item = proto_tree_add_item(parent_tree, hf_capabilities,
tvb, offset, 1, FALSE);
tvb, offset, 1, ENC_NA);
tree = proto_item_add_subtree(item, ett_capabilities);
count = tvb_get_guint8(tvb, offset);
@ -473,7 +473,7 @@ dissect_dvmrp_v3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int
proto_item *item;
item = proto_tree_add_item(parent_tree, hf_flags,
tvb, offset, 1, FALSE);
tvb, offset, 1, ENC_NA);
tree = proto_item_add_subtree(item, ett_flags);
proto_tree_add_item(tree, hf_flag_tunnel, tvb,
@ -546,7 +546,7 @@ dissect_dvmrp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int
int old_offset = offset;
item = proto_tree_add_item(parent_tree, hf_commands,
tvb, offset, -1, FALSE);
tvb, offset, -1, ENC_NA);
tree = proto_item_add_subtree(item, ett_commands);
cmd = tvb_get_guint8(tvb, offset);

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

@ -242,19 +242,19 @@ dissect_eapol(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
offset, 8, FALSE);
offset += 8;
proto_tree_add_item(eapol_tree, hf_eapol_wpa_keydes_nonce, tvb, offset,
32, FALSE);
32, ENC_NA);
offset += 32;
proto_tree_add_item(eapol_tree, hf_eapol_keydes_key_iv, tvb,
offset, 16, FALSE);
offset, 16, ENC_NA);
offset += 16;
proto_tree_add_item(eapol_tree, hf_eapol_wpa_keydes_rsc, tvb, offset,
8, FALSE);
8, ENC_NA);
offset += 8;
proto_tree_add_item(eapol_tree, hf_eapol_wpa_keydes_id, tvb, offset, 8,
FALSE);
ENC_NA);
offset += 8;
proto_tree_add_item(eapol_tree, hf_eapol_wpa_keydes_mic, tvb, offset,
16, FALSE);
16, ENC_NA);
offset += 16;
eapol_data_len = tvb_get_ntohs(tvb, offset);
proto_tree_add_uint(eapol_tree, hf_eapol_wpa_keydes_datalen, tvb,
@ -262,7 +262,7 @@ dissect_eapol(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
offset += 2;
if (eapol_data_len != 0) {
ti = proto_tree_add_item(eapol_tree, hf_eapol_wpa_keydes_data,
tvb, offset, eapol_data_len, FALSE);
tvb, offset, eapol_data_len, ENC_NA);
if ((keyinfo & KEY_INFO_ENCR_KEY_DATA_MASK) ||
!(keyinfo & KEY_INFO_KEY_TYPE_MASK)) {
/* RSN: EAPOL-Key Key Data is encrypted.
@ -284,7 +284,7 @@ dissect_eapol(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
offset, 8, FALSE);
offset += 8;
proto_tree_add_item(eapol_tree, hf_eapol_keydes_key_iv, tvb,
offset, 16, FALSE);
offset, 16, ENC_NA);
offset += 16;
key_index = tvb_get_guint8(tvb, offset);
ti = proto_tree_add_text(eapol_tree, tvb, offset, 1,
@ -298,12 +298,12 @@ dissect_eapol(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
tvb, offset, 1, key_index);
offset += 1;
proto_tree_add_item(eapol_tree, hf_eapol_keydes_key_signature, tvb,
offset, 16, FALSE);
offset, 16, ENC_NA);
offset += 16;
if (eapol_key_len != 0) {
if (eapol_len > 44) { /* Size of rc4 key with no key content */
proto_tree_add_item(eapol_tree, hf_eapol_keydes_key, tvb, offset,
eapol_key_len, FALSE);
eapol_key_len, ENC_NA);
} else {
/* IEEE 802.1X-2004 7.6.3.6: If no bytes remain, then */
proto_tree_add_text(eapol_tree, tvb, offset, 0, "Key: Use key locally generated by peer");

92
epan/dissectors/packet-edonkey.c
View File

@ -681,20 +681,20 @@ static int dissect_edonkey_metatag(tvbuff_t *tvb, packet_info *pinfo _U_,
case EDONKEY_MTAG_HASH:
/* <Tag> ::= HASH */
tag_length += 16;
ti = proto_tree_add_item(tree, hf_edonkey_metatag, tvb, offset, tag_length, FALSE);
ti = proto_tree_add_item(tree, hf_edonkey_metatag, tvb, offset, tag_length, ENC_NA);
metatag_tree = proto_item_add_subtree(ti, ett_edonkey_metatag);
proto_tree_add_uint(metatag_tree, hf_edonkey_metatag_type, tvb, offset, 1, tag_type);
if (tag_type==real_tag_type)
proto_tree_add_uint(metatag_tree, hf_edonkey_metatag_namesize, tvb, offset+1, 2, tag_name_size);
edonkey_tree_add_metatag_name(metatag_tree, tvb, tag_offset-tag_name_size, tag_name_size, special_tagtype);
proto_tree_add_item(metatag_tree, hf_edonkey_hash, tvb, tag_offset, 16, FALSE);
proto_tree_add_item(metatag_tree, hf_edonkey_hash, tvb, tag_offset, 16, ENC_NA);
break;
case EDONKEY_MTAG_STRING:
/* <Tag> ::= <Length (guint16)> <String> */
string_length = tvb_get_letohs(tvb, tag_offset);
tag_length += 2+string_length;
ti = proto_tree_add_item(tree, hf_edonkey_metatag, tvb, offset, tag_length, FALSE);
ti = proto_tree_add_item(tree, hf_edonkey_metatag, tvb, offset, tag_length, ENC_NA);
metatag_tree = proto_item_add_subtree(ti, ett_edonkey_metatag);
proto_tree_add_uint(metatag_tree, hf_edonkey_metatag_type, tvb, offset, 1, tag_type);
if (tag_type==real_tag_type)
@ -707,7 +707,7 @@ static int dissect_edonkey_metatag(tvbuff_t *tvb, packet_info *pinfo _U_,
case EDONKEY_MTAG_DWORD:
/* <Tag> ::= guint32 */
tag_length += 4;
ti = proto_tree_add_item(tree, hf_edonkey_metatag, tvb, offset, tag_length, FALSE);
ti = proto_tree_add_item(tree, hf_edonkey_metatag, tvb, offset, tag_length, ENC_NA);
metatag_tree = proto_item_add_subtree(ti, ett_edonkey_metatag);
proto_tree_add_uint(metatag_tree, hf_edonkey_metatag_type, tvb, offset, 1, tag_type);
if (tag_type==real_tag_type)
@ -732,7 +732,7 @@ static int dissect_edonkey_metatag(tvbuff_t *tvb, packet_info *pinfo _U_,
case EDONKEY_MTAG_FLOAT:
/* <Tag> ::= 4 byte float */
tag_length += 4;
ti = proto_tree_add_item(tree, hf_edonkey_metatag, tvb, offset, tag_length, FALSE);
ti = proto_tree_add_item(tree, hf_edonkey_metatag, tvb, offset, tag_length, ENC_NA);
metatag_tree = proto_item_add_subtree(ti, ett_edonkey_metatag);
proto_tree_add_uint(metatag_tree, hf_edonkey_metatag_type, tvb, offset, 1, tag_type);
if (tag_type==real_tag_type)
@ -743,7 +743,7 @@ static int dissect_edonkey_metatag(tvbuff_t *tvb, packet_info *pinfo _U_,
case EDONKEY_MTAG_WORD:
/* <Tag> ::= guint16 */
tag_length += 2;
ti = proto_tree_add_item(tree, hf_edonkey_metatag, tvb, offset, tag_length, FALSE);
ti = proto_tree_add_item(tree, hf_edonkey_metatag, tvb, offset, tag_length, ENC_NA);
metatag_tree = proto_item_add_subtree(ti, ett_edonkey_metatag);
proto_tree_add_uint(metatag_tree, hf_edonkey_metatag_type, tvb, offset, 1, tag_type);
if (tag_type==real_tag_type)
@ -758,7 +758,7 @@ static int dissect_edonkey_metatag(tvbuff_t *tvb, packet_info *pinfo _U_,
case EDONKEY_MTAG_BYTE:
/* <Tag> ::= guint8 */
tag_length += 1;
ti = proto_tree_add_item(tree, hf_edonkey_metatag, tvb, offset, tag_length, FALSE);
ti = proto_tree_add_item(tree, hf_edonkey_metatag, tvb, offset, tag_length, ENC_NA);
metatag_tree = proto_item_add_subtree(ti, ett_edonkey_metatag);
proto_tree_add_uint(metatag_tree, hf_edonkey_metatag_type, tvb, offset, 1, tag_type);
if (tag_type==real_tag_type)
@ -773,7 +773,7 @@ static int dissect_edonkey_metatag(tvbuff_t *tvb, packet_info *pinfo _U_,
case EDONKEY_MTAG_BOOL:
/* <Tag> ::= <Bool (guint8)> */
tag_length += 1;
ti = proto_tree_add_item(tree, hf_edonkey_metatag, tvb, offset, tag_length, FALSE);
ti = proto_tree_add_item(tree, hf_edonkey_metatag, tvb, offset, tag_length, ENC_NA);
metatag_tree = proto_item_add_subtree(ti, ett_edonkey_metatag);
proto_tree_add_uint(metatag_tree, hf_edonkey_metatag_type, tvb, offset, 1, tag_type);
if (tag_type==real_tag_type)
@ -795,7 +795,7 @@ static int dissect_edonkey_metatag(tvbuff_t *tvb, packet_info *pinfo _U_,
* is a multiple of 8 longs.
*/
tag_length += 2+(array_length/8)+1;
ti = proto_tree_add_item(tree, hf_edonkey_metatag, tvb, offset, tag_length, FALSE);
ti = proto_tree_add_item(tree, hf_edonkey_metatag, tvb, offset, tag_length, ENC_NA);
metatag_tree = proto_item_add_subtree(ti, ett_edonkey_metatag);
proto_tree_add_uint(metatag_tree, hf_edonkey_metatag_type, tvb, offset, 1, tag_type);
if (tag_type==real_tag_type)
@ -808,7 +808,7 @@ static int dissect_edonkey_metatag(tvbuff_t *tvb, packet_info *pinfo _U_,
/* <Tag> ::= <Length (guint32)> <BLOB> */
blob_length = tvb_get_letohl(tvb, tag_offset);
tag_length += 4+blob_length;
ti = proto_tree_add_item(tree, hf_edonkey_metatag, tvb, offset, tag_length, FALSE);
ti = proto_tree_add_item(tree, hf_edonkey_metatag, tvb, offset, tag_length, ENC_NA);
metatag_tree = proto_item_add_subtree(ti, ett_edonkey_metatag);
proto_tree_add_uint(metatag_tree, hf_edonkey_metatag_type, tvb, offset, 1, tag_type);
if (tag_type==real_tag_type)
@ -826,7 +826,7 @@ static int dissect_edonkey_metatag(tvbuff_t *tvb, packet_info *pinfo _U_,
/* <Tag> ::= <String> */
string_length = real_tag_type-EDONKEY_MTAG_STR1+1;
tag_length += string_length;
ti = proto_tree_add_item(tree, hf_edonkey_metatag, tvb, offset, tag_length, FALSE);
ti = proto_tree_add_item(tree, hf_edonkey_metatag, tvb, offset, tag_length, ENC_NA);
metatag_tree = proto_item_add_subtree(ti, ett_edonkey_metatag);
proto_tree_add_uint(metatag_tree, hf_edonkey_metatag_type, tvb, offset, 1, tag_type);
if (real_tag_type==tag_type)
@ -836,7 +836,7 @@ static int dissect_edonkey_metatag(tvbuff_t *tvb, packet_info *pinfo _U_,
} else {
/* Unknown tag type - actual tag length is also unknown */
ti = proto_tree_add_item(tree, hf_edonkey_metatag, tvb, offset, tag_length, FALSE);
ti = proto_tree_add_item(tree, hf_edonkey_metatag, tvb, offset, tag_length, ENC_NA);
metatag_tree = proto_item_add_subtree(ti, ett_edonkey_metatag);
proto_tree_add_text(metatag_tree, tvb, offset, 1, "Unknown Meta Tag Type (0x%02x)", tag_type);
if (real_tag_type==tag_type)
@ -967,7 +967,7 @@ static int dissect_edonkey_hash(tvbuff_t *tvb, packet_info *pinfo _U_,
int offset, proto_tree *tree)
{
/* <hash> ::= HASH (16 word MD4 digest) */
proto_tree_add_item(tree, hf_edonkey_hash, tvb, offset, 16, FALSE);
proto_tree_add_item(tree, hf_edonkey_hash, tvb, offset, 16, ENC_NA);
return offset+16;
}
@ -976,7 +976,7 @@ static int dissect_edonkey_file_hash(tvbuff_t *tvb, packet_info *pinfo _U_,
int offset, proto_tree *tree)
{
/* <File hash> ::= HASH (16 word MD4 digest) */
proto_tree_add_item(tree, hf_edonkey_file_hash, tvb, offset, 16, FALSE);
proto_tree_add_item(tree, hf_edonkey_file_hash, tvb, offset, 16, ENC_NA);
return offset+16;
}
@ -987,7 +987,7 @@ static int dissect_edonkey_public_key(tvbuff_t *tvb, packet_info *pinfo _U_,
guint8 length = tvb_get_guint8(tvb, offset);
proto_tree_add_text(tree, tvb, offset, 1, "Public key length: %u", length);
offset++;
proto_tree_add_item(tree, hf_emule_public_key, tvb, offset, length, FALSE);
proto_tree_add_item(tree, hf_emule_public_key, tvb, offset, length, ENC_NA);
return offset + length;
}
@ -998,7 +998,7 @@ static int dissect_edonkey_signature(tvbuff_t *tvb, packet_info *pinfo _U_,
guint8 length = tvb_get_guint8(tvb, offset);
proto_tree_add_text(tree, tvb, offset, 1, "Signature length: %u", length);
offset++;
proto_tree_add_item(tree, hf_emule_signature, tvb, offset, length, FALSE);
proto_tree_add_item(tree, hf_emule_signature, tvb, offset, length, ENC_NA);
return offset + length;
}
@ -1072,7 +1072,7 @@ static int dissect_kademlia_tag_bsob(tvbuff_t *tvb, packet_info *pinfo _U_,
bsob_length = tvb_get_guint8(tvb, offset);
*string_value = tvb_bytes_to_str( tvb, offset + 1, bsob_length );
proto_tree_add_item(tree, hf_kademlia_tag_bsob, tvb, offset + 1, bsob_length, FALSE);
proto_tree_add_item(tree, hf_kademlia_tag_bsob, tvb, offset + 1, bsob_length, ENC_NA);
return offset + 1 + bsob_length;
}
@ -1152,7 +1152,7 @@ static int dissect_edonkey_file_status(tvbuff_t *tvb, packet_info *pinfo _U_,
proto_tree_add_uint(tree, hf_edonkey_part_count, tvb, offset, 2, partcount);
if (partcount>0) {
proto_tree_add_item(tree, hf_edonkey_file_status, tvb, offset+2, arrlen, FALSE);
proto_tree_add_item(tree, hf_edonkey_file_status, tvb, offset+2, arrlen, ENC_NA);
}
return offset+2+arrlen;
}
@ -1171,7 +1171,7 @@ static int dissect_edonkey_server_hash(tvbuff_t *tvb, packet_info *pinfo _U_,
int offset, proto_tree *tree)
{
/* <Server hash> ::= HASH (16 word MD4 digest) */
proto_tree_add_item(tree, hf_edonkey_server_hash, tvb, offset, 16, FALSE);
proto_tree_add_item(tree, hf_edonkey_server_hash, tvb, offset, 16, ENC_NA);
return offset+16;
}
@ -1180,7 +1180,7 @@ static int dissect_edonkey_client_hash(tvbuff_t *tvb, packet_info *pinfo _U_,
int offset, proto_tree *tree)
{
/* <Client hash> ::= HASH (16 word MD4 digest) */
proto_tree_add_item(tree, hf_edonkey_client_hash, tvb, offset, 16, FALSE);
proto_tree_add_item(tree, hf_edonkey_client_hash, tvb, offset, 16, ENC_NA);
return offset+16;
}
@ -1193,7 +1193,7 @@ static int dissect_emule_sourceOBFU(tvbuff_t *tvb, packet_info *pinfo _U_,
proto_tree *sourceOBFU_tree;
guint8 settings = tvb_get_guint8(tvb, offset+6);
/* Add subtree for client info */
ti = proto_tree_add_item(tree, hf_emule_sourceOBFU, tvb, offset, 7 + ((settings & 0x80) ? 16 : 0), FALSE);
ti = proto_tree_add_item(tree, hf_emule_sourceOBFU, tvb, offset, 7 + ((settings & 0x80) ? 16 : 0), ENC_NA);
sourceOBFU_tree = proto_item_add_subtree(ti, ett_emule_sourceOBFU);
proto_tree_add_item(sourceOBFU_tree, hf_edonkey_ip, tvb, offset, 4, FALSE);
@ -1290,7 +1290,7 @@ static int dissect_edonkey_client_info(tvbuff_t *tvb, packet_info *pinfo _U_,
proto_item *ti;
proto_tree *clientinfo_tree;
/* Add subtree for client info */
ti = proto_tree_add_item(tree, hf_edonkey_clientinfo, tvb, offset, 0, FALSE);
ti = proto_tree_add_item(tree, hf_edonkey_clientinfo, tvb, offset, 0, ENC_NA);
clientinfo_tree = proto_item_add_subtree(ti, ett_edonkey_clientinfo);
offset = dissect_edonkey_client_hash(tvb, pinfo, offset, clientinfo_tree);
offset = dissect_edonkey_client_id(tvb, pinfo, offset, clientinfo_tree, FALSE);
@ -1315,7 +1315,7 @@ static int dissect_edonkey_server_info(tvbuff_t *tvb, packet_info *pinfo _U_,
proto_item *ti;
proto_tree *serverinfo_tree;
/* Add subtree for server info */
ti = proto_tree_add_item(tree, hf_edonkey_serverinfo, tvb, offset, 0, FALSE);
ti = proto_tree_add_item(tree, hf_edonkey_serverinfo, tvb, offset, 0, ENC_NA);
serverinfo_tree = proto_item_add_subtree(ti, ett_edonkey_serverinfo);
offset = dissect_edonkey_server_hash(tvb, pinfo, offset, serverinfo_tree);
offset = dissect_edonkey_address(tvb, pinfo, offset, serverinfo_tree);
@ -1332,7 +1332,7 @@ static int dissect_edonkey_file_info(tvbuff_t *tvb, packet_info *pinfo _U_,
proto_tree *fileinfo_tree;
int startoff;
/* Add subtree for file info */
ti = proto_tree_add_item(tree, hf_edonkey_fileinfo, tvb, offset, 0, FALSE);
ti = proto_tree_add_item(tree, hf_edonkey_fileinfo, tvb, offset, 0, ENC_NA);
startoff = offset;
fileinfo_tree = proto_item_add_subtree(ti, ett_edonkey_fileinfo);
offset = dissect_edonkey_file_hash(tvb, pinfo, offset, fileinfo_tree);
@ -1364,7 +1364,7 @@ static int dissect_emule_aich_root_hash(tvbuff_t *tvb, packet_info *pinfo _U_,
int offset, proto_tree *tree)
{
/* <AICH Root Hash> ::= HASH (20 byte SHA1 digest) */
proto_tree_add_item(tree, hf_emule_aich_root_hash, tvb, offset, 20, FALSE);
proto_tree_add_item(tree, hf_emule_aich_root_hash, tvb, offset, 20, ENC_NA);
return offset + 20;
}
@ -1375,12 +1375,12 @@ static int dissect_emule_aich_hash_list_entry(tvbuff_t *tvb, packet_info *pinfo
proto_item *ti;
proto_tree *aichhash_tree;
/* <AICH Hash List Entry> ::= <AICH Hash ID> <AICH Hash> */
ti = proto_tree_add_item(tree, hf_emule_aich_hash_entry, tvb, offset, 22, FALSE);
ti = proto_tree_add_item(tree, hf_emule_aich_hash_entry, tvb, offset, 22, ENC_NA);
aichhash_tree = proto_item_add_subtree(ti, ett_emule_aichhash);
hashid = tvb_get_letohs(tvb, offset);
proto_tree_add_uint(aichhash_tree, hf_emule_aich_hash_id, tvb, offset, 2, hashid);
proto_tree_add_item(aichhash_tree, hf_emule_aich_hash, tvb, offset+2, 20, FALSE);
proto_tree_add_item(aichhash_tree, hf_emule_aich_hash, tvb, offset+2, 20, ENC_NA);
return offset + 22;
}
@ -1415,7 +1415,7 @@ static int dissect_emule_multipacket(tvbuff_t *tvb, packet_info *pinfo _U_,
switch (opcode) {
case EDONKEY_MSG_FILE_STATUS_REQUEST:
ti = proto_tree_add_item(tree, hf_emule_multipacket_entry, tvb, offset, 1, FALSE);
ti = proto_tree_add_item(tree, hf_emule_multipacket_entry, tvb, offset, 1, ENC_NA);
mp_tree = proto_item_add_subtree(ti, ett_emule_multipacket);
proto_tree_add_uint_format(mp_tree, hf_emule_multipacket_opcode, tvb, offset, 1,
@ -1453,7 +1453,7 @@ static int dissect_emule_multipacket(tvbuff_t *tvb, packet_info *pinfo _U_,
}
}
ti = proto_tree_add_item(tree, hf_emule_multipacket_entry, tvb, offset, oplen, FALSE);
ti = proto_tree_add_item(tree, hf_emule_multipacket_entry, tvb, offset, oplen, ENC_NA);
mp_tree = proto_item_add_subtree(ti, ett_emule_multipacket);
proto_tree_add_uint_format(mp_tree, hf_emule_multipacket_opcode, tvb, offset, 1,
@ -1467,7 +1467,7 @@ static int dissect_emule_multipacket(tvbuff_t *tvb, packet_info *pinfo _U_,
offset += oplen;
break;
case EMULE_MSG_SOURCES_REQUEST:
ti = proto_tree_add_item(tree, hf_emule_multipacket_entry, tvb, offset, 1, FALSE);
ti = proto_tree_add_item(tree, hf_emule_multipacket_entry, tvb, offset, 1, ENC_NA);
mp_tree = proto_item_add_subtree(ti, ett_emule_multipacket);
proto_tree_add_uint_format(mp_tree, hf_emule_multipacket_opcode, tvb, offset, 1,
@ -1475,7 +1475,7 @@ static int dissect_emule_multipacket(tvbuff_t *tvb, packet_info *pinfo _U_,
offset += 1;
break;
case EMULE_MSG_AICHFILEHASH_REQUEST:
ti = proto_tree_add_item(tree, hf_emule_multipacket_entry, tvb, offset, 1, FALSE);
ti = proto_tree_add_item(tree, hf_emule_multipacket_entry, tvb, offset, 1, ENC_NA);
mp_tree = proto_item_add_subtree(ti, ett_emule_multipacket);
proto_tree_add_uint_format(mp_tree, hf_emule_multipacket_opcode, tvb, offset, 1,
@ -1487,7 +1487,7 @@ static int dissect_emule_multipacket(tvbuff_t *tvb, packet_info *pinfo _U_,
partcount = tvb_get_letohs(tvb, offset+1);
arrlen = (partcount+7)/8;
ti = proto_tree_add_item(tree, hf_emule_multipacket_entry, tvb, offset, 3+arrlen, FALSE);
ti = proto_tree_add_item(tree, hf_emule_multipacket_entry, tvb, offset, 3+arrlen, ENC_NA);
mp_tree = proto_item_add_subtree(ti, ett_emule_multipacket);
proto_tree_add_uint_format(mp_tree, hf_emule_multipacket_opcode, tvb, offset, 1,
@ -1497,7 +1497,7 @@ static int dissect_emule_multipacket(tvbuff_t *tvb, packet_info *pinfo _U_,
case EDONKEY_MSG_FILE_REQUEST_ANSWER:
namelen = tvb_get_letohs(tvb, offset+1);
ti = proto_tree_add_item(tree, hf_emule_multipacket_entry, tvb, offset, 3+namelen, FALSE);
ti = proto_tree_add_item(tree, hf_emule_multipacket_entry, tvb, offset, 3+namelen, ENC_NA);
mp_tree = proto_item_add_subtree(ti, ett_emule_multipacket);
proto_tree_add_uint_format(mp_tree, hf_emule_multipacket_opcode, tvb, offset, 1,
@ -1505,12 +1505,12 @@ static int dissect_emule_multipacket(tvbuff_t *tvb, packet_info *pinfo _U_,
offset = dissect_edonkey_file_name(tvb, pinfo, offset+1, mp_tree);
break;
case EMULE_MSG_AICHFILEHASH_ANSWER:
ti = proto_tree_add_item(tree, hf_emule_multipacket_entry, tvb, offset, 21, FALSE);
ti = proto_tree_add_item(tree, hf_emule_multipacket_entry, tvb, offset, 21, ENC_NA);
mp_tree = proto_item_add_subtree(ti, ett_emule_multipacket);
proto_tree_add_uint_format(mp_tree, hf_emule_multipacket_opcode, tvb, offset, 1,
opcode, "AICH Root Hash (0x%02x)", opcode);
proto_tree_add_item(mp_tree, hf_emule_aich_root_hash, tvb, offset+1, 20, FALSE);
proto_tree_add_item(mp_tree, hf_emule_aich_root_hash, tvb, offset+1, 20, ENC_NA);
offset += 21;
break;
@ -1542,7 +1542,7 @@ static int dissect_overnet_peer(tvbuff_t *tvb, packet_info *pinfo _U_,
/* <Peer> ::= <Hash> <Address> <Peer type> */
proto_item *ti;
proto_tree *peer_tree;
ti = proto_tree_add_item(tree, hf_overnet_peer, tvb, offset, 16 + 6 + 1, FALSE);
ti = proto_tree_add_item(tree, hf_overnet_peer, tvb, offset, 16 + 6 + 1, ENC_NA);
peer_tree = proto_item_add_subtree(ti, ett_overnet_peer);
offset = dissect_edonkey_hash(tvb, pinfo, offset, peer_tree);
offset = dissect_edonkey_address(tvb, pinfo, offset, peer_tree);
@ -1567,7 +1567,7 @@ static int dissect_kademlia_peer(tvbuff_t *tvb, packet_info *pinfo _U_,
proto_tree *peer_tree;
int kad_version;
ti = proto_tree_add_item(tree, hf_kademlia_peer, tvb, offset, 16 + 4 + 4 + 1, FALSE);
ti = proto_tree_add_item(tree, hf_kademlia_peer, tvb, offset, 16 + 4 + 4 + 1, ENC_NA);
peer_tree = proto_item_add_subtree(ti, ett_overnet_peer);
@ -1593,7 +1593,7 @@ static int dissect_kademlia2_peer(tvbuff_t *tvb, packet_info *pinfo _U_,
proto_item *ti;
proto_tree *peer_tree;
ti = proto_tree_add_item(tree, hf_kademlia_peer, tvb, offset, 16 + 4 + 4 + 1, FALSE);
ti = proto_tree_add_item(tree, hf_kademlia_peer, tvb, offset, 16 + 4 + 4 + 1, ENC_NA);
peer_tree = proto_item_add_subtree(ti, ett_overnet_peer);
@ -1632,7 +1632,7 @@ static int dissect_edonkey_search_query(tvbuff_t *tvb, packet_info *pinfo _U_,
operator = tvb_get_guint8(tvb, offset+1);
/* Add subtree for search entry */
ti = proto_tree_add_item(tree, hf_edonkey_search, tvb, offset, search_length, FALSE);
ti = proto_tree_add_item(tree, hf_edonkey_search, tvb, offset, search_length, ENC_NA);
search_tree = proto_item_add_subtree(ti, ett_edonkey_search);
/* Add query info */
@ -1651,7 +1651,7 @@ static int dissect_edonkey_search_query(tvbuff_t *tvb, packet_info *pinfo _U_,
search_length += 2+string_length;
/* Add subtree for search entry */
ti = proto_tree_add_item(tree, hf_edonkey_search, tvb, offset, search_length, FALSE);
ti = proto_tree_add_item(tree, hf_edonkey_search, tvb, offset, search_length, ENC_NA);
search_tree = proto_item_add_subtree(ti, ett_edonkey_search);
/* Add query info */
@ -1673,7 +1673,7 @@ static int dissect_edonkey_search_query(tvbuff_t *tvb, packet_info *pinfo _U_,
search_length += 2 + tag_name_size;
/* Add subtree for search entry */
ti = proto_tree_add_item(tree, hf_edonkey_search, tvb, offset, search_length, FALSE);
ti = proto_tree_add_item(tree, hf_edonkey_search, tvb, offset, search_length, ENC_NA);
search_tree = proto_item_add_subtree(ti, ett_edonkey_search);
/* Add query info */
@ -1697,7 +1697,7 @@ static int dissect_edonkey_search_query(tvbuff_t *tvb, packet_info *pinfo _U_,
search_length += 2 + tag_name_size;
/* Add subtree for search entry */
ti = proto_tree_add_item(tree, hf_edonkey_search, tvb, offset, search_length, FALSE);
ti = proto_tree_add_item(tree, hf_edonkey_search, tvb, offset, search_length, ENC_NA);
search_tree = proto_item_add_subtree(ti, ett_edonkey_search);
/* Add query info */
@ -1710,7 +1710,7 @@ static int dissect_edonkey_search_query(tvbuff_t *tvb, packet_info *pinfo _U_,
default:
/* Unknown search type - actual search length is also unknown */
ti = proto_tree_add_item(tree, hf_edonkey_search, tvb, offset, search_length, FALSE);
ti = proto_tree_add_item(tree, hf_edonkey_search, tvb, offset, search_length, ENC_NA);
search_tree = proto_item_add_subtree(ti, ett_edonkey_search);
proto_tree_add_text(search_tree, tvb, offset, search_length, "Unknown Search (0x%02x)", search_type);
offset += search_length;
@ -2972,7 +2972,7 @@ static void dissect_edonkey_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tre
/* Add edonkey message tree */
if (edonkey_tree) {
ti = proto_tree_add_item(edonkey_tree, hf_edonkey_message, tvb,
offset, EDONKEY_TCP_HEADER_LENGTH + msg_len, FALSE);
offset, EDONKEY_TCP_HEADER_LENGTH + msg_len, ENC_NA);
edonkey_msg_tree = proto_item_add_subtree(ti, ett_edonkey_message);
proto_tree_add_uint_format(edonkey_msg_tree, hf_edonkey_protocol, tvb, offset, 1, protocol,
@ -3041,7 +3041,7 @@ static void dissect_edonkey_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tre
(*dissector)(msg_type, tvb, pinfo, offset+1, msg_len-1, edonkey_msg_tree);
} else {
ti = proto_tree_add_item(edonkey_msg_tree, hf_emule_zlib, tvb,
offset+1, msg_len-1, FALSE);
offset+1, msg_len-1, ENC_NA);
emule_zlib_tree = proto_item_add_subtree(ti, ett_emule_zlib);
add_new_data_source(pinfo, tvbraw, "Decompressed Data");
(*dissector)(msg_type, tvbraw, pinfo, 0, tvb_length(tvbraw), emule_zlib_tree);
@ -3096,7 +3096,7 @@ static void dissect_edonkey_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t
if (edonkey_tree) {
int remainingLength, extraBytes;
ti = proto_tree_add_item(edonkey_tree, hf_edonkey_message, tvb, offset, -1, FALSE);
ti = proto_tree_add_item(edonkey_tree, hf_edonkey_message, tvb, offset, -1, ENC_NA);
edonkey_msg_tree = proto_item_add_subtree(ti, ett_edonkey_message);
proto_tree_add_uint_format(edonkey_msg_tree, hf_edonkey_protocol, tvb, offset, 1, protocol,

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

@ -750,7 +750,7 @@ static void dissect_eigrp_ipx_int(tvbuff_t *tvb, packet_info *pinfo, proto_tree
int offset = 0;
proto_item *ti_dst;
proto_tree_add_item(tree, hf_eigrp_ipx_int_nexthop_addr, tvb, offset, 4, FALSE);
proto_tree_add_item(tree, hf_eigrp_ipx_int_nexthop_addr, tvb, offset, 4, ENC_NA);
offset += 4;
proto_tree_add_item(tree, hf_eigrp_ipx_int_nexthop_id, tvb, offset, 6, FALSE);
offset += 6;
@ -768,7 +768,7 @@ static void dissect_eigrp_ipx_int(tvbuff_t *tvb, packet_info *pinfo, proto_tree
offset += 1;
proto_tree_add_item(tree, hf_eigrp_ipx_int_reserved, tvb, offset, 2, FALSE);
offset += 2;
ti_dst = proto_tree_add_item(tree, hf_eigrp_ipx_int_dst, tvb, offset, 4, FALSE);
ti_dst = proto_tree_add_item(tree, hf_eigrp_ipx_int_dst, tvb, offset, 4, ENC_NA);
proto_item_append_text(ti, " = %08x%s", tvb_get_ntohl(tvb, 26), ((tvb_get_ntohl(tvb, 10) == 0xffffffff) ? " - Destination unreachable":""));
if (tvb_get_ntohl(tvb, 10) == 0xffffffff) {
expert_add_info_format(pinfo, ti_dst, PI_RESPONSE_CODE, PI_NOTE, "Destination unreachable");
@ -780,7 +780,7 @@ static void dissect_eigrp_ipx_ext(tvbuff_t *tvb, packet_info *pinfo, proto_tree
int offset = 0;
proto_item *ti_dst;
proto_tree_add_item(tree, hf_eigrp_ipx_ext_nexthop_addr, tvb, offset, 4, FALSE);
proto_tree_add_item(tree, hf_eigrp_ipx_ext_nexthop_addr, tvb, offset, 4, ENC_NA);
offset += 4;
proto_tree_add_item(tree, hf_eigrp_ipx_ext_nexthop_id, tvb, offset, 6, FALSE);
offset += 6;
@ -813,7 +813,7 @@ static void dissect_eigrp_ipx_ext(tvbuff_t *tvb, packet_info *pinfo, proto_tree
offset += 1;
proto_tree_add_item(tree, hf_eigrp_ipx_ext_reserved2, tvb, offset, 2, FALSE);
offset += 2;
ti_dst = proto_tree_add_item(tree, hf_eigrp_ipx_ext_dst, tvb, offset, 4, FALSE);
ti_dst = proto_tree_add_item(tree, hf_eigrp_ipx_ext_dst, tvb, offset, 4, ENC_NA);
proto_item_append_text(ti, " = %08x%s", tvb_get_ntohl(tvb, 46), ((tvb_get_ntohl(tvb, 30) == 0xffffffff) ? " - Destination unreachable":""));
if (tvb_get_ntohl(tvb, 30) == 0xffffffff) {
expert_add_info_format(pinfo, ti_dst, PI_RESPONSE_CODE, PI_NOTE, "Destination unreachable");

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

@ -849,7 +849,7 @@ dissect_cpf(enip_request_key_t *request_key, int command, tvbuff_t *tvb,
/* Socket address struct - sin_zero */
proto_tree_add_item(sockaddr_tree, hf_enip_sinzero,
tvb, offset+16, 8, ENC_BIG_ENDIAN );
tvb, offset+16, 8, ENC_NA );
/* Vendor ID */
proto_tree_add_item(item_tree, hf_enip_lir_vendor,
@ -914,7 +914,7 @@ dissect_cpf(enip_request_key_t *request_key, int command, tvbuff_t *tvb,
/* Socket address struct - sin_zero */
proto_tree_add_item( item_tree, hf_enip_sinzero,
tvb, offset+14, 8, ENC_BIG_ENDIAN );
tvb, offset+14, 8, ENC_NA );
break;
@ -1101,7 +1101,7 @@ dissect_enip_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item( header_tree, hf_enip_length, tvb, 2, 2, ENC_LITTLE_ENDIAN );
proto_tree_add_item( header_tree, hf_enip_session, tvb, 4, 4, ENC_LITTLE_ENDIAN );
proto_tree_add_item( header_tree, hf_enip_status, tvb, 8, 4, ENC_LITTLE_ENDIAN );
proto_tree_add_item( header_tree, hf_enip_sendercontex, tvb, 12, 8, ENC_LITTLE_ENDIAN );
proto_tree_add_item( header_tree, hf_enip_sendercontex, tvb, 12, 8, ENC_NA );
proto_tree_add_item( header_tree, hf_enip_options, tvb, 20, 4, ENC_LITTLE_ENDIAN );
/* Append session and command to the protocol tree */

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

@ -220,7 +220,7 @@ dissect_error_cause(tvbuff_t *cause_tvb, proto_tree *parameter_tree)
break;
}
if (padding_length > 0)
proto_tree_add_item(cause_tree, hf_cause_padding, cause_tvb, CAUSE_HEADER_OFFSET + length, padding_length, ENC_BIG_ENDIAN);
proto_tree_add_item(cause_tree, hf_cause_padding, cause_tvb, CAUSE_HEADER_OFFSET + length, padding_length, ENC_NA);
}
static void
@ -493,7 +493,7 @@ dissect_pool_handle_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tre
char* tmp;
handle_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH;
pi = proto_tree_add_item(parameter_tree, hf_pool_handle, parameter_tvb, POOL_HANDLE_OFFSET, handle_length, ENC_BIG_ENDIAN);
pi = proto_tree_add_item(parameter_tree, hf_pool_handle, parameter_tvb, POOL_HANDLE_OFFSET, handle_length, ENC_NA);
tmp = (gchar*)tvb_get_ephemeral_string(parameter_tvb, POOL_HANDLE_OFFSET, handle_length);
proto_item_append_text(pi, " (%s)", tmp);
@ -558,7 +558,7 @@ dissect_cookie_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, pr
cookie_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH;
if (cookie_length > 0)
proto_tree_add_item(parameter_tree, hf_cookie, parameter_tvb, COOKIE_OFFSET, cookie_length, ENC_BIG_ENDIAN);
proto_tree_add_item(parameter_tree, hf_cookie, parameter_tvb, COOKIE_OFFSET, cookie_length, ENC_NA);
proto_item_append_text(parameter_item, " (%u byte%s)", cookie_length, plurality(cookie_length, "", "s"));
}
@ -592,7 +592,7 @@ dissect_unknown_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, p
parameter_value_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH;
if (parameter_value_length > 0)
proto_tree_add_item(parameter_tree, hf_parameter_value, parameter_tvb, PARAMETER_VALUE_OFFSET, parameter_value_length, ENC_BIG_ENDIAN);
proto_tree_add_item(parameter_tree, hf_parameter_value, parameter_tvb, PARAMETER_VALUE_OFFSET, parameter_value_length, ENC_NA);
proto_item_append_text(parameter_item, " (type %u and %u byte%s value)", type, parameter_value_length, plurality(parameter_value_length, "", "s"));
}
@ -704,7 +704,7 @@ dissect_parameter(tvbuff_t *parameter_tvb, proto_tree *enrp_tree)
};
if (padding_length > 0)
proto_tree_add_item(parameter_tree, hf_parameter_padding, parameter_tvb, PARAMETER_HEADER_OFFSET + length, padding_length, ENC_BIG_ENDIAN);
proto_tree_add_item(parameter_tree, hf_parameter_padding, parameter_tvb, PARAMETER_HEADER_OFFSET + length, padding_length, ENC_NA);
}
static void
@ -905,7 +905,7 @@ dissect_enrp_error_message(tvbuff_t *message_tvb, proto_tree *message_tree, prot
static void
dissect_unknown_message(tvbuff_t *message_tvb, proto_tree *message_tree, proto_tree *flags_tree _U_)
{
proto_tree_add_item(message_tree, hf_message_value, message_tvb, MESSAGE_VALUE_OFFSET, tvb_length(message_tvb) - MESSAGE_HEADER_LENGTH, ENC_BIG_ENDIAN);
proto_tree_add_item(message_tree, hf_message_value, message_tvb, MESSAGE_VALUE_OFFSET, tvb_length(message_tvb) - MESSAGE_HEADER_LENGTH, ENC_NA);
}
#define ENRP_PRESENCE_MESSAGE_TYPE 0x01

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

@ -274,7 +274,7 @@ dissect_enttec_dmx_data(tvbuff_t *tvb, guint offset, proto_tree *tree)
tvb,
offset,
length,
FALSE);
ENC_NA);
si = proto_item_add_subtree(hi, ett_enttec);
@ -309,17 +309,17 @@ dissect_enttec_dmx_data(tvbuff_t *tvb, guint offset, proto_tree *tree)
}
item = proto_tree_add_item(si, hf_enttec_dmx_data_data_filter, tvb,
offset, length, FALSE );
offset, length, ENC_NA );
PROTO_ITEM_SET_HIDDEN(item);
offset += length;
} else if (type == ENTTEC_DATA_TYPE_CHAN_VAL) {
proto_tree_add_item(tree, hf_enttec_dmx_data_data_filter, tvb,
offset, length, FALSE);
offset, length, ENC_NA);
offset += length;
} else {
proto_tree_add_item(tree, hf_enttec_dmx_data_data_filter, tvb,
offset, length, FALSE);
offset, length, ENC_NA);
offset += length;
}

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

@ -916,7 +916,7 @@ dissect_epl_preq(proto_tree *epl_tree, tvbuff_t *tvb, packet_info *pinfo, gint o
if (epl_tree && (len > 0))
{
proto_tree_add_item(epl_tree, hf_epl_preq_pl, tvb, offset, len, TRUE);
proto_tree_add_item(epl_tree, hf_epl_preq_pl, tvb, offset, len, ENC_NA);
}
offset += len;
@ -985,7 +985,7 @@ dissect_epl_pres(proto_tree *epl_tree, tvbuff_t *tvb, packet_info *pinfo, guint8
offset += 2;
if (epl_tree && (len > 0))
{
proto_tree_add_item(epl_tree, hf_epl_pres_pl, tvb, offset, len, TRUE);
proto_tree_add_item(epl_tree, hf_epl_pres_pl, tvb, offset, len, ENC_NA);
}
offset += len;
@ -1120,7 +1120,7 @@ dissect_epl_asnd_nmtreq(proto_tree *epl_tree, tvbuff_t *tvb, packet_info *pinfo,
proto_tree_add_item(epl_tree, hf_epl_asnd_nmtrequest_rct, tvb, offset+1, 1, TRUE);
proto_tree_add_item(epl_tree, hf_epl_asnd_nmtrequest_rcd, tvb, offset+2, -1, TRUE);
proto_tree_add_item(epl_tree, hf_epl_asnd_nmtrequest_rcd, tvb, offset+2, -1, ENC_NA);
}
offset += 2;
@ -1148,7 +1148,7 @@ dissect_epl_asnd_nmtcmd(proto_tree *epl_tree, tvbuff_t *tvb, packet_info *pinfo,
switch (epl_asnd_nmtcommand_cid)
{
case EPL_ASND_NMTCOMMAND_NMTNETHOSTNAMESET:
proto_tree_add_item(epl_tree, hf_epl_asnd_nmtcommand_nmtnethostnameset_hn, tvb, offset, 32, TRUE);
proto_tree_add_item(epl_tree, hf_epl_asnd_nmtcommand_nmtnethostnameset_hn, tvb, offset, 32, ENC_NA);
offset += 32;
break;
@ -1158,12 +1158,12 @@ dissect_epl_asnd_nmtcmd(proto_tree *epl_tree, tvbuff_t *tvb, packet_info *pinfo,
break;
case EPL_ASND_NMTCOMMAND_NMTPUBLISHTIME:
proto_tree_add_item(epl_tree, hf_epl_asnd_nmtcommand_nmtpublishtime_dt, tvb, offset, 6, TRUE);
proto_tree_add_item(epl_tree, hf_epl_asnd_nmtcommand_nmtpublishtime_dt, tvb, offset, 6, ENC_NA);
offset += 6;
break;
default:
proto_tree_add_item(epl_tree, hf_epl_asnd_nmtcommand_cdat, tvb, offset, -1, TRUE);
proto_tree_add_item(epl_tree, hf_epl_asnd_nmtcommand_cdat, tvb, offset, -1, ENC_NA);
}
if (check_col(pinfo->cinfo, COL_INFO))
@ -1293,7 +1293,7 @@ dissect_epl_asnd_ires(proto_tree *epl_tree, tvbuff_t *tvb, packet_info *pinfo, g
proto_tree_add_item(epl_tree, hf_epl_asnd_identresponse_hn, tvb, offset, 32, TRUE);
offset += 32;
proto_tree_add_item(epl_tree, hf_epl_asnd_identresponse_vex2, tvb, offset, 48, TRUE);
proto_tree_add_item(epl_tree, hf_epl_asnd_identresponse_vex2, tvb, offset, 48, ENC_NA);
offset += 48;
if (check_col(pinfo->cinfo, COL_INFO))
@ -1359,7 +1359,7 @@ dissect_epl_asnd_sres(proto_tree *epl_tree, tvbuff_t *tvb, packet_info *pinfo, g
proto_tree_add_item(epl_seb_tree, hf_epl_asnd_statusresponse_seb_err_errorregister_u8_bit7, tvb, offset, 1, TRUE);
offset += 2;
proto_tree_add_item(epl_seb_tree, hf_epl_asnd_statusresponse_seb_devicespecific_err, tvb,offset, 6, TRUE);
proto_tree_add_item(epl_seb_tree, hf_epl_asnd_statusresponse_seb_devicespecific_err, tvb,offset, 6, ENC_NA);
offset += 6;
/* List of errors / events */
@ -1603,7 +1603,7 @@ dissect_epl_sdo_command_write_by_index(proto_tree *epl_tree, tvbuff_t *tvb, pack
}
size = tvb_reported_length_remaining(tvb, offset);
item = proto_tree_add_item(epl_tree, hf_epl_asnd_sdo_cmd_write_by_index_data, tvb, offset, size, TRUE);
item = proto_tree_add_item(epl_tree, hf_epl_asnd_sdo_cmd_write_by_index_data, tvb, offset, size, ENC_NA);
if (size == 4)
{
@ -1673,7 +1673,7 @@ dissect_epl_sdo_command_read_by_index(proto_tree *epl_tree, tvbuff_t *tvb, packe
}
size = tvb_reported_length_remaining(tvb, offset);
item = proto_tree_add_item(epl_tree, hf_epl_asnd_sdo_cmd_read_by_index_data, tvb, offset, size, TRUE);
item = proto_tree_add_item(epl_tree, hf_epl_asnd_sdo_cmd_read_by_index_data, tvb, offset, size, ENC_NA);
if (size == 4)
{

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

@ -208,7 +208,7 @@ dissect_epl_v1_soc(proto_tree *epl_v1_tree, tvbuff_t *tvb, gint offset)
proto_tree_add_item(epl_v1_tree, hf_epl_v1_soc_powerlink_cycle_time, tvb, offset, 4, TRUE);
offset += 4;
proto_tree_add_item(epl_v1_tree, hf_epl_v1_soc_net_command_parameter, tvb, offset, 32, TRUE);
proto_tree_add_item(epl_v1_tree, hf_epl_v1_soc_net_command_parameter, tvb, offset, 32, ENC_NA);
offset += 32;
return offset;
@ -223,7 +223,7 @@ dissect_epl_v1_eoc(proto_tree *epl_v1_tree, tvbuff_t *tvb, gint offset)
proto_tree_add_item(epl_v1_tree, hf_epl_v1_eoc_net_command, tvb, offset, 2, TRUE);
offset += 8;
proto_tree_add_item(epl_v1_tree, hf_epl_v1_eoc_net_command_parameter, tvb, offset, 32, TRUE);
proto_tree_add_item(epl_v1_tree, hf_epl_v1_eoc_net_command_parameter, tvb, offset, 32, ENC_NA);
offset += 32;
return offset;
@ -245,7 +245,7 @@ dissect_epl_v1_preq(proto_tree *epl_v1_tree, tvbuff_t *tvb, gint offset)
offset += 6;
if(len>0){
proto_tree_add_item(epl_v1_tree, hf_epl_v1_preq_out_data, tvb, offset, len, TRUE);
proto_tree_add_item(epl_v1_tree, hf_epl_v1_preq_out_data, tvb, offset, len, ENC_NA);
offset += len;
}
@ -273,7 +273,7 @@ dissect_epl_v1_pres(proto_tree *epl_v1_tree, tvbuff_t *tvb, gint offset)
offset += 6;
if(len>0){
proto_tree_add_item(epl_v1_tree, hf_epl_v1_pres_in_data, tvb, offset, len, TRUE);
proto_tree_add_item(epl_v1_tree, hf_epl_v1_pres_in_data, tvb, offset, len, ENC_NA);
offset += len;
}
@ -329,7 +329,7 @@ dissect_epl_v1_asnd(proto_tree *epl_v1_tree, tvbuff_t *tvb, gint offset)
proto_tree_add_item(epl_v1_tree, hf_epl_v1_asnd_poll_out_size, tvb, offset, 4, TRUE);
offset += 4;
} else { /* "Generic" and all other channels */
proto_tree_add_item(epl_v1_tree, hf_epl_v1_asnd_data, tvb, offset, len, TRUE);
proto_tree_add_item(epl_v1_tree, hf_epl_v1_asnd_data, tvb, offset, len, ENC_NA);
offset += len;
}

32
epan/dissectors/packet-extreme.c
View File

@ -493,7 +493,7 @@ dissect_info_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, prot
offset += 2;
proto_tree_add_item(info_tree, hf_edp_info_reserved, tvb, offset, 6,
ENC_BIG_ENDIAN);
ENC_NA);
offset += 6;
/* Begin version subtree */
@ -524,7 +524,7 @@ dissect_info_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, prot
/* End of version subtree */
proto_tree_add_item(info_tree, hf_edp_info_vchassconn, tvb, offset, 16,
ENC_BIG_ENDIAN);
ENC_NA);
offset += 16;
}
@ -577,7 +577,7 @@ dissect_vlan_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, prot
return;
}
proto_tree_add_item(vlan_tree, hf_edp_vlan_reserved1, tvb, offset, 1,
ENC_BIG_ENDIAN);
ENC_NA);
offset += 1;
length -= 1;
@ -603,7 +603,7 @@ dissect_vlan_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, prot
return;
}
proto_tree_add_item(vlan_tree, hf_edp_vlan_reserved2, tvb, offset, 4,
ENC_BIG_ENDIAN);
ENC_NA);
offset += 4;
length -= 4;
@ -675,7 +675,7 @@ dissect_esrp_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, prot
offset += 2;
proto_tree_add_item(esrp_tree, hf_edp_esrp_reserved, tvb, offset, 2,
ENC_BIG_ENDIAN);
ENC_NA);
offset += 2;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "ESRP");
@ -714,7 +714,7 @@ dissect_eaps_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length _U_,
offset += 2;
proto_tree_add_item(eaps_tree, hf_edp_eaps_reserved0, tvb, offset, 4,
ENC_BIG_ENDIAN);
ENC_NA);
offset += 4;
proto_tree_add_item(eaps_tree, hf_edp_eaps_sysmac, tvb, offset, 6,
@ -734,7 +734,7 @@ dissect_eaps_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length _U_,
offset += 1;
proto_tree_add_item(eaps_tree, hf_edp_eaps_reserved1, tvb, offset, 1,
ENC_BIG_ENDIAN);
ENC_NA);
offset += 1;
proto_tree_add_item(eaps_tree, hf_edp_eaps_helloseq, tvb, offset, 2,
@ -742,7 +742,7 @@ dissect_eaps_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length _U_,
offset += 2;
proto_tree_add_item(eaps_tree, hf_edp_eaps_reserved2, tvb, offset, 38,
ENC_BIG_ENDIAN);
ENC_NA);
offset += 38;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "EAPS");
@ -789,7 +789,7 @@ dissect_esl_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, proto
length -= 2;
proto_tree_add_item(esl_tree, hf_edp_esl_reserved0, tvb, offset, 4,
ENC_BIG_ENDIAN);
ENC_NA);
offset += 4;
length -= 4;
@ -799,7 +799,7 @@ dissect_esl_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, proto
length -= 6;
proto_tree_add_item(esl_tree, hf_edp_esl_reserved1, tvb, offset, 4,
ENC_BIG_ENDIAN);
ENC_NA);
offset += 4;
length -= 4;
@ -829,7 +829,7 @@ dissect_esl_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, proto
length -= 2;
proto_tree_add_item(esl_tree, hf_edp_esl_reserved4, tvb, offset, 2,
ENC_BIG_ENDIAN);
ENC_NA);
offset += 2;
length -= 2;
@ -839,7 +839,7 @@ dissect_esl_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, proto
length -= 2;
proto_tree_add_item(esl_tree, hf_edp_esl_reserved5, tvb, offset, 2,
ENC_BIG_ENDIAN);
ENC_NA);
offset += 2;
length -= 2;
@ -857,7 +857,7 @@ dissect_esl_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, proto
}
proto_tree_add_item(esl_tree, hf_edp_esl_rest, tvb, offset, length,
ENC_BIG_ENDIAN);
ENC_NA);
offset += length;
length = 0;
@ -908,7 +908,7 @@ dissect_elsm_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length,
length -= 1;
proto_tree_add_item(elsm_tree, hf_edp_elsm_magic, tvb, offset, 2,
ENC_BIG_ENDIAN);
ENC_NA);
offset += 2;
length -= 2;
}
@ -929,7 +929,7 @@ dissect_elrp_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, prot
length -= 4;
proto_tree_add_item(elrp_tree, hf_edp_elrp_unknown, tvb, offset, length,
ENC_BIG_ENDIAN);
ENC_NA);
}
static void
@ -951,7 +951,7 @@ dissect_unknown_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, p
length -= 4;
proto_tree_add_item(unknown_tree, hf_edp_unknown_data, tvb, offset, length,
ENC_BIG_ENDIAN);
ENC_NA);
}
static void

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

@ -1032,9 +1032,9 @@ dissect_fcels_logi (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
}
offset += 16;
}
proto_tree_add_item (logi_tree, hf_fcels_vendorvers, tvb, offset, 16, FALSE);
proto_tree_add_item (logi_tree, hf_fcels_vendorvers, tvb, offset, 16, ENC_NA);
if (svcvld) {
proto_tree_add_item (logi_tree, hf_fcels_svcavail, tvb, offset+32, 8, FALSE);
proto_tree_add_item (logi_tree, hf_fcels_svcavail, tvb, offset+32, 8, ENC_NA);
}
}
}
@ -1568,11 +1568,11 @@ dissect_fcels_lsts (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
1, FALSE);
proto_tree_add_item (lsts_tree, hf_fcels_loopstate, tvb, offset+2, 1, FALSE);
proto_tree_add_item (lsts_tree, hf_fcels_publicloop_bmap, tvb, offset+3,
16, FALSE);
16, ENC_NA);
proto_tree_add_item (lsts_tree, hf_fcels_pvtloop_bmap, tvb, offset+19,
16, FALSE);
16, ENC_NA);
proto_tree_add_item (lsts_tree, hf_fcels_alpa_map, tvb, offset+35,
128, FALSE);
128, ENC_NA);
}
}
@ -1894,7 +1894,7 @@ dissect_fcels_rnid (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
if (tvb_get_guint8 (tvb, offset+4) == 0xDF) {
/* Decode the Specific Node ID Format as this is known */
proto_tree_add_item (rnid_tree, hf_fcels_vendoruniq, tvb,
offset+24, 16, FALSE);
offset+24, 16, ENC_NA);
proto_tree_add_item (rnid_tree, hf_fcels_asstype, tvb,
offset+40, 4, FALSE);
proto_tree_add_item (rnid_tree, hf_fcels_physport, tvb,

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

@ -310,14 +310,14 @@ dissect_fcgi_record(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
break;
default:
if (clen > 0) {
proto_tree_add_item(fcgi_tree, hf_fcgi_content_data, tvb, offset, clen, TRUE);
proto_tree_add_item(fcgi_tree, hf_fcgi_content_data, tvb, offset, clen, ENC_NA);
offset += clen;
}
break;
}
if (plen > 0) {
proto_tree_add_item(fcgi_tree, hf_fcgi_padding_data, tvb, offset, plen, TRUE);
proto_tree_add_item(fcgi_tree, hf_fcgi_padding_data, tvb, offset, plen, ENC_NA);
offset += plen;
}
}

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

@ -1262,7 +1262,7 @@ dissect_swils_zone_mbr (tvbuff_t *tvb, proto_tree *zmbr_tree, int offset)
proto_tree_add_string (zmbr_tree, hf_swils_zone_mbrid, tvb,
offset+4, 4, dpbuf);
proto_tree_add_item (zmbr_tree, hf_swils_zone_mbrid_lun, tvb,
offset+8, 8, FALSE);
offset+8, 8, ENC_NA);
break;
case FC_SWILS_ZONEMBR_FCID_LUN:
proto_tree_add_string (zmbr_tree, hf_swils_zone_mbrid, tvb,

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

@ -530,10 +530,10 @@ dissect_fip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
subtree = proto_item_add_subtree(item, ett_fip_dt_vend);
fip_desc_type_len(subtree, desc_tvb);
proto_tree_add_item(subtree, hf_fip_desc_vend, desc_tvb,
4, 8, FALSE);
4, 8, ENC_NA);
if (tvb_bytes_exist(desc_tvb, 9, -1)) {
proto_tree_add_item(subtree, hf_fip_desc_vend_data,
desc_tvb, 9, -1, FALSE);
desc_tvb, 9, -1, ENC_NA);
}
break;
case FIP_DT_VLAN:
@ -552,7 +552,7 @@ dissect_fip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
subtree = proto_item_add_subtree(item, ett_fip_dt_unk);
fip_desc_type_len(subtree, desc_tvb);
proto_tree_add_item(subtree, hf_fip_desc_unk, desc_tvb,
2, -1, FALSE);
2, -1, ENC_NA);
break;
}
}

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

@ -246,7 +246,7 @@ dissect_fix_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
col_set_str(pinfo->cinfo, COL_INFO, "[FIX continuation]");
ti = proto_tree_add_item(tree, proto_fix, tvb, 0, -1, FALSE);
fix_tree = proto_item_add_subtree(ti, ett_fix);
proto_tree_add_item(fix_tree, hf_fix_data, tvb, 0, -1, FALSE);
proto_tree_add_item(fix_tree, hf_fix_data, tvb, 0, -1, ENC_NA);
return;
}

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

@ -210,7 +210,7 @@ static guint16 assign_rb_info(tvbuff_t *tvb, packet_info *pinfo, guint16 offset,
proto_tree *subtree;
proto_item *pi;
pi = proto_tree_add_item(tree, hf_fph_rb, tvb, offset, 8, TRUE);
pi = proto_tree_add_item(tree, hf_fph_rb, tvb, offset, 8, ENC_NA);
subtree = proto_item_add_subtree(pi, ett_fph_rb);
if (urnti)
@ -302,7 +302,7 @@ static void assign_fph_dch(tvbuff_t *tvb, packet_info *pinfo, guint16 offset, fp
fpi->num_chans = cnt;
fpi->dch_crc_present = 1;
while (i < cnt) {
pi = proto_tree_add_item(tree, hf_fph_tf, tvb, offset, 4, TRUE);
pi = proto_tree_add_item(tree, hf_fph_tf, tvb, offset, 4, ENC_NA);
subtree = proto_item_add_subtree(pi, ett_fph_rb);
hdr = tvb_get_ptr(tvb, offset, 4);
dch_id = (hdr[0] & 0x1f) + 1;
@ -404,7 +404,7 @@ static void assign_fph_edch(tvbuff_t *tvb, packet_info *pinfo, guint16 offset, f
fpi->edch_ddi[i] = ddi;
fpi->edch_macd_pdu_size[i] = maces_size;
if (tree) {
pi = proto_tree_add_item(tree, hf_fph_ddi_entry, tvb, offset - 4, 4, TRUE);
pi = proto_tree_add_item(tree, hf_fph_ddi_entry, tvb, offset - 4, 4, ENC_NA);
subtree = proto_item_add_subtree(pi, ett_fph_ddi_entry);
proto_tree_add_uint(subtree, hf_fph_ddi_value, tvb, offset - 4, 1, ddi);
proto_tree_add_uint(subtree, hf_fph_ddi_logical, tvb, offset - 3, 1, logical);

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

@ -144,7 +144,7 @@ dissect_fractalgeneratorprotocol_data_message(tvbuff_t *message_tvb, proto_tree
buffer_length = tvb_get_ntohl(message_tvb, DATA_POINTS_OFFSET)*4;
if (buffer_length > 0) {
proto_tree_add_item(message_tree, hf_buffer, message_tvb, DATA_BUFFER_OFFSET, buffer_length, FALSE);
proto_tree_add_item(message_tree, hf_buffer, message_tvb, DATA_BUFFER_OFFSET, buffer_length, ENC_NA);
}
}

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

@ -242,7 +242,7 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
PROTO_ITEM_SET_GENERATED(item);
if(pinfo->fd->flags.ref_time){
ti = proto_tree_add_item(fh_tree, hf_frame_time_reference, tvb, 0, 0, FALSE);
ti = proto_tree_add_item(fh_tree, hf_frame_time_reference, tvb, 0, 0, ENC_NA);
PROTO_ITEM_SET_GENERATED(ti);
}

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

@ -452,7 +452,7 @@ gdsdb_connect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
offset += length + 5;
for(i=0;i<count;i++){
ti = proto_tree_add_item(tree, hf_gdsdb_connect_pref,
tvb, offset, 20, FALSE);
tvb, offset, 20, ENC_NA);
pref_tree = proto_item_add_subtree(ti,
ett_gdsdb_connect_pref);
proto_tree_add_item(pref_tree,
@ -666,7 +666,7 @@ gdsdb_response(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
length = tvb_get_ntohl(tvb, offset);
offset += length + 4;
proto_tree_add_item(tree, hf_gdsdb_response_status, tvb,
offset, tvb_length(tvb) - offset, FALSE);
offset, tvb_length(tvb) - offset, ENC_NA);
}
return tvb_length(tvb);

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

@ -3404,7 +3404,7 @@ dissect_giop_request_1_1 (tvbuff_t * tvb, packet_info * pinfo,
if(tree)
{
proto_tree_add_item (request_tree, hf_giop_objekt_key, tvb,
offset - objkey_len, objkey_len, FALSE);
offset - objkey_len, objkey_len, ENC_NA);
}
}
}
@ -3763,7 +3763,7 @@ dissect_giop_locate_request( tvbuff_t * tvb, packet_info * pinfo,
if(locate_request_tree)
{
proto_tree_add_item(locate_request_tree, hf_giop_objekt_key, tvb, offset-len, len, FALSE);
proto_tree_add_item(locate_request_tree, hf_giop_objekt_key, tvb, offset-len, len, ENC_NA);
}
}
@ -4814,7 +4814,7 @@ static void decode_IIOP_IOR_profile(tvbuff_t *tvb, packet_info *pinfo, proto_tre
}
if(tree) {
proto_tree_add_item(tree, hf_giop_objekt_key, tvb, *offset -seqlen, seqlen, FALSE);
proto_tree_add_item(tree, hf_giop_objekt_key, tvb, *offset -seqlen, seqlen, ENC_NA);
}
g_free(objkey);
}

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

@ -108,7 +108,7 @@ dissect_git_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
4, plen);
proto_tree_add_item(git_tree, hf_git_packet_data, tvb, offset+4,
plen-4, FALSE);
plen-4, ENC_NA);
}
}

24
epan/dissectors/packet-glbp.c
View File

@ -169,15 +169,15 @@ dissect_glbp_hello(tvbuff_t *tvb, int offset,
guint8 addrtype;
guint8 addrlen;
proto_tree_add_item(tlv_tree, hf_glbp_hello_unknown10, tvb, offset, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(tlv_tree, hf_glbp_hello_unknown10, tvb, offset, 1, ENC_NA);
offset ++;
proto_tree_add_item(tlv_tree, hf_glbp_hello_vgstate, tvb, offset, 1, ENC_BIG_ENDIAN);
offset ++;
proto_tree_add_item(tlv_tree, hf_glbp_hello_unknown11, tvb, offset, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(tlv_tree, hf_glbp_hello_unknown11, tvb, offset, 1, ENC_NA);
offset ++;
proto_tree_add_item(tlv_tree, hf_glbp_hello_priority, tvb, offset, 1, ENC_BIG_ENDIAN);
offset++;
proto_tree_add_item(tlv_tree, hf_glbp_hello_unknown12, tvb, offset, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(tlv_tree, hf_glbp_hello_unknown12, tvb, offset, 2, ENC_NA);
offset += 2;
proto_tree_add_item(tlv_tree, hf_glbp_hello_helloint, tvb, offset, 4, ENC_BIG_ENDIAN);
offset += 4;
@ -187,7 +187,7 @@ dissect_glbp_hello(tvbuff_t *tvb, int offset,
offset += 2;
proto_tree_add_item(tlv_tree, hf_glbp_hello_timeout, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
proto_tree_add_item(tlv_tree, hf_glbp_hello_unknown13, tvb, offset, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(tlv_tree, hf_glbp_hello_unknown13, tvb, offset, 2, ENC_NA);
offset += 2;
proto_tree_add_item(tlv_tree, hf_glbp_hello_addrtype, tvb, offset, 1, ENC_BIG_ENDIAN);
addrtype = tvb_get_guint8(tvb, offset);
@ -211,7 +211,7 @@ dissect_glbp_hello(tvbuff_t *tvb, int offset,
proto_tree_add_item(tlv_tree, hf_glbp_hello_virtualipv6, tvb, offset, addrlen, ENC_BIG_ENDIAN);
break;
default:
proto_tree_add_item(tlv_tree, hf_glbp_hello_virtualunk, tvb, offset, addrlen, ENC_BIG_ENDIAN);
proto_tree_add_item(tlv_tree, hf_glbp_hello_virtualunk, tvb, offset, addrlen, ENC_NA);
break;
}
offset += addrlen;
@ -231,13 +231,13 @@ dissect_glbp_reqresp(tvbuff_t *tvb, int offset,
offset++;
proto_tree_add_item(tlv_tree, hf_glbp_reqresp_vfstate, tvb, offset, 1, ENC_BIG_ENDIAN);
offset++;
proto_tree_add_item(tlv_tree, hf_glbp_reqresp_unknown21, tvb, offset, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(tlv_tree, hf_glbp_reqresp_unknown21, tvb, offset, 1, ENC_NA);
offset += 1;
proto_tree_add_item(tlv_tree, hf_glbp_reqresp_priority, tvb, offset, 1, ENC_BIG_ENDIAN);
offset++;
proto_tree_add_item(tlv_tree, hf_glbp_reqresp_weight, tvb, offset, 1, ENC_BIG_ENDIAN);
offset++;
proto_tree_add_item(tlv_tree, hf_glbp_reqresp_unknown22, tvb, offset, 7, ENC_BIG_ENDIAN);
proto_tree_add_item(tlv_tree, hf_glbp_reqresp_unknown22, tvb, offset, 7, ENC_NA);
offset += 7;
proto_tree_add_item(tlv_tree, hf_glbp_reqresp_virtualmac, tvb, offset, 6, ENC_BIG_ENDIAN);
offset += 6;
@ -264,16 +264,16 @@ dissect_glbp_auth(tvbuff_t *tvb, int offset,
offset += authlength;
break;
case 2:
proto_tree_add_item(tlv_tree, hf_glbp_auth_md5hash, tvb, offset, authlength, ENC_BIG_ENDIAN);
proto_tree_add_item(tlv_tree, hf_glbp_auth_md5hash, tvb, offset, authlength, ENC_NA);
offset += authlength;
break;
case 3:
proto_tree_add_item(tlv_tree, hf_glbp_auth_md5chainindex, tvb, offset, 4, ENC_BIG_ENDIAN);
proto_tree_add_item(tlv_tree, hf_glbp_auth_md5chainhash, tvb, offset+4, authlength-4, ENC_BIG_ENDIAN);
proto_tree_add_item(tlv_tree, hf_glbp_auth_md5chainhash, tvb, offset+4, authlength-4, ENC_NA);
offset += authlength;
break;
default:
proto_tree_add_item(tlv_tree, hf_glbp_auth_authunknown, tvb, offset, authlength, ENC_BIG_ENDIAN);
proto_tree_add_item(tlv_tree, hf_glbp_auth_authunknown, tvb, offset, authlength, ENC_NA);
offset += authlength;
break;
}
@ -285,7 +285,7 @@ static int
dissect_glbp_unknown(tvbuff_t *tvb, int offset, guint32 length,
packet_info *pinfo _U_, proto_tree *tlv_tree)
{
proto_tree_add_item(tlv_tree, hf_glbp_unknown_data, tvb, offset, length, ENC_BIG_ENDIAN);
proto_tree_add_item(tlv_tree, hf_glbp_unknown_data, tvb, offset, length, ENC_NA);
offset += length;
return offset;
@ -319,7 +319,7 @@ dissect_glbp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
offset++;
proto_tree_add_item(glbp_tree, hf_glbp_group, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
proto_tree_add_item(glbp_tree, hf_glbp_unknown2, tvb, offset, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(glbp_tree, hf_glbp_unknown2, tvb, offset, 2, ENC_NA);
offset += 2;
proto_tree_add_item(glbp_tree, hf_glbp_ownerid, tvb, offset, 6, ENC_BIG_ENDIAN);
offset += 6;

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

@ -141,7 +141,7 @@ dissect_gmtlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *gmhdr_tree, gui
proto_item_append_text(ti, "; Source: %s", val_to_str(tl>>8, gmhdr_ftype_timestamp, "Unknown"));
break;
default:
ti = proto_tree_add_item(gmhdr_tree, hf_gmhdr_generic, tvb, offset, fl, FALSE);
ti = proto_tree_add_item(gmhdr_tree, hf_gmhdr_generic, tvb, offset, fl, ENC_NA);
proto_item_append_text(ti, " [Id: %u, Length: %u]", tl >> 8, fl);
break;
}

24
epan/dissectors/packet-gnutella.c
View File

@ -228,7 +228,7 @@ static void dissect_gnutella_queryhit(tvbuff_t *tvb, guint offset, proto_tree *t
(GNUTELLA_LONG_LENGTH * 2) +
name_length + extra_length +
GNUTELLA_QUERYHIT_END_OF_STRING_LENGTH,
FALSE);
ENC_NA);
hit_tree = proto_item_add_subtree(qhi, ett_gnutella);
@ -259,7 +259,7 @@ static void dissect_gnutella_queryhit(tvbuff_t *tvb, guint offset, proto_tree *t
tvb,
extra_at_offset,
extra_length,
FALSE);
ENC_NA);
}
}
@ -274,7 +274,7 @@ static void dissect_gnutella_queryhit(tvbuff_t *tvb, guint offset, proto_tree *t
tvb,
hit_offset,
servent_id_at_offset - hit_offset,
FALSE);
ENC_NA);
}
else {
servent_id_at_offset = hit_offset;
@ -285,7 +285,7 @@ static void dissect_gnutella_queryhit(tvbuff_t *tvb, guint offset, proto_tree *t
tvb,
servent_id_at_offset,
GNUTELLA_SERVENT_ID_LENGTH,
FALSE);
ENC_NA);
}
@ -296,7 +296,7 @@ static void dissect_gnutella_push(tvbuff_t *tvb, guint offset, proto_tree *tree)
tvb,
offset + GNUTELLA_PUSH_SERVENT_ID_OFFSET,
GNUTELLA_SERVENT_ID_LENGTH,
FALSE);
ENC_NA);
proto_tree_add_item(tree,
hf_gnutella_push_index,
@ -400,7 +400,7 @@ static void dissect_gnutella_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *
tvb,
0,
GNUTELLA_HEADER_LENGTH,
FALSE);
ENC_NA);
gnutella_header_tree = proto_item_add_subtree(hi, ett_gnutella);
proto_tree_add_item(gnutella_header_tree,
@ -408,7 +408,7 @@ static void dissect_gnutella_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *
tvb,
GNUTELLA_HEADER_ID_OFFSET,
GNUTELLA_SERVENT_ID_LENGTH,
FALSE);
ENC_NA);
proto_tree_add_uint_format(gnutella_header_tree,
hf_gnutella_header_payload,
@ -450,7 +450,7 @@ static void dissect_gnutella_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *
tvb,
GNUTELLA_HEADER_LENGTH,
size,
FALSE);
ENC_NA);
gnutella_pong_tree = proto_item_add_subtree(
pi,
ett_gnutella);
@ -466,7 +466,7 @@ static void dissect_gnutella_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *
tvb,
GNUTELLA_HEADER_LENGTH,
size,
FALSE);
ENC_NA);
gnutella_push_tree = proto_item_add_subtree(
pi,
ett_gnutella);
@ -482,7 +482,7 @@ static void dissect_gnutella_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *
tvb,
GNUTELLA_HEADER_LENGTH,
size,
FALSE);
ENC_NA);
gnutella_query_tree = proto_item_add_subtree(
pi,
ett_gnutella);
@ -499,7 +499,7 @@ static void dissect_gnutella_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *
tvb,
GNUTELLA_HEADER_LENGTH,
size,
FALSE);
ENC_NA);
gnutella_queryhit_tree = proto_item_add_subtree(
pi,
ett_gnutella);
@ -557,7 +557,7 @@ static void dissect_gnutella(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
tvb,
0,
-1,
FALSE);
ENC_NA);
}
return;
}

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

@ -63,7 +63,7 @@ dissect_gpef_efskey(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *p
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
if (parent_tree) {
item = proto_tree_add_item(parent_tree, hf_gpef_efskey, tvb, -1, -1, FALSE);
item = proto_tree_add_item(parent_tree, hf_gpef_efskey, tvb, -1, -1, ENC_NA);
tree = proto_item_add_subtree(item, ett_gpef_efskey);
}

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

@ -217,7 +217,7 @@ dissect_gre_3gpp2_attribs(tvbuff_t *tvb, int offset, proto_tree *tree)
guint8 value;
int start_offset = offset;
proto_item* ti = proto_tree_add_item(tree, hf_gre_3ggp2_attrib, tvb, offset, 0, FALSE);
proto_item* ti = proto_tree_add_item(tree, hf_gre_3ggp2_attrib, tvb, offset, 0, ENC_NA);
proto_tree* atree = proto_item_add_subtree(ti, ett_3gpp2_attribs);
while(last_attrib != TRUE)
@ -241,7 +241,7 @@ dissect_gre_3gpp2_attribs(tvbuff_t *tvb, int offset, proto_tree *tree)
case ID_3GPP2_FLOW_DISCRIMINATOR:
{
value = tvb_get_guint8(tvb,offset);
proto_tree_add_item(attr_tree, hf_gre_3ggp2_flow_disc, tvb, offset, attrib_length, FALSE);
proto_tree_add_item(attr_tree, hf_gre_3ggp2_flow_disc, tvb, offset, attrib_length, ENC_NA);
proto_item_append_text(attr_item," - 0x%x",value);
}
break;
@ -287,7 +287,7 @@ dissect_gre_wccp2_redirect_header(tvbuff_t *tvb, int offset, proto_tree *tree)
proto_item * ti;
proto_tree * rh_tree;
ti = proto_tree_add_item(tree, hf_gre_wccp_redirect_header, tvb, offset, 4, FALSE);
ti = proto_tree_add_item(tree, hf_gre_wccp_redirect_header, tvb, offset, 4, ENC_NA);
rh_tree = proto_item_add_subtree(ti, ett_gre_wccp2_redirect_header);
proto_tree_add_item(rh_tree, hf_gre_wccp_dynamic_service, tvb, offset, 1, FALSE);
@ -450,7 +450,7 @@ dissect_gre(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree *r_tree;
for (;;) {
it_routing = proto_tree_add_item(gre_tree, hf_gre_routing, tvb, offset, -1, FALSE);
it_routing = proto_tree_add_item(gre_tree, hf_gre_routing, tvb, offset, -1, ENC_NA);
r_tree = proto_item_add_subtree(ti, ett_gre_routing);
sre_af = tvb_get_ntohs(tvb, offset);
@ -468,7 +468,7 @@ dissect_gre(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if (sre_af == 0 && sre_length == 0)
break;
proto_tree_add_item(r_tree, hf_gre_routing_information , tvb, offset, sre_length, FALSE);
proto_tree_add_item(r_tree, hf_gre_routing_information , tvb, offset, sre_length, ENC_NA);
offset += sre_length;
}
}

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

@ -5479,7 +5479,7 @@ static int decode_gtp_tmgi(tvbuff_t * tvb, int offset, packet_info * pinfo, prot
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
offset = offset + 2;
ti = proto_tree_add_item(ext_tree, hf_gtp_tmgi, tvb, offset, length, ENC_BIG_ENDIAN);
ti = proto_tree_add_item(ext_tree, hf_gtp_tmgi, tvb, offset, length, ENC_NA);
tmgi_tree = proto_item_add_subtree(ti, ett_gtp_tmgi);
next_tvb = tvb_new_subset(tvb, offset, length, length);
@ -6587,7 +6587,7 @@ static int decode_gtp_priv_ext(tvbuff_t * tvb, int offset, packet_info * pinfo _
* displayed as hex data?
*/
if (length > 2){
proto_tree_add_item(ext_tree_priv_ext, hf_gtp_ext_val, tvb, offset, length - 2, ENC_BIG_ENDIAN);
proto_tree_add_item(ext_tree_priv_ext, hf_gtp_ext_val, tvb, offset, length - 2, ENC_NA);
next_tvb = tvb_new_subset_remaining(tvb, offset);
dissector_try_uint(gtp_priv_ext_dissector_table, ext_id, next_tvb, pinfo, ext_tree_priv_ext);
}

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

@ -945,7 +945,7 @@ dissect_gtpv2_stn_sr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_
tvbuff_t *new_tvb;
int offset = 0;
stn_sr_item = proto_tree_add_item(tree, hf_gtpv2_stn_sr, tvb, offset, length, ENC_BIG_ENDIAN);
stn_sr_item = proto_tree_add_item(tree, hf_gtpv2_stn_sr, tvb, offset, length, ENC_NA);
new_tvb = tvb_new_subset(tvb, offset, length, length );
sub_tree = proto_item_add_subtree(stn_sr_item, ett_gtpv2_stn_sr);
@ -1519,7 +1519,7 @@ dissect_gtpv2_paa(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto
*/
proto_tree_add_item(tree, hf_gtpv2_pdn_ipv6_len, tvb, offset, 1, ENC_BIG_ENDIAN);
offset++;
proto_tree_add_item(tree, hf_gtpv2_pdn_ipv6, tvb, offset, 16, ENC_BIG_ENDIAN);
proto_tree_add_item(tree, hf_gtpv2_pdn_ipv6, tvb, offset, 16, ENC_NA);
offset+=16;
break;
case 3:
@ -1534,7 +1534,7 @@ dissect_gtpv2_paa(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto
*/
proto_tree_add_item(tree, hf_gtpv2_pdn_ipv6_len, tvb, offset, 1, ENC_BIG_ENDIAN);
offset++;
proto_tree_add_item(tree, hf_gtpv2_pdn_ipv6, tvb, offset, 16, ENC_BIG_ENDIAN);
proto_tree_add_item(tree, hf_gtpv2_pdn_ipv6, tvb, offset, 16, ENC_NA);
offset+=16;
proto_tree_add_item(tree, hf_gtpv2_pdn_ipv4, tvb, offset, 4, ENC_BIG_ENDIAN);
offset+=4;
@ -2932,7 +2932,7 @@ dissect_gtpv2_guti(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_it
proto_tree_add_item(tree, hf_gtpv2_mme_code, tvb, offset, 1, ENC_BIG_ENDIAN);
offset++;
proto_tree_add_item(tree, hf_gtpv2_m_tmsi, tvb, offset,4, ENC_BIG_ENDIAN);
proto_tree_add_item(tree, hf_gtpv2_m_tmsi, tvb, offset,4, ENC_NA);
}
/*
@ -3535,7 +3535,7 @@ static void
dissect_gtpv2_ti(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint16 length, guint8 message_type _U_, guint8 instance _U_)
{
/* 5 to (n+4) Transaction Identifier */
proto_tree_add_item(tree, hf_gtpv2_ti, tvb, 0, length, ENC_BIG_ENDIAN);
proto_tree_add_item(tree, hf_gtpv2_ti, tvb, 0, length, ENC_NA);
}

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

@ -278,7 +278,7 @@ dissect_gvcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if (packet_plsize >= 8) {
proto_tree_add_item(gvcp_tree, hf_gvcp_address2, tvb, 12, 4, FALSE);
if (packet_plsize >= 12)
proto_tree_add_item(gvcp_tree, hf_gvcp_remainder, tvb, 16, -1, FALSE);
proto_tree_add_item(gvcp_tree, hf_gvcp_remainder, tvb, 16, -1, ENC_NA);
}
}
break;
@ -288,7 +288,7 @@ dissect_gvcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if (packet_plsize >= 8) {
proto_tree_add_item(gvcp_tree, hf_gvcp_value2, tvb, 12, 4, FALSE);
if (packet_plsize >= 12)
proto_tree_add_item(gvcp_tree, hf_gvcp_remainder, tvb, 16, -1, FALSE);
proto_tree_add_item(gvcp_tree, hf_gvcp_remainder, tvb, 16, -1, ENC_NA);
}
}
break;
@ -300,7 +300,7 @@ dissect_gvcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(gvcp_tree, hf_gvcp_address2, tvb, 16, 4, FALSE);
proto_tree_add_item(gvcp_tree, hf_gvcp_value2, tvb, 20, 4, FALSE);
if (packet_plsize >= 24)
proto_tree_add_item(gvcp_tree, hf_gvcp_remainder, tvb, 24, -1, FALSE);
proto_tree_add_item(gvcp_tree, hf_gvcp_remainder, tvb, 24, -1, ENC_NA);
}
}
break;
@ -319,7 +319,7 @@ dissect_gvcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
case 0x86: /* Block Write Request */
if (packet_plsize >= 8) {
proto_tree_add_item(gvcp_tree, hf_gvcp_address, tvb, 8, 4, FALSE);
proto_tree_add_item(gvcp_tree, hf_gvcp_data, tvb, 12, -1, FALSE);
proto_tree_add_item(gvcp_tree, hf_gvcp_data, tvb, 12, -1, ENC_NA);
}
break;
case 0x87: /* Block Write Answer */
@ -328,7 +328,7 @@ dissect_gvcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
break;
default:
if (packet_plsize > 0)
proto_tree_add_item(gvcp_tree, hf_gvcp_data, tvb, 8, -1, FALSE);
proto_tree_add_item(gvcp_tree, hf_gvcp_data, tvb, 8, -1, ENC_NA);
break;
}

14
epan/dissectors/packet-h223.c
View File

@ -662,7 +662,7 @@ dissect_mux_al_pdu( tvbuff_t *tvb, packet_info *pinfo, proto_tree *vc_tree,
PROTO_ITEM_SET_HIDDEN(hidden_item);
}
next_tvb = tvb;
al_subitem = proto_tree_add_item(al_tree, hf_h223_al_payload, next_tvb, 0, -1, FALSE);
al_subitem = proto_tree_add_item(al_tree, hf_h223_al_payload, next_tvb, 0, -1, ENC_NA);
break;
case al2WithSequenceNumbers:
@ -689,7 +689,7 @@ dissect_mux_al_pdu( tvbuff_t *tvb, packet_info *pinfo, proto_tree *vc_tree,
}
next_tvb = tvb_new_subset( tvb, data_start, len-1-data_start, len-1-data_start );
al_subitem = proto_tree_add_item(al_tree, hf_h223_al_payload, next_tvb, 0, -1, FALSE);
al_subitem = proto_tree_add_item(al_tree, hf_h223_al_payload, next_tvb, 0, -1, ENC_NA);
calc_checksum = h223_al2_crc8bit(tvb);
real_checksum = tvb_get_guint8(tvb, len - 1);
@ -923,7 +923,7 @@ dissect_mux_payload( tvbuff_t *tvb, packet_info *pinfo, guint32 pkt_offset,
proto_tree *vc_tree = NULL;
if(pdu_tree) {
proto_item *vc_item = proto_tree_add_item(pdu_tree, hf_h223_mux_deact, tvb, 0, len, FALSE);
proto_item *vc_item = proto_tree_add_item(pdu_tree, hf_h223_mux_deact, tvb, 0, len, ENC_NA);
vc_tree = proto_item_add_subtree(vc_item, ett_h223_mux_deact);
}
call_dissector(data_handle,tvb,pinfo,vc_tree);
@ -1010,16 +1010,16 @@ dissect_mux_pdu( tvbuff_t *tvb, packet_info *pinfo, guint32 pkt_offset,
if( h223_tree ) {
if( mpl == 0 ) {
pdu_item = proto_tree_add_item (h223_tree, hf_h223_mux_stuffing_pdu, tvb, 0, -1, FALSE);
pdu_item = proto_tree_add_item (h223_tree, hf_h223_mux_stuffing_pdu, tvb, 0, -1, ENC_NA);
pdu_tree = proto_item_add_subtree (pdu_item, ett_h223_mux_stuffing_pdu);
} else {
pdu_item = proto_tree_add_item (h223_tree, hf_h223_mux_pdu, tvb, 0, -1, FALSE);
pdu_item = proto_tree_add_item (h223_tree, hf_h223_mux_pdu, tvb, 0, -1, ENC_NA);
pdu_tree = proto_item_add_subtree (pdu_item, ett_h223_mux_pdu);
}
}
if( pdu_tree ) {
proto_item *item = proto_tree_add_item (pdu_tree, hf_h223_mux_header, tvb, 0, offset, FALSE);
proto_item *item = proto_tree_add_item (pdu_tree, hf_h223_mux_header, tvb, 0, offset, ENC_NA);
proto_tree *hdr_tree = proto_item_add_subtree (item, ett_h223_mux_header);
switch(call_info->h223_level) {
@ -1075,7 +1075,7 @@ dissect_mux_pdu( tvbuff_t *tvb, packet_info *pinfo, guint32 pkt_offset,
proto_tree *vc_tree = NULL;
if( pdu_tree ) {
proto_item *vc_item = proto_tree_add_item(pdu_tree, hf_h223_mux_extra, next_tvb, 0, len, FALSE);
proto_item *vc_item = proto_tree_add_item(pdu_tree, hf_h223_mux_extra, next_tvb, 0, len, ENC_NA);
vc_tree = proto_item_add_subtree(vc_item, ett_h223_mux_deact);
}
call_dissector(data_handle,next_tvb,pinfo,vc_tree);

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

@ -104,7 +104,7 @@ dissect_h261( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree )
offset++;
/* The rest of the packet is the H.261 stream */
proto_tree_add_item( h261_tree, hf_h261_data, tvb, offset, -1, FALSE );
proto_tree_add_item( h261_tree, hf_h261_data, tvb, offset, -1, ENC_NA );
}
}

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

@ -148,14 +148,14 @@ dissect_h263P( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree )
/* Length, in bytes, of the extra picture header. */
plen = (data16 & 0x01f8) >> 3;
if (plen != 0){
extra_hdr_item = proto_tree_add_item( h263P_tree, hf_h263P_extra_hdr, tvb, offset, plen, FALSE );
extra_hdr_item = proto_tree_add_item( h263P_tree, hf_h263P_extra_hdr, tvb, offset, plen, ENC_NA );
h263P_extr_hdr_tree = proto_item_add_subtree( extra_hdr_item, ett_h263P_extra_hdr );
dissect_h263_picture_layer( tvb, pinfo, h263P_extr_hdr_tree, offset, plen, TRUE);
offset += plen;
}
if ((data16&0x0400)!=0){
/* P bit = 1 */
data_item = proto_tree_add_item( h263P_tree, hf_h263P_payload, tvb, offset, -1, FALSE );
data_item = proto_tree_add_item( h263P_tree, hf_h263P_payload, tvb, offset, -1, ENC_NA );
h263P_data_tree = proto_item_add_subtree( data_item, ett_h263P_data );
/* Startc code holds bit 17 -23 of the codeword */
startcode = tvb_get_guint8(tvb,offset)&0xfe;
@ -196,7 +196,7 @@ dissect_h263P( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree )
}
return;
}
proto_tree_add_item( h263P_tree, hf_h263P_payload, tvb, offset, -1, FALSE );
proto_tree_add_item( h263P_tree, hf_h263P_payload, tvb, offset, -1, ENC_NA );
}
}

38
epan/dissectors/packet-hip.c
View File

@ -517,10 +517,10 @@ dissect_hip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
offset += 8;
proto_tree_add_item(hip_tree, hf_hip_hit_sndr, tvb, offset,
16, FALSE);
16, ENC_NA);
offset += 16;
proto_tree_add_item(hip_tree, hf_hip_hit_rcvr, tvb, offset,
16, FALSE);
16, ENC_NA);
offset += 16;
length = (hiph_hdr_len + 1) * 8;
@ -599,7 +599,7 @@ dissect_hip_tlv(tvbuff_t *tvb, int offset, proto_item *ti, int type, int tlv_len
proto_tree_add_item(t, hf_hip_tlv_r1_res, tvb, newoffset, 4, FALSE);
/* R1 generation counter */
newoffset += 4;
proto_tree_add_item(t, hf_hip_tlv_r1count, tvb, newoffset, 8, FALSE);
proto_tree_add_item(t, hf_hip_tlv_r1count, tvb, newoffset, 8, ENC_NA);
break;
case PARAM_LOCATOR:
/* RFC 5206 section 4. and RFC 5770 section 5.7. for type 2 locators
@ -722,7 +722,7 @@ dissect_hip_tlv(tvbuff_t *tvb, int offset, proto_item *ti, int type, int tlv_len
proto_tree_add_item(t, hf_hip_tlv_puzzle_o, tvb, newoffset, 2, FALSE);
/* Puzzle I */
newoffset += 2;
proto_tree_add_item(t, hf_hip_tlv_puzzle_i, tvb,newoffset, 8, FALSE);
proto_tree_add_item(t, hf_hip_tlv_puzzle_i, tvb,newoffset, 8, ENC_NA);
break;
case PARAM_SOLUTION:
t = proto_item_add_subtree(ti, ett_hip_tlv_data);
@ -736,10 +736,10 @@ dissect_hip_tlv(tvbuff_t *tvb, int offset, proto_item *ti, int type, int tlv_len
proto_tree_add_item(t, hf_hip_tlv_solution_o, tvb,newoffset, 2, FALSE);
/* Solution I */
newoffset += 2;
proto_tree_add_item(t, hf_hip_tlv_solution_i, tvb, newoffset, 8, FALSE);
proto_tree_add_item(t, hf_hip_tlv_solution_i, tvb, newoffset, 8, ENC_NA);
/* Solution J */
newoffset += 8;
proto_tree_add_item(t, hf_hip_tlv_solution_j, tvb, newoffset, 8, FALSE);
proto_tree_add_item(t, hf_hip_tlv_solution_j, tvb, newoffset, 8, ENC_NA);
break;
case PARAM_SEQ:
t = proto_item_add_subtree(ti, ett_hip_tlv_data);
@ -770,7 +770,7 @@ dissect_hip_tlv(tvbuff_t *tvb, int offset, proto_item *ti, int type, int tlv_len
/* First Public value */
newoffset += 2;
proto_tree_add_item(t, hf_hip_tlv_dh_pub, tvb, newoffset, pv_len, FALSE);
proto_tree_add_item(t, hf_hip_tlv_dh_pub, tvb, newoffset, pv_len, ENC_NA);
/* Check for the second group */
if ((pv_len + newoffset) < tlv_len) {
/* Second Group ID*/
@ -785,7 +785,7 @@ dissect_hip_tlv(tvbuff_t *tvb, int offset, proto_item *ti, int type, int tlv_len
/* Second Public Value */
newoffset += 2;
proto_tree_add_item(t, hf_hip_tlv_dh_pub, tvb, newoffset,
pv_len, FALSE);
pv_len, ENC_NA);
}
break;
case PARAM_ESP_TRANSFORM:
@ -909,22 +909,22 @@ dissect_hip_tlv(tvbuff_t *tvb, int offset, proto_item *ti, int type, int tlv_len
newoffset++;
/* Q */
proto_tree_add_item(t, hf_hip_tlv_host_id_q, tvb, newoffset,
20, FALSE);
20, ENC_NA);
newoffset += 20;
if (hi_t > 56) /* max 4096 bits */
break;
/* P */
newlen = 64 + (hi_t * 8);
proto_tree_add_item(t, hf_hip_tlv_host_id_p, tvb, newoffset,
newlen, FALSE);
newlen, ENC_NA);
/* G */
newoffset += newlen;
proto_tree_add_item(t, hf_hip_tlv_host_id_g, tvb, newoffset,
newlen, FALSE);
newlen, ENC_NA);
/* Y */
newoffset += newlen;
proto_tree_add_item(t, hf_hip_tlv_host_id_y, tvb, newoffset,
newlen, FALSE);
newlen, ENC_NA);
break;
case HI_ALG_RSA:
/* RSA KEY RR RFC 3110
@ -951,7 +951,7 @@ dissect_hip_tlv(tvbuff_t *tvb, int offset, proto_item *ti, int type, int tlv_len
}
/* e */
proto_tree_add_item(t, hf_hip_tlv_host_id_e, tvb, newoffset,
e_len, FALSE);
e_len, ENC_NA);
newoffset += e_len;
hi_len -= e_len;
@ -963,7 +963,7 @@ dissect_hip_tlv(tvbuff_t *tvb, int offset, proto_item *ti, int type, int tlv_len
/* RSA public modulus n */
proto_tree_add_item(t, hf_hip_tlv_host_id_n, tvb, newoffset,
hi_len, FALSE);
hi_len, ENC_NA);
break;
default:
proto_tree_add_text(t, tvb, newoffset, 1,
@ -1000,7 +1000,7 @@ dissect_hip_tlv(tvbuff_t *tvb, int offset, proto_item *ti, int type, int tlv_len
newoffset++;
/* Certificate */
proto_tree_add_item(t, hf_hip_tlv_certificate, tvb, newoffset,
tlv_len-4, FALSE);
tlv_len-4, ENC_NA);
break;
case PARAM_NOTIFICATION:
t = proto_item_add_subtree(ti, ett_hip_tlv_data);
@ -1012,7 +1012,7 @@ dissect_hip_tlv(tvbuff_t *tvb, int offset, proto_item *ti, int type, int tlv_len
newoffset += 2;
/* Notification Data */
proto_tree_add_item(t, hf_hip_tlv_notification_data, tvb, newoffset,
tlv_len-4, FALSE);
tlv_len-4, ENC_NA);
break;
case PARAM_ECHO_REQUEST_SIGNED:
case PARAM_ECHO_RESPONSE_SIGNED:
@ -1021,7 +1021,7 @@ dissect_hip_tlv(tvbuff_t *tvb, int offset, proto_item *ti, int type, int tlv_len
t = proto_item_add_subtree(ti, ett_hip_tlv_data);
/* Variable length Opaque Data */
proto_tree_add_item(t, hf_hip_tlv_opaque_data, tvb, newoffset,
tlv_len, FALSE);
tlv_len, ENC_NA);
break;
case PARAM_REG_INFO:
case PARAM_REG_REQUEST:
@ -1065,7 +1065,7 @@ dissect_hip_tlv(tvbuff_t *tvb, int offset, proto_item *ti, int type, int tlv_len
t = proto_item_add_subtree(ti, ett_hip_tlv_data);
/* HMAC */
proto_tree_add_item(t, hf_hip_tlv_hmac, tvb, offset+4,
tlv_len, FALSE);
tlv_len, ENC_NA);
break;
case PARAM_HIP_SIGNATURE:
case PARAM_HIP_SIGNATURE_2:
@ -1078,7 +1078,7 @@ dissect_hip_tlv(tvbuff_t *tvb, int offset, proto_item *ti, int type, int tlv_len
newoffset++;
/* Signature */
proto_tree_add_item(t, hf_hip_tlv_sig, tvb, newoffset, tlv_len-1,
FALSE);
ENC_NA);
break;
case PARAM_FROM:
t = proto_item_add_subtree(ti, ett_hip_tlv_data);

Some files were not shown because too many files have changed in this diff Show More