diff options
| author | Bill Meier <wmeier@newsguy.com> | 2011-10-04 22:44:31 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2011-10-04 22:44:31 +0000 |
| commit | 94f36ca4ff177617fcc4e4ca8a171e374f8aeff6 (patch) | |
| tree | 060bfcfb238455d21752efec8612998f2ab1db6f /epan | |
| parent | 039fc59cb110aa485e910583d1edd5ff81ca2168 (diff) | |
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
Diffstat (limited to 'epan')
293 files changed, 2394 insertions, 2394 deletions
diff --git a/epan/dissectors/packet-2dparityfec.c b/epan/dissectors/packet-2dparityfec.c index baa78ae1c8..68d5e22bab 100644 --- a/epan/dissectors/packet-2dparityfec.c +++ b/epan/dissectors/packet-2dparityfec.c @@ -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); } } diff --git a/epan/dissectors/packet-3com-njack.c b/epan/dissectors/packet-3com-njack.c index dcc86be829..621d809247 100644 --- a/epan/dissectors/packet-3com-njack.c +++ b/epan/dissectors/packet-3com-njack.c @@ -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; diff --git a/epan/dissectors/packet-aim-generic.c b/epan/dissectors/packet-aim-generic.c index 92dd121f4f..b00d28009d 100644 --- a/epan/dissectors/packet-aim-generic.c +++ b/epan/dissectors/packet-aim-generic.c @@ -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; } diff --git a/epan/dissectors/packet-aim-messaging.c b/epan/dissectors/packet-aim-messaging.c index 66c0a3a640..238cf83558 100644 --- a/epan/dissectors/packet-aim-messaging.c +++ b/epan/dissectors/packet-aim-messaging.c @@ -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); diff --git a/epan/dissectors/packet-aim-sst.c b/epan/dissectors/packet-aim-sst.c index aa25f3d8b8..d54f7cf18d 100644 --- a/epan/dissectors/packet-aim-sst.c +++ b/epan/dissectors/packet-aim-sst.c @@ -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; diff --git a/epan/dissectors/packet-airopeek.c b/epan/dissectors/packet-airopeek.c index 5660ae8777..5a22d39bc5 100644 --- a/epan/dissectors/packet-airopeek.c +++ b/epan/dissectors/packet-airopeek.c @@ -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; diff --git a/epan/dissectors/packet-alcap.c b/epan/dissectors/packet-alcap.c index 474e6992f7..cb63ca1537 100644 --- a/epan/dissectors/packet-alcap.c +++ b/epan/dissectors/packet-alcap.c @@ -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); diff --git a/epan/dissectors/packet-amqp.c b/epan/dissectors/packet-amqp.c index 2548df103a..4146eccc59 100644 --- a/epan/dissectors/packet-amqp.c +++ b/epan/dissectors/packet-amqp.c @@ -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); } diff --git a/epan/dissectors/packet-arcnet.c b/epan/dissectors/packet-arcnet.c index 8fec7dd763..8d4466bc2b 100644 --- a/epan/dissectors/packet-arcnet.c +++ b/epan/dissectors/packet-arcnet.c @@ -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; } diff --git a/epan/dissectors/packet-artnet.c b/epan/dissectors/packet-artnet.c index cfafcd7342..ca34e7494d 100644 --- a/epan/dissectors/packet-artnet.c +++ b/epan/dissectors/packet-artnet.c @@ -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 ); diff --git a/epan/dissectors/packet-aruba-papi.c b/epan/dissectors/packet-aruba-papi.c index d9dfea1695..a806ad1382 100644 --- a/epan/dissectors/packet-aruba-papi.c +++ b/epan/dissectors/packet-aruba-papi.c @@ -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) diff --git a/epan/dissectors/packet-asap.c b/epan/dissectors/packet-asap.c index a375d9a9b8..3e13913a47 100644 --- a/epan/dissectors/packet-asap.c +++ b/epan/dissectors/packet-asap.c @@ -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 diff --git a/epan/dissectors/packet-asf.c b/epan/dissectors/packet-asf.c index efe6902752..df9f0a9fcf 100644 --- a/epan/dissectors/packet-asf.c +++ b/epan/dissectors/packet-asf.c @@ -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 diff --git a/epan/dissectors/packet-assa_r3.c b/epan/dissectors/packet-assa_r3.c index 4921ef8070..6892986fa2 100644 --- a/epan/dissectors/packet-assa_r3.c +++ b/epan/dissectors/packet-assa_r3.c @@ -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); diff --git a/epan/dissectors/packet-atalk.c b/epan/dissectors/packet-atalk.c index 4e4752c972..763123d2d4 100644 --- a/epan/dissectors/packet-atalk.c +++ b/epan/dissectors/packet-atalk.c @@ -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); diff --git a/epan/dissectors/packet-ayiya.c b/epan/dissectors/packet-ayiya.c index 506f0e4b5e..ef30817c20 100644 --- a/epan/dissectors/packet-ayiya.c +++ b/epan/dissectors/packet-ayiya.c @@ -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) { diff --git a/epan/dissectors/packet-bacnet.c b/epan/dissectors/packet-bacnet.c index b9e07a47b2..7179215b1f 100644 --- a/epan/dissectors/packet-bacnet.c +++ b/epan/dissectors/packet-bacnet.c @@ -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, diff --git a/epan/dissectors/packet-banana.c b/epan/dissectors/packet-banana.c index bfb3b3508d..bf89489e4a 100644 --- a/epan/dissectors/packet-banana.c +++ b/epan/dissectors/packet-banana.c @@ -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) { diff --git a/epan/dissectors/packet-bgp.c b/epan/dissectors/packet-bgp.c index f9f7a38672..1951afcd11 100644 --- a/epan/dissectors/packet-bgp.c +++ b/epan/dissectors/packet-bgp.c @@ -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: diff --git a/epan/dissectors/packet-bittorrent.c b/epan/dissectors/packet-bittorrent.c index 9a1b4c6d92..c6abd8c9be 100644 --- a/epan/dissectors/packet-bittorrent.c +++ b/epan/dissectors/packet-bittorrent.c @@ -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) { diff --git a/epan/dissectors/packet-bmc.c b/epan/dissectors/packet-bmc.c index ae520b297e..e4a5edf17c 100644 --- a/epan/dissectors/packet-bmc.c +++ b/epan/dissectors/packet-bmc.c @@ -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; diff --git a/epan/dissectors/packet-bootp.c b/epan/dissectors/packet-bootp.c index e5d5b466c3..70c44b8b93 100644 --- a/epan/dissectors/packet-bootp.c +++ b/epan/dissectors/packet-bootp.c @@ -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"); diff --git a/epan/dissectors/packet-bpdu.c b/epan/dissectors/packet-bpdu.c index 6c2d188c96..231e9853e0 100644 --- a/epan/dissectors/packet-bpdu.c +++ b/epan/dissectors/packet-bpdu.c @@ -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) { diff --git a/epan/dissectors/packet-bssap.c b/epan/dissectors/packet-bssap.c index d9ad77d672..ef6431158d 100644 --- a/epan/dissectors/packet-bssap.c +++ b/epan/dissectors/packet-bssap.c @@ -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; diff --git a/epan/dissectors/packet-bssgp.c b/epan/dissectors/packet-bssgp.c index d941da5631..3ff07d1f1c 100644 --- a/epan/dissectors/packet-bssgp.c +++ b/epan/dissectors/packet-bssgp.c @@ -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); diff --git a/epan/dissectors/packet-bt-utp.c b/epan/dissectors/packet-bt-utp.c index 9353841091..7cf6955dce 100644 --- a/epan/dissectors/packet-bt-utp.c +++ b/epan/dissectors/packet-bt-utp.c @@ -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; diff --git a/epan/dissectors/packet-btamp.c b/epan/dissectors/packet-btamp.c index 06cc59e56a..359f422fef 100644 --- a/epan/dissectors/packet-btamp.c +++ b/epan/dissectors/packet-btamp.c @@ -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; } diff --git a/epan/dissectors/packet-bthci_cmd.c b/epan/dissectors/packet-bthci_cmd.c index cd16469d87..77d0c04355 100644 --- a/epan/dissectors/packet-bthci_cmd.c +++ b/epan/dissectors/packet-bthci_cmd.c @@ -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; } } diff --git a/epan/dissectors/packet-bthci_evt.c b/epan/dissectors/packet-bthci_evt.c index 2bb36177b8..1e35a9983c 100644 --- a/epan/dissectors/packet-bthci_evt.c +++ b/epan/dissectors/packet-bthci_evt.c @@ -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; } diff --git a/epan/dissectors/packet-bthci_sco.c b/epan/dissectors/packet-bthci_sco.c index a6f5552bd5..febcaf808d 100644 --- a/epan/dissectors/packet-bthci_sco.c +++ b/epan/dissectors/packet-bthci_sco.c @@ -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); } diff --git a/epan/dissectors/packet-btl2cap.c b/epan/dissectors/packet-btl2cap.c index 40f321376f..d9a299a3b3 100644 --- a/epan/dissectors/packet-btl2cap.c +++ b/epan/dissectors/packet-btl2cap.c @@ -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 */ diff --git a/epan/dissectors/packet-btobex.c b/epan/dissectors/packet-btobex.c index f298d17425..6874d2497e 100644 --- a/epan/dissectors/packet-btobex.c +++ b/epan/dissectors/packet-btobex.c @@ -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++) { diff --git a/epan/dissectors/packet-btrfcomm.c b/epan/dissectors/packet-btrfcomm.c index e98f82ca80..af7eee3af7 100644 --- a/epan/dissectors/packet-btrfcomm.c +++ b/epan/dissectors/packet-btrfcomm.c @@ -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 diff --git a/epan/dissectors/packet-bvlc.c b/epan/dissectors/packet-bvlc.c index da674c0d7e..4bb051691f 100644 --- a/epan/dissectors/packet-bvlc.c +++ b/epan/dissectors/packet-bvlc.c @@ -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 */ diff --git a/epan/dissectors/packet-capwap.c b/epan/dissectors/packet-capwap.c index 11d8ab1da2..1e60137305 100644 --- a/epan/dissectors/packet-capwap.c +++ b/epan/dissectors/packet-capwap.c @@ -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))); diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c index b295981e04..2095e924a1 100644 --- a/epan/dissectors/packet-catapult-dct2000.c +++ b/epan/dissectors/packet-catapult-dct2000.c @@ -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))", diff --git a/epan/dissectors/packet-cfm.c b/epan/dissectors/packet-cfm.c index 3ee097cbb5..1154db6eb6 100644 --- a/epan/dissectors/packet-cfm.c +++ b/epan/dissectors/packet-cfm.c @@ -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; } diff --git a/epan/dissectors/packet-cigi.c b/epan/dissectors/packet-cigi.c index 5e9ce814b9..985695d87f 100644 --- a/epan/dissectors/packet-cigi.c +++ b/epan/dissectors/packet-cigi.c @@ -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)); diff --git a/epan/dissectors/packet-cip.c b/epan/dissectors/packet-cip.c index 90107fa832..6666e6fad7 100644 --- a/epan/dissectors/packet-cip.c +++ b/epan/dissectors/packet-cip.c @@ -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); } diff --git a/epan/dissectors/packet-cisco-erspan.c b/epan/dissectors/packet-cisco-erspan.c index 6cbcc61d32..fcc23c272b 100644 --- a/epan/dissectors/packet-cisco-erspan.c +++ b/epan/dissectors/packet-cisco-erspan.c @@ -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 { diff --git a/epan/dissectors/packet-cisco-wids.c b/epan/dissectors/packet-cisco-wids.c index 16947f5df2..2484ed58db 100644 --- a/epan/dissectors/packet-cisco-wids.c +++ b/epan/dissectors/packet-cisco-wids.c @@ -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); diff --git a/epan/dissectors/packet-classicstun.c b/epan/dissectors/packet-classicstun.c index 239284466f..64b93dd240 100644 --- a/epan/dissectors/packet-classicstun.c +++ b/epan/dissectors/packet-classicstun.c @@ -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: diff --git a/epan/dissectors/packet-collectd.c b/epan/dissectors/packet-collectd.c index e6925b3ed0..d2706809c4 100644 --- a/epan/dissectors/packet-collectd.c +++ b/epan/dissectors/packet-collectd.c @@ -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, diff --git a/epan/dissectors/packet-data.c b/epan/dissectors/packet-data.c index 9224c44cae..233043e2e5 100644 --- a/epan/dissectors/packet-data.c +++ b/epan/dissectors/packet-data.c @@ -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); diff --git a/epan/dissectors/packet-dcc.c b/epan/dissectors/packet-dcc.c index 93c937ae7e..b5ea3e9208 100644 --- a/epan/dissectors/packet-dcc.c +++ b/epan/dissectors/packet-dcc.c @@ -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); \ } diff --git a/epan/dissectors/packet-dcerpc-krb5rpc.c b/epan/dissectors/packet-dcerpc-krb5rpc.c index 69e99ebb3e..b1940a6bd6 100644 --- a/epan/dissectors/packet-dcerpc-krb5rpc.c +++ b/epan/dissectors/packet-dcerpc-krb5rpc.c @@ -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); diff --git a/epan/dissectors/packet-dcerpc-netlogon.c b/epan/dissectors/packet-dcerpc-netlogon.c index 3d5432af5e..ce6f235933 100644 --- a/epan/dissectors/packet-dcerpc-netlogon.c +++ b/epan/dissectors/packet-dcerpc-netlogon.c @@ -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, diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c index 9146887f49..ec9971c088 100644 --- a/epan/dissectors/packet-dcerpc.c +++ b/epan/dissectors/packet-dcerpc.c @@ -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; diff --git a/epan/dissectors/packet-dcom-dispatch.c b/epan/dissectors/packet-dcom-dispatch.c index 8d5302ec19..c8cabd6192 100644 --- a/epan/dissectors/packet-dcom-dispatch.c +++ b/epan/dissectors/packet-dcom-dispatch.c @@ -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; diff --git a/epan/dissectors/packet-dcom-remunkn.c b/epan/dissectors/packet-dcom-remunkn.c index 1cbab9180b..a8596ac383 100644 --- a/epan/dissectors/packet-dcom-remunkn.c +++ b/epan/dissectors/packet-dcom-remunkn.c @@ -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; diff --git a/epan/dissectors/packet-dcom.c b/epan/dissectors/packet-dcom.c index 3a8b3689ba..51f5fbbacd 100644 --- a/epan/dissectors/packet-dcom.c +++ b/epan/dissectors/packet-dcom.c @@ -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, diff --git a/epan/dissectors/packet-dcp-etsi.c b/epan/dissectors/packet-dcp-etsi.c index 473ebaec6b..86ba3dde61 100644 --- a/epan/dissectors/packet-dcp-etsi.c +++ b/epan/dissectors/packet-dcp-etsi.c @@ -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); diff --git a/epan/dissectors/packet-dec-dnart.c b/epan/dissectors/packet-dec-dnart.c index a6d3feb61b..ca9782af15 100644 --- a/epan/dissectors/packet-dec-dnart.c +++ b/epan/dissectors/packet-dec-dnart.c @@ -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); diff --git a/epan/dissectors/packet-dect.c b/epan/dissectors/packet-dect.c index 3b6dcedd2d..373540d06f 100644 --- a/epan/dissectors/packet-dect.c +++ b/epan/dissectors/packet-dect.c @@ -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) { diff --git a/epan/dissectors/packet-dhcp-failover.c b/epan/dissectors/packet-dhcp-failover.c index fe77e8e25a..c4fdb31821 100644 --- a/epan/dissectors/packet-dhcp-failover.c +++ b/epan/dissectors/packet-dhcp-failover.c @@ -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: diff --git a/epan/dissectors/packet-dhcpv6.c b/epan/dissectors/packet-dhcpv6.c index d5cc6e9f84..47e341fa4a 100644 --- a/epan/dissectors/packet-dhcpv6.c +++ b/epan/dissectors/packet-dhcpv6.c @@ -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: diff --git a/epan/dissectors/packet-diameter.c b/epan/dissectors/packet-diameter.c index a4bb07fc18..01aecaf9c0 100644 --- a/epan/dissectors/packet-diameter.c +++ b/epan/dissectors/packet-diameter.c @@ -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); diff --git a/epan/dissectors/packet-diameter_3gpp.c b/epan/dissectors/packet-diameter_3gpp.c index 203ef15598..0e35ed678e 100644 --- a/epan/dissectors/packet-diameter_3gpp.c +++ b/epan/dissectors/packet-diameter_3gpp.c @@ -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 diff --git a/epan/dissectors/packet-distcc.c b/epan/dissectors/packet-distcc.c index 88a6554875..f067917624 100644 --- a/epan/dissectors/packet-distcc.c +++ b/epan/dissectors/packet-distcc.c @@ -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]"); } diff --git a/epan/dissectors/packet-dlm3.c b/epan/dissectors/packet-dlm3.c index 3ea6e09d69..b790c5e06e 100644 --- a/epan/dissectors/packet-dlm3.c +++ b/epan/dissectors/packet-dlm3.c @@ -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) { diff --git a/epan/dissectors/packet-dnp.c b/epan/dissectors/packet-dnp.c index 05fb0fc80d..72926ea024 100644 --- a/epan/dissectors/packet-dnp.c +++ b/epan/dissectors/packet-dnp.c @@ -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; } diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c index 4f0d18e202..e06b4ed59b 100644 --- a/epan/dissectors/packet-dns.c +++ b/epan/dissectors/packet-dns.c @@ -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; diff --git a/epan/dissectors/packet-dplay.c b/epan/dissectors/packet-dplay.c index 66a29adb22..8b2154ff2e 100644 --- a/epan/dissectors/packet-dplay.c +++ b/epan/dissectors/packet-dplay.c @@ -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); } } diff --git a/epan/dissectors/packet-dsi.c b/epan/dissectors/packet-dsi.c index 4beb4dc7e8..8fc96ddc26 100644 --- a/epan/dissectors/packet-dsi.c +++ b/epan/dissectors/packet-dsi.c @@ -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; } } diff --git a/epan/dissectors/packet-dtls.c b/epan/dissectors/packet-dtls.c index 608ded2a77..6f0612d05b 100644 --- a/epan/dissectors/packet-dtls.c +++ b/epan/dissectors/packet-dtls.c @@ -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; } } diff --git a/epan/dissectors/packet-dua.c b/epan/dissectors/packet-dua.c index 086f673f92..44d33f9795 100644 --- a/epan/dissectors/packet-dua.c +++ b/epan/dissectors/packet-dua.c @@ -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 diff --git a/epan/dissectors/packet-dvbci.c b/epan/dissectors/packet-dvbci.c index 23b49ca4a6..5d277806cc 100644 --- a/epan/dissectors/packet-dvbci.c +++ b/epan/dissectors/packet-dvbci.c @@ -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; diff --git a/epan/dissectors/packet-dvmrp.c b/epan/dissectors/packet-dvmrp.c index 93f2dd5078..3c096e499a 100644 --- a/epan/dissectors/packet-dvmrp.c +++ b/epan/dissectors/packet-dvmrp.c @@ -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); diff --git a/epan/dissectors/packet-eapol.c b/epan/dissectors/packet-eapol.c index 2f7f3f2dce..6a1ab76b73 100644 --- a/epan/dissectors/packet-eapol.c +++ b/epan/dissectors/packet-eapol.c @@ -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"); diff --git a/epan/dissectors/packet-edonkey.c b/epan/dissectors/packet-edonkey.c index 87347ccef6..c9b0f9a5b2 100644 --- a/epan/dissectors/packet-edonkey.c +++ b/epan/dissectors/packet-edonkey.c @@ -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, diff --git a/epan/dissectors/packet-eigrp.c b/epan/dissectors/packet-eigrp.c index 0956c87fdd..f9208d7946 100644 --- a/epan/dissectors/packet-eigrp.c +++ b/epan/dissectors/packet-eigrp.c @@ -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"); diff --git a/epan/dissectors/packet-enip.c b/epan/dissectors/packet-enip.c index 9a81c630fb..9b5e5c43cc 100644 --- a/epan/dissectors/packet-enip.c +++ b/epan/dissectors/packet-enip.c @@ -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 */ diff --git a/epan/dissectors/packet-enrp.c b/epan/dissectors/packet-enrp.c index 84c4f175b9..f8a034838d 100644 --- a/epan/dissectors/packet-enrp.c +++ b/epan/dissectors/packet-enrp.c @@ -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 diff --git a/epan/dissectors/packet-enttec.c b/epan/dissectors/packet-enttec.c index 85752ac90b..9cc014488b 100644 --- a/epan/dissectors/packet-enttec.c +++ b/epan/dissectors/packet-enttec.c @@ -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; } diff --git a/epan/dissectors/packet-epl.c b/epan/dissectors/packet-epl.c index 0023352d80..978b7fbc90 100644 --- a/epan/dissectors/packet-epl.c +++ b/epan/dissectors/packet-epl.c @@ -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) { diff --git a/epan/dissectors/packet-epl_v1.c b/epan/dissectors/packet-epl_v1.c index 8fc5c0ac9c..91604191c5 100644 --- a/epan/dissectors/packet-epl_v1.c +++ b/epan/dissectors/packet-epl_v1.c @@ -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; } diff --git a/epan/dissectors/packet-extreme.c b/epan/dissectors/packet-extreme.c index 96d7d8f1a9..fd681b78de 100644 --- a/epan/dissectors/packet-extreme.c +++ b/epan/dissectors/packet-extreme.c @@ -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 diff --git a/epan/dissectors/packet-fcels.c b/epan/dissectors/packet-fcels.c index 76592032fa..a5bd5fd027 100644 --- a/epan/dissectors/packet-fcels.c +++ b/epan/dissectors/packet-fcels.c @@ -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, diff --git a/epan/dissectors/packet-fcgi.c b/epan/dissectors/packet-fcgi.c index 1d811373af..75dec691fd 100644 --- a/epan/dissectors/packet-fcgi.c +++ b/epan/dissectors/packet-fcgi.c @@ -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; } } diff --git a/epan/dissectors/packet-fcswils.c b/epan/dissectors/packet-fcswils.c index 98380ec8c0..88871ffa10 100644 --- a/epan/dissectors/packet-fcswils.c +++ b/epan/dissectors/packet-fcswils.c @@ -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, diff --git a/epan/dissectors/packet-fip.c b/epan/dissectors/packet-fip.c index d83aa04323..709d2610de 100644 --- a/epan/dissectors/packet-fip.c +++ b/epan/dissectors/packet-fip.c @@ -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; } } diff --git a/epan/dissectors/packet-fix.c b/epan/dissectors/packet-fix.c index 890b32939c..d9825f3652 100644 --- a/epan/dissectors/packet-fix.c +++ b/epan/dissectors/packet-fix.c @@ -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; } diff --git a/epan/dissectors/packet-fp_hint.c b/epan/dissectors/packet-fp_hint.c index 56c3b3a44c..9c36656b42 100644 --- a/epan/dissectors/packet-fp_hint.c +++ b/epan/dissectors/packet-fp_hint.c @@ -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); diff --git a/epan/dissectors/packet-fractalgeneratorprotocol.c b/epan/dissectors/packet-fractalgeneratorprotocol.c index e265b8d4fd..63cd17de0d 100644 --- a/epan/dissectors/packet-fractalgeneratorprotocol.c +++ b/epan/dissectors/packet-fractalgeneratorprotocol.c @@ -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); } } diff --git a/epan/dissectors/packet-frame.c b/epan/dissectors/packet-frame.c index 767a063f14..d640a7a242 100644 --- a/epan/dissectors/packet-frame.c +++ b/epan/dissectors/packet-frame.c @@ -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); } diff --git a/epan/dissectors/packet-gdsdb.c b/epan/dissectors/packet-gdsdb.c index 3bea81948c..fbfe2daa5f 100644 --- a/epan/dissectors/packet-gdsdb.c +++ b/epan/dissectors/packet-gdsdb.c @@ -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); diff --git a/epan/dissectors/packet-giop.c b/epan/dissectors/packet-giop.c index ad3b13dbee..49a66c58e6 100644 --- a/epan/dissectors/packet-giop.c +++ b/epan/dissectors/packet-giop.c @@ -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); } diff --git a/epan/dissectors/packet-git.c b/epan/dissectors/packet-git.c index 5690dbb682..4f9dedf389 100644 --- a/epan/dissectors/packet-git.c +++ b/epan/dissectors/packet-git.c @@ -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); } } diff --git a/epan/dissectors/packet-glbp.c b/epan/dissectors/packet-glbp.c index abc95425a4..6448165202 100644 --- a/epan/dissectors/packet-glbp.c +++ b/epan/dissectors/packet-glbp.c @@ -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; diff --git a/epan/dissectors/packet-gmhdr.c b/epan/dissectors/packet-gmhdr.c index c46d743030..bc9017ca3d 100644 --- a/epan/dissectors/packet-gmhdr.c +++ b/epan/dissectors/packet-gmhdr.c @@ -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; } diff --git a/epan/dissectors/packet-gnutella.c b/epan/dissectors/packet-gnutella.c index 76b416e2b4..2240828988 100644 --- a/epan/dissectors/packet-gnutella.c +++ b/epan/dissectors/packet-gnutella.c @@ -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; } diff --git a/epan/dissectors/packet-gpef.c b/epan/dissectors/packet-gpef.c index 559b03eacc..0dab34afac 100644 --- a/epan/dissectors/packet-gpef.c +++ b/epan/dissectors/packet-gpef.c @@ -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); } diff --git a/epan/dissectors/packet-gre.c b/epan/dissectors/packet-gre.c index 604588fc6d..5ea46d6c2d 100644 --- a/epan/dissectors/packet-gre.c +++ b/epan/dissectors/packet-gre.c @@ -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; } } diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c index 6482d6e4d0..403373a617 100644 --- a/epan/dissectors/packet-gtp.c +++ b/epan/dissectors/packet-gtp.c @@ -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); } diff --git a/epan/dissectors/packet-gtpv2.c b/epan/dissectors/packet-gtpv2.c index e2b71bd392..11261c9481 100644 --- a/epan/dissectors/packet-gtpv2.c +++ b/epan/dissectors/packet-gtpv2.c @@ -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); } diff --git a/epan/dissectors/packet-gvcp.c b/epan/dissectors/packet-gvcp.c index 5a7715795a..ccc55df91f 100644 --- a/epan/dissectors/packet-gvcp.c +++ b/epan/dissectors/packet-gvcp.c @@ -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; } diff --git a/epan/dissectors/packet-h223.c b/epan/dissectors/packet-h223.c index 6ded1dc05e..24c655a167 100644 --- a/epan/dissectors/packet-h223.c +++ b/epan/dissectors/packet-h223.c @@ -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); diff --git a/epan/dissectors/packet-h261.c b/epan/dissectors/packet-h261.c index 90c2990800..cdceb30e74 100644 --- a/epan/dissectors/packet-h261.c +++ b/epan/dissectors/packet-h261.c @@ -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 ); } } diff --git a/epan/dissectors/packet-h263p.c b/epan/dissectors/packet-h263p.c index 0ee9424677..9800b55e4a 100644 --- a/epan/dissectors/packet-h263p.c +++ b/epan/dissectors/packet-h263p.c @@ -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 ); } } diff --git a/epan/dissectors/packet-hip.c b/epan/dissectors/packet-hip.c index 9ac472cc3a..e21881f099 100644 --- a/epan/dissectors/packet-hip.c +++ b/epan/dissectors/packet-hip.c @@ -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); diff --git a/epan/dissectors/packet-hp-erm.c b/epan/dissectors/packet-hp-erm.c index 8830e2daf4..d167d13025 100644 --- a/epan/dissectors/packet-hp-erm.c +++ b/epan/dissectors/packet-hp-erm.c @@ -72,7 +72,7 @@ dissect_hp_erm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_hp_erm, tvb, 0, -1, FALSE); hp_erm_tree = proto_item_add_subtree(ti, ett_hp_erm); - proto_tree_add_item(hp_erm_tree, hf_hp_erm_unknown, tvb, 0, 12, FALSE); + proto_tree_add_item(hp_erm_tree, hf_hp_erm_unknown, tvb, 0, 12, ENC_NA); } eth_tvb = tvb_new_subset_remaining(tvb, 12); diff --git a/epan/dissectors/packet-hpteam.c b/epan/dissectors/packet-hpteam.c index 73ae24f13e..597a237e19 100644 --- a/epan/dissectors/packet-hpteam.c +++ b/epan/dissectors/packet-hpteam.c @@ -79,7 +79,7 @@ dissect_hpteam(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { /* we are being asked for details */ hpteam_item = proto_tree_add_item(tree, proto_hpteam, tvb, 0, -1, FALSE); hpteam_tree = proto_item_add_subtree(hpteam_item, ett_hpteam); - proto_tree_add_item(hpteam_tree, hf_hpteam, tvb, offset, 58, FALSE); + proto_tree_add_item(hpteam_tree, hf_hpteam, tvb, offset, 58, ENC_NA); } } else { diff --git a/epan/dissectors/packet-iax2.c b/epan/dissectors/packet-iax2.c index 5fdb124b66..4875c6e480 100644 --- a/epan/dissectors/packet-iax2.c +++ b/epan/dissectors/packet-iax2.c @@ -1846,7 +1846,7 @@ static guint32 dissect_trunkcall_ts (tvbuff_t * tvb, guint32 offset, proto_tree proto_tree_add_item(call_tree, hf_iax2_trunk_call_len, tvb, offset, 2, FALSE); proto_tree_add_item(call_tree, hf_iax2_trunk_call_scallno, tvb, offset + 2, 2, FALSE); proto_tree_add_item(call_tree, hf_iax2_trunk_call_ts, tvb, offset + 4, 2, FALSE); - proto_tree_add_item(call_tree, hf_iax2_trunk_call_data, tvb, offset + 6, rlen, FALSE); + proto_tree_add_item(call_tree, hf_iax2_trunk_call_data, tvb, offset + 6, rlen, ENC_NA); } offset += 6 + rlen; @@ -1878,7 +1878,7 @@ static guint32 dissect_trunkcall_nots (tvbuff_t * tvb, guint32 offset, proto_tre proto_tree_add_item(call_tree, hf_iax2_trunk_call_scallno, tvb, offset, 2, FALSE); proto_tree_add_item(call_tree, hf_iax2_trunk_call_len, tvb, offset + 2, 2, FALSE); - proto_tree_add_item(call_tree, hf_iax2_trunk_call_data, tvb, offset + 4, rlen, FALSE); + proto_tree_add_item(call_tree, hf_iax2_trunk_call_data, tvb, offset + 4, rlen, ENC_NA); } offset += 4 + rlen; diff --git a/epan/dissectors/packet-icmp.c b/epan/dissectors/packet-icmp.c index 5b86b0298c..313a77c3b2 100644 --- a/epan/dissectors/packet-icmp.c +++ b/epan/dissectors/packet-icmp.c @@ -418,7 +418,7 @@ dissect_mip_extensions(tvbuff_t *tvb, int offset, proto_tree *tree) offset++; /* challenge */ proto_tree_add_item(mip_tree, hf_icmp_mip_challenge, tvb, offset, - length, FALSE); + length, ENC_NA); offset+=length; break; diff --git a/epan/dissectors/packet-icmpv6.c b/epan/dissectors/packet-icmpv6.c index 7228c9d253..d03836da55 100644 --- a/epan/dissectors/packet-icmpv6.c +++ b/epan/dissectors/packet-icmpv6.c @@ -1239,7 +1239,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree /* ICMPv6 Option */ opt_len = tvb_get_guint8(tvb, offset + 1) * 8; - ti = proto_tree_add_item(tree, hf_icmpv6_opt, tvb, offset, opt_len, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, hf_icmpv6_opt, tvb, offset, opt_len, ENC_NA); icmp6opt_tree = proto_item_add_subtree(ti, ett_icmpv6_opt); opt_offset = offset; @@ -1284,14 +1284,14 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree PROTO_ITEM_SET_HIDDEN(ti_opt); /* Padding: 6 bytes */ - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_padding, tvb, opt_offset + 8, 6, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_padding, tvb, opt_offset + 8, 6, ENC_NA); link_str = tvb_eui64_to_str(tvb, opt_offset, ENC_BIG_ENDIAN); col_append_fstr(pinfo->cinfo, COL_INFO, " from %s", link_str); proto_item_append_text(ti, " : %s", link_str); }else{ - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_linkaddr, tvb, opt_offset, opt_len-2, ENC_BIG_ENDIAN); - ti_opt = proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_src_linkaddr, tvb, opt_offset, opt_len-2, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_linkaddr, tvb, opt_offset, opt_len-2, ENC_NA); + ti_opt = proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_src_linkaddr, tvb, opt_offset, opt_len-2, ENC_NA); PROTO_ITEM_SET_HIDDEN(ti_opt); } opt_offset += opt_len; @@ -1318,14 +1318,14 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree PROTO_ITEM_SET_HIDDEN(ti_opt); /* Padding: 6 bytes */ - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_padding, tvb, opt_offset + 8, 6, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_padding, tvb, opt_offset + 8, 6, ENC_NA); link_str = tvb_eui64_to_str(tvb, opt_offset, ENC_BIG_ENDIAN); col_append_fstr(pinfo->cinfo, COL_INFO, " from %s", link_str); proto_item_append_text(ti, " : %s", link_str); }else{ - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_linkaddr, tvb, opt_offset, opt_len-2, ENC_BIG_ENDIAN); - ti_opt = proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_target_linkaddr, tvb, opt_offset, opt_len-2, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_linkaddr, tvb, opt_offset, opt_len-2, ENC_NA); + ti_opt = proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_target_linkaddr, tvb, opt_offset, opt_len-2, ENC_NA); PROTO_ITEM_SET_HIDDEN(ti_opt); } opt_offset += opt_len; @@ -1375,7 +1375,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree } opt_offset += 4; - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_reserved, tvb, opt_offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_reserved, tvb, opt_offset, 4, ENC_NA); opt_offset += 4; /* Prefix */ @@ -1387,16 +1387,16 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree } case ND_OPT_REDIRECTED_HEADER: /* Redirected Header (4) */ - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_reserved, tvb, opt_offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_reserved, tvb, opt_offset, 6, ENC_NA); opt_offset += 6; - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_redirected_packet, tvb, opt_offset, -1, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_redirected_packet, tvb, opt_offset, -1, ENC_NA); offset = dissect_contained_icmpv6(tvb, opt_offset, pinfo, icmp6opt_tree); break; case ND_OPT_MTU: /* MTU (5) */ - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_reserved, tvb, opt_offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_reserved, tvb, opt_offset, 2, ENC_NA); opt_offset += 2; proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_mtu, tvb, opt_offset, 4, ENC_BIG_ENDIAN); @@ -1408,16 +1408,16 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_nbma_shortcut_limit, tvb, opt_offset, 1, ENC_BIG_ENDIAN); proto_item_append_text(ti, " : %d", tvb_get_guint8(tvb, opt_offset)); - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_reserved, tvb, opt_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_reserved, tvb, opt_offset, 1, ENC_NA); opt_offset += 1; - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_reserved, tvb, opt_offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_reserved, tvb, opt_offset, 4, ENC_NA); opt_offset += 4; break; case ND_OPT_ADVINTERVAL: /* Advertisement Interval Option (7) */ - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_reserved, tvb, opt_offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_reserved, tvb, opt_offset, 2, ENC_NA); opt_offset += 2; proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_advertisement_interval, tvb, opt_offset, 4, ENC_BIG_ENDIAN); @@ -1428,7 +1428,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree case ND_OPT_HOMEAGENT_INFO: /* Home Agent Information Option (8) */ { - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_reserved, tvb, opt_offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_reserved, tvb, opt_offset, 2, ENC_NA); opt_offset += 2; proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_home_agent_preference, tvb, opt_offset, 2, ENC_BIG_ENDIAN); @@ -1441,7 +1441,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree case ND_OPT_SOURCE_ADDRLIST: /* Source Address List (9) */ case ND_OPT_TARGET_ADDRLIST: /* Target Address List (10)*/ { - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_reserved, tvb, opt_offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_reserved, tvb, opt_offset, 6, ENC_NA); opt_offset += 6; while(opt_offset < (offset + opt_len) ) { @@ -1467,7 +1467,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree /* Reserved 8 bits */ - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_reserved, tvb, opt_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_reserved, tvb, opt_offset, 1, ENC_NA); opt_offset += 1; /* CGA Parameters A variable-length field containing the CGA Parameters data @@ -1475,17 +1475,17 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree * "Cryptographically Generated Addresses (CGA)", RFC3972. */ par_len = opt_len -4 -padd_length; - cga_item = proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_cga, tvb, opt_offset, par_len, ENC_BIG_ENDIAN); + cga_item = proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_cga, tvb, opt_offset, par_len, ENC_NA); par_len += opt_offset; cga_tree = proto_item_add_subtree(cga_item, ett_icmpv6_cga_param_name); - proto_tree_add_item(cga_tree, hf_icmpv6_opt_cga_modifier, tvb, opt_offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(cga_tree, hf_icmpv6_opt_cga_modifier, tvb, opt_offset, 16, ENC_NA); opt_offset += 16; - proto_tree_add_item(cga_tree, hf_icmpv6_opt_cga_subnet_prefix, tvb, opt_offset, 8, ENC_BIG_ENDIAN); + proto_tree_add_item(cga_tree, hf_icmpv6_opt_cga_subnet_prefix, tvb, opt_offset, 8, ENC_NA); opt_offset += 8; - proto_tree_add_item(cga_tree ,hf_icmpv6_opt_cga_count, tvb, opt_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(cga_tree ,hf_icmpv6_opt_cga_count, tvb, opt_offset, 1, ENC_NA); opt_offset += 1; asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); @@ -1500,12 +1500,12 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree proto_tree_add_item(cga_tree, hf_icmpv6_opt_cga_ext_length, tvb, opt_offset, 2, ENC_BIG_ENDIAN); opt_offset += 2; - proto_tree_add_item(cga_tree, hf_icmpv6_opt_cga_ext_data, tvb, opt_offset, ext_data_len, ENC_BIG_ENDIAN); + proto_tree_add_item(cga_tree, hf_icmpv6_opt_cga_ext_data, tvb, opt_offset, ext_data_len, ENC_NA); opt_offset += ext_data_len; } /* Padding */ - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_padding, tvb, opt_offset, padd_length, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_padding, tvb, opt_offset, padd_length, ENC_NA); opt_offset += padd_length; break; } @@ -1514,7 +1514,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree int par_len; /*5.2. RSA Signature Option */ /* Reserved, A 16-bit field reserved for future use. */ - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_reserved, tvb, opt_offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_reserved, tvb, opt_offset, 2, ENC_NA); opt_offset = opt_offset + 2; /* Key Hash @@ -1522,7 +1522,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree * bits of a SHA-1 [14] hash of the public key used for constructing * the signature. */ - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_rsa_key_hash, tvb, opt_offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_rsa_key_hash, tvb, opt_offset, 16, ENC_NA); opt_offset = opt_offset + 16; /* Digital Signature */ @@ -1536,7 +1536,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree } case ND_OPT_TIMESTAMP: /* Timestamp Option (13) */ /* Reserved A 48-bit field reserved for future use. */ - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_reserved, tvb, opt_offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_reserved, tvb, opt_offset, 6, ENC_NA); opt_offset += 6; /* Timestamp @@ -1553,7 +1553,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree case ND_OPT_NONCE: /* Nonce option (14) */ /* 5.3.2. Nonce Option */ - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_nonce, tvb, opt_offset, opt_len - 2, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_nonce, tvb, opt_offset, opt_len - 2, ENC_NA); opt_offset += opt_len -2; break; case ND_OPT_TRUST_ANCHOR: /* Trust Anchor Option (15) */ @@ -1580,7 +1580,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree switch (name_type){ case 1: /* DER Encoded X.501 Name */ - name_item = proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_name_x501, tvb, opt_offset, par_len, ENC_BIG_ENDIAN); + name_item = proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_name_x501, tvb, opt_offset, par_len, ENC_NA); name_tree = proto_item_add_subtree(name_item, ett_icmpv6_opt_name); asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); dissect_x509if_Name(FALSE, tvb, opt_offset, &asn1_ctx, name_tree, hf_icmpv6_x509if_Name); @@ -1595,7 +1595,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree opt_offset += par_len; /* Padding */ - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_padding, tvb, opt_offset, padd_length, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_padding, tvb, opt_offset, padd_length, ENC_NA); opt_offset += padd_length; break; @@ -1612,7 +1612,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree opt_offset += 1; /* Reserved */ - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_reserved, tvb, opt_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_reserved, tvb, opt_offset, 1, ENC_NA); opt_offset += 1; /* Certificate */ @@ -1622,11 +1622,11 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree opt_offset = dissect_x509af_Certificate(FALSE, tvb, opt_offset, &asn1_ctx, icmp6opt_tree, hf_icmpv6_x509af_Certificate); padd_length = opt_len - (opt_offset - offset); /* Padding */ - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_padding, tvb, opt_offset, padd_length, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_padding, tvb, opt_offset, padd_length, ENC_NA); opt_offset += padd_length; }else{ padd_length = opt_len - 4; - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_certificate_padding, tvb, opt_offset, padd_length, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_certificate_padding, tvb, opt_offset, padd_length, ENC_NA); opt_offset += padd_length; } break; @@ -1645,7 +1645,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree prefix_len = tvb_get_guint8(tvb, opt_offset); opt_offset += 1; - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_reserved, tvb, opt_offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_reserved, tvb, opt_offset, 4, ENC_NA); opt_offset += 4; /* IPv6 Address */ @@ -1669,7 +1669,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree prefix_len = tvb_get_guint8(tvb, opt_offset); opt_offset += 1; - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_reserved, tvb, opt_offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_reserved, tvb, opt_offset, 4, ENC_NA); opt_offset += 4; /* Prefix */ @@ -1686,7 +1686,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree opt_offset += 1; /* Link Layer Address */ - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_lla_bytes, tvb, opt_offset, opt_len-3, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_lla_bytes, tvb, opt_offset, opt_len-3, ENC_NA); opt_offset += opt_len - 3; break; } @@ -1708,7 +1708,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_naack_supplied_ncoa, tvb, opt_offset, 16, ENC_BIG_ENDIAN); opt_offset += 16; }else{ - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_reserved, tvb, opt_offset, opt_len - 4, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_reserved, tvb, opt_offset, opt_len - 4, ENC_NA); opt_offset += opt_len - 4; } break; @@ -1804,7 +1804,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree case ND_OPT_RECURSIVE_DNS_SERVER: /* Recursive DNS Server Option (25) */ { /* Reserved */ - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_reserved, tvb, opt_offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_reserved, tvb, opt_offset, 2, ENC_NA); opt_offset += 2; /* RDNSS Lifetime */ @@ -1834,7 +1834,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree } case ND_OPT_FLAGS_EXTENSION: /* RA Flags Extension Option (26) */ { - ti_opt = proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_efo, tvb, opt_offset, 6, ENC_BIG_ENDIAN); + ti_opt = proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_efo, tvb, opt_offset, 6, ENC_NA); flag_tree = proto_item_add_subtree(ti_opt, ett_icmpv6_flag_efo); proto_tree_add_item(flag_tree, hf_icmpv6_opt_efo_m, tvb, opt_offset, 2, ENC_BIG_ENDIAN); @@ -1845,7 +1845,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree proto_tree_add_item(flag_tree, hf_icmpv6_opt_efo_rsv, tvb, opt_offset, 2, ENC_BIG_ENDIAN); opt_offset += 2; - proto_tree_add_item(flag_tree, hf_icmpv6_opt_reserved, tvb, opt_offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(flag_tree, hf_icmpv6_opt_reserved, tvb, opt_offset, 4, ENC_NA); opt_offset += 4; break; } @@ -1868,11 +1868,11 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree /* Handover Key Encryption Public Key */ par_len = opt_len-4-padd_length; - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_hkr_encryption_public_key, tvb, opt_offset, par_len, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_hkr_encryption_public_key, tvb, opt_offset, par_len, ENC_NA); opt_offset += par_len; /* Padding */ - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_hkr_padding, tvb, opt_offset, padd_length, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_hkr_padding, tvb, opt_offset, padd_length, ENC_NA); opt_offset += 1; break; } @@ -1903,7 +1903,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree opt_offset += par_len; /* Padding */ - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_hkr_padding, tvb, opt_offset, padd_length, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_hkr_padding, tvb, opt_offset, padd_length, ENC_NA); opt_offset += 1; break; } @@ -1921,12 +1921,12 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree opt_offset += 1; /* HAI Value */ - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_hai_value, tvb, opt_offset, hai_len, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_hai_value, tvb, opt_offset, hai_len, ENC_NA); opt_offset += hai_len; /* Padding... */ padd_length = opt_len - opt_offset; - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_padding, tvb, opt_offset, padd_length, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_padding, tvb, opt_offset, padd_length, ENC_NA); opt_offset += padd_length; break; @@ -1945,12 +1945,12 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree opt_offset += 1; /* MN Value */ - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_mn_value, tvb, opt_offset, mn_len, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_mn_value, tvb, opt_offset, mn_len, ENC_NA); opt_offset += mn_len; /* Padding... */ padd_length = opt_len - opt_offset; - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_padding, tvb, opt_offset, padd_length, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_padding, tvb, opt_offset, padd_length, ENC_NA); opt_offset += padd_length; break; @@ -1961,7 +1961,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree const guchar *dnssl_name; /* Reserved */ - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_reserved, tvb, opt_offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_reserved, tvb, opt_offset, 2, ENC_NA); opt_offset += 2; /* DNSSL Lifetime */ @@ -1992,7 +1992,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree int par_len; /* Reserved */ - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_reserved, tvb, opt_offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_reserved, tvb, opt_offset, 2, ENC_NA); opt_offset += 2; /* Key Hash @@ -2000,7 +2000,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree * bits of a SHA-1 [14] hash of the public key used for constructing * the signature. */ - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_ps_key_hash, tvb, opt_offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_ps_key_hash, tvb, opt_offset, 16, ENC_NA); opt_offset += 16; /* Digital Signature */ @@ -2022,7 +2022,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree opt_offset += 1; /* Reserved */ - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_reserved, tvb, opt_offset, 3, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_reserved, tvb, opt_offset, 3, ENC_NA); opt_offset += 3; /* Lifetime */ @@ -2056,7 +2056,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree opt_offset += 1; /* Reserved */ - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_reserved, tvb, opt_offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_reserved, tvb, opt_offset, 2, ENC_NA); opt_offset += 2; /* Lifetime */ @@ -2096,7 +2096,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree opt_offset += 2; /* Reserved */ - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_reserved, tvb, opt_offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_reserved, tvb, opt_offset, 4, ENC_NA); opt_offset += 4; /* 6LBR Address */ @@ -2112,7 +2112,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree "Dissector for ICMPv6 Option (%d)" " code not implemented, Contact Wireshark developers" " if you want this supported", opt_type); - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_data, tvb, opt_offset, opt_len, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_data, tvb, opt_offset, opt_len, ENC_NA); opt_offset += opt_len; break; @@ -2121,7 +2121,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree offset += opt_len; if(offset > opt_offset){ - ti_opt = proto_tree_add_item(icmp6opt_tree, hf_icmpv6_unknown_data, tvb, opt_offset, offset - opt_offset, ENC_BIG_ENDIAN); + ti_opt = proto_tree_add_item(icmp6opt_tree, hf_icmpv6_unknown_data, tvb, opt_offset, offset - opt_offset, ENC_NA); expert_add_info_format(pinfo, ti_opt, PI_MALFORMED, PI_ERROR, "Unknown Data (not interpreted)"); } /* Close the ) to option root label */ @@ -2145,7 +2145,7 @@ dissect_icmpv6_rpl_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree /* there are more options */ /* ICMPv6 RPL Option */ - ti = proto_tree_add_item(tree, hf_icmpv6_rpl_opt, tvb, offset, 1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, hf_icmpv6_rpl_opt, tvb, offset, 1, ENC_NA); icmp6opt_tree = proto_item_add_subtree(ti, ett_icmpv6_rpl_opt); opt_offset = offset; @@ -2174,7 +2174,7 @@ dissect_icmpv6_rpl_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree switch (opt_type) { case RPL_OPT_PADN: /* n-byte padding */ - ti_opt = proto_tree_add_item(icmp6opt_tree, hf_icmpv6_rpl_opt_padn, tvb, opt_offset, opt_len, ENC_BIG_ENDIAN); + ti_opt = proto_tree_add_item(icmp6opt_tree, hf_icmpv6_rpl_opt_padn, tvb, opt_offset, opt_len, ENC_NA); proto_item_append_text(ti_opt, " (Length : %i bytes)", opt_len); opt_offset += opt_len; break; @@ -2193,7 +2193,7 @@ dissect_icmpv6_rpl_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree opt_offset +=1; /* Flags */ - ti_opt = proto_tree_add_item(icmp6opt_tree, hf_icmpv6_rpl_opt_route_flag, tvb, opt_offset, 1, ENC_BIG_ENDIAN); + ti_opt = proto_tree_add_item(icmp6opt_tree, hf_icmpv6_rpl_opt_route_flag, tvb, opt_offset, 1, ENC_NA); flag_tree = proto_item_add_subtree(ti_opt, ett_icmpv6_rpl_flag_routing); proto_tree_add_item(flag_tree, hf_icmpv6_rpl_opt_route_pref, tvb, opt_offset, 1, ENC_BIG_ENDIAN); @@ -2237,7 +2237,7 @@ dissect_icmpv6_rpl_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree case RPL_OPT_CONFIG: { /* Flags */ - ti_opt = proto_tree_add_item(icmp6opt_tree, hf_icmpv6_rpl_opt_config_flag, tvb, opt_offset, 1, ENC_BIG_ENDIAN); + ti_opt = proto_tree_add_item(icmp6opt_tree, hf_icmpv6_rpl_opt_config_flag, tvb, opt_offset, 1, ENC_NA); flag_tree = proto_item_add_subtree(ti_opt, ett_icmpv6_rpl_flag_config); proto_tree_add_item(flag_tree, hf_icmpv6_rpl_opt_config_reserved, tvb, opt_offset, 1, ENC_BIG_ENDIAN); @@ -2287,7 +2287,7 @@ dissect_icmpv6_rpl_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree struct e_in6_addr target_prefix; /* Flag */ - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_rpl_opt_target_flag, tvb, opt_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_rpl_opt_target_flag, tvb, opt_offset, 1, ENC_NA); opt_offset += 1; /* Prefix length */ @@ -2418,7 +2418,7 @@ dissect_icmpv6_rpl_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree opt_offset += 4; /* 4 reserved bytes. */ - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_rpl_opt_reserved, tvb, opt_offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_rpl_opt_reserved, tvb, opt_offset, 4, ENC_NA); opt_offset += 4; /* Prefix */ @@ -2441,7 +2441,7 @@ dissect_icmpv6_rpl_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree "Dissector for ICMPv6 RPL Option" " (%d) code not implemented, Contact" " Wireshark developers if you want this supported", opt_type); - proto_tree_add_item(icmp6opt_tree, hf_icmpv6_data, tvb, opt_offset, opt_len, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6opt_tree, hf_icmpv6_data, tvb, opt_offset, opt_len, ENC_NA); opt_offset += opt_len; break; } /* switch (opt_type) */ @@ -2449,7 +2449,7 @@ dissect_icmpv6_rpl_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree offset += opt_len + 2; if(offset > opt_offset){ - ti_opt = proto_tree_add_item(icmp6opt_tree, hf_icmpv6_unknown_data, tvb, opt_offset, offset - opt_offset, ENC_BIG_ENDIAN); + ti_opt = proto_tree_add_item(icmp6opt_tree, hf_icmpv6_unknown_data, tvb, opt_offset, offset - opt_offset, ENC_NA); expert_add_info_format(pinfo, ti_opt, PI_MALFORMED, PI_ERROR, "Unknown Data (not interpreted)"); } @@ -2517,7 +2517,7 @@ dissect_rpl_control(tvbuff_t *tvb, int rpl_offset, packet_info *pinfo _U_, proto } case 2: { - proto_tree_add_item(icmp6_tree, hf_icmpv6_rpl_secure_key_source, tvb, rpl_offset, 8, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6_tree, hf_icmpv6_rpl_secure_key_source, tvb, rpl_offset, 8, ENC_NA); rpl_offset += 8; proto_tree_add_item(icmp6_tree, hf_icmpv6_rpl_secure_key_index, tvb, rpl_offset, 1, ENC_BIG_ENDIAN); rpl_offset += 1; @@ -2527,7 +2527,7 @@ dissect_rpl_control(tvbuff_t *tvb, int rpl_offset, packet_info *pinfo _U_, proto { if(lvl == 1 || lvl == 3) { - proto_tree_add_item(icmp6_tree, hf_icmpv6_rpl_secure_key_source, tvb, rpl_offset, 8, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6_tree, hf_icmpv6_rpl_secure_key_source, tvb, rpl_offset, 8, ENC_NA); rpl_offset += 8; proto_tree_add_item(icmp6_tree, hf_icmpv6_rpl_secure_key_index, tvb, rpl_offset, 1, ENC_BIG_ENDIAN); rpl_offset += 1; @@ -2547,7 +2547,7 @@ dissect_rpl_control(tvbuff_t *tvb, int rpl_offset, packet_info *pinfo _U_, proto rpl_offset += 1; /* Reserved */ - proto_tree_add_item(icmp6_tree, hf_icmpv6_reserved, tvb, rpl_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6_tree, hf_icmpv6_reserved, tvb, rpl_offset, 1, ENC_NA); rpl_offset += 1; /* RPL Options */ @@ -2587,7 +2587,7 @@ dissect_rpl_control(tvbuff_t *tvb, int rpl_offset, packet_info *pinfo _U_, proto rpl_offset += 1; /* Reserved */ - proto_tree_add_item(icmp6_tree, hf_icmpv6_reserved, tvb, rpl_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6_tree, hf_icmpv6_reserved, tvb, rpl_offset, 1, ENC_NA); rpl_offset += 1; /* DODAGID */ @@ -2617,7 +2617,7 @@ dissect_rpl_control(tvbuff_t *tvb, int rpl_offset, packet_info *pinfo _U_, proto rpl_offset += 1; /* Reserved */ - proto_tree_add_item(icmp6_tree, hf_icmpv6_reserved, tvb, rpl_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6_tree, hf_icmpv6_reserved, tvb, rpl_offset, 1, ENC_NA); rpl_offset += 1; /* Sequence */ @@ -2843,7 +2843,7 @@ dissect_rrenum(tvbuff_t *tvb, int rr_offset, packet_info *pinfo _U_, proto_tree rr_offset += 2; /* Reserved */ - proto_tree_add_item(tree, hf_icmpv6_reserved, tvb, rr_offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_icmpv6_reserved, tvb, rr_offset, 4, ENC_NA); rr_offset += 4; /* Data ? */ @@ -2855,7 +2855,7 @@ dissect_rrenum(tvbuff_t *tvb, int rr_offset, packet_info *pinfo _U_, proto_tree /* Match-Prefix Part */ guint8 opcode, matchlen, minlen, maxlen; - ti_mp = proto_tree_add_item(tree, hf_icmpv6_rr_pco_mp_part, tvb, rr_offset, 24, ENC_BIG_ENDIAN); + ti_mp = proto_tree_add_item(tree, hf_icmpv6_rr_pco_mp_part, tvb, rr_offset, 24, ENC_NA); mp_tree = proto_item_add_subtree(ti_mp, ett_icmpv6_rr_mp); /* OpCode */ @@ -2887,7 +2887,7 @@ dissect_rrenum(tvbuff_t *tvb, int rr_offset, packet_info *pinfo _U_, proto_tree rr_offset += 1; /* Reserved */ - proto_tree_add_item(mp_tree, hf_icmpv6_reserved, tvb, rr_offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(mp_tree, hf_icmpv6_reserved, tvb, rr_offset, 2, ENC_NA); rr_offset += 2; /* Match Prefix */ @@ -2901,7 +2901,7 @@ dissect_rrenum(tvbuff_t *tvb, int rr_offset, packet_info *pinfo _U_, proto_tree /* Use-Prefix Part */ guint8 uselen, keeplen; - ti_up = proto_tree_add_item(tree, hf_icmpv6_rr_pco_up_part, tvb, rr_offset, 32, ENC_BIG_ENDIAN); + ti_up = proto_tree_add_item(tree, hf_icmpv6_rr_pco_up_part, tvb, rr_offset, 32, ENC_NA); up_tree = proto_item_add_subtree(ti_up, ett_icmpv6_rr_up); /* UseLen */ @@ -2974,7 +2974,7 @@ dissect_rrenum(tvbuff_t *tvb, int rr_offset, packet_info *pinfo _U_, proto_tree guint32 interfaceindex; /* Result Message */ - ti_rm = proto_tree_add_item(tree, hf_icmpv6_rr_rm, tvb, rr_offset, 24, ENC_BIG_ENDIAN); + ti_rm = proto_tree_add_item(tree, hf_icmpv6_rr_rm, tvb, rr_offset, 24, ENC_NA); rm_tree = proto_item_add_subtree(ti_rm, ett_icmpv6_rr_rm); /* Flags */ @@ -3020,7 +3020,7 @@ dissect_mldrv2( tvbuff_t *tvb, guint32 offset, packet_info *pinfo _U_, proto_tre int mldr_offset = offset; /* Reserved */ - proto_tree_add_item(tree, hf_icmpv6_reserved, tvb, mldr_offset, 2, FALSE ); + proto_tree_add_item(tree, hf_icmpv6_reserved, tvb, mldr_offset, 2, ENC_NA ); mldr_offset += 2; /* Nr of Mcast Address Records (M) */ @@ -3033,7 +3033,7 @@ dissect_mldrv2( tvbuff_t *tvb, guint32 offset, packet_info *pinfo _U_, proto_tre guint16 i, nb_sources; struct e_in6_addr multicast_address; - ti_mar = proto_tree_add_item(tree, hf_icmpv6_mldr_mar, tvb, mldr_offset, -1, ENC_BIG_ENDIAN); + ti_mar = proto_tree_add_item(tree, hf_icmpv6_mldr_mar, tvb, mldr_offset, -1, ENC_NA); mar_tree = proto_item_add_subtree(ti_mar, ett_icmpv6_mar); /* Record Type */ @@ -3065,7 +3065,7 @@ dissect_mldrv2( tvbuff_t *tvb, guint32 offset, packet_info *pinfo _U_, proto_tre /* Auxiliary Data ? */ if(aux_data_len) { - proto_tree_add_item(mar_tree, hf_icmpv6_mldr_mar_auxiliary_data, tvb, mldr_offset, aux_data_len * 4, ENC_BIG_ENDIAN); + proto_tree_add_item(mar_tree, hf_icmpv6_mldr_mar_auxiliary_data, tvb, mldr_offset, aux_data_len * 4, ENC_NA); mldr_offset += aux_data_len * 4; } @@ -3222,7 +3222,7 @@ dissect_icmpv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * as it could really be any length, couldn't it? */ if (tree) - proto_tree_add_item(icmp6_tree, hf_icmpv6_nonce, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6_tree, hf_icmpv6_nonce, tvb, offset, 4, ENC_NA); offset += 4; } else { if (!pinfo->in_error_pkt) { @@ -3255,7 +3255,7 @@ dissect_icmpv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case ICMP6_DST_UNREACH: /* Destination Unreachable (1) */ case ICMP6_TIME_EXCEEDED: /* Time Exceeded (3) */ /* Reserved */ - proto_tree_add_item(icmp6_tree, hf_icmpv6_reserved, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6_tree, hf_icmpv6_reserved, tvb, offset, 4, ENC_NA); offset += 4; offset = dissect_contained_icmpv6(tvb, offset, pinfo, icmp6_tree); @@ -3296,7 +3296,7 @@ dissect_icmpv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 2; /* Reserved */ - proto_tree_add_item(icmp6_tree, hf_icmpv6_reserved, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6_tree, hf_icmpv6_reserved, tvb, offset, 2, ENC_NA); offset += 2; /* Multicast Address */ @@ -3336,7 +3336,7 @@ dissect_icmpv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 2; /* Reserved */ - proto_tree_add_item(icmp6_tree, hf_icmpv6_reserved, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6_tree, hf_icmpv6_reserved, tvb, offset, 2, ENC_NA); offset += 2; /* Multicast Address */ @@ -3348,7 +3348,7 @@ dissect_icmpv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case ICMP6_ND_ROUTER_SOLICIT: /* Router Solicitation (133) */ { /* Reserved */ - proto_tree_add_item(icmp6_tree, hf_icmpv6_reserved, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6_tree, hf_icmpv6_reserved, tvb, offset, 4, ENC_NA); offset += 4; /* Show options */ @@ -3393,7 +3393,7 @@ dissect_icmpv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case ICMP6_ND_NEIGHBOR_SOLICIT: /* Neighbor Solicitation (135) */ { /* Reserved */ - proto_tree_add_item(icmp6_tree, hf_icmpv6_reserved, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6_tree, hf_icmpv6_reserved, tvb, offset, 4, ENC_NA); offset += 4; /* Target Address */ @@ -3450,7 +3450,7 @@ dissect_icmpv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case ICMP6_ND_REDIRECT: /* Redirect Message (137) */ { /* Reserved */ - proto_tree_add_item(icmp6_tree, hf_icmpv6_reserved, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6_tree, hf_icmpv6_reserved, tvb, offset, 4, ENC_NA); offset += 4; /* Target Address */ @@ -3480,7 +3480,7 @@ dissect_icmpv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case ICMP6_IND_ADVERT: /* Inverse Neighbor Discovery Advertisement Message (142) */ { /* Reserved */ - proto_tree_add_item(icmp6_tree, hf_icmpv6_reserved, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6_tree, hf_icmpv6_reserved, tvb, offset, 4, ENC_NA); offset += 4; /* Show options */ @@ -3499,7 +3499,7 @@ dissect_icmpv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 2; /* Reserved */ - proto_tree_add_item(icmp6_tree, hf_icmpv6_reserved, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6_tree, hf_icmpv6_reserved, tvb, offset, 2, ENC_NA); offset += 2; break; @@ -3511,7 +3511,7 @@ dissect_icmpv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 2; /* Reserved */ - proto_tree_add_item(icmp6_tree, hf_icmpv6_reserved, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6_tree, hf_icmpv6_reserved, tvb, offset, 2, ENC_NA); offset += 2; /* Show all Home Agent Addresses */ @@ -3529,7 +3529,7 @@ dissect_icmpv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 2; /* Reserved */ - proto_tree_add_item(icmp6_tree, hf_icmpv6_reserved, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6_tree, hf_icmpv6_reserved, tvb, offset, 2, ENC_NA); offset += 2; break; } @@ -3540,7 +3540,7 @@ dissect_icmpv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 2; /* Flag */ - ti_flag = proto_tree_add_item(icmp6_tree, hf_icmpv6_mip6_flag, tvb,offset, 6, ENC_BIG_ENDIAN); + ti_flag = proto_tree_add_item(icmp6_tree, hf_icmpv6_mip6_flag, tvb,offset, 6, ENC_NA); flag_tree = proto_item_add_subtree(ti_flag, ett_icmpv6_flag_mip6); proto_tree_add_item(flag_tree, hf_icmpv6_mip6_flag_m, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(flag_tree, hf_icmpv6_mip6_flag_o, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -3582,7 +3582,7 @@ dissect_icmpv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 2; /* Reserved */ - proto_tree_add_item(icmp6_tree, hf_icmpv6_reserved, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6_tree, hf_icmpv6_reserved, tvb, offset, 2, ENC_NA); offset += 2; /* Show options */ @@ -3604,14 +3604,14 @@ dissect_icmpv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case FMIP6_SUBTYPE_RTSOLPR: { /* Reserved */ - proto_tree_add_item(icmp6_tree, hf_icmpv6_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6_tree, hf_icmpv6_reserved, tvb, offset, 1, ENC_NA); } break; case FMIP6_SUBTYPE_PRRTADV: { proto_item_append_text(code_item, " (%s)", val_to_str(icmp6_code, fmip6_prrtadv_code_val, "Unknown %d") ); /* Reserved */ - proto_tree_add_item(icmp6_tree, hf_icmpv6_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6_tree, hf_icmpv6_reserved, tvb, offset, 1, ENC_NA); } break; case FMIP6_SUBTYPE_HI: @@ -3630,7 +3630,7 @@ dissect_icmpv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_item_append_text(code_item, " (%s)", val_to_str(icmp6_code, fmip6_hack_code_val, "Unknown %d") ); /* Reserved */ - proto_tree_add_item(icmp6_tree, hf_icmpv6_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6_tree, hf_icmpv6_reserved, tvb, offset, 1, ENC_NA); } break; } @@ -3696,7 +3696,7 @@ dissect_icmpv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) "Dissector for ICMPv6 Type (%d)" " code not implemented, Contact Wireshark" " developers if you want this supported", icmp6_type); - proto_tree_add_item(icmp6_tree, hf_icmpv6_data, tvb, offset, -1, ENC_BIG_ENDIAN); + proto_tree_add_item(icmp6_tree, hf_icmpv6_data, tvb, offset, -1, ENC_NA); break; } /* switch (icmp6_type) */ } /* if (tree) */ diff --git a/epan/dissectors/packet-ieee1722.c b/epan/dissectors/packet-ieee1722.c index b009633da7..cfbbfa050b 100644 --- a/epan/dissectors/packet-ieee1722.c +++ b/epan/dissectors/packet-ieee1722.c @@ -210,7 +210,7 @@ static void dissect_1722(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Make the Audio sample tree. */ ti = proto_tree_add_item(ieee1722_tree, hf_1722_data, tvb, - IEEE_1722_DATA_OFFSET, datalen, FALSE); + IEEE_1722_DATA_OFFSET, datalen, ENC_NA); audio_tree = proto_item_add_subtree(ti, ett_1722_audio); @@ -231,7 +231,7 @@ static void dissect_1722(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(sample_tree, hf_1722_label, tvb, offset, 1, FALSE); offset += 1; - proto_tree_add_item(sample_tree, hf_1722_sample, tvb, offset, 3, FALSE); + proto_tree_add_item(sample_tree, hf_1722_sample, tvb, offset, 3, ENC_NA); offset += 3; } } diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 12e0c2ca1e..10643adec8 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -3674,7 +3674,7 @@ dissect_roaming_consortium_list(proto_tree *tree, tvbuff_t *tvb, int offset, } item = proto_tree_add_item(tree, hf_ieee80211_ff_anqp_roaming_consortium_oi, - tvb, offset, len, ENC_BIG_ENDIAN); + tvb, offset, len, ENC_NA); add_manuf(item, tvb, offset); offset += len; } @@ -3845,13 +3845,13 @@ dissect_anqp_info(proto_tree *tree, tvbuff_t *tvb, int offset, break; default: proto_tree_add_item(tree, hf_ieee80211_ff_anqp_info, - tvb, offset, len, ENC_BIG_ENDIAN); + tvb, offset, len, ENC_NA); break; } break; default: proto_tree_add_item(tree, hf_ieee80211_ff_anqp_info, - tvb, offset, len, ENC_BIG_ENDIAN); + tvb, offset, len, ENC_NA); break; } @@ -3909,7 +3909,7 @@ dissect_gas_initial_request(proto_tree *tree, tvbuff_t *tvb, int offset, dissect_anqp(query, tvb, offset, TRUE); else proto_tree_add_item(query, hf_ieee80211_ff_query_request, - tvb, offset, req_len, ENC_BIG_ENDIAN); + tvb, offset, req_len, ENC_NA); offset += req_len; return offset - start; @@ -3945,7 +3945,7 @@ dissect_gas_initial_response(proto_tree *tree, tvbuff_t *tvb, int offset, dissect_anqp(query, tvb, offset, FALSE); else proto_tree_add_item(query, hf_ieee80211_ff_query_response, - tvb, offset, resp_len, ENC_BIG_ENDIAN); + tvb, offset, resp_len, ENC_NA); offset += resp_len; } @@ -3982,7 +3982,7 @@ dissect_gas_comeback_response(proto_tree *tree, tvbuff_t *tvb, int offset, dissect_anqp(query, tvb, offset, FALSE); else proto_tree_add_item(query, hf_ieee80211_ff_query_response, - tvb, offset, resp_len, ENC_BIG_ENDIAN); + tvb, offset, resp_len, ENC_NA); offset += resp_len; } @@ -4361,7 +4361,7 @@ add_fixed_field(proto_tree * tree, tvbuff_t * tvb, int offset, int lfcode) proto_item *mimo_item; proto_tree *mimo_tree; - mimo_item = proto_tree_add_item(tree, hf_ieee80211_ff_mimo_cntrl, tvb, offset, 6, ENC_LITTLE_ENDIAN); + mimo_item = proto_tree_add_item(tree, hf_ieee80211_ff_mimo_cntrl, tvb, offset, 6, ENC_NA); mimo_tree = proto_item_add_subtree (mimo_item, ett_ff_mimo_cntrl); proto_tree_add_item(mimo_tree, hf_ieee80211_ff_mimo_cntrl_nc_index, tvb, offset, 1, ENC_LITTLE_ENDIAN); @@ -5443,7 +5443,7 @@ dissect_vendor_ie_wpawme(proto_tree * tree, tvbuff_t * tvb, int offset, guint32 ucs_count = tvb_get_letohs(tvb, offset); offset += 2; - wpa_ucs_item = proto_tree_add_item(tree, hf_ieee80211_wfa_ie_wpa_ucs_list, tvb, offset, ucs_count * 4, ENC_BIG_ENDIAN); + wpa_ucs_item = proto_tree_add_item(tree, hf_ieee80211_wfa_ie_wpa_ucs_list, tvb, offset, ucs_count * 4, ENC_NA); wpa_ucs_tree = proto_item_add_subtree(wpa_ucs_item, ett_wpa_ucs_tree); for(i=1; i <= ucs_count; i++) { @@ -5467,7 +5467,7 @@ dissect_vendor_ie_wpawme(proto_tree * tree, tvbuff_t * tvb, int offset, guint32 akms_count = tvb_get_letohs(tvb, offset); offset += 2; - wpa_akms_item = proto_tree_add_item(tree, hf_ieee80211_wfa_ie_wpa_akms_list, tvb, offset, akms_count * 4, ENC_BIG_ENDIAN); + wpa_akms_item = proto_tree_add_item(tree, hf_ieee80211_wfa_ie_wpa_akms_list, tvb, offset, akms_count * 4, ENC_NA); wpa_akms_tree = proto_item_add_subtree(wpa_akms_item, ett_wpa_akms_tree); for(i=1; i <= akms_count; i++) { @@ -5703,7 +5703,7 @@ dissect_vendor_ie_marvell(proto_item * item _U_, proto_tree * ietree, default: proto_tree_add_item(ietree, hf_ieee80211_marvell_ie_data, tvb, offset, - tag_len - 1, ENC_BIG_ENDIAN); + tag_len - 1, ENC_NA); break; } } @@ -5845,7 +5845,7 @@ dissect_vendor_ie_atheros(proto_item * item _U_, proto_tree * ietree, } } if(offset < tag_end){ - ti = proto_tree_add_item(ietree, hf_ieee80211_atheros_ie_data, tvb, offset, tag_end - offset, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(ietree, hf_ieee80211_atheros_ie_data, tvb, offset, tag_end - offset, ENC_NA); expert_add_info_format(pinfo, ti, PI_UNDECODED, PI_WARN, "Unknown Data (not interpreted)"); } @@ -5917,7 +5917,7 @@ dissect_vendor_ie_aironet(proto_item * aironet_item, proto_tree * ietree, break; default: proto_tree_add_item(ietree, hf_ieee80211_aironet_ie_data, tvb, offset, - tag_len - 1, ENC_BIG_ENDIAN); + tag_len - 1, ENC_NA); break; } if (!dont_change) { @@ -6004,7 +6004,7 @@ dissect_rsn_ie(proto_tree * tree, tvbuff_t * tvb, int offset, guint32 tag_len) offset += 2; - rsn_pcs_item = proto_tree_add_item(tree, hf_ieee80211_rsn_pcs_list, tvb, offset, pcs_count * 4, ENC_BIG_ENDIAN); + rsn_pcs_item = proto_tree_add_item(tree, hf_ieee80211_rsn_pcs_list, tvb, offset, pcs_count * 4, ENC_NA); rsn_pcs_tree = proto_item_add_subtree(rsn_pcs_item, ett_rsn_pcs_tree); for(i=1; i <= pcs_count; i++) { @@ -6028,7 +6028,7 @@ dissect_rsn_ie(proto_tree * tree, tvbuff_t * tvb, int offset, guint32 tag_len) akms_count = tvb_get_letohs(tvb, offset); offset += 2; - rsn_akms_item = proto_tree_add_item(tree, hf_ieee80211_rsn_akms_list, tvb, offset, akms_count * 4, ENC_BIG_ENDIAN); + rsn_akms_item = proto_tree_add_item(tree, hf_ieee80211_rsn_akms_list, tvb, offset, akms_count * 4, ENC_NA); rsn_akms_tree = proto_item_add_subtree(rsn_akms_item, ett_rsn_akms_tree); for(i=1; i <= akms_count; i++) { @@ -6068,11 +6068,11 @@ dissect_rsn_ie(proto_tree * tree, tvbuff_t * tvb, int offset, guint32 tag_len) pmkid_count = tvb_get_letohs(tvb, offset); offset += 2; - rsn_pmkid_item = proto_tree_add_item(tree, hf_ieee80211_rsn_pmkid_list, tvb, offset, pmkid_count * 16, ENC_BIG_ENDIAN); + rsn_pmkid_item = proto_tree_add_item(tree, hf_ieee80211_rsn_pmkid_list, tvb, offset, pmkid_count * 16, ENC_NA); rsn_pmkid_tree = proto_item_add_subtree(rsn_pmkid_item, ett_rsn_pmkid_tree); for(i=1; i <= pmkid_count; i++) { - proto_tree_add_item(rsn_pmkid_tree, hf_ieee80211_rsn_pmkid, tvb, offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(rsn_pmkid_tree, hf_ieee80211_rsn_pmkid, tvb, offset, 16, ENC_NA); offset +=16; } @@ -6133,13 +6133,13 @@ dissect_fast_bss_transition(proto_tree *tree, tvbuff_t *tvb, int offset, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; proto_tree_add_item(tree, hf_ieee80211_tag_ft_mic, - tvb, offset, 16, ENC_BIG_ENDIAN); + tvb, offset, 16, ENC_NA); offset += 16; proto_tree_add_item(tree, hf_ieee80211_tag_ft_anonce, - tvb, offset, 32, ENC_BIG_ENDIAN); + tvb, offset, 32, ENC_NA); offset += 32; proto_tree_add_item(tree, hf_ieee80211_tag_ft_snonce, - tvb, offset, 32, ENC_BIG_ENDIAN); + tvb, offset, 32, ENC_NA); offset += 32; while (offset + 2 <= end) { @@ -6165,7 +6165,7 @@ dissect_fast_bss_transition(proto_tree *tree, tvbuff_t *tvb, int offset, switch (id) { case 1: proto_tree_add_item(tree, hf_ieee80211_tag_ft_subelem_r1kh_id, - tvb, offset, len, ENC_BIG_ENDIAN); + tvb, offset, len, ENC_NA); break; case 2: proto_tree_add_item(tree, hf_ieee80211_tag_ft_subelem_gtk_key_info, @@ -6181,12 +6181,12 @@ dissect_fast_bss_transition(proto_tree *tree, tvbuff_t *tvb, int offset, if (offset > s_end) break; proto_tree_add_item(tree, hf_ieee80211_tag_ft_subelem_gtk_rsc, - tvb, offset, 8, ENC_BIG_ENDIAN); + tvb, offset, 8, ENC_NA); offset += 8; if (offset > s_end) break; proto_tree_add_item(tree, hf_ieee80211_tag_ft_subelem_gtk_key, - tvb, offset, s_end - offset, ENC_BIG_ENDIAN); + tvb, offset, s_end - offset, ENC_NA); break; case 3: proto_tree_add_item(tree, hf_ieee80211_tag_ft_subelem_r0kh_id, @@ -6199,7 +6199,7 @@ dissect_fast_bss_transition(proto_tree *tree, tvbuff_t *tvb, int offset, if (offset > s_end) break; proto_tree_add_item(tree, hf_ieee80211_tag_ft_subelem_igtk_ipn, - tvb, offset, 6, ENC_BIG_ENDIAN); + tvb, offset, 6, ENC_NA); offset += 6; if (offset > s_end) break; @@ -6209,11 +6209,11 @@ dissect_fast_bss_transition(proto_tree *tree, tvbuff_t *tvb, int offset, if (offset > s_end) break; proto_tree_add_item(tree, hf_ieee80211_tag_ft_subelem_igtk_key, - tvb, offset, 24, ENC_BIG_ENDIAN); + tvb, offset, 24, ENC_NA); break; default: proto_tree_add_item(tree, hf_ieee80211_tag_ft_subelem_data, - tvb, offset, len, ENC_BIG_ENDIAN); + tvb, offset, len, ENC_NA); break; } offset = s_end; @@ -6231,9 +6231,9 @@ dissect_mmie(proto_tree *tree, tvbuff_t *tvb, int offset, guint32 tag_len) proto_tree_add_item(tree, hf_ieee80211_tag_mmie_keyid, tvb, offset, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ieee80211_tag_mmie_ipn, tvb, offset + 2, 6, - ENC_LITTLE_ENDIAN); + ENC_NA); proto_tree_add_item(tree, hf_ieee80211_tag_mmie_mic, tvb, offset + 8, 8, - ENC_BIG_ENDIAN); + ENC_NA); } static void @@ -6531,7 +6531,7 @@ dissect_wsie_ie(proto_tree * tree, tvbuff_t * tvb, int offset, guint32 tag_len _ for (i=0;i<providercount;i++) { local_offset = offset; - cap_item = proto_tree_add_item(pst_tree, hf_ieee80211_pst_providercap, tvb, local_offset, 0, ENC_LITTLE_ENDIAN); + cap_item = proto_tree_add_item(pst_tree, hf_ieee80211_pst_providercap, tvb, local_offset, 0, ENC_NA); proto_item_append_text(cap_item, ": %u", i+1); cap_tree = proto_item_add_subtree(cap_item, ett_pst_cap_tree); @@ -7232,7 +7232,7 @@ add_tagged_field(packet_info * pinfo, proto_tree * tree, tvbuff_t * tvb, int off } tag_end = offset + 2 + tag_len; if (tree) { - ti = proto_tree_add_item(orig_tree, hf_ieee80211_tag, tvb, offset, 2 + tag_len , ENC_BIG_ENDIAN); + ti = proto_tree_add_item(orig_tree, hf_ieee80211_tag, tvb, offset, 2 + tag_len , ENC_NA); proto_item_append_text(ti, ": %s", rval_to_str(tag_no, tag_num_vals, "Reserved tag Number")); tree = proto_item_add_subtree(ti, ett_80211_mgt_ie); @@ -7380,7 +7380,7 @@ add_tagged_field(packet_info * pinfo, proto_tree * tree, tvbuff_t * tvb, int off proto_tree_add_item(bmapctl_tree, hf_ieee80211_tim_bmapctl_offset, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_ieee80211_tim_partial_virtual_bitmap, tvb, offset, tag_len - 3, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ieee80211_tim_partial_virtual_bitmap, tvb, offset, tag_len - 3, ENC_NA); break; } @@ -7425,7 +7425,7 @@ add_tagged_field(packet_info * pinfo, proto_tree * tree, tvbuff_t * tvb, int off continue; } if(tvb_get_guint8(tvb, offset) <= 200) { /* 802.11d */ - sub_item = proto_tree_add_item(tree, hf_ieee80211_tag_country_info_fnm, tvb, offset, 3, ENC_BIG_ENDIAN); + sub_item = proto_tree_add_item(tree, hf_ieee80211_tag_country_info_fnm, tvb, offset, 3, ENC_NA); sub_tree = proto_item_add_subtree(sub_item, ett_tag_country_fnm_tree); proto_tree_add_item(sub_tree, hf_ieee80211_tag_country_info_fnm_fcn, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -7438,7 +7438,7 @@ add_tagged_field(packet_info * pinfo, proto_tree * tree, tvbuff_t * tvb, int off proto_item_append_text(sub_item, ", Maximum Transmit Power Level: %d dBm", tvb_get_guint8(tvb, offset)); offset += 1; } else { /* 802.11j */ - sub_item = proto_tree_add_item(tree, hf_ieee80211_tag_country_info_rrc, tvb, offset, 3, ENC_BIG_ENDIAN); + sub_item = proto_tree_add_item(tree, hf_ieee80211_tag_country_info_rrc, tvb, offset, 3, ENC_NA); sub_tree = proto_item_add_subtree(sub_item, ett_tag_country_rcc_tree); proto_tree_add_item(sub_tree, hf_ieee80211_tag_country_info_rrc_rei, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -7700,7 +7700,7 @@ add_tagged_field(packet_info * pinfo, proto_tree * tree, tvbuff_t * tvb, int off case TAG_CHALLENGE_TEXT: /* 7.3.2.8 Challenge Text element (16) */ offset += 2; - proto_tree_add_item(tree, hf_ieee80211_tag_challenge_text, tvb, offset, tag_len, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_ieee80211_tag_challenge_text, tvb, offset, tag_len, ENC_NA); break; case TAG_POWER_CONSTRAINT: /* 7.3.2.15 Power Constraint element (32) */ @@ -7784,7 +7784,7 @@ add_tagged_field(packet_info * pinfo, proto_tree * tree, tvbuff_t * tvb, int off } while(offset < tag_end) { - chan_item = proto_tree_add_item(tree, hf_ieee80211_tag_supported_channels, tvb, offset, 2, ENC_BIG_ENDIAN); + chan_item = proto_tree_add_item(tree, hf_ieee80211_tag_supported_channels, tvb, offset, 2, ENC_NA); proto_item_append_text(chan_item, " #%d", i); i++; @@ -8653,7 +8653,7 @@ add_tagged_field(packet_info * pinfo, proto_tree * tree, tvbuff_t * tvb, int off } if (tag_len - (offset - start) == 16) { - proto_tree_add_item(tree, hf_ieee80211_rsn_pmkid, tvb, offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_ieee80211_rsn_pmkid, tvb, offset, 16, ENC_NA); offset +=16; } break; @@ -9738,7 +9738,7 @@ dissect_ieee80211_common (tvbuff_t * tvb, packet_info * pinfo, offset += 2; offset += add_fixed_field(hdr_tree, tvb, offset, FIELD_BLOCK_ACK_SSC); - proto_tree_add_item(hdr_tree, hf_ieee80211_block_ack_bitmap, tvb, offset, 128, ENC_BIG_ENDIAN); + proto_tree_add_item(hdr_tree, hf_ieee80211_block_ack_bitmap, tvb, offset, 128, ENC_NA); offset += 128; break; } @@ -9748,7 +9748,7 @@ dissect_ieee80211_common (tvbuff_t * tvb, packet_info * pinfo, offset += 2; offset += add_fixed_field(hdr_tree, tvb, offset, FIELD_BLOCK_ACK_SSC); - proto_tree_add_item(hdr_tree, hf_ieee80211_block_ack_bitmap, tvb, offset, 8, ENC_BIG_ENDIAN); + proto_tree_add_item(hdr_tree, hf_ieee80211_block_ack_bitmap, tvb, offset, 8, ENC_NA); offset += 8; break; } @@ -9776,7 +9776,7 @@ dissect_ieee80211_common (tvbuff_t * tvb, packet_info * pinfo, offset += 2; offset += add_fixed_field(ba_mtid_sub_tree, tvb, offset, FIELD_BLOCK_ACK_SSC); - proto_tree_add_item(ba_mtid_sub_tree, hf_ieee80211_block_ack_bitmap, tvb, offset, 8, ENC_BIG_ENDIAN); + proto_tree_add_item(ba_mtid_sub_tree, hf_ieee80211_block_ack_bitmap, tvb, offset, 8, ENC_NA); offset += 8; } break; @@ -10989,7 +10989,7 @@ dissect_prism(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { /* DID */ if(tree) { - ti_did = proto_tree_add_item(prism_tree, hf_ieee80211_prism_did, tvb, offset, 12, ENC_LITTLE_ENDIAN); + ti_did = proto_tree_add_item(prism_tree, hf_ieee80211_prism_did, tvb, offset, 12, ENC_NA); prism_did_tree = proto_item_add_subtree(ti_did, ett_prism_did); proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_type, tvb, offset, 4, ENC_LITTLE_ENDIAN); @@ -11515,7 +11515,7 @@ dissect_wlancap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(wlan_tree, hf_wlan_receiver_addr, tvb, offset, 6, ENC_BIG_ENDIAN); offset+=6; if (tree) - proto_tree_add_item(wlan_tree, hf_wlan_padding, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(wlan_tree, hf_wlan_padding, tvb, offset, 2, ENC_NA); offset+=2; } diff --git a/epan/dissectors/packet-igmp.c b/epan/dissectors/packet-igmp.c index 143f6d9d42..674159656e 100644 --- a/epan/dissectors/packet-igmp.c +++ b/epan/dissectors/packet-igmp.c @@ -563,7 +563,7 @@ dissect_v3_group_record(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr /* aux data */ if(adl){ - proto_tree_add_item(tree, hf_aux_data, tvb, offset, adl*4, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_aux_data, tvb, offset, adl*4, ENC_NA); offset += adl*4; } @@ -751,7 +751,7 @@ dissect_igmp_v0(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int type, i offset += 4; /* access key */ - proto_tree_add_item(tree, hf_access_key, tvb, offset, 8, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_access_key, tvb, offset, 8, ENC_NA); offset += 8; return offset; diff --git a/epan/dissectors/packet-image-png.c b/epan/dissectors/packet-image-png.c index 47844467a2..cce9b794f0 100644 --- a/epan/dissectors/packet-image-png.c +++ b/epan/dissectors/packet-image-png.c @@ -240,7 +240,7 @@ dissect_png(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) tree=proto_item_add_subtree(ti, ett_png); } - proto_tree_add_item(tree, hf_png_signature, tvb, offset, 8, FALSE); + proto_tree_add_item(tree, hf_png_signature, tvb, offset, 8, ENC_NA); offset+=8; while(tvb_reported_length_remaining(tvb, offset)){ @@ -291,7 +291,7 @@ dissect_png(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) } if(!cd){ - proto_tree_add_item(chunk_tree, hf_png_chunk_data, tvb, offset, len, FALSE); + proto_tree_add_item(chunk_tree, hf_png_chunk_data, tvb, offset, len, ENC_NA); } else { if(cd->dissector){ tvbuff_t *next_tvb; diff --git a/epan/dissectors/packet-imf.c b/epan/dissectors/packet-imf.c index 31fc28baf7..dbc278cf42 100644 --- a/epan/dissectors/packet-imf.c +++ b/epan/dissectors/packet-imf.c @@ -702,7 +702,7 @@ dissect_imf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* just show the lines or highlight the rest of the buffer as message text */ - item = proto_tree_add_item(tree, hf_imf_message_text, tvb, end_offset, -1 , FALSE); + item = proto_tree_add_item(tree, hf_imf_message_text, tvb, end_offset, -1 , ENC_NA); text_tree = proto_item_add_subtree(item, ett_imf_message_text); start_offset = end_offset; diff --git a/epan/dissectors/packet-infiniband.c b/epan/dissectors/packet-infiniband.c index ab341c5347..04ff57a3f7 100644 --- a/epan/dissectors/packet-infiniband.c +++ b/epan/dissectors/packet-infiniband.c @@ -1678,7 +1678,7 @@ dissect_infiniband_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g } /* Local Route Header Subtree */ - local_route_header_item = proto_tree_add_item(all_headers_tree, hf_infiniband_LRH, tvb, offset, 8, FALSE); + local_route_header_item = proto_tree_add_item(all_headers_tree, hf_infiniband_LRH, tvb, offset, 8, ENC_NA); proto_item_set_text(local_route_header_item, "%s", "Local Route Header"); local_route_header_tree = proto_item_add_subtree(local_route_header_item, ett_lrh); @@ -1735,7 +1735,7 @@ skip_lrh: switch(lnh_val) { case IBA_GLOBAL: - global_route_header_item = proto_tree_add_item(all_headers_tree, hf_infiniband_GRH, tvb, offset, 40, FALSE); + global_route_header_item = proto_tree_add_item(all_headers_tree, hf_infiniband_GRH, tvb, offset, 40, ENC_NA); proto_item_set_text(global_route_header_item, "%s", "Global Route Header"); global_route_header_tree = proto_item_add_subtree(global_route_header_item, ett_grh); @@ -1778,7 +1778,7 @@ skip_lrh: /* otherwise fall through and start parsing BTH */ case IBA_LOCAL: bthFollows = TRUE; - base_transport_header_item = proto_tree_add_item(all_headers_tree, hf_infiniband_BTH, tvb, offset, 12, FALSE); + base_transport_header_item = proto_tree_add_item(all_headers_tree, hf_infiniband_BTH, tvb, offset, 12, ENC_NA); proto_item_set_text(base_transport_header_item, "%s", "Base Transport Header"); base_transport_header_tree = proto_item_add_subtree(base_transport_header_item, ett_bth); proto_tree_add_item(base_transport_header_tree, hf_infiniband_opcode, tvb, offset, 1, FALSE); @@ -1816,7 +1816,7 @@ skip_lrh: break; default: /* Unknown Packet */ - RAWDATA_header_item = proto_tree_add_item(all_headers_tree, hf_infiniband_raw_data, tvb, offset, -1, FALSE); + RAWDATA_header_item = proto_tree_add_item(all_headers_tree, hf_infiniband_raw_data, tvb, offset, -1, ENC_NA); proto_item_set_text(RAWDATA_header_item, "%s", "Unknown Raw Data - IB Encapsulated"); break; } @@ -2222,7 +2222,7 @@ parse_RDETH(proto_tree * parentTree, tvbuff_t *tvb, gint *offset) proto_tree *RDETH_header_tree = NULL; proto_item *RDETH_header_item = NULL; - RDETH_header_item = proto_tree_add_item(parentTree, hf_infiniband_RDETH, tvb, local_offset, 4, FALSE); + RDETH_header_item = proto_tree_add_item(parentTree, hf_infiniband_RDETH, tvb, local_offset, 4, ENC_NA); proto_item_set_text(RDETH_header_item, "%s", "RDETH - Reliable Datagram Extended Transport Header"); RDETH_header_tree = proto_item_add_subtree(RDETH_header_item, ett_rdeth); @@ -2243,7 +2243,7 @@ parse_DETH(proto_tree *parentTree, packet_info *pinfo, tvbuff_t *tvb, gint *offs proto_tree *DETH_header_tree = NULL; proto_item *DETH_header_item = NULL; - DETH_header_item = proto_tree_add_item(parentTree, hf_infiniband_DETH, tvb, local_offset, 8, FALSE); + DETH_header_item = proto_tree_add_item(parentTree, hf_infiniband_DETH, tvb, local_offset, 8, ENC_NA); proto_item_set_text(DETH_header_item, "%s", "DETH - Datagram Extended Transport Header"); DETH_header_tree = proto_item_add_subtree(DETH_header_item, ett_deth); @@ -2267,7 +2267,7 @@ parse_RETH(proto_tree * parentTree, tvbuff_t *tvb, gint *offset) proto_tree *RETH_header_tree = NULL; proto_item *RETH_header_item = NULL; - RETH_header_item = proto_tree_add_item(parentTree, hf_infiniband_RETH, tvb, local_offset, 16, FALSE); + RETH_header_item = proto_tree_add_item(parentTree, hf_infiniband_RETH, tvb, local_offset, 16, ENC_NA); proto_item_set_text(RETH_header_item, "%s", "RETH - RDMA Extended Transport Header"); RETH_header_tree = proto_item_add_subtree(RETH_header_item, ett_reth); @@ -2290,7 +2290,7 @@ parse_ATOMICETH(proto_tree * parentTree, tvbuff_t *tvb, gint *offset) proto_tree *ATOMICETH_header_tree = NULL; proto_item *ATOMICETH_header_item = NULL; - ATOMICETH_header_item = proto_tree_add_item(parentTree, hf_infiniband_AtomicETH, tvb, local_offset, 28, FALSE); + ATOMICETH_header_item = proto_tree_add_item(parentTree, hf_infiniband_AtomicETH, tvb, local_offset, 28, ENC_NA); proto_item_set_text(ATOMICETH_header_item, "%s", "AtomicETH - Atomic Extended Transport Header"); ATOMICETH_header_tree = proto_item_add_subtree(ATOMICETH_header_item, ett_atomiceth); @@ -2313,7 +2313,7 @@ parse_AETH(proto_tree * parentTree, tvbuff_t *tvb, gint *offset) proto_tree *AETH_header_tree = NULL; proto_item *AETH_header_item = NULL; - AETH_header_item = proto_tree_add_item(parentTree, hf_infiniband_AETH, tvb, local_offset, 4, FALSE); + AETH_header_item = proto_tree_add_item(parentTree, hf_infiniband_AETH, tvb, local_offset, 4, ENC_NA); proto_item_set_text(AETH_header_item, "%s", "AETH - ACK Extended Transport Header"); AETH_header_tree = proto_item_add_subtree(AETH_header_item, ett_aeth); @@ -2335,7 +2335,7 @@ parse_ATOMICACKETH(proto_tree * parentTree, tvbuff_t *tvb, gint *offset) proto_tree *ATOMICACKETH_header_tree = NULL; proto_item *ATOMICACKETH_header_item = NULL; - ATOMICACKETH_header_item = proto_tree_add_item(parentTree, hf_infiniband_AtomicAckETH, tvb, local_offset, 8, FALSE); + ATOMICACKETH_header_item = proto_tree_add_item(parentTree, hf_infiniband_AtomicAckETH, tvb, local_offset, 8, ENC_NA); proto_item_set_text(ATOMICACKETH_header_item, "%s", "ATOMICACKETH - Atomic ACK Extended Transport Header"); ATOMICACKETH_header_tree = proto_item_add_subtree(ATOMICACKETH_header_item, ett_atomicacketh); proto_tree_add_item(ATOMICACKETH_header_tree, hf_infiniband_original_remote_data, tvb, local_offset, 8, FALSE); local_offset+=8; @@ -2354,10 +2354,10 @@ parse_IMMDT(proto_tree * parentTree, tvbuff_t *tvb, gint *offset) proto_tree *IMMDT_header_tree = NULL; proto_item *IMMDT_header_item = NULL; - IMMDT_header_item = proto_tree_add_item(parentTree, hf_infiniband_IMMDT, tvb, local_offset, 4, FALSE); + IMMDT_header_item = proto_tree_add_item(parentTree, hf_infiniband_IMMDT, tvb, local_offset, 4, ENC_NA); proto_item_set_text(IMMDT_header_item, "%s", "IMMDT - Immediate Data Extended Transport Header"); IMMDT_header_tree = proto_item_add_subtree(IMMDT_header_item, ett_immdt); - proto_tree_add_item(IMMDT_header_tree, hf_infiniband_IMMDT, tvb, local_offset, 4, FALSE); local_offset+=4; + proto_tree_add_item(IMMDT_header_tree, hf_infiniband_IMMDT, tvb, local_offset, 4, ENC_NA); local_offset+=4; *offset = local_offset; } @@ -2373,11 +2373,11 @@ parse_IETH(proto_tree * parentTree, tvbuff_t *tvb, gint *offset) proto_tree *IETH_header_tree = NULL; proto_item *IETH_header_item = NULL; - IETH_header_item = proto_tree_add_item(parentTree, hf_infiniband_IETH, tvb, local_offset, 4, FALSE); + IETH_header_item = proto_tree_add_item(parentTree, hf_infiniband_IETH, tvb, local_offset, 4, ENC_NA); proto_item_set_text(IETH_header_item, "%s", "IETH - Invalidate Extended Transport Header"); IETH_header_tree = proto_item_add_subtree(IETH_header_item, ett_ieth); - proto_tree_add_item(IETH_header_tree, hf_infiniband_IETH, tvb, local_offset, 4, FALSE); local_offset+=4; + proto_tree_add_item(IETH_header_tree, hf_infiniband_IETH, tvb, local_offset, 4, ENC_NA); local_offset+=4; *offset = local_offset; } @@ -2570,7 +2570,7 @@ static void parse_PAYLOAD(proto_tree *parentTree, packet_info *pinfo, tvbuff_t * if (dissector_found) { /* now create payload entry to show Ethertype */ - PAYLOAD_header_item = proto_tree_add_item(parentTree, hf_infiniband_payload, tvb, local_offset, tvb_reported_length_remaining(tvb, local_offset)-6, FALSE); + PAYLOAD_header_item = proto_tree_add_item(parentTree, hf_infiniband_payload, tvb, local_offset, tvb_reported_length_remaining(tvb, local_offset)-6, ENC_NA); proto_item_set_text(PAYLOAD_header_item, "%s", "IBA Payload - appears to be EtherType encapsulated"); PAYLOAD_header_tree = proto_item_add_subtree(PAYLOAD_header_item, ett_payload); proto_tree_add_uint(PAYLOAD_header_tree, hf_infiniband_etype, tvb, @@ -2630,10 +2630,10 @@ static void parse_VENDOR(proto_tree * parentTree, tvbuff_t *tvb, gint *offset) proto_tree *VENDOR_header_tree = NULL; proto_item *VENDOR_header_item = NULL; - VENDOR_header_item = proto_tree_add_item(parentTree, hf_infiniband_vendor, tvb, local_offset, 4, FALSE); + VENDOR_header_item = proto_tree_add_item(parentTree, hf_infiniband_vendor, tvb, local_offset, 4, ENC_NA); proto_item_set_text(VENDOR_header_item, "%s", "Vendor Specific or Unknown Header Sequence"); VENDOR_header_tree = proto_item_add_subtree(VENDOR_header_item, ett_vendor); - proto_tree_add_item(VENDOR_header_tree, hf_infiniband_vendor, tvb, local_offset, -1, FALSE); + proto_tree_add_item(VENDOR_header_tree, hf_infiniband_vendor, tvb, local_offset, -1, ENC_NA); *offset = local_offset; } @@ -2673,7 +2673,7 @@ static void parse_RWH(proto_tree *ah_tree, tvbuff_t *tvb, gint *offset, packet_i gint captured_length, reported_length; - RWH_header_item = proto_tree_add_item(ah_tree, hf_infiniband_RWH, tvb, *offset, 4, FALSE); + RWH_header_item = proto_tree_add_item(ah_tree, hf_infiniband_RWH, tvb, *offset, 4, ENC_NA); proto_item_set_text(RWH_header_item, "%s", "RWH - Raw Header"); RWH_header_tree = proto_item_add_subtree(RWH_header_item, ett_rwh); @@ -2734,7 +2734,7 @@ static gboolean parse_EoIB(proto_tree *tree, tvbuff_t *tvb, gint offset, packet_ encap_tvb = tvb_new_subset(tvb, offset + 4, tvb_length_remaining(tvb, offset + 4), encap_size - 4); - header_item = proto_tree_add_item(tree, hf_infiniband_EOIB, tvb, offset, 4, FALSE); + header_item = proto_tree_add_item(tree, hf_infiniband_EOIB, tvb, offset, 4, ENC_NA); header_subtree = proto_item_add_subtree(header_item, ett_eoib); proto_tree_add_item(header_subtree, hf_infiniband_ver, tvb, offset, 2, FALSE); @@ -2783,11 +2783,11 @@ static void parse_SUBN_LID_ROUTED(proto_tree *parentTree, packet_info *pinfo, tv local_offset = *offset; /* local_offset - 24 here because when we come out of parse_MAD_Common, the offset it sitting at the data section. */ - SUBN_LID_ROUTED_header_item = proto_tree_add_item(parentTree, hf_infiniband_SMP_LID, tvb, local_offset - 24, 256, FALSE); + SUBN_LID_ROUTED_header_item = proto_tree_add_item(parentTree, hf_infiniband_SMP_LID, tvb, local_offset - 24, 256, ENC_NA); proto_item_set_text(SUBN_LID_ROUTED_header_item, "%s", "SMP (LID Routed) "); SUBN_LID_ROUTED_header_tree = proto_item_add_subtree(SUBN_LID_ROUTED_header_item, ett_subn_lid_routed); proto_tree_add_item(SUBN_LID_ROUTED_header_tree, hf_infiniband_m_key, tvb, local_offset, 8, FALSE); local_offset +=8; - proto_tree_add_item(SUBN_LID_ROUTED_header_tree, hf_infiniband_reserved256, tvb, local_offset, 32, FALSE); local_offset +=32; + proto_tree_add_item(SUBN_LID_ROUTED_header_tree, hf_infiniband_reserved256, tvb, local_offset, 32, ENC_NA); local_offset +=32; label_SUBM_Method(SUBN_LID_ROUTED_header_item, &MadData, pinfo); label_SUBM_Attribute(SUBN_LID_ROUTED_header_item, &MadData, pinfo); @@ -2795,10 +2795,10 @@ static void parse_SUBN_LID_ROUTED(proto_tree *parentTree, packet_info *pinfo, tv /* Try to do the detail parse of the attribute. If there is an error, or the attribute is unknown, we'll just highlight the generic data. */ if(!parse_SUBM_Attribute(SUBN_LID_ROUTED_header_tree, tvb, &local_offset, &MadData)) { - proto_tree_add_item(SUBN_LID_ROUTED_header_tree, hf_infiniband_smp_data, tvb, local_offset, 64, FALSE); local_offset +=64; + proto_tree_add_item(SUBN_LID_ROUTED_header_tree, hf_infiniband_smp_data, tvb, local_offset, 64, ENC_NA); local_offset +=64; } - proto_tree_add_item(SUBN_LID_ROUTED_header_tree, hf_infiniband_reserved1024, tvb, local_offset, 128, FALSE); local_offset +=128; + proto_tree_add_item(SUBN_LID_ROUTED_header_tree, hf_infiniband_reserved1024, tvb, local_offset, 128, ENC_NA); local_offset +=128; *offset = local_offset; } @@ -2824,7 +2824,7 @@ static void parse_SUBN_DIRECTED_ROUTE(proto_tree *parentTree, packet_info *pinfo /* local_offset - 24 here because when we come out of parse_MAD_Common, the offset it sitting at the data section. * We need to go backwards because this particular SMP uses the class specific portion of the Common MAD Header */ - SUBN_DIRECTED_ROUTE_header_item = proto_tree_add_item(parentTree, hf_infiniband_SMP_DIRECTED, tvb, local_offset - 24, 256, FALSE); + SUBN_DIRECTED_ROUTE_header_item = proto_tree_add_item(parentTree, hf_infiniband_SMP_DIRECTED, tvb, local_offset - 24, 256, ENC_NA); proto_item_set_text(SUBN_DIRECTED_ROUTE_header_item, "%s", "SMP (Directed Route) "); SUBN_DIRECTED_ROUTE_header_tree = proto_item_add_subtree(SUBN_DIRECTED_ROUTE_header_item, ett_subn_directed_route); @@ -2841,16 +2841,16 @@ static void parse_SUBN_DIRECTED_ROUTE(proto_tree *parentTree, packet_info *pinfo proto_tree_add_item(SUBN_DIRECTED_ROUTE_header_tree, hf_infiniband_m_key, tvb, local_offset, 8, FALSE); local_offset +=8; proto_tree_add_item(SUBN_DIRECTED_ROUTE_header_tree, hf_infiniband_dr_slid, tvb, local_offset, 2, FALSE); local_offset +=2; proto_tree_add_item(SUBN_DIRECTED_ROUTE_header_tree, hf_infiniband_dr_dlid, tvb, local_offset, 2, FALSE); local_offset +=2; - proto_tree_add_item(SUBN_DIRECTED_ROUTE_header_tree, hf_infiniband_reserved28, tvb, local_offset, 28, FALSE); local_offset +=28; + proto_tree_add_item(SUBN_DIRECTED_ROUTE_header_tree, hf_infiniband_reserved28, tvb, local_offset, 28, ENC_NA); local_offset +=28; /* Try to do the detail parse of the attribute. If there is an error, or the attribute is unknown, we'll just highlight the generic data. */ if(!parse_SUBM_Attribute(SUBN_DIRECTED_ROUTE_header_tree, tvb, &local_offset, &MadData)) { - proto_tree_add_item(SUBN_DIRECTED_ROUTE_header_tree, hf_infiniband_smp_data, tvb, local_offset, 64, FALSE); local_offset +=64; + proto_tree_add_item(SUBN_DIRECTED_ROUTE_header_tree, hf_infiniband_smp_data, tvb, local_offset, 64, ENC_NA); local_offset +=64; } - proto_tree_add_item(SUBN_DIRECTED_ROUTE_header_tree, hf_infiniband_initial_path, tvb, local_offset, 64, FALSE); local_offset +=64; - proto_tree_add_item(SUBN_DIRECTED_ROUTE_header_tree, hf_infiniband_return_path, tvb, local_offset, 64, FALSE); local_offset +=64; + proto_tree_add_item(SUBN_DIRECTED_ROUTE_header_tree, hf_infiniband_initial_path, tvb, local_offset, 64, ENC_NA); local_offset +=64; + proto_tree_add_item(SUBN_DIRECTED_ROUTE_header_tree, hf_infiniband_return_path, tvb, local_offset, 64, ENC_NA); local_offset +=64; *offset = local_offset; } @@ -2879,7 +2879,7 @@ static void parse_SUBNADMN(proto_tree *parentTree, packet_info *pinfo, tvbuff_t } local_offset = *offset; - SUBNADMN_header_item = proto_tree_add_item(parentTree, hf_infiniband_SA, tvb, local_offset - 36, 256, FALSE); + SUBNADMN_header_item = proto_tree_add_item(parentTree, hf_infiniband_SA, tvb, local_offset - 36, 256, ENC_NA); proto_item_set_text(SUBNADMN_header_item, "%s", "SMA"); SUBNADMN_header_tree = proto_item_add_subtree(SUBNADMN_header_item, ett_subnadmin); @@ -2893,7 +2893,7 @@ static void parse_SUBNADMN(proto_tree *parentTree, packet_info *pinfo, tvbuff_t if(!parse_SUBA_Attribute(SUBNADMN_header_tree, tvb, &local_offset, &MadData)) { - proto_tree_add_item(SUBNADMN_header_tree, hf_infiniband_subnet_admin_data, tvb, local_offset, 200, FALSE); local_offset+=200; + proto_tree_add_item(SUBNADMN_header_tree, hf_infiniband_subnet_admin_data, tvb, local_offset, 200, ENC_NA); local_offset+=200; } *offset = local_offset; } @@ -2926,7 +2926,7 @@ static void parse_PERF(proto_tree *parentTree, tvbuff_t *tvb, packet_info *pinfo parse_PERF_PortCountersExtended(parentTree, tvb, pinfo, &local_offset); break; default: - PERF_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, local_offset, MAD_DATA_SIZE, FALSE); local_offset += MAD_DATA_SIZE; + PERF_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, local_offset, MAD_DATA_SIZE, ENC_NA); local_offset += MAD_DATA_SIZE; proto_item_set_text(PERF_header_item, "%s", "PERF - Performance Management MAD (Dissector Not Implemented)"); break; } @@ -2952,7 +2952,7 @@ static void parse_BM(proto_tree *parentTree, tvbuff_t *tvb, gint *offset) } local_offset = *offset; - PERF_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, local_offset, MAD_DATA_SIZE, FALSE); local_offset += MAD_DATA_SIZE; + PERF_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, local_offset, MAD_DATA_SIZE, ENC_NA); local_offset += MAD_DATA_SIZE; proto_item_set_text(PERF_header_item, "%s", "BM - Baseboard Management MAD (Dissector Not Implemented)"); *offset = local_offset; } @@ -2974,7 +2974,7 @@ static void parse_DEV_MGT(proto_tree *parentTree, tvbuff_t *tvb, gint *offset) return; } local_offset = *offset; - PERF_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, local_offset, MAD_DATA_SIZE, FALSE); local_offset += MAD_DATA_SIZE; + PERF_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, local_offset, MAD_DATA_SIZE, ENC_NA); local_offset += MAD_DATA_SIZE; proto_item_set_text(PERF_header_item, "%s", "DEV_MGT - Device Management MAD (Dissector Not Implemented)"); *offset = local_offset; } @@ -3007,7 +3007,7 @@ static void parse_COM_MGT(proto_tree *parentTree, packet_info *pinfo, tvbuff_t * } local_offset = *offset; - CM_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, local_offset, 140, FALSE); + CM_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, local_offset, 140, ENC_NA); label = val_to_str(MadData.attributeID, CM_Attributes, "(Unknown CM Attribute)"); @@ -3065,8 +3065,8 @@ static void parse_COM_MGT(proto_tree *parentTree, packet_info *pinfo, tvbuff_t * local_offset += 1; /* skip reserved */ proto_tree_add_item(CM_header_tree, hf_cm_req_alt_local_lid, tvb, local_offset, 2, FALSE); local_offset += 2; proto_tree_add_item(CM_header_tree, hf_cm_req_alt_remote_lid, tvb, local_offset, 2, FALSE); local_offset += 2; - proto_tree_add_item(CM_header_tree, hf_cm_req_alt_local_gid, tvb, local_offset, 16, FALSE); local_offset += 16; - proto_tree_add_item(CM_header_tree, hf_cm_req_alt_remote_gid, tvb, local_offset, 16, FALSE); local_offset += 16; + proto_tree_add_item(CM_header_tree, hf_cm_req_alt_local_gid, tvb, local_offset, 16, ENC_NA); local_offset += 16; + proto_tree_add_item(CM_header_tree, hf_cm_req_alt_remote_gid, tvb, local_offset, 16, ENC_NA); local_offset += 16; proto_tree_add_item(CM_header_tree, hf_cm_req_flow_label, tvb, local_offset, 2, FALSE); local_offset += 2; local_offset += 1; /* skip reserved */ proto_tree_add_item(CM_header_tree, hf_cm_req_packet_rate, tvb, local_offset, 1, FALSE); local_offset += 1; @@ -3117,7 +3117,7 @@ static void parse_COM_MGT(proto_tree *parentTree, packet_info *pinfo, tvbuff_t * next_tvb = tvb_new_subset(tvb, local_offset, 92, -1); if (! dissector_try_heuristic(heur_dissectors_cm_private, next_tvb, pinfo, parentTree) ) /* if none reported success, add this as raw "data" */ - proto_tree_add_item(CM_header_tree, hf_cm_req_private_data, tvb, local_offset, 92, FALSE); + proto_tree_add_item(CM_header_tree, hf_cm_req_private_data, tvb, local_offset, 92, ENC_NA); local_offset += 92; break; @@ -3203,7 +3203,7 @@ static void parse_COM_MGT(proto_tree *parentTree, packet_info *pinfo, tvbuff_t * next_tvb = tvb_new_subset(tvb, local_offset, 196, -1); if (! dissector_try_heuristic(heur_dissectors_cm_private, next_tvb, pinfo, parentTree) ) /* if none reported success, add this as raw "data" */ - proto_tree_add_item(CM_header_tree, hf_cm_rep_privatedata, tvb, local_offset, 196, FALSE); + proto_tree_add_item(CM_header_tree, hf_cm_rep_privatedata, tvb, local_offset, 196, ENC_NA); local_offset += 196; break; @@ -3211,7 +3211,7 @@ static void parse_COM_MGT(proto_tree *parentTree, packet_info *pinfo, tvbuff_t * proto_tree_add_item(CM_header_tree, hf_cm_rtu_localcommid, tvb, local_offset, 4, FALSE); local_offset += 4; proto_tree_add_item(CM_header_tree, hf_cm_rtu_remotecommid, tvb, local_offset, 4, FALSE); local_offset += 4; /* currently only REQ/REP call subdissectors for the private data */ - proto_tree_add_item(CM_header_tree, hf_cm_rtu_privatedata, tvb, local_offset, 224, FALSE); local_offset += 224; + proto_tree_add_item(CM_header_tree, hf_cm_rtu_privatedata, tvb, local_offset, 224, ENC_NA); local_offset += 224; break; case ATTR_CM_REJ: proto_tree_add_item(CM_header_tree, hf_cm_rej_local_commid, tvb, local_offset, 4, FALSE); local_offset += 4; @@ -3221,9 +3221,9 @@ static void parse_COM_MGT(proto_tree *parentTree, packet_info *pinfo, tvbuff_t * proto_tree_add_item(CM_header_tree, hf_cm_rej_rej_info_len, tvb, local_offset, 1, FALSE); local_offset += 1; /* skip reserved */ proto_tree_add_item(CM_header_tree, hf_cm_rej_reason, tvb, local_offset, 2, FALSE); local_offset += 2; - proto_tree_add_item(CM_header_tree, hf_cm_rej_add_rej_info, tvb, local_offset, 72, FALSE); local_offset += 72; + proto_tree_add_item(CM_header_tree, hf_cm_rej_add_rej_info, tvb, local_offset, 72, ENC_NA); local_offset += 72; /* currently only REQ/REP call subdissectors for the private data */ - proto_tree_add_item(CM_header_tree, hf_cm_rej_private_data, tvb, local_offset, 148, FALSE); local_offset += 148; + proto_tree_add_item(CM_header_tree, hf_cm_rej_private_data, tvb, local_offset, 148, ENC_NA); local_offset += 148; break; default: proto_item_append_text(CM_header_item, " (Dissector Not Implemented)"); local_offset += MAD_DATA_SIZE; @@ -3251,7 +3251,7 @@ static void parse_SNMP(proto_tree *parentTree, tvbuff_t *tvb, gint *offset) } local_offset = *offset; - PERF_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, local_offset, MAD_DATA_SIZE, FALSE); local_offset += MAD_DATA_SIZE; + PERF_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, local_offset, MAD_DATA_SIZE, ENC_NA); local_offset += MAD_DATA_SIZE; proto_item_set_text(PERF_header_item, "%s", "SNMP - SNMP Tunneling MAD (Dissector Not Implemented)"); *offset = local_offset; } @@ -3274,7 +3274,7 @@ static void parse_VENDOR_MANAGEMENT(proto_tree *parentTree, tvbuff_t *tvb, gint } local_offset = *offset; - PERF_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, local_offset, MAD_DATA_SIZE, FALSE); local_offset += MAD_DATA_SIZE; + PERF_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, local_offset, MAD_DATA_SIZE, ENC_NA); local_offset += MAD_DATA_SIZE; proto_item_set_text(PERF_header_item, "%s", "VENDOR - Vendor Specific Management MAD (Dissector Not Implemented)"); *offset = local_offset; } @@ -3296,7 +3296,7 @@ static void parse_APPLICATION_MANAGEMENT(proto_tree *parentTree, tvbuff_t *tvb, return; } local_offset = *offset; - PERF_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, local_offset, MAD_DATA_SIZE, FALSE); local_offset += MAD_DATA_SIZE; + PERF_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, local_offset, MAD_DATA_SIZE, ENC_NA); local_offset += MAD_DATA_SIZE; proto_item_set_text(PERF_header_item, "%s", "APP - Application Specific MAD (Dissector Not Implemented)"); *offset = local_offset; } @@ -3323,7 +3323,7 @@ static void parse_RESERVED_MANAGEMENT(proto_tree *parentTree, tvbuff_t *tvb, gin return; } local_offset = *offset; - PERF_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, local_offset, 256, FALSE); local_offset += 256; + PERF_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, local_offset, 256, ENC_NA); local_offset += 256; proto_item_set_text(PERF_header_item, "%s", "RESERVED - Reserved MAD Type (Possible Device Error)"); *offset = local_offset; } @@ -3357,7 +3357,7 @@ static gboolean parse_MAD_Common(proto_tree *parentTree, tvbuff_t *tvb, gint *of /* Populate the Dissector Tree */ - MAD_header_item = proto_tree_add_item(parentTree, hf_infiniband_MAD, tvb, local_offset, 256, FALSE); + MAD_header_item = proto_tree_add_item(parentTree, hf_infiniband_MAD, tvb, local_offset, 256, ENC_NA); proto_item_set_text(MAD_header_item, "%s", "MAD Header - Common Management Datagram"); MAD_header_tree = proto_item_add_subtree(MAD_header_item, ett_mad); @@ -3371,7 +3371,7 @@ static gboolean parse_MAD_Common(proto_tree *parentTree, tvbuff_t *tvb, gint *of proto_tree_add_item(MAD_header_tree, hf_infiniband_attribute_id, tvb, local_offset, 2, FALSE); local_offset+=2; proto_tree_add_item(MAD_header_tree, hf_infiniband_reserved16, tvb, local_offset, 2, FALSE); local_offset+=2; proto_tree_add_item(MAD_header_tree, hf_infiniband_attribute_modifier, tvb, local_offset, 4, FALSE); local_offset+=4; - proto_tree_add_item(MAD_header_tree, hf_infiniband_data, tvb, local_offset, MAD_DATA_SIZE, FALSE); + proto_tree_add_item(MAD_header_tree, hf_infiniband_data, tvb, local_offset, MAD_DATA_SIZE, ENC_NA); *offset = local_offset; /* Move the offset to the start of the Data field - this will be where the other parsers start. */ return TRUE; @@ -3388,7 +3388,7 @@ static gboolean parse_RMPP(proto_tree *parentTree, tvbuff_t *tvb, gint *offset) proto_tree *RMPP_header_tree = NULL; proto_item *RMPP_header_item = NULL; - RMPP_header_item = proto_tree_add_item(parentTree, hf_infiniband_RMPP, tvb, local_offset, 12, FALSE); + RMPP_header_item = proto_tree_add_item(parentTree, hf_infiniband_RMPP, tvb, local_offset, 12, ENC_NA); proto_item_set_text(RMPP_header_item, "%s", val_to_str(RMPP_Type, RMPP_Packet_Types, "Reserved RMPP Type! (0x%02x)")); RMPP_header_tree = proto_item_add_subtree(RMPP_header_item, ett_rmpp); @@ -3406,18 +3406,18 @@ static gboolean parse_RMPP(proto_tree *parentTree, tvbuff_t *tvb, gint *offset) case RMPP_DATA: proto_tree_add_item(RMPP_header_tree, hf_infiniband_segment_number, tvb, local_offset, 4, FALSE); local_offset+=4; proto_tree_add_item(RMPP_header_tree, hf_infiniband_payload_length32, tvb, local_offset, 4, FALSE); local_offset+=4; - proto_tree_add_item(RMPP_header_tree, hf_infiniband_transferred_data, tvb, local_offset, 220, FALSE); + proto_tree_add_item(RMPP_header_tree, hf_infiniband_transferred_data, tvb, local_offset, 220, ENC_NA); break; case RMPP_ACK: proto_tree_add_item(RMPP_header_tree, hf_infiniband_segment_number, tvb, local_offset, 4, FALSE); local_offset+=4; proto_tree_add_item(RMPP_header_tree, hf_infiniband_new_window_last, tvb, local_offset, 4, FALSE); local_offset+=4; - proto_tree_add_item(RMPP_header_tree, hf_infiniband_reserved220, tvb, local_offset, 220, FALSE); + proto_tree_add_item(RMPP_header_tree, hf_infiniband_reserved220, tvb, local_offset, 220, ENC_NA); break; case RMPP_STOP: case RMPP_ABORT: proto_tree_add_item(RMPP_header_tree, hf_infiniband_reserved32, tvb, local_offset, 4, FALSE); local_offset+=4; proto_tree_add_item(RMPP_header_tree, hf_infiniband_reserved32, tvb, local_offset, 4, FALSE); local_offset+=4; - proto_tree_add_item(RMPP_header_tree, hf_infiniband_optional_extended_error_data, tvb, local_offset, 220, FALSE); + proto_tree_add_item(RMPP_header_tree, hf_infiniband_optional_extended_error_data, tvb, local_offset, 220, ENC_NA); break; default: break; @@ -3488,7 +3488,7 @@ static gboolean parse_SUBM_Attribute(proto_tree *parentTree, tvbuff_t *tvb, gint proto_tree *SUBM_Attribute_header_tree = NULL; proto_item *SUBM_Attribute_header_item = NULL; - SUBM_Attribute_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, *offset, 64, FALSE); + SUBM_Attribute_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, *offset, 64, ENC_NA); proto_item_set_text(SUBM_Attribute_header_item, "%s", val_to_str(attributeID, SUBM_Attributes, "Unknown Attribute Type! (0x%02x)")); SUBM_Attribute_header_tree = proto_item_add_subtree(SUBM_Attribute_header_item, ett_subm_attribute); @@ -3562,7 +3562,7 @@ static gboolean parse_SUBA_Attribute(proto_tree *parentTree, tvbuff_t *tvb, gint proto_tree *SUBA_Attribute_header_tree = NULL; proto_item *SUBA_Attribute_header_item = NULL; - SUBA_Attribute_header_item = proto_tree_add_item(parentTree, hf_infiniband_SA, tvb, *offset, 200, FALSE); + SUBA_Attribute_header_item = proto_tree_add_item(parentTree, hf_infiniband_SA, tvb, *offset, 200, ENC_NA); proto_item_set_text(SUBA_Attribute_header_item, "%s", val_to_str(attributeID, SUBA_Attributes, "Unknown Attribute Type! (0x%02x)")); SUBA_Attribute_header_tree = proto_item_add_subtree(SUBA_Attribute_header_item, ett_suba_attribute); @@ -3673,7 +3673,7 @@ static void parse_NoticeDataDetails(proto_tree* parentTree, tvbuff_t* tvb, gint if(!parentTree) return; - DataDetails_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, local_offset, 54, FALSE); + DataDetails_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, local_offset, 54, ENC_NA); DataDetails_header_tree = proto_item_add_subtree(DataDetails_header_item, ett_datadetails); @@ -3764,7 +3764,7 @@ static void parse_NoticeDataDetails(proto_tree* parentTree, tvbuff_t* tvb, gint proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_DRNotice, tvb, local_offset, 1, FALSE); proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_DRPathTruncated, tvb, local_offset, 1, FALSE); proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_DRHopCount, tvb, local_offset, 1, FALSE); local_offset+=1; - proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_DRNoticeReturnPath, tvb, local_offset, 30, FALSE); local_offset+=30; + proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_DRNoticeReturnPath, tvb, local_offset, 30, ENC_NA); local_offset+=30; break; case 257: proto_item_set_text(DataDetails_header_item, "%s", "Trap 257 DataDetails"); @@ -3829,7 +3829,7 @@ static void parse_NoticesAndTraps(proto_tree* parentTree, tvbuff_t* tvb, gint *o if(!parentTree) return; - NoticesAndTraps_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, local_offset, 64, FALSE); + NoticesAndTraps_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, local_offset, 64, ENC_NA); proto_item_set_text(NoticesAndTraps_header_item, "%s", val_to_str(trapNumber, Trap_Description, "Unknown or Vendor Specific Trap Number! (0x%02x)")); NoticesAndTraps_header_tree = proto_item_add_subtree(NoticesAndTraps_header_item, ett_noticestraps); @@ -3842,11 +3842,11 @@ static void parse_NoticesAndTraps(proto_tree* parentTree, tvbuff_t* tvb, gint *o proto_tree_add_item(NoticesAndTraps_header_tree, hf_infiniband_Notice_NoticeCount, tvb, local_offset, 2, FALSE); local_offset+=2; parse_NoticeDataDetails(NoticesAndTraps_header_tree, tvb, &local_offset, trapNumber); - proto_tree_add_item(NoticesAndTraps_header_tree, hf_infiniband_Notice_DataDetails, tvb, local_offset, 54, FALSE); local_offset+=54; + proto_tree_add_item(NoticesAndTraps_header_tree, hf_infiniband_Notice_DataDetails, tvb, local_offset, 54, ENC_NA); local_offset+=54; /* Only Defined For GMPs not SMPs which is not part of this dissector phase *proto_tree_add_item(NoticesAndTraps_header_tree, hf_infiniband_Notice_IssuerGID, tvb, local_offset, 16, FALSE); local_offset+=16; - *proto_tree_add_item(NoticesAndTraps_header_tree, hf_infiniband_Notice_ClassTrapSpecificData, tvb, local_offset, 1, FALSE); local_offset+=1; */ + *proto_tree_add_item(NoticesAndTraps_header_tree, hf_infiniband_Notice_ClassTrapSpecificData, tvb, local_offset, 1, ENC_NA); local_offset+=1; */ } @@ -4210,7 +4210,7 @@ static void parse_P_KeyTable(proto_tree* parentTree, tvbuff_t* tvb, gint *offset if(!parentTree) return; - P_KeyTable_header_item = proto_tree_add_item(parentTree, hf_infiniband_P_KeyTable_P_KeyTableBlock, tvb, local_offset, 64, FALSE); + P_KeyTable_header_item = proto_tree_add_item(parentTree, hf_infiniband_P_KeyTable_P_KeyTableBlock, tvb, local_offset, 64, ENC_NA); proto_item_set_text(P_KeyTable_header_item, "%s", "P_KeyTable"); P_KeyTable_header_tree = proto_item_add_subtree(P_KeyTable_header_item, ett_pkeytable); @@ -4240,7 +4240,7 @@ static void parse_SLtoVLMappingTable(proto_tree* parentTree, tvbuff_t* tvb, gint if(!parentTree) return; - SLtoVLMappingTable_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, local_offset, 64, FALSE); + SLtoVLMappingTable_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, local_offset, 64, ENC_NA); proto_item_set_text(SLtoVLMappingTable_header_item, "%s", "SLtoVLMappingTable"); SLtoVLMappingTable_header_tree = proto_item_add_subtree(SLtoVLMappingTable_header_item, ett_sltovlmapping); @@ -4270,7 +4270,7 @@ static void parse_VLArbitrationTable(proto_tree* parentTree, tvbuff_t* tvb, gint if(!parentTree) return; - VLArbitrationTable_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, local_offset, 64, FALSE); + VLArbitrationTable_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, local_offset, 64, ENC_NA); proto_item_set_text(VLArbitrationTable_header_item, "%s", "VLArbitrationTable"); VLArbitrationTable_header_tree = proto_item_add_subtree(VLArbitrationTable_header_item, ett_vlarbitrationtable); @@ -4299,7 +4299,7 @@ static void parse_LinearForwardingTable(proto_tree* parentTree, tvbuff_t* tvb, g if(!parentTree) return; - LinearForwardingTable_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, local_offset, 64, FALSE); + LinearForwardingTable_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, local_offset, 64, ENC_NA); proto_item_set_text(LinearForwardingTable_header_item, "%s", "LinearForwardingTable"); LinearForwardingTable_header_tree = proto_item_add_subtree(LinearForwardingTable_header_item, ett_linearforwardingtable); @@ -4326,7 +4326,7 @@ static void parse_RandomForwardingTable(proto_tree* parentTree, tvbuff_t* tvb, g if(!parentTree) return; - RandomForwardingTable_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, local_offset, 64, FALSE); + RandomForwardingTable_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, local_offset, 64, ENC_NA); proto_item_set_text(RandomForwardingTable_header_item, "%s", "RandomForwardingTable"); RandomForwardingTable_header_tree = proto_item_add_subtree(RandomForwardingTable_header_item, ett_randomforwardingtable); @@ -4359,7 +4359,7 @@ static void parse_MulticastForwardingTable(proto_tree* parentTree, tvbuff_t* tvb if(!parentTree) return; - MulticastForwardingTable_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, local_offset, 64, FALSE); + MulticastForwardingTable_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, local_offset, 64, ENC_NA); proto_item_set_text(MulticastForwardingTable_header_item, "%s", "MulticastForwardingTable"); MulticastForwardingTable_header_tree = proto_item_add_subtree(MulticastForwardingTable_header_item, ett_multicastforwardingtable); @@ -4385,7 +4385,7 @@ static void parse_SMInfo(proto_tree* parentTree, tvbuff_t* tvb, gint *offset) if(!parentTree) return; - SMInfo_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, local_offset, 64, FALSE); + SMInfo_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, local_offset, 64, ENC_NA); proto_item_set_text(SMInfo_header_item, "%s", "SMInfo"); SMInfo_header_tree = proto_item_add_subtree(SMInfo_header_item, ett_sminfo); @@ -4410,12 +4410,12 @@ static void parse_VendorDiag(proto_tree* parentTree, tvbuff_t* tvb, gint *offset if(!parentTree) return; - VendorDiag_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, local_offset, 64, FALSE); + VendorDiag_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, local_offset, 64, ENC_NA); proto_item_set_text(VendorDiag_header_item, "%s", "VendorDiag"); VendorDiag_header_tree = proto_item_add_subtree(VendorDiag_header_item, ett_vendordiag); proto_tree_add_item(VendorDiag_header_tree, hf_infiniband_VendorDiag_NextIndex, tvb, local_offset, 2, FALSE); local_offset +=2; - proto_tree_add_item(VendorDiag_header_tree, hf_infiniband_VendorDiag_DiagData, tvb, local_offset, 62, FALSE); local_offset +=62; + proto_tree_add_item(VendorDiag_header_tree, hf_infiniband_VendorDiag_DiagData, tvb, local_offset, 62, ENC_NA); local_offset +=62; } /* Parse LedInfo Attribute @@ -4432,7 +4432,7 @@ static void parse_LedInfo(proto_tree* parentTree, tvbuff_t* tvb, gint *offset) if(!parentTree) return; - LedInfo_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, local_offset, 64, FALSE); + LedInfo_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, local_offset, 64, ENC_NA); proto_item_set_text(LedInfo_header_item, "%s", "LedInfo"); LedInfo_header_tree = proto_item_add_subtree(LedInfo_header_item, ett_ledinfo); @@ -4453,12 +4453,12 @@ static void parse_LinkSpeedWidthPairsTable(proto_tree* parentTree, tvbuff_t* tvb if(!parentTree) return; - LinkSpeedWidthPairsTable_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, local_offset, 64, FALSE); + LinkSpeedWidthPairsTable_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, local_offset, 64, ENC_NA); proto_item_set_text(LinkSpeedWidthPairsTable_header_item, "%s", "LinkSpeedWidthPairsTable"); LinkSpeedWidthPairsTable_header_tree = proto_item_add_subtree(LinkSpeedWidthPairsTable_header_item, ett_linkspeedwidthpairs); proto_tree_add_item(LinkSpeedWidthPairsTable_header_tree, hf_infiniband_LinkSpeedWidthPairsTable_NumTables, tvb, local_offset, 1, FALSE); local_offset +=1; - proto_tree_add_item(LinkSpeedWidthPairsTable_header_tree, hf_infiniband_LinkSpeedWidthPairsTable_PortMask, tvb, local_offset, 32, FALSE); local_offset +=32; + proto_tree_add_item(LinkSpeedWidthPairsTable_header_tree, hf_infiniband_LinkSpeedWidthPairsTable_PortMask, tvb, local_offset, 32, ENC_NA); local_offset +=32; proto_tree_add_item(LinkSpeedWidthPairsTable_header_tree, hf_infiniband_LinkSpeedWidthPairsTable_SpeedTwoFive, tvb, local_offset, 1, FALSE); local_offset +=1; proto_tree_add_item(LinkSpeedWidthPairsTable_header_tree, hf_infiniband_LinkSpeedWidthPairsTable_SpeedFive, tvb, local_offset, 1, FALSE); local_offset +=1; proto_tree_add_item(LinkSpeedWidthPairsTable_header_tree, hf_infiniband_LinkSpeedWidthPairsTable_SpeedTen, tvb, local_offset, 1, FALSE); local_offset +=1; @@ -4589,7 +4589,7 @@ static void parse_InformInfo(proto_tree* parentTree, tvbuff_t* tvb, gint *offset { return; } - InformInfo_header_item = proto_tree_add_item(parentTree, hf_infiniband_SA, tvb, local_offset, 36, FALSE); + InformInfo_header_item = proto_tree_add_item(parentTree, hf_infiniband_SA, tvb, local_offset, 36, ENC_NA); proto_item_set_text(InformInfo_header_item, "%s", "InformInfo"); InformInfo_header_tree = proto_item_add_subtree(InformInfo_header_item, ett_informinfo); @@ -4623,7 +4623,7 @@ static void parse_LinkRecord(proto_tree* parentTree, tvbuff_t* tvb, gint *offset return; } - LinkRecord_header_item = proto_tree_add_item(parentTree, hf_infiniband_SA, tvb, local_offset, 3, FALSE); + LinkRecord_header_item = proto_tree_add_item(parentTree, hf_infiniband_SA, tvb, local_offset, 3, ENC_NA); proto_item_set_text(LinkRecord_header_item, "%s", "LinkRecord"); LinkRecord_header_tree = proto_item_add_subtree(LinkRecord_header_item, ett_linkrecord); @@ -4648,21 +4648,21 @@ static void parse_ServiceRecord(proto_tree* parentTree, tvbuff_t* tvb, gint *off return; } - ServiceRecord_header_item = proto_tree_add_item(parentTree, hf_infiniband_SA, tvb, local_offset, 176, FALSE); + ServiceRecord_header_item = proto_tree_add_item(parentTree, hf_infiniband_SA, tvb, local_offset, 176, ENC_NA); proto_item_set_text(ServiceRecord_header_item, "%s", "ServiceRecord"); ServiceRecord_header_tree = proto_item_add_subtree(ServiceRecord_header_item, ett_servicerecord); proto_tree_add_item(ServiceRecord_header_tree, hf_infiniband_ServiceRecord_ServiceLease, tvb, local_offset, 4, FALSE); local_offset+=4; - proto_tree_add_item(ServiceRecord_header_tree, hf_infiniband_ServiceRecord_ServiceKey, tvb, local_offset, 16, FALSE); local_offset+=16; - proto_tree_add_item(ServiceRecord_header_tree, hf_infiniband_ServiceRecord_ServiceName, tvb, local_offset, 64, FALSE); local_offset+=64; + proto_tree_add_item(ServiceRecord_header_tree, hf_infiniband_ServiceRecord_ServiceKey, tvb, local_offset, 16, ENC_NA); local_offset+=16; + proto_tree_add_item(ServiceRecord_header_tree, hf_infiniband_ServiceRecord_ServiceName, tvb, local_offset, 64, ENC_NA); local_offset+=64; - tempData = proto_tree_add_item(ServiceRecord_header_tree, hf_infiniband_ServiceRecord_ServiceData, tvb, local_offset, 16, FALSE); local_offset+=16; + tempData = proto_tree_add_item(ServiceRecord_header_tree, hf_infiniband_ServiceRecord_ServiceData, tvb, local_offset, 16, ENC_NA); local_offset+=16; proto_item_append_text(tempData, "%s", "(ServiceData 8.1, 8.16)"); - tempData = proto_tree_add_item(ServiceRecord_header_tree, hf_infiniband_ServiceRecord_ServiceData, tvb, local_offset, 16, FALSE); local_offset+=16; + tempData = proto_tree_add_item(ServiceRecord_header_tree, hf_infiniband_ServiceRecord_ServiceData, tvb, local_offset, 16, ENC_NA); local_offset+=16; proto_item_append_text(tempData, "%s", "(ServiceData 16.1, 16.8)"); - tempData = proto_tree_add_item(ServiceRecord_header_tree, hf_infiniband_ServiceRecord_ServiceData, tvb, local_offset, 16, FALSE); local_offset+=16; + tempData = proto_tree_add_item(ServiceRecord_header_tree, hf_infiniband_ServiceRecord_ServiceData, tvb, local_offset, 16, ENC_NA); local_offset+=16; proto_item_append_text(tempData, "%s", "(ServiceData 32.1, 32.4)"); - tempData = proto_tree_add_item(ServiceRecord_header_tree, hf_infiniband_ServiceRecord_ServiceData, tvb, local_offset, 16, FALSE); local_offset+=16; + tempData = proto_tree_add_item(ServiceRecord_header_tree, hf_infiniband_ServiceRecord_ServiceData, tvb, local_offset, 16, ENC_NA); local_offset+=16; proto_item_append_text(tempData, "%s", "(ServiceData 64.1, 64.2)"); } @@ -4682,7 +4682,7 @@ static void parse_PathRecord(proto_tree* parentTree, tvbuff_t* tvb, gint *offset return; } - PathRecord_header_item = proto_tree_add_item(parentTree, hf_infiniband_SA, tvb, local_offset, 64, FALSE); + PathRecord_header_item = proto_tree_add_item(parentTree, hf_infiniband_SA, tvb, local_offset, 64, ENC_NA); proto_item_set_text(PathRecord_header_item, "%s", "PathRecord"); PathRecord_header_tree = proto_item_add_subtree(PathRecord_header_item, ett_pathrecord); local_offset += 8; /* Reserved Bits */ @@ -4723,7 +4723,7 @@ static void parse_MCMemberRecord(proto_tree* parentTree, tvbuff_t* tvb, gint *of return; } - MCMemberRecord_header_item = proto_tree_add_item(parentTree, hf_infiniband_SA, tvb, local_offset, 64, FALSE); + MCMemberRecord_header_item = proto_tree_add_item(parentTree, hf_infiniband_SA, tvb, local_offset, 64, ENC_NA); proto_item_set_text(MCMemberRecord_header_item, "%s", "MCMemberRecord"); MCMemberRecord_header_tree = proto_item_add_subtree(MCMemberRecord_header_item, ett_mcmemberrecord); @@ -4761,7 +4761,7 @@ static void parse_TraceRecord(proto_tree* parentTree, tvbuff_t* tvb, gint *offse return; } - TraceRecord_header_item = proto_tree_add_item(parentTree, hf_infiniband_SA, tvb, local_offset, 46, FALSE); + TraceRecord_header_item = proto_tree_add_item(parentTree, hf_infiniband_SA, tvb, local_offset, 46, ENC_NA); proto_item_set_text(TraceRecord_header_item, "%s", "TraceRecord"); TraceRecord_header_tree = proto_item_add_subtree(TraceRecord_header_item, ett_tracerecord); @@ -4796,7 +4796,7 @@ static void parse_MultiPathRecord(proto_tree* parentTree, tvbuff_t* tvb, gint *o return; } - MultiPathRecord_header_item = proto_tree_add_item(parentTree, hf_infiniband_SA, tvb, local_offset, 200, FALSE); + MultiPathRecord_header_item = proto_tree_add_item(parentTree, hf_infiniband_SA, tvb, local_offset, 200, ENC_NA); proto_item_set_text(MultiPathRecord_header_item, "%s", "MultiPathRecord"); MultiPathRecord_header_tree = proto_item_add_subtree(MultiPathRecord_header_item, ett_multipathrecord); @@ -4851,11 +4851,11 @@ static void parse_ServiceAssociationRecord(proto_tree* parentTree, tvbuff_t* tvb return; } - ServiceAssociationRecord_header_item = proto_tree_add_item(parentTree, hf_infiniband_SA, tvb, local_offset, 80, FALSE); + ServiceAssociationRecord_header_item = proto_tree_add_item(parentTree, hf_infiniband_SA, tvb, local_offset, 80, ENC_NA); proto_item_set_text(ServiceAssociationRecord_header_item, "%s", "ServiceAssociationRecord"); ServiceAssociationRecord_header_tree = proto_item_add_subtree(ServiceAssociationRecord_header_item, ett_serviceassocrecord); - proto_tree_add_item(ServiceAssociationRecord_header_tree, hf_infiniband_ServiceAssociationRecord_ServiceKey, tvb, local_offset, 16, FALSE); local_offset +=16; + proto_tree_add_item(ServiceAssociationRecord_header_tree, hf_infiniband_ServiceAssociationRecord_ServiceKey, tvb, local_offset, 16, ENC_NA); local_offset +=16; proto_tree_add_item(ServiceAssociationRecord_header_tree, hf_infiniband_ServiceAssociationRecord_ServiceName, tvb, local_offset, 64, FALSE); local_offset +=64; } @@ -4872,7 +4872,7 @@ static void parse_PERF_PortCounters(proto_tree* parentTree, tvbuff_t* tvb, packe col_set_str(pinfo->cinfo, COL_INFO, "PERF (PortCounters)"); - perf_item = proto_tree_add_item(parentTree, hf_infiniband_PortCounters, tvb, local_offset, 40, FALSE); + perf_item = proto_tree_add_item(parentTree, hf_infiniband_PortCounters, tvb, local_offset, 40, ENC_NA); perf_tree = proto_item_add_subtree(perf_item, ett_perfclass); local_offset += 40; /* skip reserved field */ @@ -4915,7 +4915,7 @@ static void parse_PERF_PortCountersExtended(proto_tree* parentTree, tvbuff_t* tv col_set_str(pinfo->cinfo, COL_INFO, "PERF (PortCountersExtended)"); - perf_item = proto_tree_add_item(parentTree, hf_infiniband_PortCountersExt, tvb, local_offset, 72, FALSE); + perf_item = proto_tree_add_item(parentTree, hf_infiniband_PortCountersExt, tvb, local_offset, 72, ENC_NA); perf_tree = proto_item_add_subtree(perf_item, ett_perfclass); local_offset += 40; /* skip reserved field */ diff --git a/epan/dissectors/packet-infiniband_sdp.c b/epan/dissectors/packet-infiniband_sdp.c index b0437c6efb..f61f749d35 100644 --- a/epan/dissectors/packet-infiniband_sdp.c +++ b/epan/dissectors/packet-infiniband_sdp.c @@ -236,10 +236,10 @@ manual_override: col_set_str(pinfo->cinfo, COL_PROTOCOL, "SDP"); - SDP_header_item = proto_tree_add_item(tree, hf_ib_sdp, tvb, local_offset, -1, FALSE); + SDP_header_item = proto_tree_add_item(tree, hf_ib_sdp, tvb, local_offset, -1, ENC_NA); SDP_header_tree = proto_item_add_subtree(SDP_header_item, ett_ib_sdp); - SDP_BSDH_header_item = proto_tree_add_item(SDP_header_tree, hf_ib_sdp_bsdh, tvb, local_offset, 16, FALSE); + SDP_BSDH_header_item = proto_tree_add_item(SDP_header_tree, hf_ib_sdp_bsdh, tvb, local_offset, 16, ENC_NA); SDP_BSDH_header_tree = proto_item_add_subtree(SDP_BSDH_header_item, ett_ib_sdp_bsdh); mid = tvb_get_guint8(tvb, local_offset); @@ -257,7 +257,7 @@ manual_override: switch (mid) { case Hello: - SDP_EH_header_item = proto_tree_add_item(SDP_header_tree, hf_ib_sdp_hh, tvb, local_offset, 48, FALSE); + SDP_EH_header_item = proto_tree_add_item(SDP_header_tree, hf_ib_sdp_hh, tvb, local_offset, 48, ENC_NA); SDP_EH_header_tree = proto_item_add_subtree(SDP_EH_header_item, ett_ib_sdp_hh); proto_tree_add_item(SDP_EH_header_tree, hf_ib_sdp_majv, tvb, local_offset, 1, FALSE); proto_tree_add_item(SDP_EH_header_tree, hf_ib_sdp_minv, tvb, local_offset, 1, FALSE); local_offset += 1; @@ -277,7 +277,7 @@ manual_override: proto_tree_add_item(SDP_EH_header_tree, hf_ib_sdp_extmaxadverts, tvb, local_offset, 2, FALSE); local_offset += 2; break; case HelloAck: - proto_tree_add_item(SDP_header_tree, hf_ib_sdp_hah, tvb, local_offset, 48, FALSE); + proto_tree_add_item(SDP_header_tree, hf_ib_sdp_hah, tvb, local_offset, 48, ENC_NA); break; case DisConn: break; @@ -286,13 +286,13 @@ manual_override: case SendSm: break; case RdmaWrCompl: - proto_tree_add_item(SDP_header_tree, hf_ib_sdp_rwch, tvb, local_offset, 48, FALSE); + proto_tree_add_item(SDP_header_tree, hf_ib_sdp_rwch, tvb, local_offset, 48, ENC_NA); break; case RdmaRdCompl: - proto_tree_add_item(SDP_header_tree, hf_ib_sdp_rrch, tvb, local_offset, 48, FALSE); + proto_tree_add_item(SDP_header_tree, hf_ib_sdp_rrch, tvb, local_offset, 48, ENC_NA); break; case ModeChange: - proto_tree_add_item(SDP_BSDH_header_tree, hf_ib_sdp_mch, tvb, local_offset, 48, FALSE); + proto_tree_add_item(SDP_BSDH_header_tree, hf_ib_sdp_mch, tvb, local_offset, 48, ENC_NA); break; case SrcAvailCancel: break; @@ -301,24 +301,24 @@ manual_override: case SinkCancelAck: break; case ChRcvBuf: - proto_tree_add_item(SDP_header_tree, hf_ib_sdp_crbh, tvb, local_offset, 48, FALSE); + proto_tree_add_item(SDP_header_tree, hf_ib_sdp_crbh, tvb, local_offset, 48, ENC_NA); break; case ChRcvBufAck: - proto_tree_add_item(SDP_header_tree, hf_ib_sdp_crbah, tvb, local_offset, 48, FALSE); + proto_tree_add_item(SDP_header_tree, hf_ib_sdp_crbah, tvb, local_offset, 48, ENC_NA); break; case SuspComm: - proto_tree_add_item(SDP_header_tree, hf_ib_sdp_suspch, tvb, local_offset, 48, FALSE); + proto_tree_add_item(SDP_header_tree, hf_ib_sdp_suspch, tvb, local_offset, 48, ENC_NA); break; case SuspCommAck: break; case SinkAvail: - proto_tree_add_item(SDP_header_tree, hf_ib_sdp_sinkah, tvb, local_offset, 48, FALSE); + proto_tree_add_item(SDP_header_tree, hf_ib_sdp_sinkah, tvb, local_offset, 48, ENC_NA); break; case SrcAvail: - proto_tree_add_item(SDP_header_tree, hf_ib_sdp_srcah, tvb, local_offset, 48, FALSE); + proto_tree_add_item(SDP_header_tree, hf_ib_sdp_srcah, tvb, local_offset, 48, ENC_NA); break; case Data: - proto_tree_add_item(SDP_header_tree, hf_ib_sdp_data, tvb, local_offset, -1, FALSE); + proto_tree_add_item(SDP_header_tree, hf_ib_sdp_data, tvb, local_offset, -1, ENC_NA); break; default: break; diff --git a/epan/dissectors/packet-ipmi-app.c b/epan/dissectors/packet-ipmi-app.c index 5ddd20cd60..5e3a973c6e 100644 --- a/epan/dissectors/packet-ipmi-app.c +++ b/epan/dissectors/packet-ipmi-app.c @@ -444,7 +444,7 @@ rs01(tvbuff_t *tvb, proto_tree *tree) proto_tree_add_item(tree, hf_ipmi_app_01_product, tvb, 9, 2, TRUE); if (len > 11) { /* IPMI states that Aux Revision should be displayed in MSB order */ - proto_tree_add_item(tree, hf_ipmi_app_01_fw_aux, tvb, 11, 4, FALSE); + proto_tree_add_item(tree, hf_ipmi_app_01_fw_aux, tvb, 11, 4, ENC_NA); } } @@ -488,7 +488,7 @@ rs04(tvbuff_t *tvb, proto_tree *tree) static void rq05(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_app_05_devspec, tvb, 0, tvb_length(tvb), TRUE); + proto_tree_add_item(tree, hf_ipmi_app_05_devspec, tvb, 0, tvb_length(tvb), ENC_NA); } /* Set ACPI Power State. @@ -776,7 +776,7 @@ static void rs39(tvbuff_t *tvb, proto_tree *tree) { proto_tree_add_item(tree, hf_ipmi_app_39_temp_session, tvb, 0, 4, TRUE); - proto_tree_add_item(tree, hf_ipmi_app_39_challenge, tvb, 4, 16, TRUE); + proto_tree_add_item(tree, hf_ipmi_app_39_challenge, tvb, 4, 16, ENC_NA); } static const value_string cc39[] = { @@ -797,7 +797,7 @@ rq3a(tvbuff_t *tvb, proto_tree *tree) ett_ipmi_app_3a_rq_byte1, byte1, TRUE, 0); proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_app_3a_rq_byte2, byte2, TRUE, 0); - proto_tree_add_item(tree, hf_ipmi_app_3a_authcode, tvb, 2, 16, TRUE); + proto_tree_add_item(tree, hf_ipmi_app_3a_authcode, tvb, 2, 16, ENC_NA); proto_tree_add_item(tree, hf_ipmi_app_3a_outbound_seq, tvb, 18, 4, TRUE); } diff --git a/epan/dissectors/packet-ipmi-chassis.c b/epan/dissectors/packet-ipmi-chassis.c index 91bd033cc1..3fa4962adc 100644 --- a/epan/dissectors/packet-ipmi-chassis.c +++ b/epan/dissectors/packet-ipmi-chassis.c @@ -412,7 +412,7 @@ static void bootopt_07(tvbuff_t *tvb, proto_tree *tree) { proto_tree_add_item(tree, hf_ipmi_chs_bo07_block_selector, tvb, 0, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_chs_bo07_block_data, tvb, 1, tvb_length(tvb) - 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_chs_bo07_block_data, tvb, 1, tvb_length(tvb) - 1, ENC_NA); } @@ -682,7 +682,7 @@ rs09(tvbuff_t *tvb, proto_tree *tree) boot_options[pno].intrp(sub, tree); } else { proto_tree_add_item(tree, hf_ipmi_chs_09_rs_param_data, tvb, 2, - tvb_length(tvb) - 2, TRUE); + tvb_length(tvb) - 2, ENC_NA); } } diff --git a/epan/dissectors/packet-ipmi-picmg.c b/epan/dissectors/packet-ipmi-picmg.c index 418fe811df..da0362ba53 100644 --- a/epan/dissectors/packet-ipmi-picmg.c +++ b/epan/dissectors/packet-ipmi-picmg.c @@ -1189,13 +1189,13 @@ rq20(tvbuff_t *tvb, proto_tree *tree) proto_tree_add_item(tree, hf_ipmi_picmg_20_fruid, tvb, 0, 1, TRUE); proto_tree_add_item(tree, hf_ipmi_picmg_20_lockid, tvb, 1, 2, TRUE); proto_tree_add_item(tree, hf_ipmi_picmg_20_offset, tvb, 3, 2, TRUE); - proto_tree_add_item(tree, hf_ipmi_picmg_20_data, tvb, 5, tvb_length(tvb) - 5, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_20_data, tvb, 5, tvb_length(tvb) - 5, ENC_NA); } static void rs20(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_picmg_20_count, tvb, 0, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_20_count, tvb, 0, 1, ENC_NA); } static const value_string cc20[] = { @@ -1320,7 +1320,7 @@ parse_version(tvbuff_t *tvb, proto_tree *tree) proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_picmg_prop01_byte1, byte1, TRUE, 0); proto_tree_add_item(tree, hf_ipmi_picmg_prop01_fw_minor, tvb, 1, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_picmg_prop01_fw_aux, tvb, 2, 4, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_prop01_fw_aux, tvb, 2, 4, ENC_NA); } static void @@ -1378,7 +1378,7 @@ rs2f(tvbuff_t *tvb, proto_tree *tree) if (!ipmi_getsaveddata(0, &pno)) { /* Can't parse further if property selector is not known */ - proto_tree_add_item(tree, hf_ipmi_picmg_2f_prop_data, tvb, 0, tvb_length(tvb), TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_2f_prop_data, tvb, 0, tvb_length(tvb), ENC_NA); return; } @@ -1395,7 +1395,7 @@ rs2f(tvbuff_t *tvb, proto_tree *tree) if (pno < array_length(compprops)) { compprops[pno].intrp(tvb, tree); } else { - proto_tree_add_item(tree, hf_ipmi_picmg_2f_prop_data, tvb, 0, tvb_length(tvb), TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_2f_prop_data, tvb, 0, tvb_length(tvb), ENC_NA); } } @@ -1435,7 +1435,7 @@ static void rq32(tvbuff_t *tvb, proto_tree *tree) { proto_tree_add_item(tree, hf_ipmi_picmg_32_block, tvb, 0, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_picmg_32_data, tvb, 1, tvb_length(tvb) - 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_picmg_32_data, tvb, 1, tvb_length(tvb) - 1, ENC_NA); } static void diff --git a/epan/dissectors/packet-ipmi-se.c b/epan/dissectors/packet-ipmi-se.c index 12d1d7ec0e..38988c7cd7 100644 --- a/epan/dissectors/packet-ipmi-se.c +++ b/epan/dissectors/packet-ipmi-se.c @@ -1964,7 +1964,7 @@ cfgparam_06(tvbuff_t *tvb, proto_tree *tree) static const int *byte1[] = { &hf_ipmi_se_cp06_filter, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_se_cp06_byte1, byte1, TRUE, 0); - proto_tree_add_item(tree, hf_ipmi_se_cp06_data, tvb, 1, 20, TRUE); + proto_tree_add_item(tree, hf_ipmi_se_cp06_data, tvb, 1, 20, ENC_NA); } static void @@ -1973,7 +1973,7 @@ cfgparam_07(tvbuff_t *tvb, proto_tree *tree) static const int *byte1[] = { &hf_ipmi_se_cp07_filter, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_se_cp07_byte1, byte1, TRUE, 0); - proto_tree_add_item(tree, hf_ipmi_se_cp06_data, tvb, 1, 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_se_cp06_data, tvb, 1, 1, ENC_NA); } static void @@ -1988,7 +1988,7 @@ cfgparam_09(tvbuff_t *tvb, proto_tree *tree) static const int *byte1[] = { &hf_ipmi_se_cp09_entry, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_se_cp09_byte1, byte1, TRUE, 0); - proto_tree_add_item(tree, hf_ipmi_se_cp09_data, tvb, 1, 3, TRUE); + proto_tree_add_item(tree, hf_ipmi_se_cp09_data, tvb, 1, 3, ENC_NA); } static void @@ -2345,7 +2345,7 @@ rs13(tvbuff_t *tvb, proto_tree *tree) if (!ipmi_getsaveddata(0, &pno)) { /* No request found - cannot parse further */ if (tvb_length(tvb) > 1) { - proto_tree_add_item(tree, hf_ipmi_se_13_data, tvb, 1, tvb_length(tvb) - 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_se_13_data, tvb, 1, tvb_length(tvb) - 1, ENC_NA); } return; } @@ -2375,7 +2375,7 @@ rs13(tvbuff_t *tvb, proto_tree *tree) sub = tvb_new_subset(tvb, 1, tvb_length(tvb) - 1, tvb_length(tvb) - 1); conf_params[pno].intrp(sub, tree); } else { - proto_tree_add_item(tree, hf_ipmi_se_13_data, tvb, 1, tvb_length(tvb) - 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_se_13_data, tvb, 1, tvb_length(tvb) - 1, ENC_NA); } } } @@ -2545,7 +2545,7 @@ static void rs21(tvbuff_t *tvb, proto_tree *tree) { proto_tree_add_item(tree, hf_ipmi_se_21_next, tvb, 0, 2, TRUE); - proto_tree_add_item(tree, hf_ipmi_se_21_recdata, tvb, 2, tvb_length(tvb) - 2, TRUE); + proto_tree_add_item(tree, hf_ipmi_se_21_recdata, tvb, 2, tvb_length(tvb) - 2, ENC_NA); } static const value_string cc21[] = { diff --git a/epan/dissectors/packet-ipmi-session.c b/epan/dissectors/packet-ipmi-session.c index e75d0da368..d38614f601 100644 --- a/epan/dissectors/packet-ipmi-session.c +++ b/epan/dissectors/packet-ipmi-session.c @@ -201,9 +201,9 @@ dissect_ipmi_session(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset++; if (payloadtype == IPMI_OEM_EXPLICIT) { - proto_tree_add_item(sess_tree, hf_ipmi_session_oem_iana, tvb, offset, 4, TRUE); + proto_tree_add_item(sess_tree, hf_ipmi_session_oem_iana, tvb, offset, 4, ENC_NA); offset += 4; - proto_tree_add_item(sess_tree, hf_ipmi_session_oem_payload_id, tvb, offset, 2, TRUE); + proto_tree_add_item(sess_tree, hf_ipmi_session_oem_payload_id, tvb, offset, 2, ENC_NA); offset += 2; } proto_tree_add_item(sess_tree, hf_ipmi_session_id, tvb, offset, 4, TRUE); @@ -220,7 +220,7 @@ dissect_ipmi_session(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 4; if (authtype != IPMI_AUTH_NONE) { proto_tree_add_item(sess_tree, hf_ipmi_session_authcode, - tvb, offset, 16, TRUE); + tvb, offset, 16, ENC_NA); offset += 16; } proto_tree_add_item(sess_tree, hf_ipmi_session_msg_len_1b, tvb, offset, 1, TRUE); @@ -258,7 +258,7 @@ dissect_ipmi_session(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Show the rest of the session wrapper as binary data */ if (offset < tvb_length(tvb)) { proto_tree_add_item(sess_tree, hf_ipmi_session_trailer, - tvb, offset, tvb_length(tvb) - offset, TRUE); + tvb, offset, tvb_length(tvb) - offset, ENC_NA); } } return tvb_length(tvb); diff --git a/epan/dissectors/packet-ipmi-storage.c b/epan/dissectors/packet-ipmi-storage.c index 139b466483..4a35439e87 100644 --- a/epan/dissectors/packet-ipmi-storage.c +++ b/epan/dissectors/packet-ipmi-storage.c @@ -272,7 +272,7 @@ static void rs11(tvbuff_t *tvb, proto_tree *tree) { proto_tree_add_item(tree, hf_ipmi_stor_11_ret_count, tvb, 0, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_stor_11_data, tvb, 1, tvb_length(tvb) - 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_stor_11_data, tvb, 1, tvb_length(tvb) - 1, ENC_NA); } static const value_string cc11[] = { @@ -287,7 +287,7 @@ rq12(tvbuff_t *tvb, proto_tree *tree) { proto_tree_add_item(tree, hf_ipmi_stor_12_fruid, tvb, 0, 1, TRUE); proto_tree_add_item(tree, hf_ipmi_stor_12_offset, tvb, 1, 2, TRUE); - proto_tree_add_item(tree, hf_ipmi_stor_12_data, tvb, 1, tvb_length(tvb) - 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_stor_12_data, tvb, 1, tvb_length(tvb) - 1, ENC_NA); } static void @@ -358,7 +358,7 @@ static void rs23(tvbuff_t *tvb, proto_tree *tree) { proto_tree_add_item(tree, hf_ipmi_stor_23_next, tvb, 0, 2, TRUE); - proto_tree_add_item(tree, hf_ipmi_stor_23_data, tvb, 2, tvb_length(tvb) - 2, TRUE); + proto_tree_add_item(tree, hf_ipmi_stor_23_data, tvb, 2, tvb_length(tvb) - 2, ENC_NA); } /* Add SDR @@ -366,7 +366,7 @@ rs23(tvbuff_t *tvb, proto_tree *tree) static void rq24(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_stor_24_data, tvb, 0, tvb_length(tvb), TRUE); + proto_tree_add_item(tree, hf_ipmi_stor_24_data, tvb, 0, tvb_length(tvb), ENC_NA); } static void @@ -387,7 +387,7 @@ rq25(tvbuff_t *tvb, proto_tree *tree) proto_tree_add_item(tree, hf_ipmi_stor_25_offset, tvb, 4, 1, TRUE); proto_tree_add_bitmask_text(tree, tvb, 5, 1, NULL, NULL, ett_ipmi_stor_25_byte6, byte6, TRUE, 0); - proto_tree_add_item(tree, hf_ipmi_stor_25_data, tvb, 6, tvb_length(tvb) - 6, TRUE); + proto_tree_add_item(tree, hf_ipmi_stor_25_data, tvb, 6, tvb_length(tvb) - 6, ENC_NA); } static void @@ -536,7 +536,7 @@ static void rs43(tvbuff_t *tvb, proto_tree *tree) { proto_tree_add_item(tree, hf_ipmi_stor_43_next, tvb, 0, 2, TRUE); - proto_tree_add_item(tree, hf_ipmi_stor_43_data, tvb, 2, tvb_length(tvb) - 2, TRUE); + proto_tree_add_item(tree, hf_ipmi_stor_43_data, tvb, 2, tvb_length(tvb) - 2, ENC_NA); } static const value_string cc43[] = { @@ -550,7 +550,7 @@ static const value_string cc43[] = { static void rq44(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_stor_44_data, tvb, 0, tvb_length(tvb), TRUE); + proto_tree_add_item(tree, hf_ipmi_stor_44_data, tvb, 0, tvb_length(tvb), ENC_NA); } static void @@ -577,7 +577,7 @@ rq45(tvbuff_t *tvb, proto_tree *tree) proto_tree_add_item(tree, hf_ipmi_stor_45_offset, tvb, 4, 1, TRUE); proto_tree_add_bitmask_text(tree, tvb, 5, 1, NULL, NULL, ett_ipmi_stor_45_byte6, byte6, TRUE, 0); - proto_tree_add_item(tree, hf_ipmi_stor_45_data, tvb, 6, tvb_length(tvb) - 6, TRUE); + proto_tree_add_item(tree, hf_ipmi_stor_45_data, tvb, 6, tvb_length(tvb) - 6, ENC_NA); } static void @@ -670,7 +670,7 @@ rs5a(tvbuff_t *tvb, proto_tree *tree) guint32 v; if (!ipmi_getsaveddata(0, &v) || v > 2) { - proto_tree_add_item(tree, hf_ipmi_stor_5a_unknown, tvb, 0, tvb_length(tvb), TRUE); + proto_tree_add_item(tree, hf_ipmi_stor_5a_unknown, tvb, 0, tvb_length(tvb), ENC_NA); return; } @@ -679,7 +679,7 @@ rs5a(tvbuff_t *tvb, proto_tree *tree) proto_tree_add_item(tree, hf_ipmi_stor_5a_num_entries, tvb, 4, 4, TRUE); } else if (v == 1 || v == 2) { proto_tree_add_item(tree, hf_ipmi_stor_5a_iana, tvb, 4, 3, TRUE); - proto_tree_add_item(tree, hf_ipmi_stor_5a_bytes, tvb, 7, 7, TRUE); + proto_tree_add_item(tree, hf_ipmi_stor_5a_bytes, tvb, 7, 7, ENC_NA); } } @@ -695,7 +695,7 @@ rq5b(tvbuff_t *tvb, proto_tree *tree) ett_ipmi_stor_5b_byte1, byte1, TRUE, 0); if (v > 2) { - proto_tree_add_item(tree, hf_ipmi_stor_5b_unknown, tvb, 1, tvb_length(tvb) - 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_stor_5b_unknown, tvb, 1, tvb_length(tvb) - 1, ENC_NA); return; } @@ -704,7 +704,7 @@ rq5b(tvbuff_t *tvb, proto_tree *tree) proto_tree_add_item(tree, hf_ipmi_stor_5b_num_entries, tvb, 5, 4, TRUE); } else if (v == 1 || v == 2) { proto_tree_add_item(tree, hf_ipmi_stor_5b_iana, tvb, 5, 3, TRUE); - proto_tree_add_item(tree, hf_ipmi_stor_5b_bytes, tvb, 8, 8, TRUE); + proto_tree_add_item(tree, hf_ipmi_stor_5b_bytes, tvb, 8, 8, ENC_NA); } } diff --git a/epan/dissectors/packet-ipmi-transport.c b/epan/dissectors/packet-ipmi-transport.c index ca56e42139..9ef8ec0e86 100644 --- a/epan/dissectors/packet-ipmi-transport.c +++ b/epan/dissectors/packet-ipmi-transport.c @@ -876,7 +876,7 @@ lan_19(tvbuff_t *tvb, proto_tree *tree) return; } - proto_tree_add_item(tree, hf_ipmi_trn_lan19_address, tvb, 2, tvb_length(tvb) - 2, TRUE); + proto_tree_add_item(tree, hf_ipmi_trn_lan19_address, tvb, 2, tvb_length(tvb) - 2, ENC_NA); } static void @@ -1029,7 +1029,7 @@ rq01(tvbuff_t *tvb, proto_tree *tree) lan_options[pno].intrp(next, tree); } else { proto_tree_add_item(tree, hf_ipmi_trn_01_param_data, tvb, 2, - tvb_length(tvb) - 2, TRUE); + tvb_length(tvb) - 2, ENC_NA); } } @@ -1089,7 +1089,7 @@ rs02(tvbuff_t *tvb, proto_tree *tree) if (!ipmi_getsaveddata(0, &pno) || !ipmi_getsaveddata(1, &req)) { /* No request found - cannot parse further */ if (tvb_length(tvb) > 1) { - proto_tree_add_item(tree, hf_ipmi_trn_02_param_data, tvb, 1, tvb_length(tvb) - 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_trn_02_param_data, tvb, 1, tvb_length(tvb) - 1, ENC_NA); }; return; } @@ -1119,7 +1119,7 @@ rs02(tvbuff_t *tvb, proto_tree *tree) lan_options[pno].intrp(next, tree); } else { proto_tree_add_item(tree, hf_ipmi_trn_02_param_data, tvb, 1, - tvb_length(tvb) - 1, TRUE); + tvb_length(tvb) - 1, ENC_NA); } } } @@ -1698,14 +1698,14 @@ static void serial_52(tvbuff_t *tvb, proto_tree *tree) { proto_tree_add_item(tree, hf_ipmi_trn_serial52_port_assoc_sel, tvb, 0, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_trn_serial52_conn_name, tvb, 1, 16, TRUE); + proto_tree_add_item(tree, hf_ipmi_trn_serial52_conn_name, tvb, 1, 16, ENC_NA); } static void serial_53(tvbuff_t *tvb, proto_tree *tree) { proto_tree_add_item(tree, hf_ipmi_trn_serial53_port_assoc_sel, tvb, 0, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_trn_serial53_chan_name, tvb, 1, 16, TRUE); + proto_tree_add_item(tree, hf_ipmi_trn_serial53_chan_name, tvb, 1, 16, ENC_NA); } static struct { @@ -1796,7 +1796,7 @@ rq10(tvbuff_t *tvb, proto_tree *tree) serial_options[pno].intrp(next, tree); } else { proto_tree_add_item(tree, hf_ipmi_trn_10_param_data, tvb, 2, - tvb_length(tvb) - 2, TRUE); + tvb_length(tvb) - 2, ENC_NA); } } @@ -1856,7 +1856,7 @@ rs11(tvbuff_t *tvb, proto_tree *tree) if (!ipmi_getsaveddata(0, &pno) || !ipmi_getsaveddata(1, &req)) { /* No request found - cannot parse further */ if (tvb_length(tvb) > 1) { - proto_tree_add_item(tree, hf_ipmi_trn_11_param_data, tvb, 1, tvb_length(tvb) - 1, TRUE); + proto_tree_add_item(tree, hf_ipmi_trn_11_param_data, tvb, 1, tvb_length(tvb) - 1, ENC_NA); }; return; } @@ -1886,7 +1886,7 @@ rs11(tvbuff_t *tvb, proto_tree *tree) serial_options[pno].intrp(next, tree); } else { proto_tree_add_item(tree, hf_ipmi_trn_11_param_data, tvb, 1, - tvb_length(tvb) - 1, TRUE); + tvb_length(tvb) - 1, ENC_NA); } } } @@ -1951,7 +1951,7 @@ rq14(tvbuff_t *tvb, proto_tree *tree) proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_14_byte1, byte1, TRUE, 0); proto_tree_add_item(tree, hf_ipmi_trn_14_block, tvb, 1, 1, TRUE); - proto_tree_add_item(tree, hf_ipmi_trn_14_data, tvb, 2, 16, TRUE); + proto_tree_add_item(tree, hf_ipmi_trn_14_data, tvb, 2, 16, ENC_NA); } /* Get PPP UDP Proxy Transmit Data @@ -1969,7 +1969,7 @@ rq15(tvbuff_t *tvb, proto_tree *tree) static void rs15(tvbuff_t *tvb, proto_tree *tree) { - proto_tree_add_item(tree, hf_ipmi_trn_15_data, tvb, 0, 16, TRUE); + proto_tree_add_item(tree, hf_ipmi_trn_15_data, tvb, 0, 16, ENC_NA); } /* Send PPP UDP Proxy Packet @@ -2031,7 +2031,7 @@ rs17(tvbuff_t *tvb, proto_tree *tree) proto_tree_add_item(tree, hf_ipmi_trn_17_size, tvb, 0, 2, TRUE); } else { proto_tree_add_item(tree, hf_ipmi_trn_17_data, tvb, 0, - tvb_length(tvb) < 16 ? tvb_length(tvb) : 16, TRUE); + tvb_length(tvb) < 16 ? tvb_length(tvb) : 16, ENC_NA); } } diff --git a/epan/dissectors/packet-ipmi.c b/epan/dissectors/packet-ipmi.c index 613e463530..6f89a1f167 100644 --- a/epan/dissectors/packet-ipmi.c +++ b/epan/dissectors/packet-ipmi.c @@ -1119,7 +1119,7 @@ ipmi_do_dissect(tvbuff_t *tvb, proto_tree *ipmi_tree, ipmi_dissect_format_t *dfm if (dfmt->flags & IPMI_D_NONE) { /* No parsing requested */ g_snprintf(dfmt->info, ITEM_LABEL_LENGTH, "Unknown message (not parsed)"); - proto_tree_add_item(ipmi_tree, hf_ipmi_message, tvb, 0, tvb_length(tvb), TRUE); + proto_tree_add_item(ipmi_tree, hf_ipmi_message, tvb, 0, tvb_length(tvb), ENC_NA); return; } @@ -1301,7 +1301,7 @@ ipmi_do_dissect(tvbuff_t *tvb, proto_tree *ipmi_tree, ipmi_dissect_format_t *dfm /* Defining body signature (if present) */ if (siglen) { - ti = proto_tree_add_item(hdr_tree, hf_ipmi_header_sig, tvb, offs, siglen, TRUE); + ti = proto_tree_add_item(hdr_tree, hf_ipmi_header_sig, tvb, offs, siglen, ENC_NA); proto_item_append_text(ti, " (%s)", ndesc); offs += siglen; } diff --git a/epan/dissectors/packet-ipsec-tcp.c b/epan/dissectors/packet-ipsec-tcp.c index 50a59da136..f561e5465e 100644 --- a/epan/dissectors/packet-ipsec-tcp.c +++ b/epan/dissectors/packet-ipsec-tcp.c @@ -144,19 +144,19 @@ dissect_tcpencap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Dissect the trailer following the encapsulated IPSEC/ISAKMP packet */ offset = reported_length - TRAILERLENGTH; unknown_item = proto_tree_add_item(tcpencap_tree, hf_tcpencap_unknown, tvb, - offset, TRAILERLENGTH, ENC_BIG_ENDIAN); + offset, TRAILERLENGTH, ENC_NA); /* Try to guess the contents of the trailer */ tcpencap_unknown_tree = proto_item_add_subtree(unknown_item, ett_tcpencap_unknown); - proto_tree_add_item(tcpencap_unknown_tree, hf_tcpencap_zero, tvb, offset + 0, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(tcpencap_unknown_tree, hf_tcpencap_zero, tvb, offset + 0, 4, ENC_NA); proto_tree_add_item(tcpencap_unknown_tree, hf_tcpencap_seq, tvb, offset + 4, 2, ENC_BIG_ENDIAN); if (protocol == TCP_ENCAP_P_UDP) { proto_tree_add_item(tcpencap_unknown_tree, hf_tcpencap_ike_direction, tvb, offset + 6, 2, ENC_BIG_ENDIAN); } else { proto_tree_add_item(tcpencap_unknown_tree, hf_tcpencap_esp_zero, tvb, offset + 6, 2, ENC_BIG_ENDIAN); } - proto_tree_add_item(tcpencap_unknown_tree, hf_tcpencap_magic, tvb, offset + 8, 5, ENC_BIG_ENDIAN); + proto_tree_add_item(tcpencap_unknown_tree, hf_tcpencap_magic, tvb, offset + 8, 5, ENC_NA); proto_tree_add_item(tcpencap_unknown_tree, hf_tcpencap_proto, tvb, offset + 13, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(tcpencap_unknown_tree, hf_tcpencap_magic2, tvb, offset + 14, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tcpencap_unknown_tree, hf_tcpencap_magic2, tvb, offset + 14, 2, ENC_NA); } /* Create the tvbuffer for the next dissector */ diff --git a/epan/dissectors/packet-ipsec.c b/epan/dissectors/packet-ipsec.c index 54a5304339..9e4140e1a0 100644 --- a/epan/dissectors/packet-ipsec.c +++ b/epan/dissectors/packet-ipsec.c @@ -912,7 +912,7 @@ dissect_ah_header(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, (guint32)g_ntohl(ah.ah_seq)); proto_tree_add_item(ah_tree, hf_ah_iv, tvb, sizeof(ah), (ah.ah_len) ? (ah.ah_len - 1) << 2 : 0, - FALSE); + ENC_NA); if (next_tree_p != NULL) { /* Decide where to place next protocol decode */ @@ -1827,7 +1827,7 @@ dissect_esp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(tvb_bytes_exist(tvb, 8, esp_iv_len)) { if(esp_iv_len > 0) - proto_tree_add_item(esp_tree, hf_esp_iv, tvb, 8, esp_iv_len, FALSE); + proto_tree_add_item(esp_tree, hf_esp_iv, tvb, 8, esp_iv_len, ENC_NA); } else proto_tree_add_text(esp_tree, tvb, 8, -1, "IV (truncated)"); diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c index 98e4e2657d..73fcd5f566 100644 --- a/epan/dissectors/packet-ipv6.c +++ b/epan/dissectors/packet-ipv6.c @@ -485,7 +485,7 @@ dissect_routing6(tvbuff_t *tvb, int offset, proto_tree *tree, packet_info *pinfo while(segments > 1) { struct e_in6_addr addr; - proto_tree_add_item(rthdr_tree, hf_ipv6_routing_hdr_rpl_addr, tvb, offset, (16-cmprI), FALSE); + proto_tree_add_item(rthdr_tree, hf_ipv6_routing_hdr_rpl_addr, tvb, offset, (16-cmprI), ENC_NA); /* Display Full Address */ memcpy((guint8 *)&addr, (guint8 *)&dstAddr, sizeof(dstAddr)); tvb_memcpy(tvb, (guint8 *)&addr + cmprI, offset, (16-cmprI)); @@ -499,7 +499,7 @@ dissect_routing6(tvbuff_t *tvb, int offset, proto_tree *tree, packet_info *pinfo if (segments == 1) { struct e_in6_addr addr; - proto_tree_add_item(rthdr_tree, hf_ipv6_routing_hdr_rpl_addr, tvb, offset, (16-cmprI), FALSE); + proto_tree_add_item(rthdr_tree, hf_ipv6_routing_hdr_rpl_addr, tvb, offset, (16-cmprI), ENC_NA); /* Display Full Address */ memcpy((guint8 *)&addr, (guint8 *)&dstAddr, sizeof(dstAddr)); tvb_memcpy(tvb, (guint8 *)&addr + cmprE, offset, (16-cmprE)); @@ -705,7 +705,7 @@ dissect_unknown_option(tvbuff_t *tvb, int offset, proto_tree *tree) if (tree) { /* !!! specify length */ - ti = proto_tree_add_item(tree, hf_ipv6_unk_hdr, tvb, offset, len, FALSE); + ti = proto_tree_add_item(tree, hf_ipv6_unk_hdr, tvb, offset, len, ENC_NA); unkopt_tree = proto_item_add_subtree(ti, ett_ipv6); @@ -756,7 +756,7 @@ dissect_opts(tvbuff_t *tvb, int offset, proto_tree *tree, packet_info * pinfo, c while (p < offset + len) { switch (tvb_get_guint8(tvb, p)) { case IP6OPT_PAD1: - proto_tree_add_item(dstopt_tree, hf_ipv6_opt_pad1, tvb, p, 1, FALSE); + proto_tree_add_item(dstopt_tree, hf_ipv6_opt_pad1, tvb, p, 1, ENC_NA); p++; mip_offset++; break; @@ -1337,7 +1337,7 @@ dissect_shim6(tvbuff_t *tvb, int offset, proto_tree *tree, packet_info * pinfo) if (tree) { - ti = proto_tree_add_item(tree, hf_ipv6_shim6, tvb, offset, len, FALSE); + ti = proto_tree_add_item(tree, hf_ipv6_shim6, tvb, offset, len, ENC_NA); shim_tree = proto_item_add_subtree(ti, ett_ipv6_shim6); /* Next Header */ diff --git a/epan/dissectors/packet-ipxwan.c b/epan/dissectors/packet-ipxwan.c index a31fb5406f..5e2a6860a0 100644 --- a/epan/dissectors/packet-ipxwan.c +++ b/epan/dissectors/packet-ipxwan.c @@ -219,7 +219,7 @@ dissect_ipxwan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) wan_link_delay); proto_tree_add_item(option_tree, hf_ipxwan_common_network_number, - tvb, offset+2, 4, FALSE); + tvb, offset+2, 4, ENC_NA); proto_tree_add_item(option_tree, hf_ipxwan_router_name, tvb, offset+6, 48, FALSE); @@ -275,7 +275,7 @@ dissect_ipxwan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } else { proto_tree_add_item(option_tree, hf_ipxwan_extended_node_id, tvb, - offset, 4, FALSE); + offset, 4, ENC_NA); } break; diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c index 7d21ac3bd0..1aa33d71e1 100644 --- a/epan/dissectors/packet-isakmp.c +++ b/epan/dissectors/packet-isakmp.c @@ -2512,7 +2512,7 @@ dissect_payloads(tvbuff_t *tvb, proto_tree *tree, proto_tree *parent_tree _U_, * What? There's more stuff in this chunk of data, but the * previous payload had a "next payload" type of None? */ - proto_tree_add_item(tree, hf_isakmp_extradata, tvb, offset, length, FALSE); + proto_tree_add_item(tree, hf_isakmp_extradata, tvb, offset, length, ENC_NA); break; } @@ -2600,7 +2600,7 @@ dissect_payloads(tvbuff_t *tvb, proto_tree *tree, proto_tree *parent_tree _U_, dissect_cisco_fragmentation(tvb, offset + 4, payload_length - 4, ntree, pinfo ); break; default: - proto_tree_add_item(ntree, hf_isakmp_datapayload, tvb, offset + 4, payload_length-4, FALSE); + proto_tree_add_item(ntree, hf_isakmp_datapayload, tvb, offset + 4, payload_length-4, ENC_NA); break; } @@ -2663,7 +2663,7 @@ dissect_isakmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) */ if ( (tvb_length(tvb)==1) && (tvb_get_guint8(tvb, offset)==0xff) ){ col_set_str(pinfo->cinfo, COL_INFO, "NAT Keepalive"); - proto_tree_add_item(isakmp_tree, hf_isakmp_nat_keepalive, tvb, offset, 1, FALSE); + proto_tree_add_item(isakmp_tree, hf_isakmp_nat_keepalive, tvb, offset, 1, ENC_NA); return; } @@ -2730,10 +2730,10 @@ dissect_isakmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) #endif /* HAVE_LIBGCRYPT */ if (tree) { - proto_tree_add_item(isakmp_tree, hf_isakmp_icookie, tvb, offset, COOKIE_SIZE, FALSE); + proto_tree_add_item(isakmp_tree, hf_isakmp_icookie, tvb, offset, COOKIE_SIZE, ENC_NA); offset += COOKIE_SIZE; - proto_tree_add_item(isakmp_tree, hf_isakmp_rcookie, tvb, offset, COOKIE_SIZE, FALSE); + proto_tree_add_item(isakmp_tree, hf_isakmp_rcookie, tvb, offset, COOKIE_SIZE, ENC_NA); offset += COOKIE_SIZE; hdr.next_payload = tvb_get_guint8(tvb, offset); @@ -2811,7 +2811,7 @@ dissect_isakmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (hdr.flags & E_FLAG) { if (len && isakmp_tree) { - ti = proto_tree_add_item(isakmp_tree, hf_isakmp_enc_data, tvb, offset, len, FALSE); + ti = proto_tree_add_item(isakmp_tree, hf_isakmp_enc_data, tvb, offset, len, ENC_NA); proto_item_append_text(ti, " (%d byte%s)", len, plurality(len, "", "s")); #ifdef HAVE_LIBGCRYPT @@ -2896,7 +2896,7 @@ dissect_sa(tvbuff_t *tvb, int offset, int length, proto_tree *tree, int isakmp_v tvb_bytes_to_str(tvb, offset, length), length); return; } - sti = proto_tree_add_item(tree, hf_isakmp_sa_situation, tvb, offset, 4, FALSE); + sti = proto_tree_add_item(tree, hf_isakmp_sa_situation, tvb, offset, 4, ENC_NA); stree = proto_item_add_subtree(sti, ett_isakmp_sa); proto_tree_add_item(stree, hf_isakmp_sa_situation_identity_only, tvb, offset, 4, FALSE); @@ -2910,7 +2910,7 @@ dissect_sa(tvbuff_t *tvb, int offset, int length, proto_tree *tree, int isakmp_v length, pinfo); } else { /* Unknown */ - proto_tree_add_item(tree, hf_isakmp_sa_situation, tvb, offset, length, FALSE); + proto_tree_add_item(tree, hf_isakmp_sa_situation, tvb, offset, length, ENC_NA); } } else if (isakmp_version == 2) { dissect_payloads(tvb, tree, tree, isakmp_version, PLOAD_IKE_P, offset, @@ -2960,7 +2960,7 @@ dissect_proposal(tvbuff_t *tvb, int offset, int length, proto_tree *tree, int is length -= 1; if (spi_size) { - proto_tree_add_item(tree, hf_isakmp_spi, tvb, offset, spi_size, FALSE); + proto_tree_add_item(tree, hf_isakmp_spi, tvb, offset, spi_size, ENC_NA); offset += spi_size; length -= spi_size; @@ -3005,7 +3005,7 @@ dissect_rohc_supported(tvbuff_t *tvb, proto_tree *rohc_tree, int offset ) } - rohc_item = proto_tree_add_item(rohc_tree, hf_isakmp_notify_data_rohc_attr, tvb, offset, 2+len+optlen, FALSE); + rohc_item = proto_tree_add_item(rohc_tree, hf_isakmp_notify_data_rohc_attr, tvb, offset, 2+len+optlen, ENC_NA); proto_item_append_text(rohc_item," (t=%d,l=%d) %s",rohc, optlen, val_to_str(rohc, rohc_attr_type, "Unknown Attribute Type (%02d)") ); sub_rohc_tree = proto_item_add_subtree(rohc_item, ett_isakmp_rohc_attr); proto_tree_add_item(sub_rohc_tree, hf_isakmp_notify_data_rohc_attr_format, tvb, offset, 2, FALSE); @@ -3022,7 +3022,7 @@ dissect_rohc_supported(tvbuff_t *tvb, proto_tree *rohc_tree, int offset ) proto_tree_add_text(sub_rohc_tree, tvb, offset, 0,"Attribut value is empty"); return 2+len; } - proto_tree_add_item(sub_rohc_tree, hf_isakmp_notify_data_rohc_attr_value, tvb, offset, optlen, FALSE); + proto_tree_add_item(sub_rohc_tree, hf_isakmp_notify_data_rohc_attr_value, tvb, offset, optlen, ENC_NA); switch(rohc) { case ROHC_MAX_CID: proto_tree_add_item(sub_rohc_tree, hf_isakmp_notify_data_rohc_attr_max_cid, tvb, offset, optlen, FALSE); @@ -3150,7 +3150,7 @@ dissect_transform_attribute(tvbuff_t *tvb, proto_tree *transform_attr_type_tree, } - transform_attr_type_item = proto_tree_add_item(transform_attr_type_tree, hf_isakmp_tf_attr, tvb, offset, 2+len+optlen, FALSE); + transform_attr_type_item = proto_tree_add_item(transform_attr_type_tree, hf_isakmp_tf_attr, tvb, offset, 2+len+optlen, ENC_NA); proto_item_append_text(transform_attr_type_item, " (t=%d,l=%d) %s",transform_attr_type, optlen, val_to_str(transform_attr_type, transform_isakmp_attr_type, "Unknown Attribute Type (%02d)") ); sub_transform_attr_type_tree = proto_item_add_subtree(transform_attr_type_item, ett_isakmp_tf_attr); proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_tf_attr_format, tvb, offset, 2, FALSE); @@ -3167,7 +3167,7 @@ dissect_transform_attribute(tvbuff_t *tvb, proto_tree *transform_attr_type_tree, proto_tree_add_text(sub_transform_attr_type_tree, tvb, offset, 0,"Attribute value is empty"); return 2+len; } - proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_tf_attr_value, tvb, offset, optlen, FALSE); + proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_tf_attr_value, tvb, offset, optlen, ENC_NA); switch(transform_attr_type) { case ISAKMP_ATTR_LIFE_TYPE: proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_tf_attr_life_type, tvb, offset, optlen, FALSE); @@ -3200,7 +3200,7 @@ dissect_transform_attribute(tvbuff_t *tvb, proto_tree *transform_attr_type_tree, proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_tf_attr_cmpr_dict_size, tvb, offset, optlen, FALSE); break; case ISAKMP_ATTR_CMPR_ALGORITHM: - proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_tf_attr_cmpr_algorithm, tvb, offset, optlen, FALSE); + proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_tf_attr_cmpr_algorithm, tvb, offset, optlen, ENC_NA); break; case ISAKMP_ATTR_ECN_TUNNEL: proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_tf_attr_ecn_tunnel, tvb, offset, optlen, FALSE); @@ -3214,7 +3214,7 @@ dissect_transform_attribute(tvbuff_t *tvb, proto_tree *transform_attr_type_tree, proto_item_append_text(transform_attr_type_item," : %d", tvb_get_ntohs(tvb, offset)); break; case ISAKMP_ATTR_SIG_ENCO_ALGORITHM: - proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_tf_attr_sig_enco_algorithm, tvb, offset, optlen, FALSE); + proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_tf_attr_sig_enco_algorithm, tvb, offset, optlen, ENC_NA); break; default: /* No Default Action */ @@ -3249,7 +3249,7 @@ dissect_transform_ike_attribute(tvbuff_t *tvb, proto_tree *transform_attr_type_t } - transform_attr_type_item = proto_tree_add_item(transform_attr_type_tree, hf_isakmp_ike_attr, tvb, offset, 2+len+optlen, FALSE); + transform_attr_type_item = proto_tree_add_item(transform_attr_type_tree, hf_isakmp_ike_attr, tvb, offset, 2+len+optlen, ENC_NA); proto_item_append_text(transform_attr_type_item," (t=%d,l=%d) %s",transform_attr_type, optlen, val_to_str(transform_attr_type,transform_ike_attr_type,"Unknown Attribute Type (%02d)") ); sub_transform_attr_type_tree = proto_item_add_subtree(transform_attr_type_item, ett_isakmp_tf_ike_attr); proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_ike_attr_format, tvb, offset, 2, FALSE); @@ -3266,7 +3266,7 @@ dissect_transform_ike_attribute(tvbuff_t *tvb, proto_tree *transform_attr_type_t proto_tree_add_text(sub_transform_attr_type_tree, tvb, offset, 0,"Attribut value is empty"); return 2+len; } - proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_ike_attr_value, tvb, offset, optlen, FALSE); + proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_ike_attr_value, tvb, offset, optlen, ENC_NA); switch(transform_attr_type) { case IKE_ATTR_ENCRYPTION_ALGORITHM: @@ -3302,19 +3302,19 @@ dissect_transform_ike_attribute(tvbuff_t *tvb, proto_tree *transform_attr_type_t proto_item_append_text(transform_attr_type_item," : %s", val_to_str(tvb_get_ntohs(tvb, offset), transform_attr_grp_type, "Unknown %d")); break; case IKE_ATTR_GROUP_PRIME: - proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_ike_attr_group_prime, tvb, offset, optlen, FALSE); + proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_ike_attr_group_prime, tvb, offset, optlen, ENC_NA); break; case IKE_ATTR_GROUP_GENERATOR_ONE: - proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_ike_attr_group_generator_one, tvb, offset, optlen, FALSE); + proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_ike_attr_group_generator_one, tvb, offset, optlen, ENC_NA); break; case IKE_ATTR_GROUP_GENERATOR_TWO: - proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_ike_attr_group_generator_two, tvb, offset, optlen, FALSE); + proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_ike_attr_group_generator_two, tvb, offset, optlen, ENC_NA); break; case IKE_ATTR_GROUP_CURVE_A: - proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_ike_attr_group_curve_a, tvb, offset, optlen, FALSE); + proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_ike_attr_group_curve_a, tvb, offset, optlen, ENC_NA); break; case IKE_ATTR_GROUP_CURVE_B: - proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_ike_attr_group_curve_b, tvb, offset, optlen, FALSE); + proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_ike_attr_group_curve_b, tvb, offset, optlen, ENC_NA); break; case IKE_ATTR_LIFE_TYPE: proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_ike_attr_life_type, tvb, offset, optlen, FALSE); @@ -3324,17 +3324,17 @@ dissect_transform_ike_attribute(tvbuff_t *tvb, proto_tree *transform_attr_type_t dissect_life_duration(tvb, sub_transform_attr_type_tree, transform_attr_type_item, hf_isakmp_ike_attr_life_duration, offset, optlen); break; case IKE_ATTR_PRF: - proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_ike_attr_prf, tvb, offset, optlen, FALSE); + proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_ike_attr_prf, tvb, offset, optlen, ENC_NA); break; case IKE_ATTR_KEY_LENGTH: proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_ike_attr_key_length, tvb, offset, optlen, FALSE); proto_item_append_text(transform_attr_type_item," : %d", tvb_get_ntohs(tvb, offset)); break; case IKE_ATTR_FIELD_SIZE: - proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_ike_attr_field_size, tvb, offset, optlen, FALSE); + proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_ike_attr_field_size, tvb, offset, optlen, ENC_NA); break; case IKE_ATTR_GROUP_ORDER: - proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_ike_attr_group_order, tvb, offset, optlen, FALSE); + proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_ike_attr_group_order, tvb, offset, optlen, ENC_NA); break; default: /* No Default Action */ @@ -3363,7 +3363,7 @@ dissect_transform_ike2_attribute(tvbuff_t *tvb, proto_tree *transform_attr_type_ } - transform_attr_type_item = proto_tree_add_item(transform_attr_type_tree, hf_isakmp_ike2_attr, tvb, offset, 2+len+optlen, FALSE); + transform_attr_type_item = proto_tree_add_item(transform_attr_type_tree, hf_isakmp_ike2_attr, tvb, offset, 2+len+optlen, ENC_NA); proto_item_append_text(transform_attr_type_item," (t=%d,l=%d) %s",transform_attr_type, optlen, val_to_str(transform_attr_type,transform_ike2_attr_type,"Unknown Attribute Type (%02d)") ); sub_transform_attr_type_tree = proto_item_add_subtree(transform_attr_type_item, ett_isakmp_tf_ike2_attr); proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_ike2_attr_format, tvb, offset, 2, FALSE); @@ -3380,7 +3380,7 @@ dissect_transform_ike2_attribute(tvbuff_t *tvb, proto_tree *transform_attr_type_ proto_tree_add_text(sub_transform_attr_type_tree, tvb, offset, 0,"Attribut value is empty"); return 2+len; } - proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_ike2_attr_value, tvb, offset, optlen, FALSE); + proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_ike2_attr_value, tvb, offset, optlen, ENC_NA); switch(transform_attr_type) { case IKE2_ATTR_KEY_LENGTH: proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_ike2_attr_key_length, tvb, offset, optlen, FALSE); @@ -3517,7 +3517,7 @@ _U_ length -= 4; } - proto_tree_add_item(tree, hf_isakmp_key_exch_data, tvb, offset, length, FALSE); + proto_tree_add_item(tree, hf_isakmp_key_exch_data, tvb, offset, length, ENC_NA); #ifdef HAVE_LIBGCRYPT if (decr && decr->gi_len == 0 && ADDRESSES_EQUAL(&decr->initiator, &pinfo->src)) { @@ -3579,7 +3579,7 @@ dissect_id(tvbuff_t *tvb, int offset, int length, proto_tree *tree, int isakmp_v * It shows strings of all types though some of types are not * supported in IKEv2 specification actually. */ - idit = proto_tree_add_item(tree, hf_isakmp_id_data, tvb, offset, length, FALSE); + idit = proto_tree_add_item(tree, hf_isakmp_id_data, tvb, offset, length, ENC_NA); idtree = proto_item_add_subtree(idit, ett_isakmp_id); switch (id_type) { case IKE_ID_IPV4_ADDR: @@ -3619,7 +3619,7 @@ dissect_id(tvbuff_t *tvb, int offset, int length, proto_tree *tree, int isakmp_v proto_item_append_text(idit, "%s/%s", tvb_ip6_to_str(tvb, offset), tvb_ip6_to_str(tvb, offset+16)); break; case IKE_ID_KEY_ID: - proto_tree_add_item(idtree, hf_isakmp_id_data_key_id, tvb, offset, length, FALSE); + proto_tree_add_item(idtree, hf_isakmp_id_data_key_id, tvb, offset, length, ENC_NA); break; case IKE_ID_DER_ASN1_DN: dissect_x509if_Name(FALSE, tvb, offset, &asn1_ctx, tree, hf_isakmp_id_data_cert); @@ -3676,14 +3676,14 @@ dissect_certreq(tvbuff_t *tvb, int offset, int length, proto_tree *tree, int isa dissect_x509if_Name(FALSE, tvb, offset, &asn1_ctx, tree, hf_isakmp_certreq_authority_sig); break; default: - proto_tree_add_item(tree, hf_isakmp_certreq_authority_v1, tvb, offset, length, FALSE); + proto_tree_add_item(tree, hf_isakmp_certreq_authority_v1, tvb, offset, length, ENC_NA); break; } }else if (isakmp_version == 2) { /* this is a list of 20 byte SHA-1 hashes */ while (length > 0) { - proto_tree_add_item(tree, hf_isakmp_certreq_authority_v2, tvb, offset, 20, FALSE); + proto_tree_add_item(tree, hf_isakmp_certreq_authority_v2, tvb, offset, 20, ENC_NA); offset+=20; length-=20; } @@ -3702,24 +3702,24 @@ dissect_auth(tvbuff_t *tvb, int offset, int length, proto_tree *tree) offset += 4; length -= 4; - proto_tree_add_item(tree, hf_isakmp_auth_data, tvb, offset, length, FALSE); + proto_tree_add_item(tree, hf_isakmp_auth_data, tvb, offset, length, ENC_NA); } static void dissect_hash(tvbuff_t *tvb, int offset, int length, proto_tree *ntree) { - proto_tree_add_item(ntree, hf_isakmp_hash, tvb, offset, length, FALSE); + proto_tree_add_item(ntree, hf_isakmp_hash, tvb, offset, length, ENC_NA); } static void dissect_sig(tvbuff_t *tvb, int offset, int length, proto_tree *ntree) { - proto_tree_add_item(ntree, hf_isakmp_sig, tvb, offset, length, FALSE); + proto_tree_add_item(ntree, hf_isakmp_sig, tvb, offset, length, ENC_NA); } static void dissect_nonce(tvbuff_t *tvb, int offset, int length, proto_tree *ntree) { - proto_tree_add_item(ntree, hf_isakmp_nonce, tvb, offset, length, FALSE); + proto_tree_add_item(ntree, hf_isakmp_nonce, tvb, offset, length, ENC_NA); } static void dissect_cisco_fragmentation(tvbuff_t *tvb, int offset, int length, proto_tree *tree, packet_info *pinfo) @@ -3818,14 +3818,14 @@ dissect_notif(tvbuff_t *tvb, int offset, int length, proto_tree *tree, int isakm length -= 2; if (spi_size) { - proto_tree_add_item(tree, hf_isakmp_spi, tvb, offset, spi_size, FALSE); + proto_tree_add_item(tree, hf_isakmp_spi, tvb, offset, spi_size, ENC_NA); offset += spi_size; length -= spi_size; } /* Notification Data */ - proto_tree_add_item(tree, hf_isakmp_notify_data, tvb, offset, length, FALSE); + proto_tree_add_item(tree, hf_isakmp_notify_data, tvb, offset, length, ENC_NA); if (isakmp_version == 1) { @@ -3865,14 +3865,14 @@ dissect_notif(tvbuff_t *tvb, int offset, int length, proto_tree *tree, int isakm proto_tree_add_item(tree, hf_isakmp_notify_data_redirect_new_resp_gw_ident_fqdn, tvb, offset+2, tvb_get_guint8(tvb,offset+1), FALSE); break; default : - proto_tree_add_item(tree, hf_isakmp_notify_data_redirect_new_resp_gw_ident, tvb, offset+2, tvb_get_guint8(tvb,offset+1), FALSE); + proto_tree_add_item(tree, hf_isakmp_notify_data_redirect_new_resp_gw_ident, tvb, offset+2, tvb_get_guint8(tvb,offset+1), ENC_NA); break; } length -= tvb_get_guint8(tvb, offset+1) - 2; offset += tvb_get_guint8(tvb, offset+1) + 2; if(length) { - proto_tree_add_item(tree, hf_isakmp_notify_data_redirect_nonce_data, tvb, offset, length, FALSE); + proto_tree_add_item(tree, hf_isakmp_notify_data_redirect_nonce_data, tvb, offset, length, ENC_NA); } break; case 16408: /* REDIRECT_FROM */ @@ -3886,7 +3886,7 @@ dissect_notif(tvbuff_t *tvb, int offset, int length, proto_tree *tree, int isakm proto_tree_add_item(tree, hf_isakmp_notify_data_redirect_org_resp_gw_ident_ipv6, tvb, offset+2, 16, FALSE); break; default : - proto_tree_add_item(tree, hf_isakmp_notify_data_redirect_org_resp_gw_ident, tvb, offset+2, tvb_get_guint8(tvb,offset+1), FALSE); + proto_tree_add_item(tree, hf_isakmp_notify_data_redirect_org_resp_gw_ident, tvb, offset+2, tvb_get_guint8(tvb,offset+1), ENC_NA); break; } length -= tvb_get_guint8(tvb, offset+1) - 2; @@ -3896,10 +3896,10 @@ dissect_notif(tvbuff_t *tvb, int offset, int length, proto_tree *tree, int isakm proto_tree_add_item(tree, hf_isakmp_notify_data_ticket_lifetime, tvb, offset, 4, FALSE); offset += 4; length -= 4; - proto_tree_add_item(tree, hf_isakmp_notify_data_ticket_data, tvb, offset, length, FALSE); + proto_tree_add_item(tree, hf_isakmp_notify_data_ticket_data, tvb, offset, length, ENC_NA); break; case 16413: /* TICKET_OPAQUE */ - proto_tree_add_item(tree, hf_isakmp_notify_data_ticket_data, tvb, offset, length, FALSE); + proto_tree_add_item(tree, hf_isakmp_notify_data_ticket_data, tvb, offset, length, ENC_NA); break; case 16416: /* ROHC_SUPPORTED */ while (offset < offset_end) { @@ -3907,7 +3907,7 @@ dissect_notif(tvbuff_t *tvb, int offset, int length, proto_tree *tree, int isakm } break; case 16419: /* QUICK_CRASH_DETECTION */ - proto_tree_add_item(tree, hf_isakmp_notify_data_qcd_token_secret_data, tvb, offset, length, FALSE); + proto_tree_add_item(tree, hf_isakmp_notify_data_qcd_token_secret_data, tvb, offset, length, ENC_NA); break; case 16422: /* IKEV2_MESSAGE_ID_SYNC */ proto_tree_add_item(tree, hf_isakmp_notify_data_ha_nonce_data, tvb, offset, 4, FALSE); @@ -3917,7 +3917,7 @@ dissect_notif(tvbuff_t *tvb, int offset, int length, proto_tree *tree, int isakm proto_tree_add_item(tree, hf_isakmp_notify_data_ha_expected_recv_req_msg_id, tvb, offset, 4, FALSE); break; case 16423: /* IPSEC_REPLAY_COUNTER_SYNC */ - proto_tree_add_item(tree, hf_isakmp_notify_data_ha_incoming_ipsec_sa_delta_value, tvb, offset, length, FALSE); + proto_tree_add_item(tree, hf_isakmp_notify_data_ha_incoming_ipsec_sa_delta_value, tvb, offset, length, ENC_NA); break; default: /* No Default Action */ @@ -3962,7 +3962,7 @@ dissect_delete(tvbuff_t *tvb, int offset, int length, proto_tree *tree, int isak if (spi_size > 0) { while (length > 0) { - proto_tree_add_item(tree, hf_isakmp_delete_spi, tvb, offset, spi_size, FALSE); + proto_tree_add_item(tree, hf_isakmp_delete_spi, tvb, offset, spi_size, ENC_NA); offset+=spi_size; length-=spi_size; } @@ -3979,7 +3979,7 @@ dissect_vid(tvbuff_t *tvb, int offset, int length, proto_tree *tree) pVID = tvb_get_ptr(tvb, offset, length); vendorstring = byte_to_str(pVID, (gint)length, vendor_id, "Unknown Vendor ID"); - proto_tree_add_item(tree, hf_isakmp_vid_bytes, tvb, offset, length, FALSE); + proto_tree_add_item(tree, hf_isakmp_vid_bytes, tvb, offset, length, ENC_NA); proto_tree_add_string(tree, hf_isakmp_vid_string, tvb, offset, length, vendorstring); proto_item_append_text(tree," : %s", vendorstring); @@ -4069,7 +4069,7 @@ dissect_config_attribute(tvbuff_t *tvb, proto_tree *cfg_attr_type_tree, int offs proto_tree_add_text(sub_cfg_attr_type_tree, tvb, offset, 0,"Attribut value is empty"); return 2+len; } - proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_value, tvb, offset, optlen, FALSE); + proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_value, tvb, offset, optlen, ENC_NA); switch (cfg_attr_type) { case INTERNAL_IP4_ADDRESS: /* 1 */ offset_end = offset + optlen; @@ -4233,7 +4233,7 @@ dissect_config_attribute(tvbuff_t *tvb, proto_tree *cfg_attr_type_tree, int offs case INTERNAL_IP6_LINK: /* 17 */ proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_internal_ip6_link_interface, tvb, offset, 8, FALSE); offset += 8; - proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_internal_ip6_link_id, tvb, offset, optlen-8, FALSE); + proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_internal_ip6_link_id, tvb, offset, optlen-8, ENC_NA); offset += optlen-8; break; case INTERNAL_IP6_PREFIX: /* 18 */ @@ -4336,7 +4336,7 @@ dissect_config(tvbuff_t *tvb, int offset, int length, proto_tree *tree, int isak static void dissect_nat_discovery(tvbuff_t *tvb, int offset, int length, proto_tree *tree ) { - proto_tree_add_item(tree, hf_isakmp_nat_hash, tvb, offset, length, FALSE); + proto_tree_add_item(tree, hf_isakmp_nat_hash, tvb, offset, length, ENC_NA); } static void @@ -4493,7 +4493,7 @@ dissect_ts(tvbuff_t *tvb, int offset, int length, proto_tree *tree) length -= 1; break; default: - proto_tree_add_item(tree, hf_isakmp_ts_data, tvb, offset, length, FALSE); + proto_tree_add_item(tree, hf_isakmp_ts_data, tvb, offset, length, ENC_NA); offset += length; length -= length; break; @@ -4549,7 +4549,7 @@ dissect_enc(tvbuff_t *tvb, * if the specified encryption algorithm uses IV. */ if (iv_len) { - iv_item = proto_tree_add_item(tree, hf_isakmp_enc_iv, tvb, offset, iv_len, FALSE); + iv_item = proto_tree_add_item(tree, hf_isakmp_enc_iv, tvb, offset, iv_len, ENC_NA); proto_item_append_text(iv_item, " (%d bytes)", iv_len); iv = ep_tvb_memdup(tvb, offset, iv_len); @@ -4559,7 +4559,7 @@ dissect_enc(tvbuff_t *tvb, /* * Add the encrypted portion to the tree and store it in a packet scope buffer for later decryption. */ - encr_data_item = proto_tree_add_item(tree, hf_isakmp_enc_data, tvb, offset, encr_data_len, FALSE); + encr_data_item = proto_tree_add_item(tree, hf_isakmp_enc_data, tvb, offset, encr_data_len, ENC_NA); proto_item_append_text(encr_data_item, " (%d bytes)",encr_data_len); encr_data = ep_tvb_memdup(tvb, offset, encr_data_len); offset += encr_data_len; @@ -4569,7 +4569,7 @@ dissect_enc(tvbuff_t *tvb, * the ICD be displayed even if the decryption fails. */ if (icd_len) { - icd_item = proto_tree_add_item(tree, hf_isakmp_enc_icd, tvb, offset, icd_len, FALSE); + icd_item = proto_tree_add_item(tree, hf_isakmp_enc_icd, tvb, offset, icd_len, ENC_NA); proto_item_append_text(icd_item, " (%d bytes)",icd_len); /* @@ -4664,7 +4664,7 @@ dissect_enc(tvbuff_t *tvb, tvb_set_free_cb(decr_tvb, g_free); tvb_set_child_real_data_tvbuff(tvb, decr_tvb); add_new_data_source(pinfo, decr_tvb, "Decrypted Data"); - item = proto_tree_add_item(tree, hf_isakmp_enc_decrypted_data, decr_tvb, 0, decr_data_len, FALSE); + item = proto_tree_add_item(tree, hf_isakmp_enc_decrypted_data, decr_tvb, 0, decr_data_len, ENC_NA); proto_item_append_text(item, " (%d byte%s)", decr_data_len, plurality(decr_data_len, "", "s")); /* Move the ICD item to the bottom of the tree. */ @@ -4677,7 +4677,7 @@ dissect_enc(tvbuff_t *tvb, payloads_len = decr_data_len - 1 - pad_len; if (payloads_len > 0) { - item = proto_tree_add_item(decr_tree, hf_isakmp_enc_contained_data, decr_tvb, 0, payloads_len, FALSE); + item = proto_tree_add_item(decr_tree, hf_isakmp_enc_contained_data, decr_tvb, 0, payloads_len, ENC_NA); proto_item_append_text(item, " (%d byte%s)", payloads_len, plurality(payloads_len, "", "s")); decr_payloads_tree = proto_item_add_subtree(item, ett_isakmp_decrypted_payloads); } @@ -4688,7 +4688,7 @@ dissect_enc(tvbuff_t *tvb, proto_item_append_text(padlen_item, " [too long]"); expert_add_info_format(pinfo, padlen_item, PI_MALFORMED, PI_WARN, "Pad length is too big"); } else { - item = proto_tree_add_item(decr_tree, hf_isakmp_enc_padding, decr_tvb, payloads_len, pad_len, FALSE); + item = proto_tree_add_item(decr_tree, hf_isakmp_enc_padding, decr_tvb, payloads_len, pad_len, ENC_NA); proto_item_append_text(item, " (%d byte%s)", pad_len, plurality(pad_len, "", "s")); proto_tree_move_item(decr_tree, item, padlen_item); } @@ -4703,8 +4703,8 @@ dissect_enc(tvbuff_t *tvb, } }else{ #endif /* HAVE_LIBGCRYPT */ - proto_tree_add_item(tree, hf_isakmp_enc_iv, tvb, offset, 4, FALSE); - proto_tree_add_item(tree, hf_isakmp_enc_data, tvb, offset+4 , length, FALSE); + proto_tree_add_item(tree, hf_isakmp_enc_iv, tvb, offset, 4, ENC_NA); + proto_tree_add_item(tree, hf_isakmp_enc_data, tvb, offset+4 , length, ENC_NA); #ifdef HAVE_LIBGCRYPT } #endif /* HAVE_LIBGCRYPT */ @@ -4719,7 +4719,7 @@ dissect_eap(tvbuff_t *tvb, int offset, int length, proto_tree *tree, packet_info if ((eap_tvb != NULL)&& eap_handle != NULL){ call_dissector(eap_handle, eap_tvb, pinfo, tree); }else{ - proto_tree_add_item(tree, hf_isakmp_eap_data, tvb, offset, length, FALSE); + proto_tree_add_item(tree, hf_isakmp_eap_data, tvb, offset, length, ENC_NA); } } diff --git a/epan/dissectors/packet-iscsi.c b/epan/dissectors/packet-iscsi.c index 1bad474973..7797b73d25 100644 --- a/epan/dissectors/packet-iscsi.c +++ b/epan/dissectors/packet-iscsi.c @@ -669,7 +669,7 @@ handleDataDigest(proto_item *ti, tvbuff_t *tvb, guint offset, int dataLen) { return offset + dataLen + 4; } if((unsigned)available_bytes >= (dataLen + dataDigestSize)) { - proto_tree_add_item(ti, hf_iscsi_DataDigest, tvb, offset + dataLen, dataDigestSize, FALSE); + proto_tree_add_item(ti, hf_iscsi_DataDigest, tvb, offset + dataLen, dataDigestSize, ENC_NA); } return offset + dataLen + dataDigestSize; } @@ -687,7 +687,7 @@ handleDataSegment(proto_item *ti, tvbuff_t *tvb, guint offset, guint dataSegment } if(offset < endOffset && (offset & 3) != 0) { int padding = 4 - (offset & 3); - proto_tree_add_item(ti, hf_iscsi_Padding, tvb, offset, padding, FALSE); + proto_tree_add_item(ti, hf_iscsi_Padding, tvb, offset, padding, ENC_NA); offset += padding; } if(dataSegmentLen > 0 && offset < endOffset) @@ -709,7 +709,7 @@ handleDataSegmentAsTextKeys(packet_info *pinfo, proto_item *ti, tvbuff_t *tvb, g } if(offset < endOffset && (offset & 3) != 0) { int padding = 4 - (offset & 3); - proto_tree_add_item(ti, hf_iscsi_Padding, tvb, offset, padding, FALSE); + proto_tree_add_item(ti, hf_iscsi_Padding, tvb, offset, padding, ENC_NA); offset += padding; } if(digestsActive && dataSegmentLen > 0 && offset < endOffset) @@ -916,7 +916,7 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off proto_tree_add_item(ti, hf_iscsi_TotalAHSLength, tvb, offset + 4, 1, FALSE); } proto_tree_add_uint(ti, hf_iscsi_DataSegmentLength, tvb, offset + 5, 3, tvb_get_ntoh24(tvb, offset + 5)); - proto_tree_add_item(ti, hf_iscsi_LUN, tvb, offset + 8, 8, FALSE); + proto_tree_add_item(ti, hf_iscsi_LUN, tvb, offset + 8, 8, ENC_NA); proto_tree_add_item(ti, hf_iscsi_InitiatorTaskTag, tvb, offset + 16, 4, FALSE); proto_tree_add_item(ti, hf_iscsi_TargetTransferTag, tvb, offset + 20, 4, FALSE); proto_tree_add_item(ti, hf_iscsi_CmdSN, tvb, offset + 24, 4, FALSE); @@ -929,7 +929,7 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off proto_tree_add_item(ti, hf_iscsi_TotalAHSLength, tvb, offset + 4, 1, FALSE); } proto_tree_add_uint(ti, hf_iscsi_DataSegmentLength, tvb, offset + 5, 3, tvb_get_ntoh24(tvb, offset + 5)); - proto_tree_add_item(ti, hf_iscsi_LUN, tvb, offset + 8, 8, FALSE); + proto_tree_add_item(ti, hf_iscsi_LUN, tvb, offset + 8, 8, ENC_NA); proto_tree_add_item(ti, hf_iscsi_InitiatorTaskTag, tvb, offset + 16, 4, FALSE); proto_tree_add_item(ti, hf_iscsi_TargetTransferTag, tvb, offset + 20, 4, FALSE); proto_tree_add_item(ti, hf_iscsi_StatSN, tvb, offset + 24, 4, FALSE); @@ -962,7 +962,7 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off } proto_tree_add_item(ti, hf_iscsi_TotalAHSLength, tvb, offset + 4, 1, FALSE); proto_tree_add_uint(ti, hf_iscsi_DataSegmentLength, tvb, offset + 5, 3, tvb_get_ntoh24(tvb, offset + 5)); - proto_tree_add_item(ti, hf_iscsi_LUN, tvb, offset + 8, 8, FALSE); + proto_tree_add_item(ti, hf_iscsi_LUN, tvb, offset + 8, 8, ENC_NA); proto_tree_add_item(ti, hf_iscsi_InitiatorTaskTag, tvb, offset + 16, 4, FALSE); proto_tree_add_item(ti, hf_iscsi_ExpectedDataTransferLength, tvb, offset + 20, 4, FALSE); cdata->itlq.data_length=tvb_get_ntohl(tvb, offset+20); @@ -988,7 +988,7 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off /* additional cdb */ ahs_cdb_offset=ahs_offset+1; ahs_cdb_length=ahs_length-1; - proto_tree_add_item(ti, hf_iscsi_AHS_extended_cdb, tvb, ahs_cdb_offset, ahs_cdb_length, FALSE); + proto_tree_add_item(ti, hf_iscsi_AHS_extended_cdb, tvb, ahs_cdb_offset, ahs_cdb_length, ENC_NA); ahs_offset+=ahs_length; break; case 0x02: /* bidirectional read data length */ @@ -1000,7 +1000,7 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off ahs_offset+=4; break; default: - proto_tree_add_item(ti, hf_iscsi_AHS_blob, tvb, ahs_offset, ahs_length, FALSE); + proto_tree_add_item(ti, hf_iscsi_AHS_blob, tvb, ahs_offset, ahs_length, ENC_NA); ahs_offset+=ahs_length; } @@ -1061,7 +1061,7 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off proto_tree_add_item(ti, hf_iscsi_TotalAHSLength, tvb, offset + 4, 1, FALSE); proto_tree_add_uint(ti, hf_iscsi_DataSegmentLength, tvb, offset + 5, 3, tvb_get_ntoh24(tvb, offset + 5)); } - proto_tree_add_item(ti, hf_iscsi_LUN, tvb, offset + 8, 8, FALSE); + proto_tree_add_item(ti, hf_iscsi_LUN, tvb, offset + 8, 8, ENC_NA); proto_tree_add_item(ti, hf_iscsi_InitiatorTaskTag, tvb, offset + 16, 4, FALSE); proto_tree_add_item(ti, hf_iscsi_TaskManagementFunction_ReferencedTaskTag, tvb, offset + 20, 4, FALSE); proto_tree_add_item(ti, hf_iscsi_CmdSN, tvb, offset + 24, 4, FALSE); @@ -1122,7 +1122,7 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off proto_tree_add_item(ti, hf_iscsi_ISID8, tvb, offset + 12, 2, FALSE); } else { - proto_item *tf = proto_tree_add_item(ti, hf_iscsi_ISID, tvb, offset + 8, 6, FALSE); + proto_item *tf = proto_tree_add_item(ti, hf_iscsi_ISID, tvb, offset + 8, 6, ENC_NA); proto_tree *tt = proto_item_add_subtree(tf, ett_iscsi_ISID); if(iscsi_protocol_version == ISCSI_PROTOCOL_DRAFT09) { proto_tree_add_item(tt, hf_iscsi_ISID_Type, tvb, offset + 8, 1, FALSE); @@ -1190,7 +1190,7 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off proto_tree_add_item(ti, hf_iscsi_ISID8, tvb, offset + 12, 2, FALSE); } else { - proto_item *tf = proto_tree_add_item(ti, hf_iscsi_ISID, tvb, offset + 8, 6, FALSE); + proto_item *tf = proto_tree_add_item(ti, hf_iscsi_ISID, tvb, offset + 8, 6, ENC_NA); proto_tree *tt = proto_item_add_subtree(tf, ett_iscsi_ISID); if(iscsi_protocol_version == ISCSI_PROTOCOL_DRAFT09) { proto_tree_add_item(tt, hf_iscsi_ISID_Type, tvb, offset + 8, 1, FALSE); @@ -1239,7 +1239,7 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off } proto_tree_add_uint(ti, hf_iscsi_DataSegmentLength, tvb, offset + 5, 3, tvb_get_ntoh24(tvb, offset + 5)); if(iscsi_protocol_version > ISCSI_PROTOCOL_DRAFT09) { - proto_tree_add_item(ti, hf_iscsi_LUN, tvb, offset + 8, 8, FALSE); + proto_tree_add_item(ti, hf_iscsi_LUN, tvb, offset + 8, 8, ENC_NA); } proto_tree_add_item(ti, hf_iscsi_InitiatorTaskTag, tvb, offset + 16, 4, FALSE); proto_tree_add_item(ti, hf_iscsi_TargetTransferTag, tvb, offset + 20, 4, FALSE); @@ -1264,7 +1264,7 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off } proto_tree_add_uint(ti, hf_iscsi_DataSegmentLength, tvb, offset + 5, 3, tvb_get_ntoh24(tvb, offset + 5)); if(iscsi_protocol_version > ISCSI_PROTOCOL_DRAFT09) { - proto_tree_add_item(ti, hf_iscsi_LUN, tvb, offset + 8, 8, FALSE); + proto_tree_add_item(ti, hf_iscsi_LUN, tvb, offset + 8, 8, ENC_NA); } proto_tree_add_item(ti, hf_iscsi_InitiatorTaskTag, tvb, offset + 16, 4, FALSE); proto_tree_add_item(ti, hf_iscsi_TargetTransferTag, tvb, offset + 20, 4, FALSE); @@ -1286,7 +1286,7 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off proto_tree_add_item(ti, hf_iscsi_TotalAHSLength, tvb, offset + 4, 1, FALSE); } proto_tree_add_uint(ti, hf_iscsi_DataSegmentLength, tvb, offset + 5, 3, tvb_get_ntoh24(tvb, offset + 5)); - proto_tree_add_item(ti, hf_iscsi_LUN, tvb, offset + 8, 8, FALSE); + proto_tree_add_item(ti, hf_iscsi_LUN, tvb, offset + 8, 8, ENC_NA); proto_tree_add_item(ti, hf_iscsi_InitiatorTaskTag, tvb, offset + 16, 4, FALSE); proto_tree_add_item(ti, hf_iscsi_TargetTransferTag, tvb, offset + 20, 4, FALSE); proto_tree_add_item(ti, hf_iscsi_ExpStatSN, tvb, offset + 28, 4, FALSE); @@ -1324,7 +1324,7 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off } proto_tree_add_uint(ti, hf_iscsi_DataSegmentLength, tvb, offset + 5, 3, tvb_get_ntoh24(tvb, offset + 5)); if(iscsi_protocol_version > ISCSI_PROTOCOL_DRAFT09) { - proto_tree_add_item(ti, hf_iscsi_LUN, tvb, offset + 8, 8, FALSE); + proto_tree_add_item(ti, hf_iscsi_LUN, tvb, offset + 8, 8, ENC_NA); } proto_tree_add_item(ti, hf_iscsi_InitiatorTaskTag, tvb, offset + 16, 4, FALSE); if(iscsi_protocol_version <= ISCSI_PROTOCOL_DRAFT09) { @@ -1398,7 +1398,7 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off if(iscsi_protocol_version > ISCSI_PROTOCOL_DRAFT09) { proto_tree_add_item(ti, hf_iscsi_TotalAHSLength, tvb, offset + 4, 1, FALSE); proto_tree_add_uint(ti, hf_iscsi_DataSegmentLength, tvb, offset + 5, 3, tvb_get_ntoh24(tvb, offset + 5)); - proto_tree_add_item(ti, hf_iscsi_LUN, tvb, offset + 8, 8, FALSE); + proto_tree_add_item(ti, hf_iscsi_LUN, tvb, offset + 8, 8, ENC_NA); } proto_tree_add_item(ti, hf_iscsi_InitiatorTaskTag, tvb, offset + 16, 4, FALSE); if(iscsi_protocol_version <= ISCSI_PROTOCOL_DRAFT09) { @@ -1419,7 +1419,7 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off if(iscsi_protocol_version > ISCSI_PROTOCOL_DRAFT09) { proto_tree_add_item(ti, hf_iscsi_TotalAHSLength, tvb, offset + 4, 1, FALSE); proto_tree_add_uint(ti, hf_iscsi_DataSegmentLength, tvb, offset + 5, 3, tvb_get_ntoh24(tvb, offset + 5)); - proto_tree_add_item(ti, hf_iscsi_LUN, tvb, offset + 8, 8, FALSE); + proto_tree_add_item(ti, hf_iscsi_LUN, tvb, offset + 8, 8, ENC_NA); } proto_tree_add_item(ti, hf_iscsi_InitiatorTaskTag, tvb, offset + 16, 4, FALSE); proto_tree_add_item(ti, hf_iscsi_TargetTransferTag, tvb, offset + 20, 4, FALSE); @@ -1439,7 +1439,7 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off } dsl=tvb_get_ntoh24(tvb, offset+5); proto_tree_add_uint(ti, hf_iscsi_DataSegmentLength, tvb, offset + 5, 3, tvb_get_ntoh24(tvb, offset + 5)); - proto_tree_add_item(ti, hf_iscsi_LUN, tvb, offset + 8, 8, FALSE); + proto_tree_add_item(ti, hf_iscsi_LUN, tvb, offset + 8, 8, ENC_NA); proto_tree_add_item(ti, hf_iscsi_StatSN, tvb, offset + 24, 4, FALSE); proto_tree_add_item(ti, hf_iscsi_ExpCmdSN, tvb, offset + 28, 4, FALSE); proto_tree_add_item(ti, hf_iscsi_MaxCmdSN, tvb, offset + 32, 4, FALSE); @@ -1474,7 +1474,7 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off offset+=snsl; } if((end_offset-offset)>0){ - proto_tree_add_item(ti, hf_iscsi_async_event_data, tvb, offset, end_offset-offset, FALSE); + proto_tree_add_item(ti, hf_iscsi_async_event_data, tvb, offset, end_offset-offset, ENC_NA); } } offset=end_offset; diff --git a/epan/dissectors/packet-ismacryp.c b/epan/dissectors/packet-ismacryp.c index 8bf66bb73a..382e89823a 100644 --- a/epan/dissectors/packet-ismacryp.c +++ b/epan/dissectors/packet-ismacryp.c @@ -387,7 +387,7 @@ static void dissect_ismacryp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tre } /* ADD MESSAGE BRANCH */ ismacryp_item = proto_tree_add_item( ismacryp_tree, hf_ismacryp_message, - tvb, poffset->offset_bytes, -1, FALSE ); + tvb, poffset->offset_bytes, -1, ENC_NA ); ismacryp_message_tree = proto_item_add_subtree(ismacryp_item, ett_ismacryp_message); proto_item_append_text(ismacryp_item, ", %s", "Encrypted data"); /* add text to Message tree */ nbmessage_bytes = tvb_reported_length_remaining(tvb, poffset->offset_bytes); @@ -475,7 +475,7 @@ static offset_struct* dissect_auheader( tvbuff_t *tvb, offset_struct *poffset, p header_len_bytes=((header_len)/8); /* add AU header tree */ - ismacryp_item = proto_tree_add_item(ismacryp_tree, hf_ismacryp_header, tvb, poffset->offset_bytes, header_len_bytes, FALSE ); + ismacryp_item = proto_tree_add_item(ismacryp_tree, hf_ismacryp_header, tvb, poffset->offset_bytes, header_len_bytes, ENC_NA ); proto_item_append_text(ismacryp_item, ": Length=%d bits", header_len); /* add text to Header tree indicating length */ /* sanity check if actual AU header length is zero bits, which indicates an error */ if ( header_len == 0) /* something wrong */ @@ -494,7 +494,7 @@ static offset_struct* dissect_auheader( tvbuff_t *tvb, offset_struct *poffset, p /* add header byte tree */ ismacryp_item = proto_tree_add_item(ismacryp_header_tree, hf_ismacryp_header_byte, - tvb, poffset->offset_bytes, 1, FALSE ); + tvb, poffset->offset_bytes, 1, ENC_NA ); proto_item_append_text(ismacryp_item, ": Length=8 bits"); /* add text to Header byte tree indicating length */ ismacryp_header_byte_tree = proto_item_add_subtree(ismacryp_item, ett_ismacryp_header_byte); diff --git a/epan/dissectors/packet-ismp.c b/epan/dissectors/packet-ismp.c index 12d25086ab..f572bb3d7a 100644 --- a/epan/dissectors/packet-ismp.c +++ b/epan/dissectors/packet-ismp.c @@ -523,7 +523,7 @@ dissect_ismp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) code_length = tvb_get_guint8(tvb, offset); proto_tree_add_item(ismp_tree, hf_ismp_code_length, tvb, offset, 1, FALSE); offset += 1; - proto_tree_add_item(ismp_tree, hf_ismp_auth_data, tvb, offset, code_length, FALSE); + proto_tree_add_item(ismp_tree, hf_ismp_auth_data, tvb, offset, code_length, ENC_NA); offset += code_length; /* if Enterasys Discover Protocol, dissect it */ diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c index 19add35d23..4cf5a3fbc7 100644 --- a/epan/dissectors/packet-isup.c +++ b/epan/dissectors/packet-isup.c @@ -2833,7 +2833,7 @@ dissect_nsap(tvbuff_t *parameter_tvb,gint offset,gint len, proto_tree *parameter proto_tree_add_text(parameter_tree,parameter_tvb, cc_offset, length,"DSP length %u(len %u -9 )",(len-9),len ); - proto_tree_add_item(parameter_tree, hf_bicc_nsap_dsp, parameter_tvb, offset + 8, (len - 9),FALSE); + proto_tree_add_item(parameter_tree, hf_bicc_nsap_dsp, parameter_tvb, offset + 8, (len - 9),ENC_NA); break; default: @@ -3416,7 +3416,7 @@ dissect_bat_ase_Encapsulated_Application_Information(tvbuff_t *parameter_tvb, pa break; case INTERWORKING_FUNCTION_ADDRESS : bat_ase_iwfa_item = proto_tree_add_item(bat_ase_element_tree, hf_bat_ase_biwfa, parameter_tvb, offset, content_len, - FALSE); + ENC_NA); bat_ase_iwfa_tree = proto_item_add_subtree(bat_ase_iwfa_item , ett_bat_ase_iwfa); dissect_nsap(parameter_tvb, offset, content_len, bat_ase_iwfa_tree); diff --git a/epan/dissectors/packet-iua.c b/epan/dissectors/packet-iua.c index 5130577f94..5f6905041d 100644 --- a/epan/dissectors/packet-iua.c +++ b/epan/dissectors/packet-iua.c @@ -203,7 +203,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")); } @@ -241,7 +241,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")); } @@ -487,7 +487,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")); } @@ -621,7 +621,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 diff --git a/epan/dissectors/packet-iwarp-ddp-rdmap.c b/epan/dissectors/packet-iwarp-ddp-rdmap.c index 051c00941e..6855399294 100644 --- a/epan/dissectors/packet-iwarp-ddp-rdmap.c +++ b/epan/dissectors/packet-iwarp-ddp-rdmap.c @@ -299,7 +299,7 @@ dissect_iwarp_rdmap(tvbuff_t *tvb, proto_tree *rdma_tree, guint32 offset, if (rdma_msg_opcode == RDMA_READ_REQUEST) { rdma_header_subitem = proto_tree_add_item(rdma_tree, - hf_iwarp_rdma_rr_header, tvb, offset, -1, FALSE); + hf_iwarp_rdma_rr_header, tvb, offset, -1, ENC_NA); rdma_header_tree = proto_item_add_subtree(rdma_header_subitem, ett_iwarp_rdma); @@ -321,13 +321,13 @@ dissect_iwarp_rdmap(tvbuff_t *tvb, proto_tree *rdma_tree, guint32 offset, offset, RDMA_SRCSTAG_LEN, FALSE); offset += RDMA_SRCSTAG_LEN; proto_tree_add_item(rdma_header_tree, hf_iwarp_rdma_srcto, tvb, - offset, RDMA_SRCTO_LEN, FALSE); + offset, RDMA_SRCTO_LEN, ENC_NA); offset += RDMA_SRCTO_LEN; } if (rdma_msg_opcode == RDMA_TERMINATE) { rdma_header_subitem = proto_tree_add_item(rdma_tree, - hf_iwarp_rdma_terminate_header, tvb, offset, -1, FALSE); + hf_iwarp_rdma_terminate_header, tvb, offset, -1, ENC_NA); rdma_header_tree = proto_item_add_subtree(rdma_header_subitem, ett_iwarp_rdma); @@ -336,7 +336,7 @@ dissect_iwarp_rdmap(tvbuff_t *tvb, proto_tree *rdma_tree, guint32 offset, etype = tvb_get_guint8(tvb, offset) & IWARP_ETYPE; term_ctrl_field_subitem = proto_tree_add_item(rdma_tree, - hf_iwarp_rdma_term_ctrl, tvb, offset, 3, FALSE); + hf_iwarp_rdma_term_ctrl, tvb, offset, 3, ENC_NA); term_ctrl_field_tree = proto_item_add_subtree( term_ctrl_field_subitem, ett_iwarp_rdma); proto_tree_add_item(term_ctrl_field_tree, hf_iwarp_rdma_term_layer, @@ -402,7 +402,7 @@ dissect_iwarp_rdmap(tvbuff_t *tvb, proto_tree *rdma_tree, guint32 offset, /* header control bits (hdctr), part of Terminate Control Field */ header_ctrl_field_subitem = proto_tree_add_item( term_ctrl_field_tree, hf_iwarp_rdma_term_hdrct, tvb, - offset, 1, FALSE); + offset, 1, ENC_NA); header_ctrl_field_tree = proto_item_add_subtree( header_ctrl_field_subitem, ett_iwarp_rdma); @@ -424,19 +424,19 @@ dissect_iwarp_rdmap(tvbuff_t *tvb, proto_tree *rdma_tree, guint32 offset, /* DDP Segment Length (if any) */ proto_tree_add_item(rdma_header_tree, hf_iwarp_rdma_term_ddp_seg_len, tvb, - offset, RDMA_DDP_SEGLEN_LEN, FALSE); + offset, RDMA_DDP_SEGLEN_LEN, ENC_NA); offset += RDMA_DDP_SEGLEN_LEN; /* Terminated DDP Header (if any), tagged or untagged */ if (etype == IWARP_ETYPE_DDP_TAGGED) { proto_tree_add_item(rdma_header_tree, hf_iwarp_rdma_term_ddp_h, tvb, - offset, DDP_TAGGED_HEADER_LEN, FALSE); + offset, DDP_TAGGED_HEADER_LEN, ENC_NA); offset += DDP_TAGGED_HEADER_LEN; } else { proto_tree_add_item(rdma_header_tree, hf_iwarp_rdma_term_ddp_h, tvb, - offset, DDP_UNTAGGED_HEADER_LEN, FALSE); + offset, DDP_UNTAGGED_HEADER_LEN, ENC_NA); offset += DDP_UNTAGGED_HEADER_LEN; } } @@ -444,7 +444,7 @@ dissect_iwarp_rdmap(tvbuff_t *tvb, proto_tree *rdma_tree, guint32 offset, /* Terminated RDMA Header (if any) */ if (hdrct & IWARP_HDRCT_R) { proto_tree_add_item(rdma_header_tree, hf_iwarp_rdma_term_rdma_h, - tvb, offset, RDMA_TERMINATED_RDMA_LEN, FALSE); + tvb, offset, RDMA_TERMINATED_RDMA_LEN, ENC_NA); } } } @@ -509,13 +509,13 @@ dissect_iwarp_ddp_rdmap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* DDP protocol header subtree */ ddp_item = proto_tree_add_item(ddp_rdma_tree, hf_iwarp_ddp, tvb, - offset, header_end, FALSE); + offset, header_end, ENC_NA); ddp_tree = proto_item_add_subtree(ddp_item, ett_iwarp_ddp); /* DDP control field */ ddp_ctrl_field_item = proto_tree_add_item(ddp_tree, hf_iwarp_ddp_control_field, tvb, offset, - DDP_CONTROL_FIELD_LEN, FALSE); + DDP_CONTROL_FIELD_LEN, ENC_NA); ddp_ctrl_field_tree = proto_item_add_subtree(ddp_ctrl_field_item, ett_iwarp_ddp); @@ -533,7 +533,7 @@ dissect_iwarp_ddp_rdmap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* DDP header field RsvdULP */ if (!is_tagged_buffer_model) { proto_tree_add_item(ddp_tree, hf_iwarp_ddp_rsvdulp, tvb, - offset, DDP_UNTAGGED_RSVDULP_LEN, FALSE); + offset, DDP_UNTAGGED_RSVDULP_LEN, ENC_NA); } /* RDMA protocol header subtree */ @@ -544,13 +544,13 @@ dissect_iwarp_ddp_rdmap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } rdma_item = proto_tree_add_item(ddp_rdma_tree, hf_iwarp_rdma, tvb, - offset, header_end, FALSE); + offset, header_end, ENC_NA); rdma_tree = proto_item_add_subtree(rdma_item, ett_iwarp_rdma); /* RDMA Control Field */ rdma_ctrl_field_item = proto_tree_add_item(rdma_tree, hf_iwarp_rdma_control_field, tvb, offset, - RDMA_CONTROL_FIELD_LEN, FALSE); + RDMA_CONTROL_FIELD_LEN, ENC_NA); rdma_ctrl_field_tree = proto_item_add_subtree(rdma_ctrl_field_item, ett_iwarp_rdma); @@ -568,7 +568,7 @@ dissect_iwarp_ddp_rdmap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) || rdma_msg_opcode == RDMA_SEND_SE || rdma_msg_opcode == RDMA_TERMINATE) { proto_tree_add_item(rdma_tree, hf_iwarp_rdma_reserved, - tvb, offset, RDMA_RESERVED_FIELD_LEN, FALSE); + tvb, offset, RDMA_RESERVED_FIELD_LEN, ENC_NA); } if (rdma_msg_opcode == RDMA_SEND_INVALIDATE @@ -587,15 +587,15 @@ dissect_iwarp_ddp_rdmap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Tagged Buffer Model Case */ ddp_buffer_model_item = proto_tree_add_item(ddp_tree, hf_iwarp_ddp_tagged_header, tvb, offset, - DDP_BUFFER_MODEL_LEN, FALSE); + DDP_BUFFER_MODEL_LEN, ENC_NA); ddp_buffer_model_tree = proto_item_add_subtree(ddp_buffer_model_item, ett_iwarp_ddp); proto_tree_add_item(ddp_buffer_model_tree, hf_iwarp_ddp_stag, tvb, - offset, DDP_STAG_LEN, FALSE); + offset, DDP_STAG_LEN, ENC_NA); offset += DDP_STAG_LEN; proto_tree_add_item(ddp_buffer_model_tree, hf_iwarp_ddp_to, tvb, - offset, DDP_TO_LEN, FALSE); + offset, DDP_TO_LEN, ENC_NA); offset += DDP_TO_LEN; if( rdma_msg_opcode == RDMA_READ_RESPONSE @@ -611,7 +611,7 @@ dissect_iwarp_ddp_rdmap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Untagged Buffer Model Case */ ddp_buffer_model_item = proto_tree_add_item(ddp_tree, hf_iwarp_ddp_untagged_header, tvb, offset, - DDP_BUFFER_MODEL_LEN, FALSE); + DDP_BUFFER_MODEL_LEN, ENC_NA); ddp_buffer_model_tree = proto_item_add_subtree(ddp_buffer_model_item, ett_iwarp_ddp); diff --git a/epan/dissectors/packet-iwarp-mpa.c b/epan/dissectors/packet-iwarp-mpa.c index 62e4a81f8e..001ab7513e 100644 --- a/epan/dissectors/packet-iwarp-mpa.c +++ b/epan/dissectors/packet-iwarp-mpa.c @@ -486,20 +486,20 @@ dissect_mpa_req_rep(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (message_type == MPA_REQUEST_FRAME) { mpa_header_item = proto_tree_add_item(mpa_tree, - hf_mpa_req, tvb, offset, -1, FALSE); + hf_mpa_req, tvb, offset, -1, ENC_NA); mpa_header_tree = proto_item_add_subtree( mpa_header_item, ett_mpa); proto_tree_add_item(mpa_header_tree, hf_mpa_key_req, - tvb, offset, MPA_REQ_REP_KEY_LEN, FALSE); + tvb, offset, MPA_REQ_REP_KEY_LEN, ENC_NA); } if (message_type == MPA_REPLY_FRAME) { mpa_header_item = proto_tree_add_item(mpa_tree, - hf_mpa_rep, tvb, offset, -1, FALSE); + hf_mpa_rep, tvb, offset, -1, ENC_NA); mpa_header_tree = proto_item_add_subtree( mpa_header_item, ett_mpa); proto_tree_add_item(mpa_header_tree, hf_mpa_key_rep, - tvb, offset, MPA_REQ_REP_KEY_LEN, FALSE); + tvb, offset, MPA_REQ_REP_KEY_LEN, ENC_NA); } offset += MPA_REQ_REP_KEY_LEN; @@ -536,7 +536,7 @@ dissect_mpa_req_rep(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (pd_length) { proto_tree_add_item(mpa_header_tree, hf_mpa_private_data, tvb, offset, - pd_length, FALSE); + pd_length, ENC_NA); } } return TRUE; @@ -621,7 +621,7 @@ dissect_fpdu_markers(tvbuff_t *tvb, proto_tree *tree, mpa_state_t *state, guint32 offset, i; mpa_marker_item = proto_tree_add_item(tree, hf_mpa_marker, tvb, - 0, -1, FALSE); + 0, -1, ENC_NA); mpa_marker_tree = proto_item_add_subtree(mpa_marker_item, ett_mpa); offset = get_first_marker_offset(state, tcpinfo, endpoint); @@ -739,7 +739,7 @@ dissect_mpa_fpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, mpa_tree = proto_item_add_subtree(mpa_item, ett_mpa); mpa_header_item = proto_tree_add_item(mpa_tree, hf_mpa_fpdu, - tvb, offset, -1, FALSE); + tvb, offset, -1, ENC_NA); mpa_header_tree = proto_item_add_subtree(mpa_header_item, ett_mpa); @@ -761,7 +761,7 @@ dissect_mpa_fpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, tvb, pad_offset(tcpinfo, total_length, pad_length), - pad_length, FALSE); + pad_length, ENC_NA); } dissect_fpdu_crc(tvb, mpa_header_tree, state, @@ -776,7 +776,7 @@ dissect_mpa_fpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (pad_length > 0) { proto_tree_add_item(mpa_header_tree, hf_mpa_pad, tvb, offset, - pad_length, FALSE); + pad_length, ENC_NA); offset += pad_length; } diff --git a/epan/dissectors/packet-jpeg.c b/epan/dissectors/packet-jpeg.c index 4fa576617b..fda1af0e7f 100644 --- a/epan/dissectors/packet-jpeg.c +++ b/epan/dissectors/packet-jpeg.c @@ -91,7 +91,7 @@ dissect_jpeg( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) ti = proto_tree_add_item( tree, proto_jpeg, tvb, offset, -1, FALSE ); jpeg_tree = proto_item_add_subtree( ti, ett_jpeg ); - ti = proto_tree_add_item(jpeg_tree, hf_rtp_jpeg_main_hdr, tvb, offset, 8, FALSE); + ti = proto_tree_add_item(jpeg_tree, hf_rtp_jpeg_main_hdr, tvb, offset, 8, ENC_NA); main_hdr_tree = proto_item_add_subtree(ti, ett_jpeg); proto_tree_add_item(main_hdr_tree, hf_rtp_jpeg_main_hdr_ts, tvb, offset, 1, FALSE); @@ -113,7 +113,7 @@ dissect_jpeg( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) offset += 1; if (type >= 64 && type <= 127) { - ti = proto_tree_add_item(jpeg_tree, hf_rtp_jpeg_restart_hdr, tvb, offset, 4, FALSE); + ti = proto_tree_add_item(jpeg_tree, hf_rtp_jpeg_restart_hdr, tvb, offset, 4, ENC_NA); restart_hdr_tree = proto_item_add_subtree(ti, ett_jpeg); proto_tree_add_item(restart_hdr_tree, hf_rtp_jpeg_restart_hdr_interval, tvb, offset, 2, FALSE); offset += 2; @@ -124,7 +124,7 @@ dissect_jpeg( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) } if (q >= 128 && fragment_offset == 0) { - ti = proto_tree_add_item(jpeg_tree, hf_rtp_jpeg_qtable_hdr, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(jpeg_tree, hf_rtp_jpeg_qtable_hdr, tvb, offset, -1, ENC_NA); qtable_hdr_tree = proto_item_add_subtree(ti, ett_jpeg); proto_tree_add_item(qtable_hdr_tree, hf_rtp_jpeg_qtable_hdr_mbz, tvb, offset, 1, FALSE); offset += 1; @@ -134,14 +134,14 @@ dissect_jpeg( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) len = tvb_get_ntohs(tvb, offset); offset += 2; if (len > 0) { - proto_tree_add_item(qtable_hdr_tree, hf_rtp_jpeg_qtable_hdr_data, tvb, offset, len, FALSE); + proto_tree_add_item(qtable_hdr_tree, hf_rtp_jpeg_qtable_hdr_data, tvb, offset, len, ENC_NA); offset += len; } proto_item_set_len(ti, len + 4); } /* The rest of the packet is the JPEG data */ - proto_tree_add_item( jpeg_tree, hf_rtp_jpeg_payload, tvb, offset, -1, FALSE ); + proto_tree_add_item( jpeg_tree, hf_rtp_jpeg_payload, tvb, offset, -1, ENC_NA ); } } diff --git a/epan/dissectors/packet-json.c b/epan/dissectors/packet-json.c index ae4f57e100..20537f1251 100644 --- a/epan/dissectors/packet-json.c +++ b/epan/dissectors/packet-json.c @@ -151,7 +151,7 @@ static void before_object(void *tvbparse_data, const void *wanted_data _U_, tvbp proto_tree *subtree; proto_item *ti; - ti = proto_tree_add_item(tree, hf_json_object, tok->tvb, tok->offset, tok->len, FALSE); + ti = proto_tree_add_item(tree, hf_json_object, tok->tvb, tok->offset, tok->len, ENC_NA); subtree = proto_item_add_subtree(ti, ett_json_object); ep_stack_push(data->stack, subtree); @@ -170,7 +170,7 @@ static void before_member(void *tvbparse_data, const void *wanted_data _U_, tvbp proto_tree *subtree; proto_item *ti; - ti = proto_tree_add_item(tree, hf_json_member, tok->tvb, tok->offset, tok->len, FALSE); + ti = proto_tree_add_item(tree, hf_json_member, tok->tvb, tok->offset, tok->len, ENC_NA); subtree = proto_item_add_subtree(ti, ett_json_member); ep_stack_push(data->stack, subtree); @@ -200,7 +200,7 @@ static void before_array(void *tvbparse_data, const void *wanted_data _U_, tvbpa proto_tree *subtree; proto_item *ti; - ti = proto_tree_add_item(tree, hf_json_array, tok->tvb, tok->offset, tok->len, FALSE); + ti = proto_tree_add_item(tree, hf_json_array, tok->tvb, tok->offset, tok->len, ENC_NA); subtree = proto_item_add_subtree(ti, ett_json_array); ep_stack_push(data->stack, subtree); @@ -240,15 +240,15 @@ static void after_value(void *tvbparse_data, const void *wanted_data _U_, tvbpar break; case JSON_TOKEN_FALSE: - proto_tree_add_item(tree, hf_json_value_false, tok->tvb, tok->offset, tok->len, FALSE); + proto_tree_add_item(tree, hf_json_value_false, tok->tvb, tok->offset, tok->len, ENC_NA); break; case JSON_TOKEN_NULL: - proto_tree_add_item(tree, hf_json_value_null, tok->tvb, tok->offset, tok->len, FALSE); + proto_tree_add_item(tree, hf_json_value_null, tok->tvb, tok->offset, tok->len, ENC_NA); break; case JSON_TOKEN_TRUE: - proto_tree_add_item(tree, hf_json_value_true, tok->tvb, tok->offset, tok->len, FALSE); + proto_tree_add_item(tree, hf_json_value_true, tok->tvb, tok->offset, tok->len, ENC_NA); break; case JSON_OBJECT: diff --git a/epan/dissectors/packet-jxta.c b/epan/dissectors/packet-jxta.c index 59d49dc586..9821bac62e 100644 --- a/epan/dissectors/packet-jxta.c +++ b/epan/dissectors/packet-jxta.c @@ -1074,7 +1074,7 @@ static int dissect_jxta_message_framing(tvbuff_t * tvb, packet_info * pinfo, pro do { guint8 headernamelen = tvb_get_guint8(tvb, tree_offset); proto_item *framing_header_tree_item = - proto_tree_add_item(framing_tree, hf_jxta_framing_header, tvb, tree_offset, -1, FALSE); + proto_tree_add_item(framing_tree, hf_jxta_framing_header, tvb, tree_offset, -1, ENC_NA); proto_tree *framing_header_tree = proto_item_add_subtree(framing_header_tree_item, ett_jxta_framing_header); /* @@ -1105,7 +1105,7 @@ static int dissect_jxta_message_framing(tvbuff_t * tvb, packet_info * pinfo, pro * Put header value into protocol tree. */ proto_tree_add_item(framing_header_tree, hf_jxta_framing_header_value, tvb, tree_offset + sizeof(guint16), - headervaluelen, FALSE); + headervaluelen, ENC_NA); } tree_offset += sizeof(guint16) + headervaluelen; @@ -1596,7 +1596,7 @@ static int dissect_jxta_message_element_1(tvbuff_t * tvb, packet_info * pinfo, p /* Second (optional) pass : build the proto tree */ { guint tree_offset = 0; - proto_item *jxta_elem_tree_item = proto_tree_add_item(tree, hf_jxta_element, tvb, tree_offset, -1, FALSE); + proto_item *jxta_elem_tree_item = proto_tree_add_item(tree, hf_jxta_element, tvb, tree_offset, -1, ENC_NA); proto_tree *jxta_elem_tree = proto_item_add_subtree(jxta_elem_tree_item, ett_jxta_elem); guint8 namespaceID; proto_item *namespace_ti; @@ -1853,7 +1853,7 @@ static int dissect_jxta_message_element_2(tvbuff_t * tvb, packet_info * pinfo, p /* Second (optional) pass : build the proto tree */ { guint tree_offset = 0; - proto_item *jxta_elem_tree_item = proto_tree_add_item(tree, hf_jxta_element, tvb, tree_offset, -1, FALSE); + proto_item *jxta_elem_tree_item = proto_tree_add_item(tree, hf_jxta_element, tvb, tree_offset, -1, ENC_NA); proto_tree *jxta_elem_tree = proto_item_add_subtree(jxta_elem_tree_item, ett_jxta_elem); proto_item *flags_ti; proto_tree *jxta_elem_flags_tree = NULL; diff --git a/epan/dissectors/packet-kdp.c b/epan/dissectors/packet-kdp.c index dfe8956de5..5b6bea318a 100644 --- a/epan/dissectors/packet-kdp.c +++ b/epan/dissectors/packet-kdp.c @@ -189,13 +189,13 @@ static void dissect_kdp(tvbuff_t *tvb, offset = offset + 2; break; case 4: - proto_tree_add_item(kdp_tree, hf_kdp_option4, tvb, offset, 0, FALSE); + proto_tree_add_item(kdp_tree, hf_kdp_option4, tvb, offset, 0, ENC_NA); break; case 5: - proto_tree_add_item(kdp_tree, hf_kdp_option5, tvb, offset, 0, FALSE); + proto_tree_add_item(kdp_tree, hf_kdp_option5, tvb, offset, 0, ENC_NA); break; case 6: - proto_tree_add_item(kdp_tree, hf_kdp_option6, tvb, offset, option_len - 2, FALSE); + proto_tree_add_item(kdp_tree, hf_kdp_option6, tvb, offset, option_len - 2, ENC_NA); offset = offset + option_len - 2; break; case 7: @@ -211,7 +211,7 @@ static void dissect_kdp(tvbuff_t *tvb, offset = offset + 2; break; default: - proto_tree_add_item(kdp_tree, hf_kdp_option_unknown, tvb, offset, option_len - 2, FALSE); + proto_tree_add_item(kdp_tree, hf_kdp_option_unknown, tvb, offset, option_len - 2, ENC_NA); offset = offset + option_len - 2; break; } @@ -224,7 +224,7 @@ static void dissect_kdp(tvbuff_t *tvb, proto_tree_add_item(kdp_tree, hf_kdp_fragtotal, tvb, offset, 2, FALSE); offset = offset + 2; - proto_tree_add_item(kdp_tree, hf_kdp_body, tvb, offset, -1, FALSE); + proto_tree_add_item(kdp_tree, hf_kdp_body, tvb, offset, -1, ENC_NA); } } } diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c index 08a5617b29..c2b3977aec 100644 --- a/epan/dissectors/packet-kerberos.c +++ b/epan/dissectors/packet-kerberos.c @@ -2628,7 +2628,7 @@ dissect_krb5_PAC_LOGON_INFO(proto_tree *parent_tree, tvbuff_t *tvb, int offset, static dcerpc_call_value call_data; void *old_private_data; - item=proto_tree_add_item(parent_tree, hf_krb_PAC_LOGON_INFO, tvb, offset, tvb_length_remaining(tvb, offset), FALSE); + item=proto_tree_add_item(parent_tree, hf_krb_PAC_LOGON_INFO, tvb, offset, tvb_length_remaining(tvb, offset), ENC_NA); if(parent_tree){ tree=proto_item_add_subtree(item, ett_krb_PAC_LOGON_INFO); } @@ -2664,7 +2664,7 @@ dissect_krb5_PAC_CONSTRAINED_DELEGATION(proto_tree *parent_tree, tvbuff_t *tvb, static dcerpc_call_value call_data; void *old_private_data; - item=proto_tree_add_item(parent_tree, hf_krb_PAC_CONSTRAINED_DELEGATION, tvb, offset, tvb_length_remaining(tvb, offset), FALSE); + item=proto_tree_add_item(parent_tree, hf_krb_PAC_CONSTRAINED_DELEGATION, tvb, offset, tvb_length_remaining(tvb, offset), ENC_NA); if(parent_tree){ tree=proto_item_add_subtree(item, ett_krb_PAC_CONSTRAINED_DELEGATION); } @@ -2702,7 +2702,7 @@ dissect_krb5_PAC_UPN_DNS_INFO(proto_tree *parent_tree, tvbuff_t *tvb, int offset int dn_len; guint16 bc; - item=proto_tree_add_item(parent_tree, hf_krb_PAC_UPN_DNS_INFO, tvb, offset, tvb_length_remaining(tvb, offset), FALSE); + item=proto_tree_add_item(parent_tree, hf_krb_PAC_UPN_DNS_INFO, tvb, offset, tvb_length_remaining(tvb, offset), ENC_NA); if(parent_tree){ tree=proto_item_add_subtree(item, ett_krb_PAC_UPN_DNS_INFO); } @@ -2748,7 +2748,7 @@ dissect_krb5_PAC_UPN_DNS_INFO(proto_tree *parent_tree, tvbuff_t *tvb, int offset static int dissect_krb5_PAC_CREDENTIAL_TYPE(proto_tree *parent_tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_) { - proto_tree_add_item(parent_tree, hf_krb_PAC_CREDENTIAL_TYPE, tvb, offset, tvb_length_remaining(tvb, offset), FALSE); + proto_tree_add_item(parent_tree, hf_krb_PAC_CREDENTIAL_TYPE, tvb, offset, tvb_length_remaining(tvb, offset), ENC_NA); /*qqq*/ return offset; @@ -2760,7 +2760,7 @@ dissect_krb5_PAC_SERVER_CHECKSUM(proto_tree *parent_tree, tvbuff_t *tvb, int off proto_item *item=NULL; proto_tree *tree=NULL; - item=proto_tree_add_item(parent_tree, hf_krb_PAC_SERVER_CHECKSUM, tvb, offset, tvb_length_remaining(tvb, offset), FALSE); + item=proto_tree_add_item(parent_tree, hf_krb_PAC_SERVER_CHECKSUM, tvb, offset, tvb_length_remaining(tvb, offset), ENC_NA); if(parent_tree){ tree=proto_item_add_subtree(item, ett_krb_PAC_SERVER_CHECKSUM); } @@ -2770,7 +2770,7 @@ dissect_krb5_PAC_SERVER_CHECKSUM(proto_tree *parent_tree, tvbuff_t *tvb, int off offset+=4; /* signature data */ - proto_tree_add_item(tree, hf_krb_pac_signature_signature, tvb, offset, tvb_length_remaining(tvb, offset), FALSE); + proto_tree_add_item(tree, hf_krb_pac_signature_signature, tvb, offset, tvb_length_remaining(tvb, offset), ENC_NA); return offset; } @@ -2781,7 +2781,7 @@ dissect_krb5_PAC_PRIVSVR_CHECKSUM(proto_tree *parent_tree, tvbuff_t *tvb, int of proto_item *item=NULL; proto_tree *tree=NULL; - item=proto_tree_add_item(parent_tree, hf_krb_PAC_PRIVSVR_CHECKSUM, tvb, offset, tvb_length_remaining(tvb, offset), FALSE); + item=proto_tree_add_item(parent_tree, hf_krb_PAC_PRIVSVR_CHECKSUM, tvb, offset, tvb_length_remaining(tvb, offset), ENC_NA); if(parent_tree){ tree=proto_item_add_subtree(item, ett_krb_PAC_PRIVSVR_CHECKSUM); } @@ -2791,7 +2791,7 @@ dissect_krb5_PAC_PRIVSVR_CHECKSUM(proto_tree *parent_tree, tvbuff_t *tvb, int of offset+=4; /* signature data */ - proto_tree_add_item(tree, hf_krb_pac_signature_signature, tvb, offset, tvb_length_remaining(tvb, offset), FALSE); + proto_tree_add_item(tree, hf_krb_pac_signature_signature, tvb, offset, tvb_length_remaining(tvb, offset), ENC_NA); return offset; } @@ -2804,7 +2804,7 @@ dissect_krb5_PAC_CLIENT_INFO_TYPE(proto_tree *parent_tree, tvbuff_t *tvb, int of guint16 namelen; char *name; - item=proto_tree_add_item(parent_tree, hf_krb_PAC_CLIENT_INFO_TYPE, tvb, offset, tvb_length_remaining(tvb, offset), FALSE); + item=proto_tree_add_item(parent_tree, hf_krb_PAC_CLIENT_INFO_TYPE, tvb, offset, tvb_length_remaining(tvb, offset), ENC_NA); if(parent_tree){ tree=proto_item_add_subtree(item, ett_krb_PAC_CLIENT_INFO_TYPE); } @@ -3346,7 +3346,7 @@ dissect_krb5_rfc1964_checksum(asn1_ctx_t *actx _U_, proto_tree *tree, tvbuff_t * offset += 4; /* Bnd field */ - proto_tree_add_item(tree, hf_krb_gssapi_bnd, tvb, offset, len, TRUE); + proto_tree_add_item(tree, hf_krb_gssapi_bnd, tvb, offset, len, ENC_NA); offset += len; diff --git a/epan/dissectors/packet-kerberos4.c b/epan/dissectors/packet-kerberos4.c index 5819f2dae7..f8657bf15b 100644 --- a/epan/dissectors/packet-kerberos4.c +++ b/epan/dissectors/packet-kerberos4.c @@ -117,7 +117,7 @@ dissect_krb4_kdc_request(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, in guint8 lifetime; if(version==TRANSARC_SPECIAL_VERSION){ - proto_tree_add_item(tree, hf_krb4_unknown_transarc_blob, tvb, offset, 8, FALSE); + proto_tree_add_item(tree, hf_krb4_unknown_transarc_blob, tvb, offset, 8, ENC_NA); offset+=8; } @@ -191,7 +191,7 @@ dissect_krb4_kdc_reply(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset+=2; /* encrypted blob */ - proto_tree_add_item(tree, hf_krb4_encrypted_blob, tvb, offset, length, FALSE); + proto_tree_add_item(tree, hf_krb4_encrypted_blob, tvb, offset, length, ENC_NA); offset+=length; return offset; @@ -223,11 +223,11 @@ dissect_krb4_appl_request(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i offset++; /* ticket */ - proto_tree_add_item(tree, hf_krb4_ticket_blob, tvb, offset, tlen, FALSE); + proto_tree_add_item(tree, hf_krb4_ticket_blob, tvb, offset, tlen, ENC_NA); offset+=tlen; /* request */ - proto_tree_add_item(tree, hf_krb4_request_blob, tvb, offset, rlen, FALSE); + proto_tree_add_item(tree, hf_krb4_request_blob, tvb, offset, rlen, ENC_NA); offset+=rlen; /* request time */ diff --git a/epan/dissectors/packet-kink.c b/epan/dissectors/packet-kink.c index fa3223f680..56d9c95645 100644 --- a/epan/dissectors/packet-kink.c +++ b/epan/dissectors/packet-kink.c @@ -265,7 +265,7 @@ dissect_kink(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){ proto_tree_add_uint(kink_tree, hf_kink_reserved, tvb, offset, 2, value_reserved); offset += 2; - proto_tree_add_item(kink_tree, hf_kink_checkSum, tvb, offset, chsumlen, FALSE); + proto_tree_add_item(kink_tree, hf_kink_checkSum, tvb, offset, chsumlen, ENC_NA); /* This part consider the padding. Chsumlen don't contain the padding. */ if((chsumlen % PADDING) != 0){ diff --git a/epan/dissectors/packet-klm.c b/epan/dissectors/packet-klm.c index be748840be..0683b08de2 100644 --- a/epan/dissectors/packet-klm.c +++ b/epan/dissectors/packet-klm.c @@ -68,7 +68,7 @@ dissect_holder(tvbuff_t *tvb, proto_tree *tree, int offset) proto_tree* lock_tree = NULL; lock_item = proto_tree_add_item(tree, hf_klm_holder, tvb, - offset, -1, FALSE); + offset, -1, ENC_NA); lock_tree = proto_item_add_subtree(lock_item, ett_klm_holder); @@ -94,7 +94,7 @@ dissect_lock(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, int offset) proto_tree* lock_tree = NULL; lock_item = proto_tree_add_item(tree, hf_klm_lock, tvb, - offset, -1, FALSE); + offset, -1, ENC_NA); lock_tree = proto_item_add_subtree(lock_item, ett_klm_lock); diff --git a/epan/dissectors/packet-kpasswd.c b/epan/dissectors/packet-kpasswd.c index 34c5cb0c7e..4dd8956a72 100644 --- a/epan/dissectors/packet-kpasswd.c +++ b/epan/dissectors/packet-kpasswd.c @@ -75,7 +75,7 @@ dissect_kpasswd_ap_req_data(packet_info *pinfo _U_, tvbuff_t *tvb, proto_tree *p proto_tree *tree=NULL; if(parent_tree){ - it=proto_tree_add_item(parent_tree, hf_kpasswd_ap_req_data, tvb, 0, -1, FALSE); + it=proto_tree_add_item(parent_tree, hf_kpasswd_ap_req_data, tvb, 0, -1, ENC_NA); tree=proto_item_add_subtree(it, ett_ap_req_data); } dissect_kerberos_main(tvb, pinfo, tree, FALSE, NULL); @@ -174,7 +174,7 @@ dissect_kpasswd_krb_priv_message(packet_info *pinfo _U_, tvbuff_t *tvb, proto_tr gint offset; if(parent_tree){ - it=proto_tree_add_item(parent_tree, hf_kpasswd_krb_priv_message, tvb, 0, -1, FALSE); + it=proto_tree_add_item(parent_tree, hf_kpasswd_krb_priv_message, tvb, 0, -1, ENC_NA); tree=proto_item_add_subtree(it, ett_krb_priv_message); } if(isrequest){ diff --git a/epan/dissectors/packet-l2tp.c b/epan/dissectors/packet-l2tp.c index 7afb4bbd47..64f9426dd7 100644 --- a/epan/dissectors/packet-l2tp.c +++ b/epan/dissectors/packet-l2tp.c @@ -1384,14 +1384,14 @@ process_l2tpv3_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (!(tvb_offset_exists(tvb, idx))) return; if (l2tpv3_cookie != 0) - proto_tree_add_item(l2tp_tree, hf_l2tp_cookie, tvb, idx, l2tpv3_cookie, FALSE); + proto_tree_add_item(l2tp_tree, hf_l2tp_cookie, tvb, idx, l2tpv3_cookie, ENC_NA); } switch(l2tpv3_l2_specific){ case L2TPv3_L2_SPECIFIC_DEFAULT: if (tree) { ti = proto_tree_add_item(tree, hf_l2tp_l2_spec_def, - tvb, idx + l2tpv3_cookie, 4, FALSE); + tvb, idx + l2tpv3_cookie, 4, ENC_NA); l2_specific = proto_item_add_subtree(ti, ett_l2tp_l2_spec); proto_tree_add_item(l2_specific, hf_l2tp_l2_spec_s, tvb, idx + l2tpv3_cookie, @@ -1404,7 +1404,7 @@ process_l2tpv3_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, case L2TPv3_L2_SPECIFIC_DOCSIS_DMPT: if (tree) { ti = proto_tree_add_item(tree, hf_l2tp_l2_spec_docsis_dmpt, - tvb, idx + l2tpv3_cookie, 4, FALSE); + tvb, idx + l2tpv3_cookie, 4, ENC_NA); l2_specific = proto_item_add_subtree(ti, ett_l2tp_l2_spec); proto_tree_add_item(l2_specific, hf_l2tp_l2_spec_v, tvb, @@ -1424,7 +1424,7 @@ process_l2tpv3_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, case L2TPv3_L2_SPECIFIC_ATM: if (tree) { ti = proto_tree_add_item(tree, hf_l2tp_l2_spec_atm, - tvb, idx + l2tpv3_cookie, 4, FALSE); + tvb, idx + l2tpv3_cookie, 4, ENC_NA); l2_specific = proto_item_add_subtree(ti, ett_l2tp_l2_spec); proto_tree_add_item(l2_specific, hf_l2tp_l2_spec_s, tvb, idx + l2tpv3_cookie, diff --git a/epan/dissectors/packet-laplink.c b/epan/dissectors/packet-laplink.c index 2cc06cd6b6..32898b34f9 100644 --- a/epan/dissectors/packet-laplink.c +++ b/epan/dissectors/packet-laplink.c @@ -144,7 +144,7 @@ dissect_laplink_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(laplink_tree, hf_laplink_tcp_length, tvb, offset, 2, FALSE); offset += 2; - proto_tree_add_item(laplink_tree, hf_laplink_tcp_data, tvb, offset, length, FALSE); + proto_tree_add_item(laplink_tree, hf_laplink_tcp_data, tvb, offset, length, ENC_NA); /* Continue adding tree items to process the packet here */ diff --git a/epan/dissectors/packet-ldp.c b/epan/dissectors/packet-ldp.c index 392c3a3a93..d2a1a4bf26 100644 --- a/epan/dissectors/packet-ldp.c +++ b/epan/dissectors/packet-ldp.c @@ -1118,7 +1118,7 @@ dissect_tlv_fec(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) proto_tree_add_item(agi_tree, hf_ldp_tlv_fec_gen_agi_length,tvb, offset + 1, 1, FALSE); if ( gen_fec_id_len > 0) { - proto_tree_add_item(agi_tree, hf_ldp_tlv_fec_gen_agi_value, tvb, offset+2, gen_fec_id_len , FALSE ); + proto_tree_add_item(agi_tree, hf_ldp_tlv_fec_gen_agi_value, tvb, offset+2, gen_fec_id_len , ENC_NA ); } rem -= 2 + gen_fec_id_len; vc_len -= 2 + gen_fec_id_len; @@ -1172,7 +1172,7 @@ dissect_tlv_fec(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) tvb, offset+2, gen_fec_id_len , - FALSE ); + ENC_NA ); } } } @@ -1223,7 +1223,7 @@ dissect_tlv_fec(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) } else { - proto_tree_add_item(taii_tree, hf_ldp_tlv_fec_gen_taii_value, tvb, offset+2, gen_fec_id_len , FALSE); + proto_tree_add_item(taii_tree, hf_ldp_tlv_fec_gen_taii_value, tvb, offset+2, gen_fec_id_len , ENC_NA); } } } @@ -1509,7 +1509,7 @@ dissect_tlv_common_hello_parms(tvbuff_t *tvb, guint offset, proto_tree *tree) proto_tree *val_tree; #if 0 - ti = proto_tree_add_item(tree, hf_ldp_tlv_value, tvb, offset, rem, FALSE); + ti = proto_tree_add_item(tree, hf_ldp_tlv_value, tvb, offset, rem, ENC_NA); val_tree = proto_item_add_subtree(ti, ett_ldp_tlv_val); #else val_tree=tree; @@ -2469,7 +2469,7 @@ dissect_tlv(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) break; } default: - proto_tree_add_item(tlv_tree, hf_ldp_tlv_value, tvb, offset + 4, length, FALSE); + proto_tree_add_item(tlv_tree, hf_ldp_tlv_value, tvb, offset + 4, length, ENC_NA); break; } } diff --git a/epan/dissectors/packet-ldss.c b/epan/dissectors/packet-ldss.c index 7cf097e550..cde1db52bf 100644 --- a/epan/dissectors/packet-ldss.c +++ b/epan/dissectors/packet-ldss.c @@ -356,7 +356,7 @@ dissect_ldss_broadcast(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ? " - shutdown (promises from this peer are no longer valid)" : ""); proto_tree_add_item(ldss_tree, hf_ldss_digest, - tvb, 8, DIGEST_LEN, FALSE); + tvb, 8, DIGEST_LEN, ENC_NA); proto_tree_add_item(ldss_tree, hf_ldss_size, tvb, 40, 8, FALSE); proto_tree_add_item(ldss_tree, hf_ldss_offset, @@ -392,7 +392,7 @@ dissect_ldss_broadcast(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb, 70, 2, FALSE); if (tvb_length(tvb) > 72) { proto_tree_add_item(ldss_tree, hf_ldss_properties, - tvb, 72, tvb_length(tvb) - 72, FALSE); + tvb, 72, tvb_length(tvb) - 72, ENC_NA); } } diff --git a/epan/dissectors/packet-lisp.c b/epan/dissectors/packet-lisp.c index 9ece880257..aeba4eaa50 100644 --- a/epan/dissectors/packet-lisp.c +++ b/epan/dissectors/packet-lisp.c @@ -677,7 +677,7 @@ dissect_lisp_map_register(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tr /* Authentication Data */ /* XXX: need to check is there is still enough data in buffer */ - proto_tree_add_item(lisp_tree, hf_lisp_mreg_auth, tvb, offset, authlen, FALSE); + proto_tree_add_item(lisp_tree, hf_lisp_mreg_auth, tvb, offset, authlen, ENC_NA); offset += authlen; for(i=0; i < rec_cnt; i++) { @@ -760,7 +760,7 @@ dissect_lisp_map_notify(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tree /* Authentication Data */ /* XXX: need to check is there is still enough data in buffer */ - proto_tree_add_item(lisp_tree, hf_lisp_mnot_auth, tvb, offset, authlen, FALSE); + proto_tree_add_item(lisp_tree, hf_lisp_mnot_auth, tvb, offset, authlen, ENC_NA); offset += authlen; for(i=0; i < rec_cnt; i++) { diff --git a/epan/dissectors/packet-lldp.c b/epan/dissectors/packet-lldp.c index 8932433f8f..04302393b4 100644 --- a/epan/dissectors/packet-lldp.c +++ b/epan/dissectors/packet-lldp.c @@ -761,7 +761,7 @@ dissect_lldp_chassis_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gui break; case 1: /* Chassis component */ case 3: /* Port component */ - proto_tree_add_item(chassis_tree, hf_chassis_id, tvb, (offset+3), (tempLen-1), FALSE); + proto_tree_add_item(chassis_tree, hf_chassis_id, tvb, (offset+3), (tempLen-1), ENC_NA); break; } } @@ -1212,7 +1212,7 @@ dissect_lldp_management_address(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre proto_tree_add_item(system_mgm_addr, hf_mgn_addr_ipv6, tvb, tempOffset, 16, FALSE); break; default: - proto_tree_add_item(system_mgm_addr, hf_mgn_addr_hex, tvb, tempOffset, (stringLen-1), FALSE); + proto_tree_add_item(system_mgm_addr, hf_mgn_addr_hex, tvb, tempOffset, (stringLen-1), ENC_NA); break; } @@ -1241,7 +1241,7 @@ dissect_lldp_management_address(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre tempOffset++; /* Get OID identifier */ - proto_tree_add_item(system_mgm_addr, hf_mgn_obj_id, tvb, tempOffset, stringLen, FALSE); + proto_tree_add_item(system_mgm_addr, hf_mgn_obj_id, tvb, tempOffset, stringLen, ENC_NA); } } @@ -2538,7 +2538,7 @@ dissect_profinet_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gu break; } default: - proto_tree_add_item(tree, hf_unknown_subtype, tvb, offset, tlvLen2-1, FALSE); + proto_tree_add_item(tree, hf_unknown_subtype, tvb, offset, tlvLen2-1, ENC_NA); } } @@ -2590,7 +2590,7 @@ dissect_cisco_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint } break; default: - proto_tree_add_item(tree, hf_unknown_subtype, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_unknown_subtype, tvb, offset, 1, ENC_NA); break; } } @@ -2690,7 +2690,7 @@ dissect_organizational_specific_tlv(tvbuff_t *tvb, packet_info *pinfo, proto_tre dissect_ieee_802_1qbg_tlv(tvb, pinfo, org_tlv_tree, (offset+5)); break; default: - proto_tree_add_item(org_tlv_tree, hf_unknown_subtype, tvb, (offset+5), (guint16) (tempLen-3), FALSE); + proto_tree_add_item(org_tlv_tree, hf_unknown_subtype, tvb, (offset+5), (guint16) (tempLen-3), ENC_NA); } return (tempLen + 2); diff --git a/epan/dissectors/packet-ltp.c b/epan/dissectors/packet-ltp.c index 1fa0449a8e..744c673d7f 100644 --- a/epan/dissectors/packet-ltp.c +++ b/epan/dissectors/packet-ltp.c @@ -680,7 +680,7 @@ dissect_ltp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) frame_offset++; /* Adding the session id subtree */ - ltp_session_item = proto_tree_add_item(ltp_header_item,hf_ltp_session_id,tvb,frame_offset, engine_id_size + session_num_size,FALSE); + ltp_session_item = proto_tree_add_item(ltp_header_item,hf_ltp_session_id,tvb,frame_offset, engine_id_size + session_num_size,ENC_NA); ltp_session_tree = proto_item_add_subtree(ltp_session_item,ett_hdr_session); proto_tree_add_uint64(ltp_session_tree,hf_ltp_session_orig,tvb,frame_offset,engine_id_size,engine_id); frame_offset+=engine_id_size; diff --git a/epan/dissectors/packet-m2pa.c b/epan/dissectors/packet-m2pa.c index fa2b13c294..0e52436b7f 100644 --- a/epan/dissectors/packet-m2pa.c +++ b/epan/dissectors/packet-m2pa.c @@ -348,7 +348,7 @@ dissect_v8_link_status_message(tvbuff_t *message_data_tvb, packet_info *pinfo, p proto_tree_add_item(m2pa_tree, hf_v8_status, message_data_tvb, STATUS_OFFSET, STATUS_LENGTH, ENC_BIG_ENDIAN); if (filler_length > 0) - proto_tree_add_item(m2pa_tree, hf_filler, message_data_tvb, FILLER_OFFSET, filler_length, ENC_BIG_ENDIAN); + proto_tree_add_item(m2pa_tree, hf_filler, message_data_tvb, FILLER_OFFSET, filler_length, ENC_NA); } static const value_string link_status_values[] = { @@ -375,7 +375,7 @@ dissect_link_status_message(tvbuff_t *message_data_tvb, packet_info *pinfo, prot proto_tree_add_item(m2pa_tree, hf_status, message_data_tvb, STATUS_OFFSET, STATUS_LENGTH, ENC_BIG_ENDIAN); if (filler_length > 0) - proto_tree_add_item(m2pa_tree, hf_filler, message_data_tvb, FILLER_OFFSET, filler_length, ENC_BIG_ENDIAN); + proto_tree_add_item(m2pa_tree, hf_filler, message_data_tvb, FILLER_OFFSET, filler_length, ENC_NA); } static void @@ -385,7 +385,7 @@ dissect_unknown_message(tvbuff_t *message_data_tvb, proto_tree *m2pa_tree) length = tvb_length(message_data_tvb); if ((m2pa_tree) && (length > 0)) - proto_tree_add_item(m2pa_tree, hf_unknown_data, message_data_tvb, 0, length, ENC_BIG_ENDIAN); + proto_tree_add_item(m2pa_tree, hf_unknown_data, message_data_tvb, 0, length, ENC_NA); } #define V2_MESSAGE_DATA_OFFSET (HEADER_OFFSET + V2_HEADER_LENGTH) @@ -484,7 +484,7 @@ dissect_message_data(tvbuff_t *message_tvb, packet_info *pinfo, proto_item *m2pa { proto_item *pi; - pi = proto_tree_add_item(m2pa_tree, hf_undecode_data, message_tvb, length, (actual_length - length), ENC_BIG_ENDIAN); + pi = proto_tree_add_item(m2pa_tree, hf_undecode_data, message_tvb, length, (actual_length - length), ENC_NA); expert_add_info_format(pinfo, pi, PI_MALFORMED, PI_WARN, "There are %d bytes of data which is greater than M2PA's length parameter (%d)", actual_length, length); diff --git a/epan/dissectors/packet-m2tp.c b/epan/dissectors/packet-m2tp.c index b0d71479ad..b09432f1ed 100644 --- a/epan/dissectors/packet-m2tp.c +++ b/epan/dissectors/packet-m2tp.c @@ -351,7 +351,7 @@ dissect_m2tp_diagnostic_information_parameter(tvbuff_t *parameter_tvb, proto_tre if (parameter_tree) { length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); diagnostic_info_length = length - PARAMETER_HEADER_LENGTH; - proto_tree_add_item(parameter_tree, hf_m2tp_diagnostic_info, parameter_tvb, PARAMETER_VALUE_OFFSET, diagnostic_info_length, ENC_BIG_ENDIAN); + proto_tree_add_item(parameter_tree, hf_m2tp_diagnostic_info, parameter_tvb, PARAMETER_VALUE_OFFSET, diagnostic_info_length, ENC_NA); proto_item_set_text(parameter_item, "Diagnostic information (%u byte%s)", diagnostic_info_length, plurality(diagnostic_info_length, "", "s")); } } @@ -365,7 +365,7 @@ dissect_m2tp_heartbeat_data_parameter(tvbuff_t *parameter_tvb, proto_tree *param if (parameter_tree) { length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); heartbeat_data_length = length - PARAMETER_HEADER_LENGTH; - proto_tree_add_item(parameter_tree, hf_m2tp_heartbeat_data, parameter_tvb, PARAMETER_VALUE_OFFSET, heartbeat_data_length, ENC_BIG_ENDIAN); + proto_tree_add_item(parameter_tree, hf_m2tp_heartbeat_data, parameter_tvb, PARAMETER_VALUE_OFFSET, heartbeat_data_length, ENC_NA); proto_item_set_text(parameter_item, "Heartbeat data (%u byte%s)", heartbeat_data_length, plurality(heartbeat_data_length, "", "s")); } } @@ -429,7 +429,7 @@ dissect_m2tp_unknown_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tr length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); parameter_value_length = length - PARAMETER_HEADER_LENGTH; - proto_tree_add_item(parameter_tree, hf_m2tp_parameter_value, parameter_tvb, PARAMETER_VALUE_OFFSET, parameter_value_length, ENC_BIG_ENDIAN); + proto_tree_add_item(parameter_tree, hf_m2tp_parameter_value, parameter_tvb, PARAMETER_VALUE_OFFSET, parameter_value_length, ENC_NA); proto_item_set_text(parameter_item, "Parameter with tag %u and %u byte%s value", tag, parameter_value_length, plurality(parameter_value_length, "", "s")); } @@ -495,7 +495,7 @@ dissect_m2tp_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree * }; if ((parameter_tree) && (padding_length > 0)) - proto_tree_add_item(parameter_tree, hf_m2tp_parameter_padding, parameter_tvb, PARAMETER_HEADER_OFFSET + length, padding_length, ENC_BIG_ENDIAN); + proto_tree_add_item(parameter_tree, hf_m2tp_parameter_padding, parameter_tvb, PARAMETER_HEADER_OFFSET + length, padding_length, ENC_NA); } /* M2TP Message */ diff --git a/epan/dissectors/packet-m2ua.c b/epan/dissectors/packet-m2ua.c index 17cedd829f..adde5b394e 100644 --- a/epan/dissectors/packet-m2ua.c +++ b/epan/dissectors/packet-m2ua.c @@ -312,7 +312,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_diagnostic_information, parameter_tvb, DIAGNOSTIC_INFO_OFFSET, diag_info_length, ENC_BIG_ENDIAN); + proto_tree_add_item(parameter_tree, hf_diagnostic_information, parameter_tvb, DIAGNOSTIC_INFO_OFFSET, diag_info_length, ENC_NA); proto_item_append_text(parameter_item, " (%u byte%s)", diag_info_length, plurality(diag_info_length, "", "s")); } @@ -348,7 +348,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")); } @@ -798,7 +798,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")); } @@ -1010,7 +1010,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); } diff --git a/epan/dissectors/packet-m3ua.c b/epan/dissectors/packet-m3ua.c index 75e479ce28..366d18250f 100644 --- a/epan/dissectors/packet-m3ua.c +++ b/epan/dissectors/packet-m3ua.c @@ -466,7 +466,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_diagnostic_information, parameter_tvb, DIAGNOSTIC_INFO_OFFSET, diag_info_length, ENC_BIG_ENDIAN); + proto_tree_add_item(parameter_tree, hf_diagnostic_information, parameter_tvb, DIAGNOSTIC_INFO_OFFSET, diag_info_length, ENC_NA); proto_item_append_text(parameter_item, " (%u byte%s)", diag_info_length, plurality(diag_info_length, "", "s")); } @@ -478,7 +478,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")); } @@ -803,7 +803,7 @@ static const value_string congestion_level_values[] = { static void dissect_congestion_indication_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { - proto_tree_add_item(parameter_tree, hf_congestion_reserved, parameter_tvb, CONG_IND_RESERVED_OFFSET, CONG_IND_RESERVED_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(parameter_tree, hf_congestion_reserved, parameter_tvb, CONG_IND_RESERVED_OFFSET, CONG_IND_RESERVED_LENGTH, ENC_NA); proto_tree_add_item(parameter_tree, hf_congestion_level, parameter_tvb, CONG_IND_LEVEL_OFFSET, CONG_IND_LEVEL_LENGTH, ENC_BIG_ENDIAN); proto_item_append_text(parameter_item, " (%s)", val_to_str(tvb_get_guint8(parameter_tvb, CONG_IND_LEVEL_OFFSET), congestion_level_values, "unknown")); } @@ -864,7 +864,7 @@ dissect_concerned_destination_parameter(tvbuff_t *parameter_tvb, proto_tree *par { proto_item *item; - proto_tree_add_item(parameter_tree, hf_concerned_dest_reserved, parameter_tvb, CON_DEST_RESERVED_OFFSET, CON_DEST_RESERVED_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(parameter_tree, hf_concerned_dest_reserved, parameter_tvb, CON_DEST_RESERVED_OFFSET, CON_DEST_RESERVED_LENGTH, ENC_NA); item = proto_tree_add_item(parameter_tree, hf_concerned_dest_pc, parameter_tvb, CON_DEST_PC_OFFSET, CON_DEST_PC_LENGTH, ENC_BIG_ENDIAN); if (mtp3_pc_structured()) proto_item_append_text(item, " (%s)", mtp3_pc_to_str(tvb_get_ntoh24(parameter_tvb, CON_DEST_PC_OFFSET))); @@ -1277,7 +1277,7 @@ dissect_unknown_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, p tag = tvb_get_ntohs(parameter_tvb, PARAMETER_TAG_OFFSET); parameter_value_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH; - 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, " (tag %u and %u byte%s value)", tag, parameter_value_length, plurality(parameter_value_length, "", "s")); } @@ -1379,7 +1379,7 @@ dissect_v5_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *tr break; }; 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); } #define V6_NETWORK_APPEARANCE_PARAMETER_TAG 1 @@ -1546,7 +1546,7 @@ dissect_v6_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *tr }; 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); } #define V7_NETWORK_APPEARANCE_PARAMETER_TAG 0x80 @@ -1713,7 +1713,7 @@ dissect_v7_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *tr }; 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); } #define INFO_STRING_PARAMETER_TAG 0x0004 @@ -1877,7 +1877,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 diff --git a/epan/dissectors/packet-mac-lte.c b/epan/dissectors/packet-mac-lte.c index 4df18c695e..ab31e34be4 100644 --- a/epan/dissectors/packet-mac-lte.c +++ b/epan/dissectors/packet-mac-lte.c @@ -1314,7 +1314,7 @@ static void dissect_rar(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, pro p_mac_lte_info->rnti, p_mac_lte_info->subframeNumber); /* Create hidden 'virtual root' so can filter on mac-lte.rar */ - ti = proto_tree_add_item(tree, hf_mac_lte_rar, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, hf_mac_lte_rar, tvb, offset, -1, ENC_NA); PROTO_ITEM_SET_HIDDEN(ti); /* Create headers tree */ @@ -1428,7 +1428,7 @@ static void dissect_rar(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, pro /* Padding may follow */ if (tvb_length_remaining(tvb, offset) > 0) { proto_tree_add_item(tree, hf_mac_lte_padding_data, - tvb, offset, -1, FALSE); + tvb, offset, -1, ENC_NA); } padding_length_ti = proto_tree_add_int(tree, hf_mac_lte_padding_length, tvb, offset, 0, @@ -1464,7 +1464,7 @@ static void dissect_bch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* Raw data */ ti = proto_tree_add_item(tree, hf_mac_lte_bch_pdu, - tvb, offset, -1, FALSE); + tvb, offset, -1, ENC_NA); if (global_mac_lte_attempt_rrc_decode) { /* Attempt to decode payload using LTE RRC dissector */ @@ -1508,7 +1508,7 @@ static void dissect_pch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* Always show as raw data */ ti = proto_tree_add_item(tree, hf_mac_lte_pch_pdu, - tvb, offset, -1, FALSE); + tvb, offset, -1, ENC_NA); if (global_mac_lte_attempt_rrc_decode) { @@ -2666,7 +2666,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree proto_tree_add_item(cr_tree, hf_mac_lte_control_ue_contention_resolution_identity, - tvb, offset, 6, FALSE); + tvb, offset, 6, ENC_NA); /* Get pointer to result struct for this frame */ crResult = g_hash_table_lookup(mac_lte_cr_result_hash, GUINT_TO_POINTER(pinfo->fd->num)); @@ -3137,7 +3137,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree if (lcids[number_of_headers-1] == PADDING_LCID) { if (tvb_length_remaining(tvb, offset) > 0) { proto_tree_add_item(tree, hf_mac_lte_padding_data, - tvb, offset, -1, FALSE); + tvb, offset, -1, ENC_NA); } padding_length_ti = proto_tree_add_int(tree, hf_mac_lte_padding_length, tvb, offset, 0, @@ -3279,7 +3279,7 @@ void dissect_mac_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* SR event is subtree */ sr_ti = proto_tree_add_item(mac_lte_tree, hf_mac_lte_oob_send_sr, - tvb, 0, 0, FALSE); + tvb, 0, 0, ENC_NA); sr_tree = proto_item_add_subtree(sr_ti, ett_mac_lte_oob); PROTO_ITEM_SET_GENERATED(sr_ti); @@ -3332,7 +3332,7 @@ void dissect_mac_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) PROTO_ITEM_SET_GENERATED(ti); ti = proto_tree_add_item(mac_lte_tree, hf_mac_lte_oob_sr_failure, - tvb, 0, 0, FALSE); + tvb, 0, 0, ENC_NA); PROTO_ITEM_SET_GENERATED(ti); /* Info column */ @@ -3507,7 +3507,7 @@ void dissect_mac_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* If we know its predefined data, don't try to decode any further */ if (p_mac_lte_info->isPredefinedData) { - proto_tree_add_item(mac_lte_tree, hf_mac_lte_predefined_pdu, tvb, offset, -1, FALSE); + proto_tree_add_item(mac_lte_tree, hf_mac_lte_predefined_pdu, tvb, offset, -1, ENC_NA); write_pdu_label_and_info(pdu_ti, NULL, pinfo, "Predefined data (%u bytes%s)", p_mac_lte_info->length, @@ -3528,7 +3528,7 @@ void dissect_mac_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) (p_mac_lte_info->crcStatusValid && (p_mac_lte_info->detailed_phy_info.dl_info.crc_status != crc_success))) { - proto_tree_add_item(mac_lte_tree, hf_mac_lte_raw_pdu, tvb, offset, -1, FALSE); + proto_tree_add_item(mac_lte_tree, hf_mac_lte_raw_pdu, tvb, offset, -1, ENC_NA); write_pdu_label_and_info(pdu_ti, NULL, pinfo, "Raw data (%u bytes)", tvb_length_remaining(tvb, offset)); /* Queue tap info. diff --git a/epan/dissectors/packet-meta.c b/epan/dissectors/packet-meta.c index 02d8884b7d..ba3e86dc40 100644 --- a/epan/dissectors/packet-meta.c +++ b/epan/dissectors/packet-meta.c @@ -168,7 +168,7 @@ static guint16 skip_item(proto_tree *meta_tree, tvbuff_t *tvb, packet_info *pinf total_len = aligned_len + 4; /* 4: id, type, len fields */ subti = proto_tree_add_item(meta_tree, hf_meta_item, tvb, offs - 4, - aligned_len + 4, FALSE); + aligned_len + 4, ENC_NA); item_tree = proto_item_add_subtree(subti, ett_meta_item); proto_tree_add_uint(item_tree, hf_meta_item_id, tvb, offs - 4, 2, id); proto_tree_add_uint(item_tree, hf_meta_item_type, tvb, offs - 2, 1, type); @@ -220,7 +220,7 @@ static guint16 evaluate_meta_item_pcap(proto_tree *meta_tree, tvbuff_t *tvb, pac break; default: subti = proto_tree_add_item(meta_tree, hf_meta_item, tvb, offs - 4, - aligned_len + 4, FALSE); + aligned_len + 4, ENC_NA); item_tree = proto_item_add_subtree(subti, ett_meta_item); proto_tree_add_uint(item_tree, hf_meta_item_id, tvb, offs - 4, 2, id); proto_tree_add_uint(item_tree, hf_meta_item_type, tvb, offs - 2, 1, type); @@ -370,7 +370,7 @@ static guint16 evaluate_meta_item_dxt(proto_tree *meta_tree, tvbuff_t *tvb, pack break; default: subti = proto_tree_add_item(meta_tree, hf_meta_item, tvb, offs - 4, - aligned_len + 4, FALSE); + aligned_len + 4, ENC_NA); item_tree = proto_item_add_subtree(subti, ett_meta_item); proto_tree_add_uint(item_tree, hf_meta_item_id, tvb, offs - 4, 2, id); proto_tree_add_uint(item_tree, hf_meta_item_type, tvb, offs - 2, 1, type); diff --git a/epan/dissectors/packet-mgcp.c b/epan/dissectors/packet-mgcp.c index e5fcea6689..13d04526d9 100644 --- a/epan/dissectors/packet-mgcp.c +++ b/epan/dissectors/packet-mgcp.c @@ -1781,7 +1781,7 @@ static void dissect_mgcp_params(tvbuff_t *tvb, proto_tree *tree) if (tree) { mgcp_param_ti = proto_tree_add_item(tree, hf_mgcp_params, tvb, - tvb_linebegin, tvb_len, FALSE); + tvb_linebegin, tvb_len, ENC_NA); proto_item_set_text(mgcp_param_ti, "Parameters"); mgcp_param_tree = proto_item_add_subtree(mgcp_param_ti, ett_mgcp_param); diff --git a/epan/dissectors/packet-mip.c b/epan/dissectors/packet-mip.c index 93a4b144a1..6999310cfc 100644 --- a/epan/dissectors/packet-mip.c +++ b/epan/dissectors/packet-mip.c @@ -476,7 +476,7 @@ dissect_mip_extensions( tvbuff_t *tvb, int offset, proto_tree *tree) /* All these extensions look the same. 4 byte SPI followed by a key */ proto_tree_add_item(ext_tree, hf_mip_aext_spi, tvb, offset, 4, FALSE); proto_tree_add_item(ext_tree, hf_mip_aext_auth, tvb, offset+4, ext_len-4, - FALSE); + ENC_NA); break; case MN_NAI_EXT: proto_tree_add_item(ext_tree, hf_mip_next_nai, tvb, offset, @@ -496,7 +496,7 @@ dissect_mip_extensions( tvbuff_t *tvb, int offset, proto_tree *tree) proto_tree_add_item(ext_tree, hf_mip_aext_spi, tvb, offset, 4, FALSE); /* Key */ proto_tree_add_item(ext_tree, hf_mip_aext_auth, tvb, offset + 4, - ext_len - 4, FALSE); + ext_len - 4, ENC_NA); break; case REV_SUPP_EXT: /* RFC 3543 */ @@ -587,16 +587,16 @@ dissect_mip_extensions( tvbuff_t *tvb, int offset, proto_tree *tree) proto_tree_add_item(pmipv4_tree, hf_mip_pmipv4skipext_stype, tvb, offset, 1, ext_subtype); if (ext_subtype == PMIPv4_SKIPEXT_STYPE_INTERFACE_ID) { - proto_tree_add_item(pmipv4_tree, hf_mip_pmipv4skipext_interfaceid, tvb, offset + 1, ext_len-1, FALSE); + proto_tree_add_item(pmipv4_tree, hf_mip_pmipv4skipext_interfaceid, tvb, offset + 1, ext_len-1, ENC_NA); } else if (ext_subtype == PMIPv4_SKIPEXT_STYPE_DEVICE_ID) { pmipv4skipext_type = tvb_get_guint8(tvb, offset + 1); proto_tree_add_item(pmipv4_tree, hf_mip_pmipv4skipext_deviceid_type, tvb, offset + 1, 1, pmipv4skipext_type); - proto_tree_add_item(pmipv4_tree, hf_mip_pmipv4skipext_deviceid_id, tvb, offset + 2, ext_len - 2, FALSE); + proto_tree_add_item(pmipv4_tree, hf_mip_pmipv4skipext_deviceid_id, tvb, offset + 2, ext_len - 2, ENC_NA); } else if (ext_subtype == PMIPv4_SKIPEXT_STYPE_SUBSCRIBER_ID) { pmipv4skipext_type = tvb_get_guint8(tvb, offset + 1); proto_tree_add_item(pmipv4_tree, hf_mip_pmipv4skipext_subscriberid_type, tvb, offset + 1, 1, pmipv4skipext_type); if (pmipv4skipext_type == 1) { - proto_tree_add_item(pmipv4_tree, hf_mip_pmipv4skipext_subscriberid_id, tvb, offset + 2, ext_len - 2, FALSE); + proto_tree_add_item(pmipv4_tree, hf_mip_pmipv4skipext_subscriberid_id, tvb, offset + 2, ext_len - 2, ENC_NA); } } else if (ext_subtype == PMIPv4_SKIPEXT_STYPE_ACCESS_TECHNOLOGY) { pmipv4skipext_type = tvb_get_guint8(tvb, offset + 1); @@ -632,7 +632,7 @@ dissect_mip_extensions( tvbuff_t *tvb, int offset, proto_tree *tree) cvse_local_offset+=2; /* Vendor-CVSE-Value */ /* Vendor CVSE Type+Vendor/Org ID = 6 bytes*/ - proto_tree_add_item(ext_tree, hf_mip_cvse_vendor_cvse_value, tvb, cvse_local_offset, ext_len - 6, FALSE); + proto_tree_add_item(ext_tree, hf_mip_cvse_vendor_cvse_value, tvb, cvse_local_offset, ext_len - 6, ENC_NA); break; case OLD_CVSE_EXT: /* RFC 3115 */ @@ -641,7 +641,7 @@ dissect_mip_extensions( tvbuff_t *tvb, int offset, proto_tree *tree) case MF_CHALLENGE_EXT: /* RFC 3012 */ /* The default dissector is good here. The challenge is all hex anyway. */ default: - proto_tree_add_item(ext_tree, hf_mip_ext, tvb, offset, ext_len, FALSE); + proto_tree_add_item(ext_tree, hf_mip_ext, tvb, offset, ext_len, ENC_NA); break; } /* ext type */ diff --git a/epan/dissectors/packet-mip6.c b/epan/dissectors/packet-mip6.c index 655dc2df03..3c2f55ccd3 100644 --- a/epan/dissectors/packet-mip6.c +++ b/epan/dissectors/packet-mip6.c @@ -1384,7 +1384,7 @@ dissect_mip6_opt_bad(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, int offset, proto_tree_add_item(field_tree, hf_mip6_bad_auth, tvb, offset + MIP6_BAD_AUTH_OFF, - optlen - MIP6_BAD_AUTH_OFF, FALSE); + optlen - MIP6_BAD_AUTH_OFF, ENC_NA); } /* 7 Mobility Header Link-Layer Address option [RFC5568] */ diff --git a/epan/dissectors/packet-mndp.c b/epan/dissectors/packet-mndp.c index 2dbbd85249..eb8e795bec 100644 --- a/epan/dissectors/packet-mndp.c +++ b/epan/dissectors/packet-mndp.c @@ -200,7 +200,7 @@ dissect_tlv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *mndp_tree, tvb, offset, tlv_length, encoding_info); } else { proto_tree_add_item(tlv_tree, hf_mndp_tlv_data, - tvb, offset, tlv_length, ENC_BIG_ENDIAN); + tvb, offset, tlv_length, ENC_NA); } if ( type_index != -1 && value_array[type_index].specialfunction ) { guint32 newoffset; @@ -236,7 +236,7 @@ dissect_mndp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) mndp_tree = proto_item_add_subtree(ti, ett_mndp); proto_tree_add_item(mndp_tree, hf_mndp_header_unknown, tvb, offset, 2, - ENC_BIG_ENDIAN); + ENC_NA); offset += 2; proto_tree_add_item(mndp_tree, hf_mndp_header_seqno, tvb, offset, 2, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-mount.c b/epan/dissectors/packet-mount.c index a6774427f2..7a1ebe3260 100644 --- a/epan/dissectors/packet-mount.c +++ b/epan/dissectors/packet-mount.c @@ -224,7 +224,7 @@ dissect_mountlist(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree if (tree) { lock_item = proto_tree_add_item(tree, hf_mount_mountlist, tvb, - offset, -1, FALSE); + offset, -1, ENC_NA); if (lock_item) lock_tree = proto_item_add_subtree(lock_item, ett_mount_mountlist); } @@ -302,7 +302,7 @@ dissect_exportlist(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr group_names_len=0; if (tree) { exportlist_item = proto_tree_add_item(tree, hf_mount_exportlist, tvb, - offset, -1, FALSE); + offset, -1, ENC_NA); if (exportlist_item) exportlist_tree = proto_item_add_subtree(exportlist_item, ett_mount_exportlist); } @@ -313,7 +313,7 @@ dissect_exportlist(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr if (tree) { groups_item = proto_tree_add_item(exportlist_tree, hf_mount_groups, tvb, - offset, -1, FALSE); + offset, -1, ENC_NA); if (groups_item) groups_tree = proto_item_add_subtree(groups_item, ett_mount_groups); } @@ -589,7 +589,7 @@ dissect_sgi_exportlist(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_ if (tree) { exportlist_item = proto_tree_add_item(tree, hf_mount_exportlist, - tvb, offset, -1, FALSE); + tvb, offset, -1, ENC_NA); if (exportlist_item) exportlist_tree = proto_item_add_subtree(exportlist_item, ett_mount_exportlist); diff --git a/epan/dissectors/packet-mp2t.c b/epan/dissectors/packet-mp2t.c index dc9c926a08..7b0bbc840f 100644 --- a/epan/dissectors/packet-mp2t.c +++ b/epan/dissectors/packet-mp2t.c @@ -835,7 +835,7 @@ dissect_tsp(tvbuff_t *tvb, volatile gint offset, packet_info *pinfo, * value is '11', the value of the adaptation_field_length shall be in the range 0 to 182. */ if (af_length > 0 ) { - hi = proto_tree_add_item( mp2t_tree, hf_mp2t_af, tvb, offset, af_length, FALSE); + hi = proto_tree_add_item( mp2t_tree, hf_mp2t_af, tvb, offset, af_length, ENC_NA); mp2t_af_tree = proto_item_add_subtree( hi, ett_mp2t_af ); af_flags = tvb_get_guint8(tvb, offset); @@ -935,7 +935,7 @@ dissect_tsp(tvbuff_t *tvb, volatile gint offset, packet_info *pinfo, proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_tpd_length, tvb, offset, 1, FALSE); offset += 1; - proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_tpd, tvb, offset, tpd_len, FALSE); + proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_tpd, tvb, offset, tpd_len, ENC_NA); offset += tpd_len; } @@ -983,14 +983,14 @@ dissect_tsp(tvbuff_t *tvb, volatile gint offset, packet_info *pinfo, reserved_len = (e_len + 1) - (offset - e_start_offset); if (reserved_len > 0) { - proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_e_reserved_bytes, tvb, offset, reserved_len, FALSE); + proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_e_reserved_bytes, tvb, offset, reserved_len, ENC_NA); offset += reserved_len; } } stuffing_len = (af_length + 1) - (offset - af_start_offset); if (stuffing_len > 0) { - proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_stuffing_bytes, tvb, offset, stuffing_len, FALSE); + proto_tree_add_item( mp2t_af_tree, hf_mp2t_af_stuffing_bytes, tvb, offset, stuffing_len, ENC_NA); offset += stuffing_len; } } @@ -1000,7 +1000,7 @@ dissect_tsp(tvbuff_t *tvb, volatile gint offset, packet_info *pinfo, if (payload_len > 0) { if (afc == 2) { /* AF only */ /* Packet is malformed */ - proto_tree_add_item( mp2t_tree, hf_mp2t_malformed_payload, tvb, offset, payload_len, FALSE); + proto_tree_add_item( mp2t_tree, hf_mp2t_malformed_payload, tvb, offset, payload_len, ENC_NA); offset += payload_len; } else { /* Check to make sure if we are not at end of payload, if we have less than 3 bytes, the tvb_get_ntoh24 fails. */ @@ -1033,10 +1033,10 @@ dissect_tsp(tvbuff_t *tvb, volatile gint offset, packet_info *pinfo, ENDTRY; } else { - proto_tree_add_item( mp2t_tree, hf_mp2t_payload, tvb, offset, payload_len, FALSE); + proto_tree_add_item( mp2t_tree, hf_mp2t_payload, tvb, offset, payload_len, ENC_NA); } } else { - proto_tree_add_item( mp2t_tree, hf_mp2t_payload, tvb, offset, payload_len, FALSE); + proto_tree_add_item( mp2t_tree, hf_mp2t_payload, tvb, offset, payload_len, ENC_NA); } offset += payload_len; } diff --git a/epan/dissectors/packet-mp4ves.c b/epan/dissectors/packet-mp4ves.c index bc8602c230..f8c19ebc46 100644 --- a/epan/dissectors/packet-mp4ves.c +++ b/epan/dissectors/packet-mp4ves.c @@ -673,7 +673,7 @@ dissect_mp4ves_config(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *item; proto_tree *mp4ves_tree; - item = proto_tree_add_item(tree, hf_mp4ves_config, tvb, 0, -1, FALSE); + item = proto_tree_add_item(tree, hf_mp4ves_config, tvb, 0, -1, ENC_NA); mp4ves_tree = proto_item_add_subtree(item, ett_mp4ves_config); dissect_mp4ves_VisualObjectSequence(tvb, pinfo, mp4ves_tree, 0); diff --git a/epan/dissectors/packet-mpeg1.c b/epan/dissectors/packet-mpeg1.c index feba11d52c..fa56a36181 100644 --- a/epan/dissectors/packet-mpeg1.c +++ b/epan/dissectors/packet-mpeg1.c @@ -175,7 +175,7 @@ dissect_mpeg1( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) offset += 1; /* The rest of the packet is the MPEG-1 stream */ - proto_tree_add_item( mpg_tree, hf_rtp_mpg_data, tvb, offset, -1, FALSE ); + proto_tree_add_item( mpg_tree, hf_rtp_mpg_data, tvb, offset, -1, ENC_NA ); } } diff --git a/epan/dissectors/packet-mpls-echo.c b/epan/dissectors/packet-mpls-echo.c index e9203e6b81..b2e258cf36 100644 --- a/epan/dissectors/packet-mpls-echo.c +++ b/epan/dissectors/packet-mpls-echo.c @@ -403,7 +403,7 @@ dissect_mpls_echo_tlv_fec(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem tvb_bytes_to_str(tvb, offset + 24, 16), tvb_ip6_to_str(tvb, offset + 24)); hidden_item = proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_rsvp_ipv6_ext_tunnel_id, - tvb, offset + 24, 16, FALSE); + tvb, offset + 24, 16, ENC_NA); PROTO_ITEM_SET_HIDDEN(hidden_item); proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_rsvp_ipv6_ipv6_sender, tvb, offset + 40, 16, FALSE); @@ -448,7 +448,7 @@ dissect_mpls_echo_tlv_fec(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_vendor, tvb, offset + 4, 4, FALSE); proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_value, tvb, - offset + 8, length - 4, FALSE); + offset + 8, length - 4, ENC_NA); } break; case TLV_FEC_STACK_BGP_LAB_v4: @@ -502,7 +502,7 @@ dissect_mpls_echo_tlv_fec(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem default: if(length) proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_value, - tvb, offset + 4, length, FALSE); + tvb, offset + 4, length, ENC_NA); break; } @@ -654,11 +654,11 @@ dissect_mpls_echo_tlv_ds_map(tvbuff_t *tvb, guint offset, proto_tree *tree, int offset, 4, FALSE); if(mplen > 4) proto_tree_add_item(tlv_ds_map_tree, hf_mpls_echo_tlv_ds_map_mp_mask, tvb, - offset + 4, mplen - 4, FALSE); + offset + 4, mplen - 4, ENC_NA); break; default: proto_tree_add_item(tree, hf_mpls_echo_tlv_ds_map_mp_value, tvb, - offset, mplen, FALSE); + offset, mplen, ENC_NA); break; } } @@ -866,7 +866,7 @@ dissect_mpls_echo_tlv(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem, gb offset + 4, 1, FALSE); if (length > 1) proto_tree_add_item(mpls_echo_tlv_tree, hf_mpls_echo_tlv_padding, tvb, - offset + 5, length - 1, FALSE); + offset + 5, length - 1, ENC_NA); break; case TLV_VENDOR_CODE: proto_tree_add_item(mpls_echo_tlv_tree, hf_mpls_echo_tlv_vendor, tvb, @@ -919,7 +919,7 @@ dissect_mpls_echo_tlv(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem, gb proto_tree_add_item(mpls_echo_tlv_tree, hf_mpls_echo_tlv_vendor, tvb, offset + 4, 4, FALSE); proto_tree_add_item(mpls_echo_tlv_tree, hf_mpls_echo_tlv_value, tvb, - offset + 8, length - 4, FALSE); + offset + 8, length - 4, ENC_NA); } break; case TLV_DOWNSTREAM_MAPPING: @@ -934,7 +934,7 @@ dissect_mpls_echo_tlv(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem, gb case TLV_ERRORED_TLV: if (in_errored) proto_tree_add_item(mpls_echo_tlv_tree, hf_mpls_echo_tlv_value, tvb, - offset + 4, length, FALSE); + offset + 4, length, ENC_NA); else dissect_mpls_echo_tlv_errored(tvb, offset + 4, mpls_echo_tlv_tree, length); break; @@ -953,7 +953,7 @@ dissect_mpls_echo_tlv(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem, gb case TLV_ERROR_CODE: default: proto_tree_add_item(mpls_echo_tlv_tree, hf_mpls_echo_tlv_value, tvb, - offset + 4, length, FALSE); + offset + 4, length, ENC_NA); break; } } diff --git a/epan/dissectors/packet-mrdisc.c b/epan/dissectors/packet-mrdisc.c index adba262115..458f2a584c 100644 --- a/epan/dissectors/packet-mrdisc.c +++ b/epan/dissectors/packet-mrdisc.c @@ -112,7 +112,7 @@ dissect_mrdisc_mra(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, i int old_offset = offset; item = proto_tree_add_item(parent_tree, hf_options, - tvb, offset, -1, FALSE); + tvb, offset, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_options); type = tvb_get_guint8(tvb, offset); @@ -156,7 +156,7 @@ dissect_mrdisc_mra(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, i } proto_tree_add_item(tree, hf_option_bytes, - tvb, offset, len, FALSE); + tvb, offset, len, ENC_NA); offset += len; } if (item) { diff --git a/epan/dissectors/packet-ms-mms.c b/epan/dissectors/packet-ms-mms.c index 1c7ba356b7..ed4b3bbd51 100644 --- a/epan/dissectors/packet-ms-mms.c +++ b/epan/dissectors/packet-ms-mms.c @@ -663,7 +663,7 @@ static gint dissect_msmms_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr col_set_str(pinfo->cinfo, COL_PROTOCOL, "MSMMS"); /* Add hidden filter for "msmms.data" */ - proto_tree_add_item(tree, hf_msmms_data, tvb, 0, 0, FALSE); + proto_tree_add_item(tree, hf_msmms_data, tvb, 0, 0, ENC_NA); PROTO_ITEM_SET_HIDDEN(ti); /* Create MSMMS data protocol tree */ @@ -724,7 +724,7 @@ static gint dissect_msmms_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr } /* Everything else is marked as unparsed data */ - proto_tree_add_item(msmms_tree, hf_msmms_data_unparsed, tvb, offset, packet_length-offset, TRUE); + proto_tree_add_item(msmms_tree, hf_msmms_data_unparsed, tvb, offset, packet_length-offset, ENC_NA); offset = packet_length; /* Show summary in info column */ diff --git a/epan/dissectors/packet-msnip.c b/epan/dissectors/packet-msnip.c index 47b9de6850..63ed2bb5a8 100644 --- a/epan/dissectors/packet-msnip.c +++ b/epan/dissectors/packet-msnip.c @@ -103,7 +103,7 @@ dissect_msnip_rmr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, in int old_offset = offset; item = proto_tree_add_item(parent_tree, hf_groups, - tvb, offset, -1, FALSE); + tvb, offset, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_groups); /* record type */ @@ -182,7 +182,7 @@ dissect_msnip_gm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int int old_offset = offset; item = proto_tree_add_item(parent_tree, hf_groups, - tvb, offset, -1, FALSE); + tvb, offset, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_groups); /* multicast group */ diff --git a/epan/dissectors/packet-msnlb.c b/epan/dissectors/packet-msnlb.c index 4a16f8e9e8..118bd5b473 100644 --- a/epan/dissectors/packet-msnlb.c +++ b/epan/dissectors/packet-msnlb.c @@ -64,10 +64,10 @@ dissect_msnlb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) type = tvb_get_guint8(tvb, offset); - proto_tree_add_item(msnlb_tree, hf_msnlb_unknown, tvb, offset, 4, FALSE); + proto_tree_add_item(msnlb_tree, hf_msnlb_unknown, tvb, offset, 4, ENC_NA); offset += 4; - proto_tree_add_item(msnlb_tree, hf_msnlb_unknown, tvb, offset, 4, FALSE); + proto_tree_add_item(msnlb_tree, hf_msnlb_unknown, tvb, offset, 4, ENC_NA); offset += 4; proto_tree_add_item(msnlb_tree, hf_msnlb_hpn, tvb, offset, 4, TRUE); @@ -79,10 +79,10 @@ dissect_msnlb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(msnlb_tree, hf_msnlb_host_ip, tvb, offset, 4, FALSE); offset += 4; - proto_tree_add_item(msnlb_tree, hf_msnlb_unknown, tvb, offset, 4, FALSE); + proto_tree_add_item(msnlb_tree, hf_msnlb_unknown, tvb, offset, 4, ENC_NA); offset += 4; - proto_tree_add_item(msnlb_tree, hf_msnlb_unknown, tvb, offset, 4, FALSE); + proto_tree_add_item(msnlb_tree, hf_msnlb_unknown, tvb, offset, 4, ENC_NA); offset += 4; switch (type) { @@ -91,38 +91,38 @@ dissect_msnlb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case 0xbf: - proto_tree_add_item(msnlb_tree, hf_msnlb_unknown, tvb, offset, 4, FALSE); + proto_tree_add_item(msnlb_tree, hf_msnlb_unknown, tvb, offset, 4, ENC_NA); offset += 4; proto_tree_add_item(msnlb_tree, hf_msnlb_count, tvb, offset, 4, TRUE); offset += 4; - proto_tree_add_item(msnlb_tree, hf_msnlb_unknown, tvb, offset, 4, FALSE); + proto_tree_add_item(msnlb_tree, hf_msnlb_unknown, tvb, offset, 4, ENC_NA); offset += 4; - proto_tree_add_item(msnlb_tree, hf_msnlb_unknown, tvb, offset, 4, FALSE); + proto_tree_add_item(msnlb_tree, hf_msnlb_unknown, tvb, offset, 4, ENC_NA); offset += 4; - proto_tree_add_item(msnlb_tree, hf_msnlb_unknown, tvb, offset, 4, FALSE); + proto_tree_add_item(msnlb_tree, hf_msnlb_unknown, tvb, offset, 4, ENC_NA); offset += 4; - proto_tree_add_item(msnlb_tree, hf_msnlb_unknown, tvb, offset, 4, FALSE); + proto_tree_add_item(msnlb_tree, hf_msnlb_unknown, tvb, offset, 4, ENC_NA); offset += 4; - proto_tree_add_item(msnlb_tree, hf_msnlb_unknown, tvb, offset, 4, FALSE); + proto_tree_add_item(msnlb_tree, hf_msnlb_unknown, tvb, offset, 4, ENC_NA); offset += 4; - proto_tree_add_item(msnlb_tree, hf_msnlb_unknown, tvb, offset, 4, FALSE); + proto_tree_add_item(msnlb_tree, hf_msnlb_unknown, tvb, offset, 4, ENC_NA); offset += 4; - proto_tree_add_item(msnlb_tree, hf_msnlb_unknown, tvb, offset, 4, FALSE); + proto_tree_add_item(msnlb_tree, hf_msnlb_unknown, tvb, offset, 4, ENC_NA); offset += 4; - proto_tree_add_item(msnlb_tree, hf_msnlb_unknown, tvb, offset, 4, FALSE); + proto_tree_add_item(msnlb_tree, hf_msnlb_unknown, tvb, offset, 4, ENC_NA); offset += 4; default: - proto_tree_add_item(msnlb_tree, hf_msnlb_unknown, tvb, offset, tvb_length_remaining(tvb, offset), FALSE); + proto_tree_add_item(msnlb_tree, hf_msnlb_unknown, tvb, offset, tvb_length_remaining(tvb, offset), ENC_NA); offset += 4; } } diff --git a/epan/dissectors/packet-msrp.c b/epan/dissectors/packet-msrp.c index 605c8ba536..6eedf9f94c 100644 --- a/epan/dissectors/packet-msrp.c +++ b/epan/dissectors/packet-msrp.c @@ -587,7 +587,7 @@ dissect_msrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } /* Headers */ - msrp_headers_item = proto_tree_add_item(msrp_tree, hf_msrp_msg_hdr, tvb, offset,(end_line_offset - offset), ENC_BIG_ENDIAN); + msrp_headers_item = proto_tree_add_item(msrp_tree, hf_msrp_msg_hdr, tvb, offset,(end_line_offset - offset), ENC_NA); msrp_hdr_tree = proto_item_add_subtree(msrp_headers_item, ett_msrp_hdr); /* diff --git a/epan/dissectors/packet-nas_eps.c b/epan/dissectors/packet-nas_eps.c index 96158214ff..ba4a508e03 100644 --- a/epan/dissectors/packet-nas_eps.c +++ b/epan/dissectors/packet-nas_eps.c @@ -722,7 +722,7 @@ de_emm_auth_resp_par(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gu curr_offset = offset; - proto_tree_add_item(tree, hf_nas_eps_emm_res, tvb, curr_offset, len, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_nas_eps_emm_res, tvb, curr_offset, len, ENC_NA); return len; } @@ -1096,7 +1096,7 @@ de_emm_esm_msg_cont(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gui curr_offset = offset; - item = proto_tree_add_item(tree, hf_nas_eps_esm_msg_cont, tvb, curr_offset, len, ENC_BIG_ENDIAN); + item = proto_tree_add_item(tree, hf_nas_eps_esm_msg_cont, tvb, curr_offset, len, ENC_NA); sub_tree = proto_item_add_subtree(item, ett_nas_eps_esm_msg_cont); /* This IE can contain any ESM PDU as defined in subclause 8.3. */ @@ -2372,7 +2372,7 @@ de_esm_pdn_addr(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 * contains an IPv6 interface identifier. Bit 8 of octet 4 represents the most significant bit * of the IPv6 interface identifier and bit 1 of octet 11 the least significant bit. */ - proto_tree_add_item(tree, hf_nas_eps_esm_pdn_ipv6_if_id, tvb, curr_offset, 8, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_nas_eps_esm_pdn_ipv6_if_id, tvb, curr_offset, 8, ENC_NA); offset+=8; break; case 3: @@ -2383,7 +2383,7 @@ de_esm_pdn_addr(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 * significant bit. Bit 8 of octet 12 represents the most significant bit of the IPv4 address * and bit 1 of octet 15 the least significant bit. */ - proto_tree_add_item(tree, hf_nas_eps_esm_pdn_ipv6_if_id, tvb, curr_offset, 8, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_nas_eps_esm_pdn_ipv6_if_id, tvb, curr_offset, 8, ENC_NA); curr_offset+=8; proto_tree_add_item(tree, hf_nas_eps_esm_pdn_ipv4, tvb, curr_offset, 4, ENC_BIG_ENDIAN); curr_offset+=4; diff --git a/epan/dissectors/packet-nb_rtpmux.c b/epan/dissectors/packet-nb_rtpmux.c index b2c7222a5e..36f59434c6 100644 --- a/epan/dissectors/packet-nb_rtpmux.c +++ b/epan/dissectors/packet-nb_rtpmux.c @@ -128,7 +128,7 @@ dissect_nb_rtpmux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Timestamp (TS) */ proto_tree_add_item(nb_rtpmux_cmp_rtp_tree, hf_nb_rtpmux_cmp_rtp_timestamp, tvb, offset+6, 2, FALSE); if (length != 0) - proto_tree_add_item(nb_rtpmux_cmp_rtp_tree, hf_nb_rtpmux_cmp_rtp_data,tvb, offset+8, length-3, FALSE); + proto_tree_add_item(nb_rtpmux_cmp_rtp_tree, hf_nb_rtpmux_cmp_rtp_data,tvb, offset+8, length-3, ENC_NA); }else{ /* 6.4.2.3 Transport Format for multiplexing without RTP Header Compression */ @@ -156,7 +156,7 @@ dissect_nb_rtpmux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) else { proto_tree_add_item(nb_rtpmux_tree, - hf_nb_rtpmux_data, tvb, offset+5, length, FALSE); + hf_nb_rtpmux_data, tvb, offset+5, length, ENC_NA); } } } /* if tbit */ diff --git a/epan/dissectors/packet-nbd.c b/epan/dissectors/packet-nbd.c index 4f83f16287..581dbda748 100644 --- a/epan/dissectors/packet-nbd.c +++ b/epan/dissectors/packet-nbd.c @@ -352,7 +352,7 @@ dissect_nbd_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) } if(nbd_trans->type==NBD_CMD_WRITE){ - proto_tree_add_item(tree, hf_nbd_data, tvb, offset, nbd_trans->datalen, FALSE); + proto_tree_add_item(tree, hf_nbd_data, tvb, offset, nbd_trans->datalen, ENC_NA); } break; case NBD_RESPONSE_MAGIC: @@ -371,7 +371,7 @@ dissect_nbd_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) } if(nbd_trans->type==NBD_CMD_READ){ - proto_tree_add_item(tree, hf_nbd_data, tvb, offset, nbd_trans->datalen, FALSE); + proto_tree_add_item(tree, hf_nbd_data, tvb, offset, nbd_trans->datalen, ENC_NA); } break; } diff --git a/epan/dissectors/packet-ncp-nmas.c b/epan/dissectors/packet-ncp-nmas.c index ef9ed3d9c1..c80b863535 100644 --- a/epan/dissectors/packet-ncp-nmas.c +++ b/epan/dissectors/packet-ncp-nmas.c @@ -345,7 +345,7 @@ dissect_nmas_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ncp_tree, nc foffset += 4; break; case 2: /* Client Put Data */ - proto_tree_add_item(atree, hf_opaque, tvb, foffset, msg_length, FALSE); + proto_tree_add_item(atree, hf_opaque, tvb, foffset, msg_length, ENC_NA); foffset += msg_length; break; case 4: /* Client Get Data */ @@ -413,7 +413,7 @@ dissect_nmas_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ncp_tree, nc msg_length = tvb_get_ntohl(tvb, foffset); proto_tree_add_item(atree, hf_length, tvb, foffset, 4, FALSE); foffset += 4; - proto_tree_add_item(atree, hf_data, tvb, foffset, msg_length, FALSE); + proto_tree_add_item(atree, hf_data, tvb, foffset, msg_length, ENC_NA); foffset += msg_length; break; case 3: @@ -450,7 +450,7 @@ dissect_nmas_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ncp_tree, nc } break; case 5: - proto_tree_add_item(atree, hf_opaque, tvb, foffset, tvb_reported_length_remaining(tvb, foffset), FALSE); + proto_tree_add_item(atree, hf_opaque, tvb, foffset, tvb_reported_length_remaining(tvb, foffset), ENC_NA); foffset += msg_length; break; case 7: @@ -539,7 +539,7 @@ dissect_nmas_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ncp_tree, guin foffset += 4; break; case 4: /* Client Get Data */ - proto_tree_add_item(atree, hf_opaque, tvb, foffset, msg_length, TRUE); + proto_tree_add_item(atree, hf_opaque, tvb, foffset, msg_length, ENC_NA); foffset += msg_length; break; case 6: /* Client Get User NDS Credentials */ @@ -550,7 +550,7 @@ dissect_nmas_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ncp_tree, guin proto_tree_add_item(atree, hf_login_state, tvb, foffset, 4, TRUE); foffset += 4; msg_length -= 12; - proto_tree_add_item(atree, hf_enc_cred, tvb, foffset, msg_length, TRUE); + proto_tree_add_item(atree, hf_enc_cred, tvb, foffset, msg_length, ENC_NA); foffset += msg_length; break; case 8: /* Login Store Management */ @@ -564,7 +564,7 @@ dissect_nmas_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ncp_tree, guin case 5: case 7: case 9: - proto_tree_add_item(atree, hf_enc_data, tvb, foffset, msg_length, TRUE); + proto_tree_add_item(atree, hf_enc_data, tvb, foffset, msg_length, ENC_NA); foffset += msg_length; break; default: @@ -584,7 +584,7 @@ dissect_nmas_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ncp_tree, guin msg_length = tvb_get_ntohl(tvb, foffset); proto_tree_add_item(atree, hf_length, tvb, foffset, 4, FALSE); foffset += 4; - proto_tree_add_item(atree, hf_data, tvb, foffset, msg_length, FALSE); + proto_tree_add_item(atree, hf_data, tvb, foffset, msg_length, ENC_NA); foffset += msg_length; break; case 3: @@ -605,7 +605,7 @@ dissect_nmas_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ncp_tree, guin } else { - proto_tree_add_item(atree, hf_opaque, tvb, foffset, msg_length, FALSE); + proto_tree_add_item(atree, hf_opaque, tvb, foffset, msg_length, ENC_NA); } foffset += msg_length; break; diff --git a/epan/dissectors/packet-ncp-sss.c b/epan/dissectors/packet-ncp-sss.c index bc6d5cfdd0..4c39fd75d5 100644 --- a/epan/dissectors/packet-ncp-sss.c +++ b/epan/dissectors/packet-ncp-sss.c @@ -603,11 +603,11 @@ dissect_sss_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ncp_tree, ncp foffset += 4; if (tvb_length_remaining(tvb, foffset) < (gint) msg_length) { - proto_tree_add_item(atree, hf_enc_data, tvb, foffset, -1, TRUE); + proto_tree_add_item(atree, hf_enc_data, tvb, foffset, -1, ENC_NA); } else { - proto_tree_add_item(atree, hf_enc_data, tvb, foffset, msg_length, TRUE); + proto_tree_add_item(atree, hf_enc_data, tvb, foffset, msg_length, ENC_NA); } } break; @@ -631,7 +631,7 @@ dissect_sss_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ncp_tree, ncp case 7: msg_length = tvb_get_letohl(tvb, foffset); foffset += 4; - proto_tree_add_item(atree, hf_enc_cred, tvb, foffset, msg_length, FALSE); + proto_tree_add_item(atree, hf_enc_cred, tvb, foffset, msg_length, ENC_NA); break; case 8: case 9: @@ -653,7 +653,7 @@ dissect_sss_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ncp_tree, ncp if (tvb_length_remaining(tvb, foffset) > 8) { foffset += 4; - proto_tree_add_item(ncp_tree, hf_enc_data, tvb, foffset, tvb_length_remaining(tvb, foffset), TRUE); + proto_tree_add_item(ncp_tree, hf_enc_data, tvb, foffset, tvb_length_remaining(tvb, foffset), ENC_NA); } } break; @@ -753,7 +753,7 @@ dissect_sss_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ncp_tree, guint } else { - proto_tree_add_item(atree, hf_enc_data, tvb, foffset, tvb_length_remaining(tvb, foffset), TRUE); + proto_tree_add_item(atree, hf_enc_data, tvb, foffset, tvb_length_remaining(tvb, foffset), ENC_NA); } } } @@ -763,7 +763,7 @@ dissect_sss_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ncp_tree, guint proto_tree_add_text(atree, tvb, foffset, 4, "Return Code: Success (0x00000000)"); if (tvb_length_remaining(tvb, foffset) > 8) { foffset += 4; - proto_tree_add_item(atree, hf_enc_data, tvb, foffset, tvb_length_remaining(tvb, foffset), TRUE); + proto_tree_add_item(atree, hf_enc_data, tvb, foffset, tvb_length_remaining(tvb, foffset), ENC_NA); } } break; diff --git a/epan/dissectors/packet-ncp.c b/epan/dissectors/packet-ncp.c index 9d21646d62..18f0754e95 100644 --- a/epan/dissectors/packet-ncp.c +++ b/epan/dissectors/packet-ncp.c @@ -363,7 +363,7 @@ dissect_ncp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (match_strval(tvb_get_ntohs(tvb, commhdr), ncp_type_vals)==NULL) { /* Check to see if we have a valid type after packet signature length */ if (match_strval(tvb_get_ntohs(tvb, commhdr+8), ncp_type_vals)!=NULL) { - proto_tree_add_item(ncp_tree, hf_ncp_ip_packetsig, tvb, commhdr, 8, FALSE); + proto_tree_add_item(ncp_tree, hf_ncp_ip_packetsig, tvb, commhdr, 8, ENC_NA); commhdr += 8; } } @@ -634,7 +634,7 @@ dissect_ncp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (data_len < 8) return; proto_tree_add_item(ncp_tree, hf_ncp_burst_reserved, - tvb, offset, 8, FALSE); + tvb, offset, 8, ENC_NA); offset += 8; data_len -= 8; diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c index 01468c94c4..7e78d4b8a6 100644 --- a/epan/dissectors/packet-ndmp.c +++ b/epan/dissectors/packet-ndmp.c @@ -791,7 +791,7 @@ dissect_auth_attr_msg(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, break; case NDMP_AUTH_MD5: proto_tree_add_item(tree, hf_ndmp_auth_challenge, - tvb, offset, 64, FALSE); + tvb, offset, 64, ENC_NA); offset+=64; } @@ -2279,7 +2279,7 @@ dissect_auth_data(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, /* digest */ proto_tree_add_item(tree, hf_ndmp_auth_digest, - tvb, offset, 16, FALSE); + tvb, offset, 16, ENC_NA); offset+=16; } @@ -3004,7 +3004,7 @@ dissect_ndmp_header(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *p if (parent_tree) { item = proto_tree_add_item(parent_tree, hf_ndmp_header, tvb, - offset, 24, FALSE); + offset, 24, ENC_NA); tree = proto_item_add_subtree(item, ett_ndmp_header); } diff --git a/epan/dissectors/packet-ndps.c b/epan/dissectors/packet-ndps.c index 1fae570df3..c04ddacd26 100644 --- a/epan/dissectors/packet-ndps.c +++ b/epan/dissectors/packet-ndps.c @@ -2194,7 +2194,7 @@ objectidentifier(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) length = tvb_get_guint8(tvb, foffset); foffset += 1; tvb_ensure_bytes_exist(tvb, foffset, length); - proto_tree_add_item(atree, hf_ndps_oid, tvb, foffset, length, FALSE); + proto_tree_add_item(atree, hf_ndps_oid, tvb, foffset, length, ENC_NA); foffset += length; } else @@ -2345,7 +2345,7 @@ print_address(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) switch(addr_type) { case 0x00000000: - proto_tree_add_item(ndps_tree, hf_ndps_net, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_net, tvb, foffset, 4, ENC_NA); proto_tree_add_item(ndps_tree, hf_ndps_node, tvb, foffset+4, 6, FALSE); proto_tree_add_item(ndps_tree, hf_ndps_socket, tvb, foffset+10, 2, FALSE); break; @@ -2441,7 +2441,7 @@ credentials(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) if (length!=0) { tvb_ensure_bytes_exist(tvb, foffset, length); - proto_tree_add_item(atree, hf_ndps_password, tvb, foffset, length, FALSE); + proto_tree_add_item(atree, hf_ndps_password, tvb, foffset, length, ENC_NA); } proto_item_set_end(aitem, tvb, foffset); foffset += length; @@ -2453,7 +2453,7 @@ credentials(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) if (length!=0) { tvb_ensure_bytes_exist(tvb, foffset, length); - proto_tree_add_item(ndps_tree, hf_ndps_certified, tvb, foffset, length, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_certified, tvb, foffset, length, ENC_NA); } foffset += length; break; @@ -2824,7 +2824,7 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) case 24: /* Positive Integer 64 */ case 31: /* Non-Negative Real */ case 29: /* Real */ - proto_tree_add_item(ndps_tree, hf_ndps_n64, tvb, foffset, 8, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_n64, tvb, foffset, 8, ENC_NA); foffset += 8; break; case 21: /* Integer 64 Seq */ @@ -2841,7 +2841,7 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) } aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Item %u", i); atree = proto_item_add_subtree(aitem, ett_ndps); - proto_tree_add_item(atree, hf_ndps_n64, tvb, foffset, 8, FALSE); + proto_tree_add_item(atree, hf_ndps_n64, tvb, foffset, 8, ENC_NA); foffset += 8; proto_item_set_end(aitem, tvb, foffset); } @@ -2850,17 +2850,17 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) case 26: /* Cardinal 64 Range */ case 32: /* Real Range */ case 33: /* Non-Negative Real Range */ - proto_tree_add_item(ndps_tree, hf_ndps_lower_range_n64, tvb, foffset, 8, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_lower_range_n64, tvb, foffset, 8, ENC_NA); foffset += 8; - proto_tree_add_item(ndps_tree, hf_ndps_upper_range_n64, tvb, foffset, 8, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_upper_range_n64, tvb, foffset, 8, ENC_NA); foffset += 8; break; case 27: /* Maximum Integer 64 */ - proto_tree_add_item(ndps_tree, hf_ndps_lower_range_n64, tvb, foffset, 8, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_lower_range_n64, tvb, foffset, 8, ENC_NA); foffset += 8; break; case 28: /* Minimum Integer 64 */ - proto_tree_add_item(ndps_tree, hf_ndps_upper_range_n64, tvb, foffset, 8, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_upper_range_n64, tvb, foffset, 8, ENC_NA); foffset += 8; break; case 34: /* Boolean */ @@ -2907,9 +2907,9 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) foffset += 4; break; case 43: /* Medium Dimensions */ - proto_tree_add_item(ndps_tree, hf_ndps_xdimension_n64, tvb, foffset, 8, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_xdimension_n64, tvb, foffset, 8, ENC_NA); foffset += 8; - proto_tree_add_item(ndps_tree, hf_ndps_ydimension_n64, tvb, foffset, 8, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_ydimension_n64, tvb, foffset, 8, ENC_NA); foffset += 8; break; case 44: /* Dimension */ @@ -2917,7 +2917,7 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) proto_tree_add_uint(ndps_tree, hf_ndps_dim_value, tvb, foffset, 4, dimension); foffset += 4; if (dimension == 0) { - proto_tree_add_item(ndps_tree, hf_ndps_n64, tvb, foffset, 8, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_n64, tvb, foffset, 8, ENC_NA); foffset += 8; } else @@ -2926,7 +2926,7 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) } proto_tree_add_item(ndps_tree, hf_ndps_dim_flag, tvb, foffset, 4, FALSE); foffset += 4; - proto_tree_add_item(ndps_tree, hf_ndps_n64, tvb, foffset, 8, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_n64, tvb, foffset, 8, ENC_NA); foffset += 8; break; case 45: /* XY Dimensions */ @@ -2938,14 +2938,14 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) } else { - proto_tree_add_item(ndps_tree, hf_ndps_xdimension_n64, tvb, foffset, 8, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_xdimension_n64, tvb, foffset, 8, ENC_NA); foffset += 8; - proto_tree_add_item(ndps_tree, hf_ndps_ydimension_n64, tvb, foffset, 8, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_ydimension_n64, tvb, foffset, 8, ENC_NA); foffset += 8; } proto_tree_add_item(ndps_tree, hf_ndps_dim_flag, tvb, foffset, 4, FALSE); foffset += 4; - proto_tree_add_item(ndps_tree, hf_ndps_n64, tvb, foffset, 8, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_n64, tvb, foffset, 8, ENC_NA); foffset += 8; break; case 46: /* Locations */ @@ -2964,7 +2964,7 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) } aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Location %u", i); atree = proto_item_add_subtree(aitem, ett_ndps); - proto_tree_add_item(atree, hf_ndps_n64, tvb, foffset, 8, FALSE); + proto_tree_add_item(atree, hf_ndps_n64, tvb, foffset, 8, ENC_NA); foffset += 8; proto_item_set_end(aitem, tvb, foffset); } @@ -2975,17 +2975,17 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) } proto_tree_add_item(ndps_tree, hf_ndps_dim_flag, tvb, foffset, 4, FALSE); foffset += 4; - proto_tree_add_item(ndps_tree, hf_ndps_n64, tvb, foffset, 8, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_n64, tvb, foffset, 8, ENC_NA); foffset += 8; break; case 47: /* Area */ - proto_tree_add_item(ndps_tree, hf_ndps_xmin_n64, tvb, foffset, 8, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_xmin_n64, tvb, foffset, 8, ENC_NA); foffset += 8; - proto_tree_add_item(ndps_tree, hf_ndps_xmax_n64, tvb, foffset, 8, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_xmax_n64, tvb, foffset, 8, ENC_NA); foffset += 8; - proto_tree_add_item(ndps_tree, hf_ndps_ymin_n64, tvb, foffset, 8, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_ymin_n64, tvb, foffset, 8, ENC_NA); foffset += 8; - proto_tree_add_item(ndps_tree, hf_ndps_ymax_n64, tvb, foffset, 8, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_ymax_n64, tvb, foffset, 8, ENC_NA); foffset += 8; break; case 48: /* Area Seq */ @@ -3000,13 +3000,13 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) } aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Area %u", i); atree = proto_item_add_subtree(aitem, ett_ndps); - proto_tree_add_item(atree, hf_ndps_xmin_n64, tvb, foffset, 8, FALSE); + proto_tree_add_item(atree, hf_ndps_xmin_n64, tvb, foffset, 8, ENC_NA); foffset += 8; - proto_tree_add_item(atree, hf_ndps_xmax_n64, tvb, foffset, 8, FALSE); + proto_tree_add_item(atree, hf_ndps_xmax_n64, tvb, foffset, 8, ENC_NA); foffset += 8; - proto_tree_add_item(atree, hf_ndps_ymin_n64, tvb, foffset, 8, FALSE); + proto_tree_add_item(atree, hf_ndps_ymin_n64, tvb, foffset, 8, ENC_NA); foffset += 8; - proto_tree_add_item(atree, hf_ndps_ymax_n64, tvb, foffset, 8, FALSE); + proto_tree_add_item(atree, hf_ndps_ymax_n64, tvb, foffset, 8, ENC_NA); foffset += 8; proto_item_set_end(aitem, tvb, foffset); } @@ -3417,7 +3417,7 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) foffset += 4; if (length!=0) { - proto_tree_add_item(ndps_tree, hf_ndps_octet_string, tvb, foffset, length, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_octet_string, tvb, foffset, length, ENC_NA); } foffset += length; foffset += (length%2); @@ -3440,9 +3440,9 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) } else { - proto_tree_add_item(ndps_tree, hf_ndps_xdimension_n64, tvb, foffset, 8, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_xdimension_n64, tvb, foffset, 8, ENC_NA); foffset += 8; - proto_tree_add_item(ndps_tree, hf_ndps_ydimension_n64, tvb, foffset, 8, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_ydimension_n64, tvb, foffset, 8, ENC_NA); foffset += 8; } break; @@ -3470,45 +3470,45 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) } else { - proto_tree_add_item(ndps_tree, hf_ndps_xdimension_n64, tvb, foffset, 8, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_xdimension_n64, tvb, foffset, 8, ENC_NA); foffset += 8; - proto_tree_add_item(ndps_tree, hf_ndps_ydimension_n64, tvb, foffset, 8, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_ydimension_n64, tvb, foffset, 8, ENC_NA); foffset += 8; } proto_tree_add_item(ndps_tree, hf_ndps_long_edge_feeds, tvb, foffset, 4, FALSE); foffset += 4; - proto_tree_add_item(ndps_tree, hf_ndps_xmin_n64, tvb, foffset, 8, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_xmin_n64, tvb, foffset, 8, ENC_NA); foffset += 8; - proto_tree_add_item(ndps_tree, hf_ndps_xmax_n64, tvb, foffset, 8, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_xmax_n64, tvb, foffset, 8, ENC_NA); foffset += 8; - proto_tree_add_item(ndps_tree, hf_ndps_ymin_n64, tvb, foffset, 8, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_ymin_n64, tvb, foffset, 8, ENC_NA); foffset += 8; - proto_tree_add_item(ndps_tree, hf_ndps_ymax_n64, tvb, foffset, 8, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_ymax_n64, tvb, foffset, 8, ENC_NA); foffset += 8; } else { - proto_tree_add_item(ndps_tree, hf_ndps_lower_range_n64, tvb, foffset, 8, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_lower_range_n64, tvb, foffset, 8, ENC_NA); foffset += 8; - proto_tree_add_item(ndps_tree, hf_ndps_upper_range_n64, tvb, foffset, 8, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_upper_range_n64, tvb, foffset, 8, ENC_NA); foffset += 8; - proto_tree_add_item(ndps_tree, hf_ndps_inc_across_feed, tvb, foffset, 8, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_inc_across_feed, tvb, foffset, 8, ENC_NA); foffset += 8; - proto_tree_add_item(ndps_tree, hf_ndps_lower_range_n64, tvb, foffset, 8, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_lower_range_n64, tvb, foffset, 8, ENC_NA); foffset += 8; - proto_tree_add_item(ndps_tree, hf_ndps_upper_range_n64, tvb, foffset, 8, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_upper_range_n64, tvb, foffset, 8, ENC_NA); foffset += 8; - proto_tree_add_item(ndps_tree, hf_ndps_size_inc_in_feed, tvb, foffset, 8, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_size_inc_in_feed, tvb, foffset, 8, ENC_NA); foffset += 8; proto_tree_add_item(ndps_tree, hf_ndps_long_edge_feeds, tvb, foffset, 4, FALSE); foffset += 4; - proto_tree_add_item(ndps_tree, hf_ndps_xmin_n64, tvb, foffset, 8, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_xmin_n64, tvb, foffset, 8, ENC_NA); foffset += 8; - proto_tree_add_item(ndps_tree, hf_ndps_xmax_n64, tvb, foffset, 8, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_xmax_n64, tvb, foffset, 8, ENC_NA); foffset += 8; - proto_tree_add_item(ndps_tree, hf_ndps_ymin_n64, tvb, foffset, 8, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_ymin_n64, tvb, foffset, 8, ENC_NA); foffset += 8; - proto_tree_add_item(ndps_tree, hf_ndps_ymax_n64, tvb, foffset, 8, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_ymax_n64, tvb, foffset, 8, ENC_NA); foffset += 8; } break; @@ -3641,7 +3641,7 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) foffset += 4; if (length!=0) { - proto_tree_add_item(ndps_tree, hf_ndps_add_bytes, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_add_bytes, tvb, foffset, 4, ENC_NA); } foffset += length; break; @@ -3656,9 +3656,9 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) break; case 0: - proto_tree_add_item(ndps_tree, hf_ndps_xdimension_n64, tvb, foffset, 8, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_xdimension_n64, tvb, foffset, 8, ENC_NA); foffset += 8; - proto_tree_add_item(ndps_tree, hf_ndps_ydimension_n64, tvb, foffset, 8, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_ydimension_n64, tvb, foffset, 8, ENC_NA); foffset += 8; break; @@ -3818,7 +3818,7 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) if (length!=0) { tvb_ensure_bytes_exist(tvb, foffset, length); - proto_tree_add_item(ndps_tree, hf_ndps_octet_string, tvb, foffset, length, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_octet_string, tvb, foffset, length, ENC_NA); } foffset += length; foffset += (length%2); @@ -3827,7 +3827,7 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) if (length!=0) { tvb_ensure_bytes_exist(tvb, foffset, length); - proto_tree_add_item(ndps_tree, hf_ndps_octet_string, tvb, foffset, length, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_octet_string, tvb, foffset, length, ENC_NA); } foffset += length; foffset += (length%2); @@ -3840,7 +3840,7 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) if (length!=0) { tvb_ensure_bytes_exist(tvb, foffset, length); - proto_tree_add_item(ndps_tree, hf_ndps_octet_string, tvb, foffset, length, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_octet_string, tvb, foffset, length, ENC_NA); } foffset += length; foffset += (length%2); @@ -3860,7 +3860,7 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) if (length!=0) { tvb_ensure_bytes_exist(tvb, foffset, length); - proto_tree_add_item(ndps_tree, hf_ndps_octet_string, tvb, foffset, length, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_octet_string, tvb, foffset, length, ENC_NA); } foffset += length; foffset += (length%2); @@ -3883,7 +3883,7 @@ attribute_value(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) if (length!=0) { tvb_ensure_bytes_exist(tvb, foffset, length); - proto_tree_add_item(ndps_tree, hf_ndps_octet_string, tvb, foffset, length, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_octet_string, tvb, foffset, length, ENC_NA); } foffset += length; foffset += (length%2); @@ -4207,7 +4207,7 @@ dissect_ndps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree) proto_tree_add_item(ndps_tree, hf_ndps_rpc_accept, tvb, foffset, 4, FALSE); if (tvb_get_ntohl(tvb, foffset)==0) { foffset += 4; - proto_tree_add_item(ndps_tree, hf_ndps_auth_null, tvb, foffset, 8, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_auth_null, tvb, foffset, 8, ENC_NA); foffset += 8; } else @@ -4277,7 +4277,7 @@ dissect_ndps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree) col_append_str(pinfo->cinfo, COL_INFO, (const gchar*) ndps_func_string); foffset += 4; - proto_tree_add_item(ndps_tree, hf_ndps_auth_null, tvb, foffset, 16, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_auth_null, tvb, foffset, 16, ENC_NA); foffset+=16; dissect_ndps_request(tvb, pinfo, ndps_tree, ndps_prog, ndps_func, foffset); } @@ -4689,7 +4689,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g } if (length==4) { - proto_tree_add_item(btree, hf_ndps_included_doc, tvb, foffset, length, FALSE); + proto_tree_add_item(btree, hf_ndps_included_doc, tvb, foffset, length, ENC_NA); } foffset += length; foffset += (length%2); @@ -4911,7 +4911,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g if (length!=0) { tvb_ensure_bytes_exist(tvb, foffset, length); - proto_tree_add_item(ndps_tree, hf_ndps_context, tvb, foffset, length, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_context, tvb, foffset, length, ENC_NA); } foffset += length; foffset += (length%2); @@ -5552,7 +5552,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g if (length!=0) { tvb_ensure_bytes_exist(tvb, foffset, length); - proto_tree_add_item(ndps_tree, hf_ndps_context, tvb, foffset, length, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_context, tvb, foffset, length, ENC_NA); } foffset += length; foffset += (length%2); @@ -5599,7 +5599,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g if (length!=0) { tvb_ensure_bytes_exist(tvb, foffset, length); - proto_tree_add_item(ndps_tree, hf_ndps_guid, tvb, foffset, length, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_guid, tvb, foffset, length, ENC_NA); } foffset += length; break; @@ -5730,7 +5730,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g if (length!=0) { tvb_ensure_bytes_exist(tvb, foffset, length); - proto_tree_add_item(ndps_tree, hf_ndps_context, tvb, foffset, length, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_context, tvb, foffset, length, ENC_NA); } foffset += length; foffset += (length%2); @@ -5794,7 +5794,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g if (length!=0) { tvb_ensure_bytes_exist(tvb, foffset, length); - proto_tree_add_item(atree, hf_ndps_item_bytes, tvb, foffset, length, FALSE); + proto_tree_add_item(atree, hf_ndps_item_bytes, tvb, foffset, length, ENC_NA); } foffset += length; } @@ -5916,7 +5916,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g if (length!=0) { tvb_ensure_bytes_exist(tvb, foffset, length); - proto_tree_add_item(ndps_tree, hf_ndps_context, tvb, foffset, length, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_context, tvb, foffset, length, ENC_NA); } foffset += length; foffset += (length%2); @@ -6146,7 +6146,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g if (length!=0) { tvb_ensure_bytes_exist(tvb, foffset, length); - proto_tree_add_item(ndps_tree, hf_ndps_context, tvb, foffset, length, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_context, tvb, foffset, length, ENC_NA); } foffset += length; foffset += (length%2); @@ -6346,7 +6346,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g if (length!=0) { tvb_ensure_bytes_exist(tvb, foffset, length); - proto_tree_add_item(ndps_tree, hf_ndps_context, tvb, foffset, length, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_context, tvb, foffset, length, ENC_NA); } foffset += length; foffset += (length%2); @@ -6428,7 +6428,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g { return foffset; } - proto_tree_add_item(atree, hf_ndps_item_ptr, tvb, foffset, length, FALSE); + proto_tree_add_item(atree, hf_ndps_item_ptr, tvb, foffset, length, ENC_NA); foffset += length; proto_item_set_end(aitem, tvb, foffset); } @@ -6474,7 +6474,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g foffset = ndps_string(tvb, hf_ndps_inf_file_name, ndps_tree, foffset, NULL); field_len = tvb_get_ntohl(tvb, foffset); foffset += 4; - proto_tree_add_item(ndps_tree, hf_printer_id, tvb, foffset, field_len, FALSE); + proto_tree_add_item(ndps_tree, hf_printer_id, tvb, foffset, field_len, ENC_NA); break; case 6: /* Printer Definition File */ case 10: /* Printer Definition File 2 */ @@ -6485,7 +6485,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g foffset = ndps_string(tvb, hf_ndps_inf_file_name, ndps_tree, foffset, NULL); field_len = tvb_get_ntohl(tvb, foffset); foffset += 4; - proto_tree_add_item(ndps_tree, hf_printer_id, tvb, foffset, field_len, FALSE); + proto_tree_add_item(ndps_tree, hf_printer_id, tvb, foffset, field_len, ENC_NA); break; case 7: /* Font Files */ proto_tree_add_item(ndps_tree, hf_os_type, tvb, foffset, 4, FALSE); @@ -7138,7 +7138,7 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int { return foffset; } - proto_tree_add_item(btree, hf_ndps_item_ptr, tvb, foffset, length, FALSE); + proto_tree_add_item(btree, hf_ndps_item_ptr, tvb, foffset, length, ENC_NA); foffset += length; proto_item_set_end(bitem, tvb, foffset); } @@ -7440,7 +7440,7 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int if (length!=0) { tvb_ensure_bytes_exist(tvb, foffset, length); - proto_tree_add_item(ndps_tree, hf_ndps_continuation_option, tvb, foffset, length, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_continuation_option, tvb, foffset, length, ENC_NA); } foffset += length; if(error_val != 0) @@ -7554,7 +7554,7 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int if (length!=0) { tvb_ensure_bytes_exist(tvb, foffset, length); - proto_tree_add_item(ndps_tree, hf_ndps_continuation_option, tvb, foffset, length, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_continuation_option, tvb, foffset, length, ENC_NA); } foffset += length; if(error_val != 0) @@ -7630,7 +7630,7 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int if (length!=0) { tvb_ensure_bytes_exist(tvb, foffset, length); - proto_tree_add_item(atree, hf_ndps_attribute_set, tvb, foffset, length, FALSE); + proto_tree_add_item(atree, hf_ndps_attribute_set, tvb, foffset, length, ENC_NA); } proto_item_set_end(aitem, tvb, foffset); } @@ -7666,7 +7666,7 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int if (length!=0) { tvb_ensure_bytes_exist(tvb, foffset, length); - proto_tree_add_item(ndps_tree, hf_ndps_continuation_option, tvb, foffset, length, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_continuation_option, tvb, foffset, length, ENC_NA); } foffset += length; foffset = return_code(tvb, pinfo, ndps_tree, foffset); @@ -7692,7 +7692,7 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int if (length!=0) { tvb_ensure_bytes_exist(tvb, foffset, length); - proto_tree_add_item(ndps_tree, hf_ndps_continuation_option, tvb, foffset, length, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_continuation_option, tvb, foffset, length, ENC_NA); } foffset += length; foffset = return_code(tvb, pinfo, ndps_tree, foffset); @@ -7735,7 +7735,7 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int if (length!=0) { tvb_ensure_bytes_exist(tvb, foffset, length); - proto_tree_add_item(atree, hf_ndps_attribute_set, tvb, foffset, length, FALSE); + proto_tree_add_item(atree, hf_ndps_attribute_set, tvb, foffset, length, ENC_NA); } proto_item_set_end(aitem, tvb, foffset); } @@ -7819,7 +7819,7 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int if (length!=0) { tvb_ensure_bytes_exist(tvb, foffset, length); - proto_tree_add_item(ndps_tree, hf_ndps_continuation_option, tvb, foffset, length, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_continuation_option, tvb, foffset, length, ENC_NA); } foffset += length; foffset = return_code(tvb, pinfo, ndps_tree, foffset); @@ -7938,7 +7938,7 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int if (length!=0) { tvb_ensure_bytes_exist(tvb, foffset, length); - proto_tree_add_item(ndps_tree, hf_ndps_attribute_set, tvb, foffset, length, FALSE); + proto_tree_add_item(ndps_tree, hf_ndps_attribute_set, tvb, foffset, length, ENC_NA); } break; case 0x00000002: /* Unbind */ @@ -8298,7 +8298,7 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int { return foffset; } - proto_tree_add_item(btree, hf_ndps_item_ptr, tvb, foffset, length, FALSE); + proto_tree_add_item(btree, hf_ndps_item_ptr, tvb, foffset, length, ENC_NA); foffset += length; proto_item_set_end(bitem, tvb, foffset); } diff --git a/epan/dissectors/packet-netdump.c b/epan/dissectors/packet-netdump.c index 4a5828699b..bb00eb13c0 100644 --- a/epan/dissectors/packet-netdump.c +++ b/epan/dissectors/packet-netdump.c @@ -119,7 +119,7 @@ dissect_netdump(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(netdump_tree, hf_netdump_seq_nr, tvb, 1, 4, FALSE); proto_tree_add_item(netdump_tree, hf_netdump_code, tvb, 5, 4, FALSE); proto_tree_add_item(netdump_tree, hf_netdump_info, tvb, 9, 4, TRUE); - proto_tree_add_item(netdump_tree, hf_netdump_payload, tvb, 13, -1, FALSE); + proto_tree_add_item(netdump_tree, hf_netdump_payload, tvb, 13, -1, ENC_NA); } } } diff --git a/epan/dissectors/packet-netperfmeter.c b/epan/dissectors/packet-netperfmeter.c index 463c277209..8a00c2617e 100644 --- a/epan/dissectors/packet-netperfmeter.c +++ b/epan/dissectors/packet-netperfmeter.c @@ -316,7 +316,7 @@ dissect_npmp_data_message(tvbuff_t *message_tvb, proto_tree *message_tree) ADD_FIELD(message_tree, data_byteseqnumber); ADD_FIELD(message_tree, data_timestamp); if (message_length > offset_data_payload) { - proto_tree_add_item(message_tree, hf_data_payload, message_tvb, offset_data_payload, message_length - offset_data_payload, FALSE); + proto_tree_add_item(message_tree, hf_data_payload, message_tvb, offset_data_payload, message_length - offset_data_payload, ENC_NA); } } @@ -340,7 +340,7 @@ dissect_npmp_results_message(tvbuff_t *message_tvb, proto_tree *message_tree) { const guint16 message_length = tvb_get_guint8(message_tvb, offset_message_length); if (message_length > offset_results_data) { - proto_tree_add_item(message_tree, hf_results_data, message_tvb, offset_results_data, message_length - offset_results_data, FALSE); + proto_tree_add_item(message_tree, hf_results_data, message_tvb, offset_results_data, message_length - offset_results_data, ENC_NA); } } diff --git a/epan/dissectors/packet-netsync.c b/epan/dissectors/packet-netsync.c index 05ebec4425..49530bb830 100644 --- a/epan/dissectors/packet-netsync.c +++ b/epan/dissectors/packet-netsync.c @@ -216,11 +216,11 @@ static gint dissect_netsync_cmd_hello(tvbuff_t *tvb, gint offset, proto_tree *t offset += dissect_uleb128( tvb, offset, &len ); proto_tree_add_item(tree, hf_netsync_cmd_hello_key, tvb, - offset, len, FALSE ); + offset, len, ENC_NA ); offset += len; proto_tree_add_item(tree, hf_netsync_cmd_nonce, tvb, - offset, NETSNYC_MERKLE_HASH_LENGTH, FALSE ); + offset, NETSNYC_MERKLE_HASH_LENGTH, ENC_NA ); offset += NETSNYC_MERKLE_HASH_LENGTH; return offset; @@ -242,7 +242,7 @@ static gint dissect_netsync_cmd_anonymous(tvbuff_t *tvb, gint offset, proto_tre offset += len; proto_tree_add_item(tree, hf_netsync_cmd_nonce, tvb, - offset, NETSNYC_MERKLE_HASH_LENGTH, FALSE ); + offset, NETSNYC_MERKLE_HASH_LENGTH, ENC_NA ); offset += NETSNYC_MERKLE_HASH_LENGTH; return offset; @@ -265,25 +265,25 @@ static gint dissect_netsync_cmd_auth(tvbuff_t *tvb, gint offset, proto_tree *tr offset += len; proto_tree_add_item(tree, hf_netsync_cmd_auth_id, tvb, - offset, NETSNYC_MERKLE_HASH_LENGTH, FALSE ); + offset, NETSNYC_MERKLE_HASH_LENGTH, ENC_NA ); offset += NETSNYC_MERKLE_HASH_LENGTH; offset += len; proto_tree_add_item(tree, hf_netsync_cmd_auth_nonce1, tvb, - offset, NETSNYC_MERKLE_HASH_LENGTH, FALSE ); + offset, NETSNYC_MERKLE_HASH_LENGTH, ENC_NA ); offset += NETSNYC_MERKLE_HASH_LENGTH; offset += len; proto_tree_add_item(tree, hf_netsync_cmd_auth_nonce2, tvb, - offset, NETSNYC_MERKLE_HASH_LENGTH, FALSE ); + offset, NETSNYC_MERKLE_HASH_LENGTH, ENC_NA ); offset += NETSNYC_MERKLE_HASH_LENGTH; offset += dissect_uleb128( tvb, offset, &len ); proto_tree_add_item(tree, hf_netsync_cmd_auth_sig, tvb, - offset, len, FALSE ); + offset, len, ENC_NA ); offset += len; return offset; @@ -297,7 +297,7 @@ static gint dissect_netsync_cmd_confirm(tvbuff_t *tvb, gint offset, proto_tree offset += dissect_uleb128( tvb, offset, &len ); proto_tree_add_item(tree, hf_netsync_cmd_confirm_sig, tvb, - offset, len, FALSE ); + offset, len, ENC_NA ); offset += len; @@ -308,7 +308,7 @@ static gint dissect_netsync_cmd_confirm(tvbuff_t *tvb, gint offset, proto_tree static gint dissect_netsync_cmd_refine(tvbuff_t *tvb, gint offset, proto_tree *tree, guint size) { proto_tree_add_item(tree, hf_netsync_cmd_refine_tree_node, tvb, - offset, size, FALSE ); + offset, size, ENC_NA ); offset += size; return offset; @@ -341,7 +341,7 @@ static gint dissect_netsync_cmd_send_data(tvbuff_t *tvb, gint offset, proto_tre offset += 1; proto_tree_add_item(tree, hf_netsync_cmd_send_data_id, tvb, - offset, NETSNYC_MERKLE_HASH_LENGTH, FALSE ); + offset, NETSNYC_MERKLE_HASH_LENGTH, ENC_NA ); offset += NETSNYC_MERKLE_HASH_LENGTH; return offset; @@ -355,12 +355,12 @@ static gint dissect_netsync_cmd_send_delta(tvbuff_t *tvb, gint offset, proto_tr offset += 1; proto_tree_add_item(tree, hf_netsync_cmd_send_delta_base_id, tvb, - offset, NETSNYC_MERKLE_HASH_LENGTH, FALSE ); + offset, NETSNYC_MERKLE_HASH_LENGTH, ENC_NA ); offset += NETSNYC_MERKLE_HASH_LENGTH; proto_tree_add_item(tree, hf_netsync_cmd_send_delta_ident_id, tvb, - offset, NETSNYC_MERKLE_HASH_LENGTH, FALSE ); + offset, NETSNYC_MERKLE_HASH_LENGTH, ENC_NA ); offset += NETSNYC_MERKLE_HASH_LENGTH; return offset; @@ -376,7 +376,7 @@ static gint dissect_netsync_cmd_data(tvbuff_t *tvb, gint offset, proto_tree *tr offset += 1; proto_tree_add_item(tree, hf_netsync_cmd_data_id, tvb, - offset, NETSNYC_MERKLE_HASH_LENGTH, FALSE ); + offset, NETSNYC_MERKLE_HASH_LENGTH, ENC_NA ); offset += NETSNYC_MERKLE_HASH_LENGTH; proto_tree_add_item(tree, hf_netsync_cmd_data_compressed, tvb, @@ -386,7 +386,7 @@ static gint dissect_netsync_cmd_data(tvbuff_t *tvb, gint offset, proto_tree *tr offset += dissect_uleb128( tvb, offset, &len ); proto_tree_add_item(tree, hf_netsync_cmd_data_payload, tvb, - offset, len, FALSE ); + offset, len, ENC_NA ); offset += len; return offset; @@ -402,11 +402,11 @@ static gint dissect_netsync_cmd_delta(tvbuff_t *tvb, gint offset, proto_tree *t offset += 1; proto_tree_add_item(tree, hf_netsync_cmd_delta_base_id, tvb, - offset, NETSNYC_MERKLE_HASH_LENGTH, FALSE ); + offset, NETSNYC_MERKLE_HASH_LENGTH, ENC_NA ); offset += NETSNYC_MERKLE_HASH_LENGTH; proto_tree_add_item(tree, hf_netsync_cmd_delta_ident_id, tvb, - offset, NETSNYC_MERKLE_HASH_LENGTH, FALSE ); + offset, NETSNYC_MERKLE_HASH_LENGTH, ENC_NA ); offset += NETSNYC_MERKLE_HASH_LENGTH; proto_tree_add_item(tree, hf_netsync_cmd_delta_compressed, tvb, @@ -416,7 +416,7 @@ static gint dissect_netsync_cmd_delta(tvbuff_t *tvb, gint offset, proto_tree *t offset += dissect_uleb128( tvb, offset, &len ); proto_tree_add_item(tree, hf_netsync_cmd_delta_payload, tvb, - offset, len, FALSE ); + offset, len, ENC_NA ); offset += len; return offset; @@ -430,7 +430,7 @@ static gint dissect_netsync_cmd_nonexistent(tvbuff_t *tvb, gint offset, proto_t offset += 1; proto_tree_add_item(tree, hf_netsync_cmd_nonexistent_id, tvb, - offset, NETSNYC_MERKLE_HASH_LENGTH, FALSE ); + offset, NETSNYC_MERKLE_HASH_LENGTH, ENC_NA ); offset += NETSNYC_MERKLE_HASH_LENGTH; return offset; @@ -557,7 +557,7 @@ dissect_netsync_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) default: proto_tree_add_item(netsync_tree, hf_netsync_data, tvb, - offset, size, FALSE ); + offset, size, ENC_NA ); break; } diff --git a/epan/dissectors/packet-newmail.c b/epan/dissectors/packet-newmail.c index 5c352f4377..afbab6213d 100644 --- a/epan/dissectors/packet-newmail.c +++ b/epan/dissectors/packet-newmail.c @@ -71,7 +71,7 @@ dissect_newmail(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) newmail_tree = proto_item_add_subtree(ti, ett_newmail); - proto_tree_add_item(newmail_tree, hf_newmail_payload, tvb, 0, 8, FALSE); + proto_tree_add_item(newmail_tree, hf_newmail_payload, tvb, 0, 8, ENC_NA); } } diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c index fa071842c2..c3f6570a50 100644 --- a/epan/dissectors/packet-nfs.c +++ b/epan/dissectors/packet-nfs.c @@ -2212,7 +2212,7 @@ dissect_fhandle_data_CELERRA(tvbuff_t* tvb, packet_info *pinfo _U_, proto_tree * fhlen = tvb_reported_length(tvb); /* Display the entire filehandle */ - proto_tree_add_item(tree, hf_nfs_fh_fhandle_data, tvb, 0, fhlen, FALSE); + proto_tree_add_item(tree, hf_nfs_fh_fhandle_data, tvb, 0, fhlen, ENC_NA); /* On Celerra if fhlen = 32, it's an NFSv3 filehandle */ if (fhlen == 32) { @@ -2220,7 +2220,7 @@ dissect_fhandle_data_CELERRA(tvbuff_t* tvb, packet_info *pinfo _U_, proto_tree * { proto_item* obj_item = NULL; proto_tree* obj_tree = NULL; - obj_item = proto_tree_add_item(tree, hf_nfs_fh_obj, tvb, offset+0, 16, TRUE ); + obj_item = proto_tree_add_item(tree, hf_nfs_fh_obj, tvb, offset+0, 16, ENC_NA ); obj_tree = proto_item_add_subtree(obj_item, ett_nfs_fh_obj); obj_fsid = tvb_get_letohl(tvb, offset+0); @@ -2238,7 +2238,7 @@ dissect_fhandle_data_CELERRA(tvbuff_t* tvb, packet_info *pinfo _U_, proto_tree * /* Create "Export" subtree (NFSv3: Bytes 16 thru 31 of the 32-byte file handle */ proto_item* ex_item = NULL; proto_tree* ex_tree = NULL; - ex_item = proto_tree_add_item(tree, hf_nfs_fh_ex, tvb, offset+16, 16, TRUE ); + ex_item = proto_tree_add_item(tree, hf_nfs_fh_ex, tvb, offset+16, 16, ENC_NA ); ex_tree = proto_item_add_subtree(ex_item, ett_nfs_fh_ex); ex_fsid = tvb_get_letohl(tvb, offset+16); @@ -2272,7 +2272,7 @@ dissect_fhandle_data_CELERRA(tvbuff_t* tvb, packet_info *pinfo _U_, proto_tree * { proto_item* ex_item = NULL; proto_tree* ex_tree = NULL; - ex_item = proto_tree_add_item(tree, hf_nfs_fh_ex, tvb, offset+8, 16, TRUE ); + ex_item = proto_tree_add_item(tree, hf_nfs_fh_ex, tvb, offset+8, 16, ENC_NA ); ex_tree = proto_item_add_subtree(ex_item, ett_nfs_fh_ex); ex_fsid = tvb_get_letohl(tvb, offset+8); @@ -2290,7 +2290,7 @@ dissect_fhandle_data_CELERRA(tvbuff_t* tvb, packet_info *pinfo _U_, proto_tree * { proto_item* obj_item = NULL; proto_tree* obj_tree = NULL; - obj_item = proto_tree_add_item(tree, hf_nfs_fh_obj, tvb, offset+24, 16, TRUE); + obj_item = proto_tree_add_item(tree, hf_nfs_fh_obj, tvb, offset+24, 16, ENC_NA); obj_tree = proto_item_add_subtree(obj_item, ett_nfs_fh_obj); obj_fsid = tvb_get_letohl(tvb, offset+24); @@ -2312,7 +2312,7 @@ dissect_fhandle_data_unknown(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * { guint fhlen=tvb_length(tvb); - proto_tree_add_item(tree, hf_nfs_fh_fhandle_data, tvb, 0, fhlen, FALSE); + proto_tree_add_item(tree, hf_nfs_fh_fhandle_data, tvb, 0, fhlen, ENC_NA); } @@ -3420,7 +3420,7 @@ dissect_readdir_entry(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, if (tree) { entry_item = proto_tree_add_item(tree, hf_nfs_readdir_entry, tvb, - offset+0, -1, FALSE); + offset+0, -1, ENC_NA); entry_tree = proto_item_add_subtree(entry_item, ett_nfs_readdir_entry); } @@ -5650,7 +5650,7 @@ dissect_entry3(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, if (tree) { entry_item = proto_tree_add_item(tree, hf_nfs_readdir_entry, tvb, - offset+0, -1, FALSE); + offset+0, -1, ENC_NA); entry_tree = proto_item_add_subtree(entry_item, ett_nfs_readdir_entry); } @@ -5749,7 +5749,7 @@ dissect_entryplus3(tvbuff_t *tvb, int offset, packet_info *pinfo, if (tree) { entry_item = proto_tree_add_item(tree, hf_nfs_readdir_entry, tvb, - offset+0, -1, FALSE); + offset+0, -1, ENC_NA); entry_tree = proto_item_add_subtree(entry_item, ett_nfs_readdir_entry); } @@ -8290,7 +8290,7 @@ dissect_nfs_stateid4(tvbuff_t *tvb, int offset, offset = dissect_rpc_uint32(tvb, newftree, hf_nfs_seqid4, offset); - proto_tree_add_item(newftree, hf_nfs_stateid4_other, tvb, offset, 12, FALSE); + proto_tree_add_item(newftree, hf_nfs_stateid4_other, tvb, offset, 12, ENC_NA); offset+=12; if (hash) diff --git a/epan/dissectors/packet-nfsacl.c b/epan/dissectors/packet-nfsacl.c index 7800f622f6..35bdeb329c 100644 --- a/epan/dissectors/packet-nfsacl.c +++ b/epan/dissectors/packet-nfsacl.c @@ -149,7 +149,7 @@ dissect_nfsacl_aclent(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, if (tree) { entry_item = proto_tree_add_item(tree, hf_nfsacl_aclent, tvb, - offset + 0, -1, FALSE); + offset + 0, -1, ENC_NA); entry_tree = proto_item_add_subtree(entry_item, ett_nfsacl_aclent); } @@ -450,7 +450,7 @@ dissect_nfsacl3_getacl_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, if (tree) { entry_item = proto_tree_add_item(tree, hf_nfsacl_entry, tvb, - offset + 0, -1, FALSE); + offset + 0, -1, ENC_NA); if (entry_item) entry_tree = proto_item_add_subtree(entry_item, ett_nfsacl_entry); } @@ -480,7 +480,7 @@ dissect_nfsacl3_setacl_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, if (tree) { acl_item = proto_tree_add_item(tree, hf_nfsacl_entry, tvb, offset + 0, - -1, FALSE); + -1, ENC_NA); if (acl_item) acl_tree = proto_item_add_subtree(acl_item, ett_nfsacl_entry); diff --git a/epan/dissectors/packet-nisplus.c b/epan/dissectors/packet-nisplus.c index 97c8540408..820299f8d1 100644 --- a/epan/dissectors/packet-nisplus.c +++ b/epan/dissectors/packet-nisplus.c @@ -293,7 +293,7 @@ dissect_group_obj(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre int old_offset = offset; lock_item = proto_tree_add_item(tree, hf_nisplus_group, - tvb, offset, -1, FALSE); + tvb, offset, -1, ENC_NA); lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_group); @@ -316,7 +316,7 @@ dissect_access_rights(tvbuff_t *tvb, int offset, proto_tree *tree) guint32 mask; mask_item = proto_tree_add_item(tree, hf_nisplus_access_mask, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_NA); mask_tree = proto_item_add_subtree(mask_item, ett_nisplus_access_mask); mask = tvb_get_ntohl(tvb, offset); @@ -352,7 +352,7 @@ dissect_table(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tre int old_offset = offset; lock_item = proto_tree_add_item(tree, hf_nisplus_table_col, - tvb, offset, -1, FALSE); + tvb, offset, -1, ENC_NA); lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_table_col); @@ -362,7 +362,7 @@ dissect_table(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tre mask_item = proto_tree_add_item(lock_tree, hf_nisplus_table_col_mask, tvb, offset, 4, - FALSE); + ENC_NA); mask_tree = proto_item_add_subtree(mask_item, ett_nisplus_table_col_mask); mask = tvb_get_ntohl(tvb, offset); proto_tree_add_boolean(mask_tree, hf_nisplus_table_col_mask_binary, @@ -396,7 +396,7 @@ dissect_table_obj(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre int old_offset = offset; lock_item = proto_tree_add_item(tree, hf_nisplus_table, - tvb, offset, -1, FALSE); + tvb, offset, -1, ENC_NA); lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_table); @@ -430,13 +430,13 @@ dissect_entry(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tre int old_offset = offset; lock_item = proto_tree_add_item(tree, hf_nisplus_entry_col, - tvb, offset, -1, FALSE); + tvb, offset, -1, ENC_NA); lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_entry_col); mask_item = proto_tree_add_item(lock_tree, hf_nisplus_entry_mask, tvb, offset, 4, - FALSE); + ENC_NA); mask_tree = proto_item_add_subtree(mask_item, ett_nisplus_entry_mask); mask = tvb_get_ntohl(tvb, offset); @@ -462,7 +462,7 @@ dissect_entry_obj(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre int old_offset = offset; lock_item = proto_tree_add_item(tree, hf_nisplus_entry, - tvb, offset, -1, FALSE); + tvb, offset, -1, ENC_NA); lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_entry); @@ -484,7 +484,7 @@ dissect_attr(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree int old_offset = offset; lock_item = proto_tree_add_item(tree, hf_nisplus_attr, - tvb, offset, -1, FALSE); + tvb, offset, -1, ENC_NA); lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_attr); @@ -506,7 +506,7 @@ dissect_link_obj(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree int old_offset = offset; lock_item = proto_tree_add_item(tree, hf_nisplus_link, - tvb, offset, -1, FALSE); + tvb, offset, -1, ENC_NA); lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_link); @@ -532,7 +532,7 @@ dissect_endpoint(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree * int old_offset = offset; lock_item = proto_tree_add_item(tree, hf_nisplus_endpoint, - tvb, offset, -1, FALSE); + tvb, offset, -1, ENC_NA); lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_endpoint); @@ -558,7 +558,7 @@ dissect_directory_server(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr int old_offset = offset; lock_item = proto_tree_add_item(tree, hf_nisplus_server, - tvb, offset, -1, FALSE); + tvb, offset, -1, ENC_NA); lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_server); @@ -587,7 +587,7 @@ dissect_directory_mask(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_ int old_offset = offset; lock_item = proto_tree_add_item(tree, hf_nisplus_directory_mask, - tvb, offset, -1, FALSE); + tvb, offset, -1, ENC_NA); lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_directory_mask); @@ -608,7 +608,7 @@ dissect_directory_obj(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree int old_offset = offset; lock_item = proto_tree_add_item(tree, hf_nisplus_directory, - tvb, offset, -1, FALSE); + tvb, offset, -1, ENC_NA); lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_directory); @@ -639,7 +639,7 @@ dissect_nisplus_oid(tvbuff_t *tvb, int offset, proto_tree *tree) int old_offset = offset; lock_item = proto_tree_add_item(tree, hf_nisplus_oid, tvb, - offset, -1, FALSE); + offset, -1, ENC_NA); lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_oid); @@ -662,7 +662,7 @@ dissect_nisplus_object(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree int old_offset = offset; lock_item = proto_tree_add_item(tree, hf_nisplus_object, tvb, - offset, -1, FALSE); + offset, -1, ENC_NA); lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_object); @@ -785,7 +785,7 @@ dissect_nisplus_tag(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre int old_offset = offset; lock_item = proto_tree_add_item(tree, hf_nisplus_tag, tvb, - offset, -1, FALSE); + offset, -1, ENC_NA); lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_tag); @@ -1028,7 +1028,7 @@ dissect_log_entry(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre int old_offset = offset; lock_item = proto_tree_add_item(tree, hf_nisplus_log_entry, - tvb, offset, -1, FALSE); + tvb, offset, -1, ENC_NA); lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_log_entry); @@ -1881,7 +1881,7 @@ dissect_cb_entry(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree * int old_offset = offset; lock_item = proto_tree_add_item(tree, hf_nispluscb_entry, - tvb, offset, -1, FALSE); + tvb, offset, -1, ENC_NA); /* lock_tree = proto_item_add_subtree(lock_item, ett_nispluscb_entry); */ diff --git a/epan/dissectors/packet-nlm.c b/epan/dissectors/packet-nlm.c index 2d88e8c1da..8025bd0fc5 100644 --- a/epan/dissectors/packet-nlm.c +++ b/epan/dissectors/packet-nlm.c @@ -375,7 +375,7 @@ dissect_lock(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int version, i if (tree) { lock_item = proto_tree_add_item(tree, hf_nlm_lock, tvb, - offset, -1, FALSE); + offset, -1, ENC_NA); if (lock_item) lock_tree = proto_item_add_subtree(lock_item, ett_nlm_lock); } @@ -578,7 +578,7 @@ dissect_nlm_test_res(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, if (tree) { lock_item = proto_tree_add_item(tree, hf_nlm_test_stat, tvb, - offset, -1, FALSE); + offset, -1, ENC_NA); if (lock_item) lock_tree = proto_item_add_subtree(lock_item, ett_nlm_lock); @@ -594,7 +594,7 @@ dissect_nlm_test_res(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, if (tree) { lock_item = proto_tree_add_item(lock_tree, hf_nlm_holder, tvb, - offset, -1, FALSE); + offset, -1, ENC_NA); if (lock_item) lock_tree = proto_item_add_subtree(lock_item, ett_nlm_lock); @@ -636,7 +636,7 @@ dissect_nlm_share(tvbuff_t *tvb, int offset, packet_info *pinfo, if (tree) { lock_item = proto_tree_add_item(tree, hf_nlm_share, tvb, - offset, -1, FALSE); + offset, -1, ENC_NA); if (lock_item) lock_tree = proto_item_add_subtree(lock_item, ett_nlm_lock); diff --git a/epan/dissectors/packet-ntlmssp.c b/epan/dissectors/packet-ntlmssp.c index f75c8d1578..3ced90e808 100644 --- a/epan/dissectors/packet-ntlmssp.c +++ b/epan/dissectors/packet-ntlmssp.c @@ -974,7 +974,7 @@ dissect_ntlmssp_blob (tvbuff_t *tvb, int offset, { proto_tree_add_item (ntlmssp_tree, hf_ntlmssp_ntlm_client_challenge, - tvb, blob_offset, 8, FALSE); + tvb, blob_offset, 8, ENC_NA); } } } @@ -986,7 +986,7 @@ dissect_ntlmssp_blob (tvbuff_t *tvb, int offset, { proto_tree_add_item (ntlmssp_tree, hf_ntlmssp_ntlm_client_challenge, - tvb, blob_offset+32, 8, FALSE); + tvb, blob_offset+32, 8, ENC_NA); dissect_ntlmv2_response(tvb, tree, blob_offset, blob_length); } @@ -1327,14 +1327,14 @@ dissect_ntlmv2_response(tvbuff_t *tvb, proto_tree *tree, int offset, int len) if (tree) { ntlmv2_item = proto_tree_add_item( tree, hf_ntlmssp_ntlmv2_response, tvb, - offset, len, TRUE); + offset, len, ENC_NA); ntlmv2_tree = proto_item_add_subtree( ntlmv2_item, ett_ntlmssp_ntlmv2_response); } proto_tree_add_item( ntlmv2_tree, hf_ntlmssp_ntlmv2_response_hmac, tvb, - offset, 16, TRUE); + offset, 16, ENC_NA); offset += 16; @@ -1355,7 +1355,7 @@ dissect_ntlmv2_response(tvbuff_t *tvb, proto_tree *tree, int offset, int len) proto_tree_add_item( ntlmv2_tree, hf_ntlmssp_ntlmv2_response_chal, tvb, - offset, 8, TRUE); + offset, 8, ENC_NA); offset += 8; @@ -1444,7 +1444,7 @@ dissect_ntlmssp_challenge_target_info_blob (tvbuff_t *tvb, int offset, if (ntlmssp_tree) { tf = proto_tree_add_item (ntlmssp_tree, hf_ntlmssp_challenge_target_info, tvb, - challenge_target_info_offset, challenge_target_info_length, FALSE); + challenge_target_info_offset, challenge_target_info_length, ENC_NA); challenge_target_info_tree = proto_item_add_subtree(tf, ett_ntlmssp_challenge_target_info); } proto_tree_add_uint(challenge_target_info_tree, hf_ntlmssp_challenge_target_info_len, @@ -1507,7 +1507,7 @@ dissect_ntlmssp_challenge (tvbuff_t *tvb, packet_info *pinfo, int offset, /* NTLMSSP NT Lan Manager Challenge */ proto_tree_add_item (ntlmssp_tree, hf_ntlmssp_ntlm_server_challenge, - tvb, offset, 8, FALSE); + tvb, offset, 8, ENC_NA); /* * Store the flags and the RC4 state information with the conversation, @@ -1575,7 +1575,7 @@ dissect_ntlmssp_challenge (tvbuff_t *tvb, packet_info *pinfo, int offset, * It also says that that information may be omitted. */ proto_tree_add_item (ntlmssp_tree, hf_ntlmssp_reserved, - tvb, offset, 8, FALSE); + tvb, offset, 8, ENC_NA); offset += 8; /* @@ -1957,7 +1957,7 @@ dissect_ntlmssp_payload(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) if (tree) { tf = proto_tree_add_item (tree, hf_ntlmssp_verf, - tvb, offset, -1, FALSE); + tvb, offset, -1, ENC_NA); ntlmssp_tree = proto_item_add_subtree (tf, ett_ntlmssp); @@ -1984,7 +1984,7 @@ dissect_ntlmssp_payload(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) /* Encrypted body */ proto_tree_add_item (ntlmssp_tree, hf_ntlmssp_verf_body, - tvb, offset, ntlm_signature_size + ntlm_seq_size, TRUE); + tvb, offset, ntlm_signature_size + ntlm_seq_size, ENC_NA); tvb_memcpy(tvb, key, offset, ntlm_signature_size + ntlm_seq_size); /* Try to decrypt */ decrypt_data_payload (tvb, offset+(ntlm_signature_size + ntlm_seq_size), encrypted_block_length-(ntlm_signature_size + ntlm_seq_size), pinfo, ntlmssp_tree,key); @@ -2361,14 +2361,14 @@ decrypt_verifier(tvbuff_t *tvb, int offset, guint32 encrypted_block_length, if(( conv_ntlmssp_info->flags & NTLMSSP_NEGOTIATE_EXTENDED_SECURITY )) { proto_tree_add_item (decr_tree, hf_ntlmssp_verf_hmacmd5, - decr_tvb, decrypted_offset, 8,TRUE); + decr_tvb, decrypted_offset, 8,ENC_NA); decrypted_offset += 8; /* Incrementing sequence number of DCE conversation */ proto_tree_add_item (decr_tree, hf_ntlmssp_verf_sequence, - decr_tvb, decrypted_offset, 4, TRUE); + decr_tvb, decrypted_offset, 4, ENC_NA); decrypted_offset += 4; } else { @@ -2385,7 +2385,7 @@ decrypt_verifier(tvbuff_t *tvb, int offset, guint32 encrypted_block_length, /* Incrementing sequence number of DCE conversation */ proto_tree_add_item (decr_tree, hf_ntlmssp_verf_sequence, - decr_tvb, decrypted_offset, 4, TRUE); + decr_tvb, decrypted_offset, 4, ENC_NA); decrypted_offset += 4; } } @@ -2409,7 +2409,7 @@ dissect_ntlmssp_payload_only(tvbuff_t *tvb, packet_info *pinfo, _U_ proto_tree * if (tree) { tf = proto_tree_add_item (tree, hf_ntlmssp_verf, - tvb, offset, -1, FALSE); + tvb, offset, -1, ENC_NA); ntlmssp_tree = proto_item_add_subtree (tf, ett_ntlmssp); @@ -2475,7 +2475,7 @@ dissect_ntlmssp_verf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { tf = proto_tree_add_item (tree, hf_ntlmssp_verf, - tvb, offset, -1, FALSE); + tvb, offset, -1, ENC_NA); ntlmssp_tree = proto_item_add_subtree (tf, ett_ntlmssp); @@ -2502,7 +2502,7 @@ dissect_ntlmssp_verf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Encrypted body */ proto_tree_add_item (ntlmssp_tree, hf_ntlmssp_verf_body, - tvb, offset, encrypted_block_length, TRUE); + tvb, offset, encrypted_block_length, ENC_NA); /* Try to decrypt */ decrypt_verifier (tvb, offset, encrypted_block_length, pinfo, ntlmssp_tree,NULL); diff --git a/epan/dissectors/packet-omron-fins.c b/epan/dissectors/packet-omron-fins.c index a6f17ec506..9548f4c4e8 100644 --- a/epan/dissectors/packet-omron-fins.c +++ b/epan/dissectors/packet-omron-fins.c @@ -1296,7 +1296,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(reported_length_remaining > 2) { proto_tree_add_item(command_tree, hf_omron_response_data, tvb, - (offset+2), -1, FALSE); + (offset+2), -1, ENC_NA); } offset = offset + reported_length_remaining; } @@ -1317,7 +1317,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(command_tree, hf_omron_address_bits, tvb, (offset+3), 1, FALSE); proto_tree_add_item(command_tree, hf_omron_num_items, tvb, (offset+4), 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_command_data, tvb, (offset+6), -1, FALSE); + proto_tree_add_item(command_tree, hf_omron_command_data, tvb, (offset+6), -1, ENC_NA); offset = offset + reported_length_remaining; } } @@ -1347,7 +1347,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(command_tree, hf_omron_address_bits, tvb, (offset+3), 1, FALSE); proto_tree_add_item(command_tree, hf_omron_num_items, tvb, (offset+4), 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_command_data, tvb, (offset+6), 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_command_data, tvb, (offset+6), 2, ENC_NA); offset = offset + 8; } } @@ -1486,7 +1486,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) "Unknown Memory-Area-Code (%u)", memory_area_code); return tvb_length(tvb); /* Bail out .... */ } - proto_tree_add_item(command_tree, hf_omron_data, tvb, offset, memory_code_len, FALSE); + proto_tree_add_item(command_tree, hf_omron_data, tvb, offset, memory_code_len, ENC_NA); offset = offset + memory_code_len; reported_length_remaining = reported_length_remaining - memory_code_len; @@ -1556,7 +1556,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(reported_length_remaining > 8) { proto_tree_add_item(command_tree, hf_omron_response_data, tvb, - (offset+8), -1, FALSE); + (offset+8), -1, ENC_NA); } offset = offset + reported_length_remaining; } @@ -1579,7 +1579,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(reported_length_remaining > 6) { proto_tree_add_item(command_tree, hf_omron_command_data, tvb, - (offset+6), -1, FALSE); + (offset+6), -1, ENC_NA); } offset = offset + reported_length_remaining; } @@ -1733,7 +1733,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(reported_length_remaining > 10) { - proto_tree_add_item(command_tree, hf_omron_response_data, tvb, (offset+10), -1, FALSE); + proto_tree_add_item(command_tree, hf_omron_response_data, tvb, (offset+10), -1, ENC_NA); } offset = offset + reported_length_remaining; } @@ -1753,7 +1753,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(reported_length_remaining > 8) { - proto_tree_add_item(command_tree, hf_omron_command_data, tvb, (offset+8), -1, FALSE); + proto_tree_add_item(command_tree, hf_omron_command_data, tvb, (offset+8), -1, ENC_NA); } offset = offset + reported_length_remaining; } @@ -1807,7 +1807,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) else if (reported_length_remaining == 2) { proto_tree_add_item(command_tree, hf_omron_program_number, tvb, offset, 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_monitor_label, tvb, offset, 0, FALSE); + proto_tree_add_item(command_tree, hf_omron_monitor_label, tvb, offset, 0, ENC_NA); offset = offset + 2; } } @@ -1844,7 +1844,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(reported_length_remaining == 1) { proto_tree_add_item(command_tree, hf_omron_command_data, tvb, - offset, -1, FALSE); + offset, -1, ENC_NA); offset = offset + 1; } } @@ -2374,7 +2374,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* zero-length case handled in previous switch statement */ if(reported_length_remaining > 0) { - proto_tree_add_item(command_tree, hf_omron_data, tvb, offset, -1, FALSE); + proto_tree_add_item(command_tree, hf_omron_data, tvb, offset, -1, ENC_NA); offset = offset + reported_length_remaining; } } @@ -2384,7 +2384,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(reported_length_remaining > 2) { proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_data, tvb, (offset+2), -1, FALSE); + proto_tree_add_item(command_tree, hf_omron_data, tvb, (offset+2), -1, ENC_NA); offset = offset + reported_length_remaining; } } @@ -2412,7 +2412,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* zero-length case handled in previous switch statement */ if(reported_length_remaining > 0) { - proto_tree_add_item(command_tree, hf_omron_data, tvb, offset, -1, FALSE); + proto_tree_add_item(command_tree, hf_omron_data, tvb, offset, -1, ENC_NA); offset = offset + reported_length_remaining; } } @@ -2735,7 +2735,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(reported_length_remaining > 12) { - proto_tree_add_item(command_tree, hf_omron_file_data, tvb, (offset+12), -1, FALSE); + proto_tree_add_item(command_tree, hf_omron_file_data, tvb, (offset+12), -1, ENC_NA); } offset = offset + reported_length_remaining; } @@ -2756,7 +2756,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(command_tree, hf_omron_data_length, tvb, (offset+20), 2, FALSE); if(reported_length_remaining > 22) { - proto_tree_add_item(command_tree, hf_omron_file_data, tvb, (offset+22), -1, FALSE); + proto_tree_add_item(command_tree, hf_omron_file_data, tvb, (offset+22), -1, ENC_NA); } offset = offset + reported_length_remaining; } @@ -3066,7 +3066,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_bitmask(command_tree, tvb, (offset+2), hf_omron_data_type, ett_omron_data_type, data_type_fields, FALSE); proto_tree_add_item(command_tree, hf_omron_control_data, tvb, (offset+3), 1, FALSE); - proto_tree_add_item(command_tree, hf_omron_data, tvb, (offset+4), -1, FALSE); + proto_tree_add_item(command_tree, hf_omron_data, tvb, (offset+4), -1, ENC_NA); offset = offset + reported_length_remaining; } } @@ -3083,7 +3083,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ett_omron_data_type, data_type_fields, FALSE); proto_tree_add_item(command_tree, hf_omron_control_data, tvb, (offset+1), 1, FALSE); proto_tree_add_item(command_tree, hf_omron_block_num, tvb, (offset+2), 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_data, tvb, (offset+4), -1, FALSE); + proto_tree_add_item(command_tree, hf_omron_data, tvb, (offset+4), -1, ENC_NA); offset = offset + reported_length_remaining; } } @@ -3170,7 +3170,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(command_tree, hf_omron_command_memory_area_code, tvb, (offset+2), 1, FALSE); proto_tree_add_item(command_tree, hf_omron_transfer_beginning_address, tvb, (offset+3), 3, FALSE); proto_tree_add_item(command_tree, hf_omron_num_unit_uint16, tvb, (offset+6), 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_data, tvb, (offset+8), -1, FALSE); + proto_tree_add_item(command_tree, hf_omron_data, tvb, (offset+8), -1, ENC_NA); offset = offset + reported_length_remaining; } } diff --git a/epan/dissectors/packet-ositp.c b/epan/dissectors/packet-ositp.c index 3456071ac8..d758144902 100644 --- a/epan/dissectors/packet-ositp.c +++ b/epan/dissectors/packet-ositp.c @@ -552,13 +552,13 @@ static gboolean ositp_decode_var_part(tvbuff_t *tvb, int offset, (tsap_display==TSAP_DISPLAY_AUTO && is_all_printable(tvb_get_ptr(tvb,offset,length),length))) { proto_tree_add_string(tree, hf_cotp_vp_src_tsap, tvb, offset, length, print_tsap(tvb_get_ptr(tvb, offset, length),length)); - hidden_item = proto_tree_add_item(tree, hf_cotp_vp_src_tsap_bytes, tvb, offset, length, ENC_BIG_ENDIAN); + hidden_item = proto_tree_add_item(tree, hf_cotp_vp_src_tsap_bytes, tvb, offset, length, ENC_NA); PROTO_ITEM_SET_HIDDEN(hidden_item); } else { hidden_item = proto_tree_add_string(tree, hf_cotp_vp_src_tsap, tvb, offset, length, print_tsap(tvb_get_ptr(tvb, offset, length),length)); PROTO_ITEM_SET_HIDDEN(hidden_item); - proto_tree_add_item(tree, hf_cotp_vp_src_tsap_bytes, tvb, offset, length, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_cotp_vp_src_tsap_bytes, tvb, offset, length, ENC_NA); } offset += length; vp_length -= length; @@ -572,13 +572,13 @@ static gboolean ositp_decode_var_part(tvbuff_t *tvb, int offset, (tsap_display==TSAP_DISPLAY_AUTO && is_all_printable(tvb_get_ptr(tvb,offset,length),length))) { proto_tree_add_string(tree, hf_cotp_vp_dst_tsap, tvb, offset, length, print_tsap(tvb_get_ptr(tvb, offset, length),length)); - hidden_item = proto_tree_add_item(tree, hf_cotp_vp_dst_tsap_bytes, tvb, offset, length, ENC_BIG_ENDIAN); + hidden_item = proto_tree_add_item(tree, hf_cotp_vp_dst_tsap_bytes, tvb, offset, length, ENC_NA); PROTO_ITEM_SET_HIDDEN(hidden_item); } else { hidden_item = proto_tree_add_string(tree, hf_cotp_vp_dst_tsap, tvb, offset, length, print_tsap(tvb_get_ptr(tvb, offset, length),length)); PROTO_ITEM_SET_HIDDEN(hidden_item); - proto_tree_add_item(tree, hf_cotp_vp_dst_tsap_bytes, tvb, offset, length, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_cotp_vp_dst_tsap_bytes, tvb, offset, length, ENC_NA); } offset += length; vp_length -= length; diff --git a/epan/dissectors/packet-p_mul.c b/epan/dissectors/packet-p_mul.c index d3fa01966c..051d50c392 100644 --- a/epan/dissectors/packet-p_mul.c +++ b/epan/dissectors/packet-p_mul.c @@ -560,7 +560,7 @@ static void add_ack_analysis (tvbuff_t *tvb, packet_info *pinfo, proto_tree *p_m } else { en = proto_tree_add_item (analysis_tree, hf_analysis_addr_pdu_missing, - tvb, offset, 0, ENC_BIG_ENDIAN); + tvb, offset, 0, ENC_NA); expert_add_info_format (pinfo, en, PI_SEQUENCE, PI_NOTE, "Address PDU missing"); PROTO_ITEM_SET_GENERATED (en); @@ -581,7 +581,7 @@ static void add_ack_analysis (tvbuff_t *tvb, packet_info *pinfo, proto_tree *p_m } else if (!pkg_data->msg_resend_count) { en = proto_tree_add_item (analysis_tree, hf_analysis_ack_missing, - tvb, offset, 0, ENC_BIG_ENDIAN); + tvb, offset, 0, ENC_NA); if (pinfo->fd->flags.visited) { /* We do not know this on first visit and we do not want to add a entry in the "Expert Severity Info" for this note */ @@ -626,7 +626,7 @@ static void add_ack_analysis (tvbuff_t *tvb, packet_info *pinfo, proto_tree *p_m } else { en = proto_tree_add_item (analysis_tree, hf_analysis_addr_pdu_missing, - tvb, offset, 0, ENC_BIG_ENDIAN); + tvb, offset, 0, ENC_NA); expert_add_info_format (pinfo, en, PI_SEQUENCE, PI_NOTE, "Address PDU missing"); PROTO_ITEM_SET_GENERATED (en); @@ -709,7 +709,7 @@ static p_mul_seq_val *add_seq_analysis (tvbuff_t *tvb, packet_info *pinfo, } else if (!pkg_data->msg_resend_count) { en = proto_tree_add_item (analysis_tree, hf_analysis_addr_pdu_missing, - tvb, offset, 0, ENC_BIG_ENDIAN); + tvb, offset, 0, ENC_NA); expert_add_info_format (pinfo, en, PI_SEQUENCE, PI_NOTE, "Address PDU missing"); PROTO_ITEM_SET_GENERATED (en); @@ -732,7 +732,7 @@ static p_mul_seq_val *add_seq_analysis (tvbuff_t *tvb, packet_info *pinfo, } else if (!pkg_data->msg_resend_count) { en = proto_tree_add_item (analysis_tree, hf_analysis_prev_pdu_missing, - tvb, offset, 0, ENC_BIG_ENDIAN); + tvb, offset, 0, ENC_NA); expert_add_info_format (pinfo, en, PI_SEQUENCE, PI_NOTE, "Previous PDU missing"); PROTO_ITEM_SET_GENERATED (en); diff --git a/epan/dissectors/packet-packetbb.c b/epan/dissectors/packet-packetbb.c index 02abc4a23b..f6ca248920 100644 --- a/epan/dissectors/packet-packetbb.c +++ b/epan/dissectors/packet-packetbb.c @@ -162,7 +162,7 @@ static int dissect_pbb_tlvblock(tvbuff_t *tvb, proto_tree *tree, guint offset, return maxoffset; } - tlvBlock_item = proto_tree_add_item(tree, hf_packetbb_tlvblock, tvb, offset, tlvblockEnd - offset, FALSE); + tlvBlock_item = proto_tree_add_item(tree, hf_packetbb_tlvblock, tvb, offset, tlvblockEnd - offset, ENC_NA); tlvblock_tree = proto_item_add_subtree(tlvBlock_item, ett_packetbb_tlvblock); proto_tree_add_item(tlvblock_tree, hf_packetbb_tlvblock_length, tvb, offset, 2, FALSE); @@ -205,7 +205,7 @@ static int dissect_pbb_tlvblock(tvbuff_t *tvb, proto_tree *tree, guint offset, tlvLength = offset - tlvStart + length; offset = tlvStart; - tlv_item = proto_tree_add_item(tlvBlock_item, hf_packetbb_tlv, tvb, tlvStart, tlvLength, FALSE); + tlv_item = proto_tree_add_item(tlvBlock_item, hf_packetbb_tlv, tvb, tlvStart, tlvLength, ENC_NA); tlv_tree = proto_item_add_subtree(tlv_item, ett_packetbb_tlv[tlvType]); if ((tlvFlags & TLV_HAS_TYPEEXT) == 0) { @@ -273,7 +273,7 @@ static int dissect_pbb_tlvblock(tvbuff_t *tvb, proto_tree *tree, guint offset, if (length > 0) { /* add value */ - tlvValue_item = proto_tree_add_item(tlv_tree, hf_packetbb_tlv_value, tvb, offset, length, FALSE); + tlvValue_item = proto_tree_add_item(tlv_tree, hf_packetbb_tlv_value, tvb, offset, length, ENC_NA); if ((tlvFlags & TLV_HAS_MULTIVALUE) == 0) { offset += length; @@ -284,7 +284,7 @@ static int dissect_pbb_tlvblock(tvbuff_t *tvb, proto_tree *tree, guint offset, tlvValue_tree = proto_item_add_subtree(tlvValue_item, ett_packetbb_tlv_value); for (i=indexStart; i<=indexEnd; i++) { - proto_tree_add_item(tlvValue_tree, hf_packetbb_tlv_multivalue, tvb, offset, length/c, FALSE); + proto_tree_add_item(tlvValue_tree, hf_packetbb_tlv_multivalue, tvb, offset, length/c, ENC_NA); offset += (length/c); } } @@ -424,7 +424,7 @@ static int dissect_pbb_addressblock(tvbuff_t *tvb, proto_tree *tree, guint offse } /* add address tree */ - addr_item = proto_tree_add_item(tree, hf_packetbb_addr, tvb, block_index, block_length, FALSE); + addr_item = proto_tree_add_item(tree, hf_packetbb_addr, tvb, block_index, block_length, ENC_NA); addr_tree = proto_item_add_subtree(addr_item, ett_packetbb_addr); proto_item_append_text(addr_item, " (%d addresses)", numAddr); @@ -443,16 +443,16 @@ static int dissect_pbb_addressblock(tvbuff_t *tvb, proto_tree *tree, guint offse if ((address_flags & ADDR_HASHEAD) != 0) { /* add head */ - proto_tree_add_item(addr_tree, hf_packetbb_addr_head, tvb, head_index, head_length+1, FALSE); + proto_tree_add_item(addr_tree, hf_packetbb_addr_head, tvb, head_index, head_length+1, ENC_NA); } if ((address_flags & ADDR_HASFULLTAIL) != 0) { /* add full tail */ - proto_tree_add_item(addr_tree, hf_packetbb_addr_tail, tvb, tail_index, tail_length+1, FALSE); + proto_tree_add_item(addr_tree, hf_packetbb_addr_tail, tvb, tail_index, tail_length+1, ENC_NA); } else if ((address_flags & ADDR_HASZEROTAIL) != 0) { /* add zero tail */ - proto_tree_add_item(addr_tree, hf_packetbb_addr_head, tvb, tail_index, 1, FALSE); + proto_tree_add_item(addr_tree, hf_packetbb_addr_head, tvb, tail_index, 1, ENC_NA); } for (i=0; i<numAddr; i++) { guint32 ipv4 = (addr[0] << 24) + (addr[1] << 16) + (addr[2] << 8) + addr[3]; @@ -481,7 +481,7 @@ static int dissect_pbb_addressblock(tvbuff_t *tvb, proto_tree *tree, guint offse addrValue_tree = proto_item_add_subtree(addrValue_item, ett_packetbb_addr_value); proto_tree_add_item(addrValue_tree, hf_packetbb_addr_value_mid, tvb, - mid_index + midSize*i, midSize, FALSE); + mid_index + midSize*i, midSize, ENC_NA); if ((address_flags & ADDR_HASSINGLEPRELEN) != 0) { prefix = tvb_get_guint8(tvb, prefix_index); @@ -563,11 +563,11 @@ static int dissect_pbb_message(tvbuff_t *tvb, proto_tree *tree, guint offset) { return tvb_reported_length(tvb); } - message_item = proto_tree_add_item(tree, hf_packetbb_msg, tvb, offset, messageLength, FALSE); + message_item = proto_tree_add_item(tree, hf_packetbb_msg, tvb, offset, messageLength, ENC_NA); message_tree = proto_item_add_subtree(message_item, ett_packetbb_msg[messageType]); proto_item_append_text(message_item, " (type %d)", messageType); - header_item = proto_tree_add_item(message_tree, hf_packetbb_msgheader, tvb, offset, headerLength, FALSE); + header_item = proto_tree_add_item(message_tree, hf_packetbb_msgheader, tvb, offset, headerLength, ENC_NA); header_tree = proto_item_add_subtree(header_item, ett_packetbb_msgheader); /* type */ @@ -660,7 +660,7 @@ static int dissect_pbb_header(tvbuff_t *tvb, proto_tree *tree) { return tvb_reported_length(tvb); } - header_item = proto_tree_add_item(tree, hf_packetbb_header, tvb, 0, headerLength, FALSE); + header_item = proto_tree_add_item(tree, hf_packetbb_header, tvb, 0, headerLength, ENC_NA); header_tree = proto_item_add_subtree(header_item, ett_packetbb_header); /* version */ diff --git a/epan/dissectors/packet-paltalk.c b/epan/dissectors/packet-paltalk.c index 0fc7253fc0..9f502dbbe7 100644 --- a/epan/dissectors/packet-paltalk.c +++ b/epan/dissectors/packet-paltalk.c @@ -107,7 +107,7 @@ dissect_paltalk_desegmented(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(pt_tree, hf_paltalk_pdu_type, tvb, 0, 2, FALSE); proto_tree_add_item(pt_tree, hf_paltalk_version, tvb, 2, 2, FALSE); proto_tree_add_item(pt_tree, hf_paltalk_length, tvb, 4, 2, FALSE); - proto_tree_add_item(pt_tree, hf_paltalk_content, tvb, 6, tvb_get_ntohs(tvb, 4), FALSE); + proto_tree_add_item(pt_tree, hf_paltalk_content, tvb, 6, tvb_get_ntohs(tvb, 4), ENC_NA); } } diff --git a/epan/dissectors/packet-pdcp-lte.c b/epan/dissectors/packet-pdcp-lte.c index 521e2909d2..1137878dc1 100644 --- a/epan/dissectors/packet-pdcp-lte.c +++ b/epan/dissectors/packet-pdcp-lte.c @@ -673,7 +673,7 @@ static int dissect_pdcp_dynamic_chain(proto_tree *tree, guint8 tos, ttl, id, rnd, nbo; /* Create dynamic IPv4 subtree */ - root_ti = proto_tree_add_item(tree, hf_pdcp_lte_rohc_dynamic_ipv4, tvb, offset, -1, FALSE); + root_ti = proto_tree_add_item(tree, hf_pdcp_lte_rohc_dynamic_ipv4, tvb, offset, -1, ENC_NA); dynamic_ipv4_tree = proto_item_add_subtree(root_ti, ett_pdcp_rohc_dynamic_ipv4); /* ToS */ @@ -718,7 +718,7 @@ static int dissect_pdcp_dynamic_chain(proto_tree *tree, unsigned short checksum; /* Create dynamic UDP subtree */ - root_ti = proto_tree_add_item(tree, hf_pdcp_lte_rohc_dynamic_udp, tvb, offset, 2, FALSE); + root_ti = proto_tree_add_item(tree, hf_pdcp_lte_rohc_dynamic_udp, tvb, offset, 2, ENC_NA); dynamic_udp_tree = proto_item_add_subtree(root_ti, ett_pdcp_rohc_dynamic_udp); /* 16-bit checksum */ @@ -755,7 +755,7 @@ static int dissect_pdcp_dynamic_chain(proto_tree *tree, guint64 ts_stride=0; /* Create dynamic RTP subtree */ - root_ti = proto_tree_add_item(tree, hf_pdcp_lte_rohc_dynamic_rtp, tvb, offset, -1, FALSE); + root_ti = proto_tree_add_item(tree, hf_pdcp_lte_rohc_dynamic_rtp, tvb, offset, -1, ENC_NA); dynamic_rtp_tree = proto_item_add_subtree(root_ti, ett_pdcp_rohc_dynamic_rtp); /* TODO: */ @@ -905,7 +905,7 @@ static int dissect_pdcp_ir_packet(proto_tree *tree, guint32 source, dest; /* Create static IPv4 subtree */ - root_ti = proto_tree_add_item(tree, hf_pdcp_lte_rohc_static_ipv4, tvb, offset, -1, FALSE); + root_ti = proto_tree_add_item(tree, hf_pdcp_lte_rohc_static_ipv4, tvb, offset, -1, ENC_NA); static_ipv4_tree = proto_item_add_subtree(root_ti, ett_pdcp_rohc_static_ipv4); /* IP version (must be 4) */ @@ -947,7 +947,7 @@ static int dissect_pdcp_ir_packet(proto_tree *tree, unsigned short source_port, dest_port; /* Create static UDP subtree */ - root_ti = proto_tree_add_item(tree, hf_pdcp_lte_rohc_static_udp, tvb, offset, -1, FALSE); + root_ti = proto_tree_add_item(tree, hf_pdcp_lte_rohc_static_udp, tvb, offset, -1, ENC_NA); static_udp_tree = proto_item_add_subtree(root_ti, ett_pdcp_rohc_static_udp); /* Source port */ @@ -974,7 +974,7 @@ static int dissect_pdcp_ir_packet(proto_tree *tree, guint32 ssrc; /* Create static RTP subtree */ - root_ti = proto_tree_add_item(tree, hf_pdcp_lte_rohc_static_rtp, tvb, offset, 4, FALSE); + root_ti = proto_tree_add_item(tree, hf_pdcp_lte_rohc_static_rtp, tvb, offset, 4, ENC_NA); static_rtp_tree = proto_item_add_subtree(root_ti, ett_pdcp_rohc_static_rtp); /* SSRC */ @@ -1048,7 +1048,7 @@ static int dissect_pdcp_feedback_feedback2(proto_tree *tree, } /* Feedback2 hidden filter */ - ti = proto_tree_add_item(tree, hf_pdcp_lte_rohc_feedback_feedback2, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, hf_pdcp_lte_rohc_feedback_feedback2, tvb, offset, -1, ENC_NA); PROTO_ITEM_SET_HIDDEN(ti); /* Ack-type */ @@ -1158,7 +1158,7 @@ static int dissect_pdcp_feedback_packet(proto_tree *tree, proto_item_append_text(root_item, " (Feedback)"); /* Create feedback tree root */ - feedback_ti = proto_tree_add_item(tree, hf_pdcp_lte_rohc_feedback, tvb, offset, -1, FALSE); + feedback_ti = proto_tree_add_item(tree, hf_pdcp_lte_rohc_feedback, tvb, offset, -1, ENC_NA); feedback_tree = proto_item_add_subtree(feedback_ti, ett_pdcp_packet); /* Code */ @@ -1253,7 +1253,7 @@ static int dissect_pdcp_r_0_crc_packet(proto_tree *tree, col_append_str(pinfo->cinfo, COL_INFO, " R-0-CRC"); proto_item_append_text(root_item, " (R-0-CRC)"); - proto_tree_add_item(tree, hf_pdcp_lte_rohc_r_0_crc, tvb, offset, -1, FALSE); + proto_tree_add_item(tree, hf_pdcp_lte_rohc_r_0_crc, tvb, offset, -1, ENC_NA); /* 7 bits of sn */ /* TODO: wrong! Large-cid may be in-between!!!! */ @@ -1977,13 +1977,13 @@ static void dissect_pdcp_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree else { /* Just show data */ proto_tree_add_item(pdcp_tree, hf_pdcp_lte_signalling_data, tvb, offset, - tvb_length_remaining(tvb, offset) - 4, FALSE); + tvb_length_remaining(tvb, offset) - 4, ENC_NA); } } else { /* Just show as unparsed data */ proto_tree_add_item(pdcp_tree, hf_pdcp_lte_signalling_data, tvb, offset, - tvb_length_remaining(tvb, offset) - 4, FALSE); + tvb_length_remaining(tvb, offset) - 4, ENC_NA); } data_length = tvb_length_remaining(tvb, offset) - 4; @@ -2149,7 +2149,7 @@ static void dissect_pdcp_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree } } else { - proto_tree_add_item(pdcp_tree, hf_pdcp_lte_user_plane_data, tvb, offset, -1, FALSE); + proto_tree_add_item(pdcp_tree, hf_pdcp_lte_user_plane_data, tvb, offset, -1, ENC_NA); } } else { @@ -2167,11 +2167,11 @@ static void dissect_pdcp_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree else { /* Just show data */ proto_tree_add_item(pdcp_tree, hf_pdcp_lte_signalling_data, tvb, offset, - tvb_length_remaining(tvb, offset), FALSE); + tvb_length_remaining(tvb, offset), ENC_NA); } } else { - proto_tree_add_item(pdcp_tree, hf_pdcp_lte_signalling_data, tvb, offset, -1, FALSE); + proto_tree_add_item(pdcp_tree, hf_pdcp_lte_signalling_data, tvb, offset, -1, ENC_NA); } } @@ -2196,7 +2196,7 @@ static void dissect_pdcp_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree /* Create pdcp tree. */ if (pdcp_tree) { - rohc_ti = proto_tree_add_item(pdcp_tree, hf_pdcp_lte_rohc, tvb, offset, -1, FALSE); + rohc_ti = proto_tree_add_item(pdcp_tree, hf_pdcp_lte_rohc, tvb, offset, -1, ENC_NA); rohc_tree = proto_item_add_subtree(rohc_ti, ett_pdcp_rohc); } @@ -2208,7 +2208,7 @@ static void dissect_pdcp_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree } if (offset > rohc_offset) { proto_tree_add_item(rohc_tree, hf_pdcp_lte_rohc_padding, tvb, rohc_offset, - offset-rohc_offset, FALSE); + offset-rohc_offset, ENC_NA); } /* Add-CID octet */ @@ -2353,7 +2353,7 @@ static void dissect_pdcp_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree /* Payload */ if (tvb_reported_length_remaining(tvb, offset) > 0) { - proto_tree_add_item(rohc_tree, hf_pdcp_lte_rohc_payload, tvb, offset, -1, FALSE); + proto_tree_add_item(rohc_tree, hf_pdcp_lte_rohc_payload, tvb, offset, -1, ENC_NA); } } diff --git a/epan/dissectors/packet-pflog.c b/epan/dissectors/packet-pflog.c index 08a11694de..7f7d40b2f9 100644 --- a/epan/dissectors/packet-pflog.c +++ b/epan/dissectors/packet-pflog.c @@ -233,7 +233,7 @@ dissect_pflog(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 1; } - proto_tree_add_item(pflog_tree, hf_pflog_pad, tvb, offset, pad_len, ENC_BIG_ENDIAN); + proto_tree_add_item(pflog_tree, hf_pflog_pad, tvb, offset, pad_len, ENC_NA); offset += pad_len; if(length >= LEN_PFLOG_BSD49) @@ -257,10 +257,10 @@ dissect_pflog(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; default: - proto_tree_add_item(pflog_tree, hf_pflog_saddr, tvb, offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(pflog_tree, hf_pflog_saddr, tvb, offset, 16, ENC_NA); offset += 16; - proto_tree_add_item(pflog_tree, hf_pflog_daddr, tvb, offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(pflog_tree, hf_pflog_daddr, tvb, offset, 16, ENC_NA); offset += 16; break; } diff --git a/epan/dissectors/packet-pim.c b/epan/dissectors/packet-pim.c index e3b5d3eaed..9df585beaf 100644 --- a/epan/dissectors/packet-pim.c +++ b/epan/dissectors/packet-pim.c @@ -659,7 +659,7 @@ dissect_pim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_tree_add_item(pim_tree, hf_pim_version, tvb, offset, 1, FALSE); proto_tree_add_item(pim_tree, hf_pim_type, tvb, offset, 1, FALSE); - proto_tree_add_item(pim_tree, hf_pim_res_bytes, tvb, offset + 1, 1, FALSE); + proto_tree_add_item(pim_tree, hf_pim_res_bytes, tvb, offset + 1, 1, ENC_NA); pim_cksum = tvb_get_ntohs(tvb, offset + 2); length = tvb_length(tvb); if (PIM_VER(pim_typever) == 2) { @@ -843,7 +843,7 @@ dissect_pim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { default: if (opt_len) proto_tree_add_item(opt_tree, hf_pim_optionvalue, tvb, - offset + 4, opt_len, FALSE); + offset + 4, opt_len, ENC_NA); break; } offset += 4 + opt_len; @@ -970,7 +970,7 @@ dissect_pim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { "Upstream-neighbor: %s", s); offset += advance; - proto_tree_add_item(pimopt_tree, hf_pim_res_bytes, tvb, offset, 1, FALSE); + proto_tree_add_item(pimopt_tree, hf_pim_res_bytes, tvb, offset, 1, ENC_NA); offset += 1; /* skip reserved field */ ngroup = tvb_get_guint8(tvb, offset); diff --git a/epan/dissectors/packet-pingpongprotocol.c b/epan/dissectors/packet-pingpongprotocol.c index cc7d126677..bf52508720 100644 --- a/epan/dissectors/packet-pingpongprotocol.c +++ b/epan/dissectors/packet-pingpongprotocol.c @@ -103,7 +103,7 @@ dissect_pingpongprotocol_ping_message(tvbuff_t *message_tvb, proto_tree *message ping_data_length = tvb_get_ntohs(message_tvb, MESSAGE_LENGTH_OFFSET) - PING_DATA_OFFSET; if (ping_data_length > 0) - proto_tree_add_item(message_tree, hf_ping_data, message_tvb, PING_DATA_OFFSET, ping_data_length, FALSE); + proto_tree_add_item(message_tree, hf_ping_data, message_tvb, PING_DATA_OFFSET, ping_data_length, ENC_NA); } static void @@ -116,7 +116,7 @@ dissect_pingpongprotocol_pong_message(tvbuff_t *message_tvb, proto_tree *message pong_data_length = tvb_get_ntohs(message_tvb, MESSAGE_LENGTH_OFFSET) - PONG_DATA_OFFSET; if (pong_data_length > 0) { - proto_tree_add_item(message_tree, hf_pong_data, message_tvb, PONG_DATA_OFFSET, pong_data_length, FALSE); + proto_tree_add_item(message_tree, hf_pong_data, message_tvb, PONG_DATA_OFFSET, pong_data_length, ENC_NA); } } diff --git a/epan/dissectors/packet-pktc.c b/epan/dissectors/packet-pktc.c index e10b8f4f57..05e804f09e 100644 --- a/epan/dissectors/packet-pktc.c +++ b/epan/dissectors/packet-pktc.c @@ -179,7 +179,7 @@ dissect_pktc_app_specific_data(packet_info *pinfo _U_, proto_tree *parent_tree, guint8 len; if (parent_tree) { - item = proto_tree_add_item(parent_tree, hf_pktc_app_spec_data, tvb, offset, -1, FALSE); + item = proto_tree_add_item(parent_tree, hf_pktc_app_spec_data, tvb, offset, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_pktc_app_spec_data); } @@ -197,7 +197,7 @@ dissect_pktc_app_specific_data(packet_info *pinfo _U_, proto_tree *parent_tree, offset+=1; /* snmpEngineID */ - engineid_item = proto_tree_add_item(tree, hf_pktc_snmpEngineID, tvb, offset, len, FALSE); + engineid_item = proto_tree_add_item(tree, hf_pktc_snmpEngineID, tvb, offset, len, ENC_NA); engineid_tree = proto_item_add_subtree(engineid_item, ett_pktc_engineid); dissect_snmp_engineid(engineid_tree, tvb, offset, len); offset+=len; @@ -261,7 +261,7 @@ dissect_pktc_list_of_ciphersuites(packet_info *pinfo _U_, proto_tree *parent_tre guint8 len, i; if (parent_tree) { - item = proto_tree_add_item(parent_tree, hf_pktc_list_of_ciphersuites, tvb, offset, -1, FALSE); + item = proto_tree_add_item(parent_tree, hf_pktc_list_of_ciphersuites, tvb, offset, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_pktc_list_of_ciphersuites); } @@ -356,7 +356,7 @@ dissect_pktc_ap_request(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset+=1; /* sha-1 hmac */ - proto_tree_add_item(tree, hf_pktc_sha1_hmac, tvb, offset, 20, FALSE); + proto_tree_add_item(tree, hf_pktc_sha1_hmac, tvb, offset, 20, ENC_NA); offset+=20; return offset; @@ -397,7 +397,7 @@ dissect_pktc_ap_reply(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int o offset+=1; /* sha-1 hmac */ - proto_tree_add_item(tree, hf_pktc_sha1_hmac, tvb, offset, 20, FALSE); + proto_tree_add_item(tree, hf_pktc_sha1_hmac, tvb, offset, 20, ENC_NA); offset+=20; return offset; @@ -407,7 +407,7 @@ static int dissect_pktc_sec_param_rec(proto_tree *tree, tvbuff_t *tvb, int offset) { /* sha-1 hmac of the subkey of the preceding AP-REP */ - proto_tree_add_item(tree, hf_pktc_sha1_hmac, tvb, offset, 20, FALSE); + proto_tree_add_item(tree, hf_pktc_sha1_hmac, tvb, offset, 20, ENC_NA); offset+=20; return offset; @@ -458,7 +458,7 @@ dissect_pktc_rekey(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offs offset+=1; /* sha-1 hmac */ - proto_tree_add_item(tree, hf_pktc_sha1_hmac, tvb, offset, 20, FALSE); + proto_tree_add_item(tree, hf_pktc_sha1_hmac, tvb, offset, 20, ENC_NA); offset+=20; return offset; @@ -508,7 +508,7 @@ dissect_pktc_mtafqdn_krbsafeuserdata(packet_info *pinfo, tvbuff_t *tvb, proto_tr offset+=6; /* MTA pub key hash */ - proto_tree_add_item(tree, hf_pktc_mtafqdn_pub_key_hash, tvb, offset, 20, FALSE); + proto_tree_add_item(tree, hf_pktc_mtafqdn_pub_key_hash, tvb, offset, 20, ENC_NA); offset+=20; /* manufacturer cert revocation time */ diff --git a/epan/dissectors/packet-pnrp.c b/epan/dissectors/packet-pnrp.c index 5f0ac01abd..683f25082d 100644 --- a/epan/dissectors/packet-pnrp.c +++ b/epan/dissectors/packet-pnrp.c @@ -415,7 +415,7 @@ static int dissect_pnrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) *--Add all Header Fields *------------------------------*/ /* Get a subtree for the Header */ - pnrp_header_item = proto_tree_add_item(pnrp_tree, hf_pnrp_header, tvb, offset,12,FALSE); + pnrp_header_item = proto_tree_add_item(pnrp_tree, hf_pnrp_header, tvb, offset,12,ENC_NA); pnrp_header_tree = proto_item_add_subtree(pnrp_header_item, ett_pnrp_header); /* Add Field ID should be 0c0010 */ @@ -708,7 +708,7 @@ static int dissect_pnrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pnrp_message_tree = proto_item_add_subtree(pnrp_message_item, ett_pnrp_message); proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_type, tvb, offset , 2, FALSE); proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_length, tvb, offset + 2, 2, FALSE); - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_hashednonce, tvb, offset + 4, data_length-4, FALSE); + proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_hashednonce, tvb, offset + 4, data_length-4, ENC_NA); } @@ -723,7 +723,7 @@ static int dissect_pnrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pnrp_message_tree = proto_item_add_subtree(pnrp_message_item, ett_pnrp_message); proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_type, tvb, offset , 2, FALSE); proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_length, tvb, offset + 2, 2, FALSE); - proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_nonce, tvb, offset + 4, data_length-4, FALSE); + proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_nonce, tvb, offset + 4, data_length-4, ENC_NA); } offset += data_length; @@ -844,7 +844,7 @@ static int dissect_pnrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) static void dissect_pnrp_ids(tvbuff_t *tvb, gint offset, gint length, proto_tree *tree) { while (32 <=length) { - proto_tree_add_item(tree, hf_pnrp_message_pnrpID, tvb, offset, 32, FALSE); + proto_tree_add_item(tree, hf_pnrp_message_pnrpID, tvb, offset, 32, ENC_NA); length -= 32; offset += 32; } @@ -858,7 +858,7 @@ static void dissect_route_entry(tvbuff_t *tvb, gint offset, gint length, proto_t if (0 <= tvb_reported_length_remaining(tvb, offset+length)) { tmp_offset = 0; /* First, we have a 32 Bit long PNRP ID */ - proto_tree_add_item(tree, hf_pnrp_message_pnrpID, tvb, offset+tmp_offset, 32, FALSE); + proto_tree_add_item(tree, hf_pnrp_message_pnrpID, tvb, offset+tmp_offset, 32, ENC_NA); tmp_offset +=32; /* Add PNRP Major Version */ proto_tree_add_item(tree,hf_pnrp_header_versionMajor,tvb,offset+tmp_offset,1,FALSE); @@ -910,7 +910,7 @@ static void dissect_encodedCPA_structure(tvbuff_t *tvb, gint offset, gint length /* Add a new subtree */ proto_item *pnrp_encodedCPA_tree = NULL; proto_item *pnrp_encodedCPA_item = NULL; - pnrp_encodedCPA_item = proto_tree_add_item(tree, hf_pnrp_encodedCPA, tvb, offset,length,FALSE); + pnrp_encodedCPA_item = proto_tree_add_item(tree, hf_pnrp_encodedCPA, tvb, offset,length,ENC_NA); pnrp_encodedCPA_tree = proto_item_add_subtree(pnrp_encodedCPA_item, ett_pnrp_message_encodedCPA); /* Length information */ @@ -931,7 +931,7 @@ static void dissect_encodedCPA_structure(tvbuff_t *tvb, gint offset, gint length /* Not After */ proto_tree_add_item(pnrp_encodedCPA_tree, hf_pnrp_encodedCPA_notAfter, tvb, offset+8, 8, FALSE); /* Service Location */ - proto_tree_add_item(pnrp_encodedCPA_tree, hf_pnrp_encodedCPA_serviceLocation, tvb, offset+16, 16, FALSE); + proto_tree_add_item(pnrp_encodedCPA_tree, hf_pnrp_encodedCPA_serviceLocation, tvb, offset+16, 16, ENC_NA); /* now, the structure is variable, so add bytes to offset */ offset +=32; @@ -939,19 +939,19 @@ static void dissect_encodedCPA_structure(tvbuff_t *tvb, gint offset, gint length /* Check if R Flag is set */ if ((flagsField & FLAGS_ENCODED_CPA_R)==0x00) { /* Nonce follows */ - proto_tree_add_item(pnrp_encodedCPA_tree, hf_pnrp_message_nonce, tvb, offset, 16, FALSE); + proto_tree_add_item(pnrp_encodedCPA_tree, hf_pnrp_message_nonce, tvb, offset, 16, ENC_NA); offset +=16; } /* Check if A Flag is set */ if (flagsField & FLAGS_ENCODED_CPA_A) { /* Binary authority */ - proto_tree_add_item(pnrp_encodedCPA_tree, hf_pnrp_encodedCPA_binaryAuthority, tvb, offset, 20, FALSE); + proto_tree_add_item(pnrp_encodedCPA_tree, hf_pnrp_encodedCPA_binaryAuthority, tvb, offset, 20, ENC_NA); offset +=20; } /* Check if C Flag is set */ if (flagsField & FLAGS_ENCODED_CPA_C) { /* Classifiert Hash */ - proto_tree_add_item(pnrp_encodedCPA_tree, hf_pnrp_encodedCPA_classifiertHash, tvb, offset, 20, FALSE); + proto_tree_add_item(pnrp_encodedCPA_tree, hf_pnrp_encodedCPA_classifiertHash, tvb, offset, 20, ENC_NA); offset +=20; } /* Check if F Flag is set */ @@ -1075,7 +1075,7 @@ static void dissect_signature_structure(tvbuff_t *tvb, gint offset, gint length, proto_tree_add_text(pnrp_signature_tree, tvb, offset,4, "Hash Algorithm Identifier : %x",tvb_get_letohl(tvb,offset)); offset += 4; /* Signature Data */ - proto_tree_add_item(pnrp_signature_tree, hf_pnrp_signature_signatureData, tvb, offset, signatureLength, FALSE); + proto_tree_add_item(pnrp_signature_tree, hf_pnrp_signature_signatureData, tvb, offset, signatureLength, ENC_NA); } } /* Register the protocol */ diff --git a/epan/dissectors/packet-portmap.c b/epan/dissectors/packet-portmap.c index 6946e0a4ea..0232401ca9 100644 --- a/epan/dissectors/packet-portmap.c +++ b/epan/dissectors/packet-portmap.c @@ -405,7 +405,7 @@ dissect_rpcb(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree if (tree) { rpcb_item = proto_tree_add_item(tree, hf_portmap_rpcb, tvb, - offset, -1, FALSE); + offset, -1, ENC_NA); if (rpcb_item) rpcb_tree = proto_item_add_subtree(rpcb_item, ett_portmap_rpcb); } diff --git a/epan/dissectors/packet-ppi-sensor.c b/epan/dissectors/packet-ppi-sensor.c index c9520bf1ab..43d80bce0f 100644 --- a/epan/dissectors/packet-ppi-sensor.c +++ b/epan/dissectors/packet-ppi-sensor.c @@ -399,7 +399,7 @@ dissect_ppi_sensor(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if (length_remaining < 60) break; if (tree) { - proto_tree_add_item(ppi_sensor_tree, hf_ppi_sensor_appspecific_data, tvb, offset, 60, FALSE); + proto_tree_add_item(ppi_sensor_tree, hf_ppi_sensor_appspecific_data, tvb, offset, 60, ENC_NA); } offset+=60; length_remaining-=60; diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c index 2dceec9ece..6f1b8d00f4 100644 --- a/epan/dissectors/packet-ppp.c +++ b/epan/dissectors/packet-ppp.c @@ -4485,7 +4485,7 @@ dissect_pap( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) { offset += 2; - data_ti = proto_tree_add_item(fh_tree, hf_pap_data, tvb, offset, -1, FALSE); + data_ti = proto_tree_add_item(fh_tree, hf_pap_data, tvb, offset, -1, ENC_NA); data_tree = proto_item_add_subtree(data_ti, ett_pap_data); switch(code){ @@ -4521,7 +4521,7 @@ dissect_pap( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) { col_append_fstr(pinfo->cinfo, COL_INFO, " (Message='%s')", message); break; default: - proto_tree_add_item(data_tree, hf_pap_stuff, tvb, offset, -1, FALSE); + proto_tree_add_item(data_tree, hf_pap_stuff, tvb, offset, -1, ENC_NA); break; } } @@ -4592,7 +4592,7 @@ dissect_chap( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) { guint name_offset=0, name_size = 0; /* Create data subtree */ - tf = proto_tree_add_item(fh_tree, hf_chap_data, tvb, offset, length, FALSE); + tf = proto_tree_add_item(fh_tree, hf_chap_data, tvb, offset, length, ENC_NA); field_tree = proto_item_add_subtree(tf, ett_chap_data); length--; @@ -4612,7 +4612,7 @@ dissect_chap( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) { /* Value */ if (length > 0) { value_offset = offset; - proto_tree_add_item(field_tree, hf_chap_value, tvb, offset, value_size, FALSE); + proto_tree_add_item(field_tree, hf_chap_value, tvb, offset, value_size, ENC_NA); /* Move along value_size bytes */ offset+=value_size; diff --git a/epan/dissectors/packet-pppoe.c b/epan/dissectors/packet-pppoe.c index 9ac71538ee..9137bf01d0 100644 --- a/epan/dissectors/packet-pppoe.c +++ b/epan/dissectors/packet-pppoe.c @@ -330,7 +330,7 @@ dissect_pppoe_subtags_dslf(tvbuff_t *tvb, packet_info *pinfo _U_, int offset, pr if (tree) { /* Create tags subtree */ - ti = proto_tree_add_item(tree, hf_pppoed_tag_vspec_tags, tvb, offset, payload_length, FALSE); + ti = proto_tree_add_item(tree, hf_pppoed_tag_vspec_tags, tvb, offset, payload_length, ENC_NA); pppoe_tree = proto_item_add_subtree(ti, ett_pppoed_tags); tagstart = offset; @@ -385,7 +385,7 @@ dissect_pppoe_subtags_dslf(tvbuff_t *tvb, packet_info *pinfo _U_, int offset, pr hf_pppoed_tag_vspec_act_int_delay_down) case PPPOE_TAG_VSPEC_DSLF_ACCESS_LOOP_ENCAPSULATION: ti = proto_tree_add_item(pppoe_tree, hf_pppoed_tag_vspec_access_loop_encapsulation, tvb, - tagstart+2, 3, FALSE); + tagstart+2, 3, ENC_NA); if (poe_tag_length != 3) { expert_add_info_format(pinfo, ti, PI_MALFORMED, PI_WARN, "%s: Wrong length: %u (expected 3)", @@ -411,7 +411,7 @@ dissect_pppoe_subtags_dslf(tvbuff_t *tvb, packet_info *pinfo _U_, int offset, pr proto_tree_add_item(pppoe_tree, hf_pppoed_tag_length_8, tvb, tagstart+1, 1, FALSE); } proto_tree_add_item(pppoe_tree, hf_pppoed_tag_unknown_data, tvb, - tagstart+1, poe_tag_length, FALSE); + tagstart+1, poe_tag_length, ENC_NA); } } @@ -440,7 +440,7 @@ dissect_pppoe_tags(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *tr if (tree) { /* Create tags subtree */ - ti = proto_tree_add_item(tree, hf_pppoed_tags, tvb, offset, payload_length-6, FALSE); + ti = proto_tree_add_item(tree, hf_pppoed_tags, tvb, offset, payload_length-6, ENC_NA); pppoe_tree = proto_item_add_subtree(ti, ett_pppoed_tags); tagstart = offset; @@ -481,11 +481,11 @@ dissect_pppoe_tags(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *tr break; case PPPOE_TAG_HOST_UNIQ: proto_tree_add_item(pppoe_tree, hf_pppoed_tag_host_uniq, tvb, - tagstart+4, poe_tag_length, FALSE); + tagstart+4, poe_tag_length, ENC_NA); break; case PPPOE_TAG_AC_COOKIE: proto_tree_add_item(pppoe_tree, hf_pppoed_tag_ac_cookie, tvb, - tagstart+4, poe_tag_length, FALSE); + tagstart+4, poe_tag_length, ENC_NA); break; case PPPOE_TAG_VENDOR: if (poe_tag_length >= 4) @@ -503,7 +503,7 @@ dissect_pppoe_tags(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *tr break; default: proto_tree_add_item(pppoe_tree, hf_pppoed_tag_vendor_unspecified, tvb, - tagstart+4+4, poe_tag_length-4, FALSE); + tagstart+4+4, poe_tag_length-4, ENC_NA); } } @@ -517,7 +517,7 @@ dissect_pppoe_tags(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *tr tagstart+6, 2, FALSE); } else { proto_tree_add_item(pppoe_tree, hf_pppoed_tag_credits, tvb, - tagstart+4, poe_tag_length, FALSE); + tagstart+4, poe_tag_length, ENC_NA); } break; case PPPOE_TAG_METRICS: @@ -580,7 +580,7 @@ dissect_pppoe_tags(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *tr } else { proto_tree_add_item(pppoe_tree, hf_pppoed_tag_metrics, tvb, - tagstart+4, poe_tag_length, FALSE); + tagstart+4, poe_tag_length, ENC_NA); } break; case PPPOE_TAG_SEQ_NUM: @@ -623,23 +623,23 @@ dissect_pppoe_tags(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *tr break; case PPPOE_TAG_RELAY_ID: proto_tree_add_item(pppoe_tree, hf_pppoed_tag_relay_session_id, tvb, - tagstart+4, poe_tag_length, FALSE); + tagstart+4, poe_tag_length, ENC_NA); break; case PPPOE_TAG_HURL: proto_tree_add_item(pppoe_tree, hf_pppoed_tag_hurl, tvb, - tagstart+4, poe_tag_length, FALSE); + tagstart+4, poe_tag_length, ENC_NA); break; case PPPOE_TAG_MOTM: proto_tree_add_item(pppoe_tree, hf_pppoed_tag_motm, tvb, - tagstart+4, poe_tag_length, FALSE); + tagstart+4, poe_tag_length, ENC_NA); break; case PPPOE_TAG_MAX_PAYLD: proto_tree_add_item(pppoe_tree, hf_pppoed_tag_max_payload, tvb, - tagstart+4, poe_tag_length, FALSE); + tagstart+4, poe_tag_length, ENC_NA); break; case PPPOE_TAG_IP_RT_ADD: proto_tree_add_item(pppoe_tree, hf_pppoed_tag_ip_route_add, tvb, - tagstart+4, poe_tag_length, FALSE); + tagstart+4, poe_tag_length, ENC_NA); break; /* These error tag values should be interpreted as a utf-8 unterminated @@ -673,7 +673,7 @@ dissect_pppoe_tags(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *tr proto_tree_add_item(pppoe_tree, hf_pppoed_tag_length, tvb, tagstart+2, 2, FALSE); } proto_tree_add_item(pppoe_tree, hf_pppoed_tag_unknown_data, tvb, - tagstart+2, poe_tag_length, FALSE); + tagstart+2, poe_tag_length, ENC_NA); } } @@ -1088,7 +1088,7 @@ static void dissect_pppoes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) poe_tag_length = tvb_get_ntohs(tvb, tagstart + 2); /* Create tags subtree */ - ti = proto_tree_add_item(pppoe_tree, hf_pppoes_tags, tvb, tagstart, 8, FALSE); + ti = proto_tree_add_item(pppoe_tree, hf_pppoes_tags, tvb, tagstart, 8, ENC_NA); pppoe_tree = proto_item_add_subtree(ti, ett_pppoes_tags); /* Show tag data */ @@ -1100,7 +1100,7 @@ static void dissect_pppoes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tagstart+6, 2, FALSE); } else { proto_tree_add_item(pppoe_tree, hf_pppoed_tag_credits, tvb, - tagstart+4, poe_tag_length, FALSE); + tagstart+4, poe_tag_length, ENC_NA); } credit_offset = 8; diff --git a/epan/dissectors/packet-pptp.c b/epan/dissectors/packet-pptp.c index 04417f8572..89f9f448b1 100644 --- a/epan/dissectors/packet-pptp.c +++ b/epan/dissectors/packet-pptp.c @@ -228,7 +228,7 @@ dissect_cntrl_req(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, tvb_get_guint8(tvb, offset), tvb_get_guint8(tvb, offset + 1)); offset += 2; - proto_tree_add_item(tree, hf_pptp_reserved, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_pptp_reserved, tvb, offset, 2, ENC_NA); offset += 2; proto_tree_add_item(tree, hf_pptp_framing_capabilities, tvb, offset, 4, FALSE); @@ -291,10 +291,10 @@ dissect_stop_req(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_item(tree, hf_pptp_reason, tvb, offset, 1, FALSE); offset += 1; - proto_tree_add_item(tree, hf_pptp_reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_pptp_reserved, tvb, offset, 1, ENC_NA); offset += 1; - proto_tree_add_item(tree, hf_pptp_reserved, tvb, offset, 2, FALSE);; + proto_tree_add_item(tree, hf_pptp_reserved, tvb, offset, 2, ENC_NA);; } static void @@ -308,7 +308,7 @@ dissect_stop_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_item(tree, hf_pptp_error, tvb, offset, 1, FALSE); offset += 1; - proto_tree_add_item(tree, hf_pptp_reserved, tvb, offset, 2, FALSE);; + proto_tree_add_item(tree, hf_pptp_reserved, tvb, offset, 2, ENC_NA);; } @@ -333,7 +333,7 @@ dissect_echo_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_item(tree, hf_pptp_error, tvb, offset, 1, FALSE); offset += 1; - proto_tree_add_item(tree, hf_pptp_reserved, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_pptp_reserved, tvb, offset, 2, ENC_NA); } static void @@ -367,7 +367,7 @@ dissect_out_req(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_item(tree, hf_pptp_phone_number_length, tvb, offset, 2, FALSE); offset += 2; - proto_tree_add_item(tree, hf_pptp_reserved, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_pptp_reserved, tvb, offset, 2, ENC_NA); offset += 2; proto_tree_add_item(tree, hf_pptp_phone_number, tvb, offset, 64, FALSE); @@ -462,7 +462,7 @@ dissect_in_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_item(tree, hf_pptp_packet_processing_delay, tvb, offset, 2, FALSE); offset += 2; - proto_tree_add_item(tree, hf_pptp_reserved, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_pptp_reserved, tvb, offset, 2, ENC_NA); } static void @@ -472,7 +472,7 @@ dissect_in_connected(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_item(tree, hf_pptp_peer_call_id, tvb, offset, 2, FALSE); offset += 2; - proto_tree_add_item(tree, hf_pptp_reserved, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_pptp_reserved, tvb, offset, 2, ENC_NA); offset += 2; proto_tree_add_item(tree, hf_pptp_connect_speed, tvb, offset, 4, FALSE); @@ -494,7 +494,7 @@ dissect_clear_req(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_item(tree, hf_pptp_call_id, tvb, offset, 2, FALSE); offset += 2; - proto_tree_add_item(tree, hf_pptp_reserved, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_pptp_reserved, tvb, offset, 2, ENC_NA); } static void @@ -513,7 +513,7 @@ dissect_disc_notify(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_item(tree, hf_pptp_cause, tvb, offset, 2, FALSE); offset += 2; - proto_tree_add_item(tree, hf_pptp_reserved, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_pptp_reserved, tvb, offset, 2, ENC_NA); offset += 2; proto_tree_add_item(tree, hf_pptp_call_statistics, tvb, offset, 64, FALSE); @@ -526,7 +526,7 @@ dissect_error_notify(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_item(tree, hf_pptp_peer_call_id, tvb, offset, 2, FALSE); offset += 2; - proto_tree_add_item(tree, hf_pptp_reserved, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_pptp_reserved, tvb, offset, 2, ENC_NA); offset += 2; proto_tree_add_item(tree, hf_pptp_crc_errors, tvb, offset, 4, FALSE); @@ -554,7 +554,7 @@ dissect_set_link(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_item(tree, hf_pptp_peer_call_id, tvb, offset, 2, FALSE); offset += 2; - proto_tree_add_item(tree, hf_pptp_reserved, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_pptp_reserved, tvb, offset, 2, ENC_NA); offset += 2; proto_tree_add_item(tree, hf_pptp_send_accm, tvb, offset, 4, FALSE); @@ -606,7 +606,7 @@ dissect_pptp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(pptp_tree, hf_pptp_control_message_type, tvb, offset, 2, FALSE); offset += 2; - proto_tree_add_item(pptp_tree, hf_pptp_reserved, tvb, offset, 2, FALSE); + proto_tree_add_item(pptp_tree, hf_pptp_reserved, tvb, offset, 2, ENC_NA); offset += 2; switch(control_message_type){ diff --git a/epan/dissectors/packet-ptp.c b/epan/dissectors/packet-ptp.c index 208036ca42..12d2ad0505 100644 --- a/epan/dissectors/packet-ptp.c +++ b/epan/dissectors/packet-ptp.c @@ -1845,7 +1845,7 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) PTP_MM_CLOCK_IDENTITY_CLOCKPORTFIELD_OFFSET, 2, FALSE); proto_tree_add_item(ptp_tree, hf_ptp_mm_clock_identity_manufactureridentity, tvb, - PTP_MM_CLOCK_IDENTITY_MANUFACTURERIDENTITY_OFFSET, 48, FALSE); + PTP_MM_CLOCK_IDENTITY_MANUFACTURERIDENTITY_OFFSET, 48, ENC_NA); break; } case PTP_MM_INITIALIZE_CLOCK:{ @@ -1873,7 +1873,7 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) PTP_MM_DEFAULT_DATA_SET_CLOCKSTRATUM_OFFSET, 1, FALSE); proto_tree_add_item(ptp_tree, hf_ptp_mm_default_data_set_clockidentifier, tvb, - PTP_MM_DEFAULT_DATA_SET_CLOCKIDENTIFIER_OFFSET, 4, FALSE); + PTP_MM_DEFAULT_DATA_SET_CLOCKIDENTIFIER_OFFSET, 4, ENC_NA); proto_tree_add_item(ptp_tree, hf_ptp_mm_default_data_set_clockvariance, tvb, PTP_MM_DEFAULT_DATA_SET_CLOCKVARIANCE_OFFSET, 2, FALSE); @@ -1911,7 +1911,7 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) PTP_MM_UPDATE_DEFAULT_DATA_SET_CLOCKSTRATUM_OFFSET, 1, FALSE); proto_tree_add_item(ptp_tree, hf_ptp_mm_update_default_data_set_clockidentifier, tvb, - PTP_MM_UPDATE_DEFAULT_DATA_SET_CLOCKIDENTIFIER_OFFSET, 4, FALSE); + PTP_MM_UPDATE_DEFAULT_DATA_SET_CLOCKIDENTIFIER_OFFSET, 4, ENC_NA); proto_tree_add_item(ptp_tree, hf_ptp_mm_update_default_data_set_clockvariance, tvb, PTP_MM_UPDATE_DEFAULT_DATA_SET_CLOCKVARIANCE_OFFSET, 2, FALSE); @@ -2026,7 +2026,7 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) PTP_MM_PARENT_DATA_SET_GRANDMASTERSTRATUM_OFFSET, 1, FALSE); proto_tree_add_item(ptp_tree, hf_ptp_mm_parent_data_set_grandmasteridentifier, tvb, - PTP_MM_PARENT_DATA_SET_GRANDMASTERIDENTIFIER_OFFSET, 4, FALSE); + PTP_MM_PARENT_DATA_SET_GRANDMASTERIDENTIFIER_OFFSET, 4, ENC_NA); proto_tree_add_item(ptp_tree, hf_ptp_mm_parent_data_set_grandmastervariance, tvb, PTP_MM_PARENT_DATA_SET_GRANDMASTERVARIANCE_OFFSET, 2, FALSE); @@ -2077,13 +2077,13 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) PTP_MM_PORT_DATA_SET_GENERALPORTADDRESSOCTETS_OFFSET, 1, FALSE); proto_tree_add_item(ptp_tree, hf_ptp_mm_port_data_set_subdomainaddress, tvb, - PTP_MM_PORT_DATA_SET_SUBDOMAINADDRESS_OFFSET, 4, FALSE); + PTP_MM_PORT_DATA_SET_SUBDOMAINADDRESS_OFFSET, 4, ENC_NA); proto_tree_add_item(ptp_tree, hf_ptp_mm_port_data_set_eventportaddress, tvb, - PTP_MM_PORT_DATA_SET_EVENTPORTADDRESS_OFFSET, 2, FALSE); + PTP_MM_PORT_DATA_SET_EVENTPORTADDRESS_OFFSET, 2, ENC_NA); proto_tree_add_item(ptp_tree, hf_ptp_mm_port_data_set_generalportaddress, tvb, - PTP_MM_PORT_DATA_SET_GENERALPORTADDRESS_OFFSET, 2, FALSE); + PTP_MM_PORT_DATA_SET_GENERALPORTADDRESS_OFFSET, 2, ENC_NA); break; } case PTP_MM_GLOBAL_TIME_DATA_SET:{ @@ -2533,7 +2533,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb, PTP_V2_AN_TLV_OFFSET + tlv_total_length + PTP_V2_AN_TLV_ATOI_TIMEOFNEXTJUMP_OFFSET, 6, - FALSE); + ENC_NA); Offset = PTP_V2_AN_TLV_OFFSET + tlv_total_length + PTP_V2_AN_TLV_ATOI_DISPLAYNAME_OFFSET; dissect_ptp_v2_text(tvb, @@ -2564,7 +2564,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb, PTP_V2_AN_TLV_OFFSET + tlv_total_length + PTP_V2_AN_TLV_DATA_OFFSET, tlv_length, - FALSE); + ENC_NA); break; } } @@ -2668,7 +2668,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb, PTP_AS_FU_TLV_INFORMATION_OFFSET + PTP_AS_FU_TLV_LASTGMPHASECHANGE_OFFSET, 12, - FALSE); + ENC_NA); proto_tree_add_item(ptp_tlv_tree, hf_ptp_as_fu_tlv_scaled_last_gm_phase_change, @@ -2978,13 +2978,13 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) Offset +=2; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_physicalAddress, tvb, - Offset, S, FALSE); + Offset, S, ENC_NA); Offset += S; N = tvb_get_ntohs (tvb, Offset+2); protocolAddress_ti = proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_protocolAddress, tvb, - Offset+4, N, FALSE); + Offset+4, N, ENC_NA); ptp_protocolAddress_tree = proto_item_add_subtree(protocolAddress_ti, ett_ptp_v2_protocolAddress); /* physicalLayerProtocol subtree */ @@ -2995,17 +2995,17 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) Offset+2, 2, FALSE); proto_tree_add_item(ptp_protocolAddress_tree, hf_ptp_v2_mm_protocolAddress, tvb, - Offset+4, N, FALSE); + Offset+4, N, ENC_NA); N = N + 4; Offset += N; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_manufacturerIdentity, tvb, - Offset, 3, FALSE); + Offset, 3, ENC_NA); Offset += 3; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_reserved, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_NA); Offset += 1; dissect_ptp_v2_text (tvb, &Offset, ptp_managementData_tree, @@ -3016,14 +3016,14 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) hf_ptp_v2_mm_userDescription, hf_ptp_v2_mm_userDescription_length); proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_profileIdentity, tvb, - Offset, 6, FALSE); + Offset, 6, ENC_NA); Offset += 6; /* Wenn Offset nicht gerade folgt noch ein pad Bit */ if ( (Offset - PTP_V2_MM_TLV_DATAFIELD_OFFSET) % 2 ) { proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_pad, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_NA); } break; } @@ -3037,7 +3037,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if ( (Offset - PTP_V2_MM_TLV_DATAFIELD_OFFSET) % 2 ) { proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_pad, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_NA); } break; } @@ -3109,7 +3109,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if ( (Offset - PTP_V2_MM_TLV_DATAFIELD_OFFSET) % 2 ) { proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_pad, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_NA); } break; } @@ -3127,7 +3127,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) PTP_V2_MM_TLV_DATAFIELD_OFFSET, 1, FALSE); proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_reserved, tvb, - PTP_V2_MM_RESERVED1, 1, FALSE); + PTP_V2_MM_RESERVED1, 1, ENC_NA); proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_numberPorts, tvb, PTP_V2_MM_NUMBERPORTS, 2, FALSE); @@ -3154,7 +3154,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) PTP_V2_MM_DOMAINNUMBER, 1, FALSE); proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_reserved, tvb, - PTP_V2_MM_RESERVED2, 1, FALSE); + PTP_V2_MM_RESERVED2, 1, ENC_NA); break; } case PTP_V2_MM_ID_CURRENT_DATA_SET: @@ -3183,7 +3183,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) Offset +=1; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_reserved, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_NA); Offset +=1; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_observedParentOffsetScaledLogVariance, tvb, @@ -3294,7 +3294,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_priority1, tvb, Offset, 1, FALSE); proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_reserved, tvb, - Offset+1, 1, FALSE); + Offset+1, 1, ENC_NA); break; } case PTP_V2_MM_ID_PRIORITY2: @@ -3302,7 +3302,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_priority2, tvb, Offset, 1, FALSE); proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_reserved, tvb, - Offset+1, 1, FALSE); + Offset+1, 1, ENC_NA); break; } case PTP_V2_MM_ID_DOMAIN: @@ -3310,7 +3310,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_domainNumber, tvb, Offset, 1, FALSE); proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_reserved, tvb, - Offset+1, 1, FALSE); + Offset+1, 1, ENC_NA); break; } case PTP_V2_MM_ID_SLAVE_ONLY: @@ -3318,7 +3318,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_SO, tvb, Offset, 1, FALSE); proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_reserved, tvb, - Offset+1, 1, FALSE); + Offset+1, 1, ENC_NA); break; } case PTP_V2_MM_ID_LOG_ANNOUNCE_INTERVAL: @@ -3327,7 +3327,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) Offset, 1, FALSE); proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_reserved, tvb, - Offset+1, 1, FALSE); + Offset+1, 1, ENC_NA); break; } case PTP_V2_MM_ID_ANNOUNCE_RECEIPT_TIMEOUT: @@ -3336,7 +3336,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) Offset, 1, FALSE); proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_reserved, tvb, - Offset+1, 1, FALSE); + Offset+1, 1, ENC_NA); break; } case PTP_V2_MM_ID_LOG_SYNC_INTERVAL: @@ -3345,7 +3345,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) Offset, 1, FALSE); proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_reserved, tvb, - Offset+1, 1, FALSE); + Offset+1, 1, ENC_NA); break; } case PTP_V2_MM_ID_VERSION_NUMBER: @@ -3354,7 +3354,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) Offset, 1, FALSE); proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_reserved, tvb, - Offset+1, 1, FALSE); + Offset+1, 1, ENC_NA); break; } case PTP_V2_MM_ID_ENABLE_PORT: @@ -3386,7 +3386,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_clockAccuracy, tvb, Offset, 1, FALSE); proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_reserved, tvb, - Offset+1, 1, FALSE); + Offset+1, 1, ENC_NA); break; } case PTP_V2_MM_ID_UTC_PROPERTIES: @@ -3404,7 +3404,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) Offset +=1; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_reserved, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_NA); break; } case PTP_V2_MM_ID_TRACEABILITY_PROPERTIES: @@ -3416,7 +3416,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) Offset +=1; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_reserved, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_NA); break; } @@ -3438,7 +3438,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) Offset +=1; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_reserved, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_NA); break; } case PTP_V2_MM_ID_PATH_TRACE_LIST: @@ -3460,7 +3460,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) Offset +=1; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_reserved, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_NA); break; } @@ -3519,7 +3519,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if ( (Offset - PTP_V2_MM_TLV_DATAFIELD_OFFSET) % 2 ) { proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_pad, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_NA); } break; } @@ -3530,7 +3530,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) Offset +=1; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_reserved, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_NA); break; } @@ -3549,7 +3549,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) Offset +=1; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_reserved, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_NA); break; } case PTP_V2_MM_ID_ALTERNATE_TIME_OFFSET_PROPERTIES: @@ -3575,7 +3575,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) Offset +=6; proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_reserved, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_NA); break; } case PTP_V2_MM_ID_TC_DEFAULT_DATA_SET: @@ -3625,7 +3625,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) Offset, 1, FALSE); proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_reserved, tvb, - Offset+1, 1, FALSE); + Offset+1, 1, ENC_NA); break; } case PTP_V2_MM_ID_DELAY_MECHANISM: @@ -3634,7 +3634,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) Offset, 1, FALSE); proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_reserved, tvb, - Offset+1, 1, FALSE); + Offset+1, 1, ENC_NA); break; } case PTP_V2_MM_ID_LOG_MIN_PDELAY_REQ_INTERVAL: @@ -3643,7 +3643,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) Offset, 1, FALSE); proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_reserved, tvb, - Offset+1, 1, FALSE); + Offset+1, 1, ENC_NA); break; } default: @@ -3668,7 +3668,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) Offset +=2; proto_tree_add_item(ptp_tree, hf_ptp_v2_mm_reserved, tvb, - Offset, 4, FALSE); + Offset, 4, ENC_NA); Offset +=4; /* optional Field! */ @@ -3682,7 +3682,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if ( (Offset - PTP_V2_MM_TLV_MANAGEMENTERRORID_OFFSET) % 2 ) { proto_tree_add_item(ptp_tree, hf_ptp_v2_mm_pad, tvb, - Offset, 1, FALSE); + Offset, 1, ENC_NA); } break; } diff --git a/epan/dissectors/packet-pw-cesopsn.c b/epan/dissectors/packet-pw-cesopsn.c index 323829440a..5e3d7f227a 100644 --- a/epan/dissectors/packet-pw-cesopsn.c +++ b/epan/dissectors/packet-pw-cesopsn.c @@ -269,7 +269,7 @@ void dissect_pw_cesopsn( tvbuff_t * tvb_original tvbuff_t* tvb; proto_item* item2; tvb = tvb_new_subset(tvb_original, 0, PWC_SIZEOF_CW, PWC_SIZEOF_CW); - item2 = proto_tree_add_item(tree2, hf_cw, tvb, 0, -1, FALSE); + item2 = proto_tree_add_item(tree2, hf_cw, tvb, 0, -1, ENC_NA); pwc_item_append_cw(item2,tvb_get_ntohl(tvb, 0),FALSE); { proto_tree* tree3; @@ -349,7 +349,7 @@ void dissect_pw_cesopsn( tvbuff_t * tvb_original proto_item* item2; tvbuff_t* tvb; tvb = tvb_new_subset(tvb_original, PWC_SIZEOF_CW, payload_size, payload_size); - item2 = proto_tree_add_item(tree2, hf_payload, tvb, 0, -1, FALSE); + item2 = proto_tree_add_item(tree2, hf_payload, tvb, 0, -1, ENC_NA); pwc_item_append_text_n_items(item2,(int)payload_size,"octet"); if (properties & PWC_PAY_SIZE_BAD) { diff --git a/epan/dissectors/packet-pw-satop.c b/epan/dissectors/packet-pw-satop.c index 222ed720fd..02a2d55cf5 100644 --- a/epan/dissectors/packet-pw-satop.c +++ b/epan/dissectors/packet-pw-satop.c @@ -266,7 +266,7 @@ void dissect_pw_satop(tvbuff_t * tvb_original tvbuff_t* tvb; proto_item* item2; tvb = tvb_new_subset(tvb_original, 0, PWC_SIZEOF_CW, PWC_SIZEOF_CW); - item2 = proto_tree_add_item(tree2, hf_cw, tvb, 0, -1, FALSE); + item2 = proto_tree_add_item(tree2, hf_cw, tvb, 0, -1, ENC_NA); pwc_item_append_cw(item2, tvb_get_ntohl(tvb, 0),FALSE); { proto_tree* tree3; @@ -343,7 +343,7 @@ void dissect_pw_satop(tvbuff_t * tvb_original proto_item* item2; tvbuff_t* tvb; tvb = tvb_new_subset(tvb_original, PWC_SIZEOF_CW, payload_size, payload_size); - item2 = proto_tree_add_item(tree2, hf_payload, tvb, 0, -1, FALSE); + item2 = proto_tree_add_item(tree2, hf_payload, tvb, 0, -1, ENC_NA); pwc_item_append_text_n_items(item2,(int)payload_size,"octet"); { proto_tree* tree3; diff --git a/epan/dissectors/packet-radiotap.c b/epan/dissectors/packet-radiotap.c index ae47e29ef2..e33cfb9b6b 100644 --- a/epan/dissectors/packet-radiotap.c +++ b/epan/dissectors/packet-radiotap.c @@ -1540,7 +1540,7 @@ dissect_radiotap(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) offset + 4, 2, TRUE); proto_tree_add_item(ven_tree, hf_radiotap_ven_data, tvb, offset + 6, iter.this_arg_size - 6, - TRUE); + ENC_NA); } if (!iter.is_radiotap_ns) @@ -1949,7 +1949,7 @@ dissect_radiotap(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) if (tree) { it = proto_tree_add_item(radiotap_tree, hf_radiotap_mcs, - tvb, offset, 3, FALSE); + tvb, offset, 3, ENC_NA); mcs_tree = proto_item_add_subtree(it, ett_radiotap_mcs); it = proto_tree_add_uint(mcs_tree, hf_radiotap_mcs_known, tvb, offset, 1, mcs_known); diff --git a/epan/dissectors/packet-radius.c b/epan/dissectors/packet-radius.c index d2e5808a0a..86bfe446cd 100644 --- a/epan/dissectors/packet-radius.c +++ b/epan/dissectors/packet-radius.c @@ -390,7 +390,7 @@ static const gchar *dissect_ascend_data_filter(proto_tree* tree, tvbuff_t* tvb, filterstr=g_string_sized_new(64); - proto_tree_add_item(tree, hf_radius_ascend_data_filter, tvb, 0, -1, FALSE); + proto_tree_add_item(tree, hf_radius_ascend_data_filter, tvb, 0, -1, ENC_NA); g_string_printf(filterstr, "%s %s %s", val_to_str(tvb_get_guint8(tvb, 0), ascenddf_filtertype, "%u"), @@ -1376,7 +1376,7 @@ dissect_radius(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { proto_tree_add_uint(radius_tree, hf_radius_length, tvb, 2, 2, rh.rh_pktlength); - proto_tree_add_item(radius_tree, hf_radius_authenticator, tvb, 4, AUTHENTICATOR_LENGTH,FALSE); + proto_tree_add_item(radius_tree, hf_radius_authenticator, tvb, 4, AUTHENTICATOR_LENGTH,ENC_NA); } tvb_memcpy(tvb, authenticator, 4, AUTHENTICATOR_LENGTH); diff --git a/epan/dissectors/packet-rdm.c b/epan/dissectors/packet-rdm.c index f328d58bf4..c4802d0ea7 100644 --- a/epan/dissectors/packet-rdm.c +++ b/epan/dissectors/packet-rdm.c @@ -109,11 +109,11 @@ dissect_rdm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset++; proto_tree_add_item(rdm_tree, hf_rdm_dest_uid, tvb, - offset, 6, FALSE); + offset, 6, ENC_NA); offset += 6; proto_tree_add_item(rdm_tree, hf_rdm_src_uid, tvb, - offset, 6, FALSE); + offset, 6, ENC_NA); offset += 6; proto_tree_add_item(rdm_tree, hf_rdm_transaction_number, tvb, @@ -147,13 +147,13 @@ dissect_rdm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (parameter_data_length > 0) { proto_tree_add_item(rdm_tree, hf_rdm_parameter_data, tvb, - offset, parameter_data_length, FALSE); + offset, parameter_data_length, ENC_NA); offset += parameter_data_length; } if (offset < message_length) { proto_tree_add_item(rdm_tree, hf_rdm_intron, tvb, - offset, message_length - offset, FALSE); + offset, message_length - offset, ENC_NA); offset = message_length; } @@ -170,7 +170,7 @@ dissect_rdm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (offset < tvb_length(tvb)) proto_tree_add_item(rdm_tree, hf_rdm_trailer, tvb, - offset, -1, FALSE); + offset, -1, ENC_NA); } } diff --git a/epan/dissectors/packet-rdp.c b/epan/dissectors/packet-rdp.c index a0b0d8246c..5bb066dd1d 100644 --- a/epan/dissectors/packet-rdp.c +++ b/epan/dissectors/packet-rdp.c @@ -930,14 +930,14 @@ dissect_rdp_clientNetworkData(tvbuff_t *tvb, int offset, packet_info *pinfo, pro FI_TERMINATOR }; - pi = proto_tree_add_item(tree, hf_rdp_clientNetworkData, tvb, offset, length, FALSE); + pi = proto_tree_add_item(tree, hf_rdp_clientNetworkData, tvb, offset, length, ENC_NA); next_tree = proto_item_add_subtree(pi, ett_rdp_clientNetworkData); offset = dissect_rdp_fields(tvb, offset, pinfo, next_tree, net_fields); if(channelCount > 0) { - pi = proto_tree_add_item(next_tree, hf_rdp_channelDefArray, tvb, offset, channelCount * 12, FALSE); + pi = proto_tree_add_item(next_tree, hf_rdp_channelDefArray, tvb, offset, channelCount * 12, ENC_NA); next_tree = proto_item_add_subtree(pi, ett_rdp_channelDefArray); if(rdp_info) @@ -1422,7 +1422,7 @@ dissect_rdp_SendData(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { length = tvb_length_remaining(tvb, offset); tree = dissect_rdp(tvb, pinfo, tree); - pi = proto_tree_add_item(tree, hf_rdp_SendData, tvb, offset, length, FALSE); + pi = proto_tree_add_item(tree, hf_rdp_SendData, tvb, offset, length, ENC_NA); tree = proto_item_add_subtree(pi, ett_rdp_SendData); conversation = find_or_create_conversation(pinfo); @@ -1437,7 +1437,7 @@ dissect_rdp_SendData(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { switch(flags & SEC_PKT_MASK) { case SEC_EXCHANGE_PKT: - pi = proto_tree_add_item(tree, hf_rdp_securityExchangePDU, tvb, offset, length, FALSE); \ + pi = proto_tree_add_item(tree, hf_rdp_securityExchangePDU, tvb, offset, length, ENC_NA); \ next_tree = proto_item_add_subtree(pi, ett_rdp_securityExchangePDU); col_append_sep_str(pinfo->cinfo, COL_INFO, " ", "SecurityExchange"); @@ -1447,7 +1447,7 @@ dissect_rdp_SendData(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { break; case SEC_INFO_PKT: - pi = proto_tree_add_item(tree, hf_rdp_clientInfoPDU, tvb, offset, length, FALSE); + pi = proto_tree_add_item(tree, hf_rdp_clientInfoPDU, tvb, offset, length, ENC_NA); next_tree = proto_item_add_subtree(pi, ett_rdp_clientInfoPDU); col_append_sep_str(pinfo->cinfo, COL_INFO, " ", "ClientInfo"); @@ -1462,7 +1462,7 @@ dissect_rdp_SendData(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { } break; case SEC_LICENSE_PKT: - pi = proto_tree_add_item(tree, hf_rdp_validClientLicenseData, tvb, offset, length, FALSE); + pi = proto_tree_add_item(tree, hf_rdp_validClientLicenseData, tvb, offset, length, ENC_NA); next_tree = proto_item_add_subtree(pi, ett_rdp_validClientLicenseData); offset = dissect_rdp_securityHeader(tvb, offset, pinfo, next_tree, rdp_info, TRUE, NULL); @@ -1511,7 +1511,7 @@ dissect_rdp_SendData(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { offset = dissect_rdp_securityHeader(tvb, offset, pinfo, tree, rdp_info, FALSE, &flags); if(!(flags & SEC_ENCRYPT)) { - pi = proto_tree_add_item(tree, hf_rdp_shareControlHeader, tvb, offset, length, FALSE); + pi = proto_tree_add_item(tree, hf_rdp_shareControlHeader, tvb, offset, length, ENC_NA); next_tree = proto_item_add_subtree(pi, ett_rdp_shareControlHeader); offset = dissect_rdp_fields(tvb, offset, pinfo, next_tree, ctrl_fields); @@ -1649,7 +1649,7 @@ dissect_rdp_ClientData(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { col_append_sep_str(pinfo->cinfo, COL_INFO, " ", "ClientData"); - pi = proto_tree_add_item(tree, hf_rdp_ClientData, tvb, offset, length, FALSE); + pi = proto_tree_add_item(tree, hf_rdp_ClientData, tvb, offset, length, ENC_NA); tree = proto_item_add_subtree(pi, ett_rdp_ClientData); while(tvb_length_remaining(tvb, offset) > 0) { @@ -1668,7 +1668,7 @@ dissect_rdp_ClientData(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(tvb_length_remaining(tvb, offset) >= length) { - pi = proto_tree_add_item(tree, hf_rdp_clientCoreData, tvb, offset, length, FALSE); \ + pi = proto_tree_add_item(tree, hf_rdp_clientCoreData, tvb, offset, length, ENC_NA); \ next_tree = proto_item_add_subtree(pi, ett_rdp_clientCoreData); offset = dissect_rdp_fields(tvb, offset, pinfo, next_tree, core_fields); @@ -1681,7 +1681,7 @@ dissect_rdp_ClientData(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { case CS_SECURITY: if(tvb_length_remaining(tvb, offset) >= length) { - pi = proto_tree_add_item(tree, hf_rdp_clientSecurityData, tvb, offset, length, FALSE); \ + pi = proto_tree_add_item(tree, hf_rdp_clientSecurityData, tvb, offset, length, ENC_NA); \ next_tree = proto_item_add_subtree(pi, ett_rdp_clientSecurityData); @@ -1708,7 +1708,7 @@ dissect_rdp_ClientData(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { case CS_CLUSTER: if(tvb_length_remaining(tvb, offset) >= length) { - pi = proto_tree_add_item(tree, hf_rdp_clientClusterData, tvb, offset, length, FALSE); \ + pi = proto_tree_add_item(tree, hf_rdp_clientClusterData, tvb, offset, length, ENC_NA); \ next_tree = proto_item_add_subtree(pi, ett_rdp_clientClusterData); @@ -1722,7 +1722,7 @@ dissect_rdp_ClientData(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { default: if(tvb_length_remaining(tvb, offset) >= length) { - pi = proto_tree_add_item(tree, hf_rdp_clientUnknownData, tvb, offset, length, FALSE); \ + pi = proto_tree_add_item(tree, hf_rdp_clientUnknownData, tvb, offset, length, ENC_NA); \ next_tree = proto_item_add_subtree(pi, ett_rdp_clientUnknownData); @@ -1830,7 +1830,7 @@ dissect_rdp_ServerData(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { col_append_sep_str(pinfo->cinfo, COL_INFO, " ", "ServerData"); - pi = proto_tree_add_item(tree, hf_rdp_ServerData, tvb, offset, length, FALSE); + pi = proto_tree_add_item(tree, hf_rdp_ServerData, tvb, offset, length, ENC_NA); tree = proto_item_add_subtree(pi, ett_rdp_ServerData); while(tvb_length_remaining(tvb, offset) > 0) { @@ -1849,7 +1849,7 @@ dissect_rdp_ServerData(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(tvb_length_remaining(tvb, offset) >= length) { - pi = proto_tree_add_item(tree, hf_rdp_serverCoreData, tvb, offset, length, FALSE); \ + pi = proto_tree_add_item(tree, hf_rdp_serverCoreData, tvb, offset, length, ENC_NA); \ next_tree = proto_item_add_subtree(pi, ett_rdp_serverCoreData); offset = dissect_rdp_fields(tvb, offset, pinfo, next_tree, sc_fields); @@ -1862,7 +1862,7 @@ dissect_rdp_ServerData(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { case SC_SECURITY: if(tvb_length_remaining(tvb, offset) >= length) { - pi = proto_tree_add_item(tree, hf_rdp_serverSecurityData, tvb, offset, length, FALSE); \ + pi = proto_tree_add_item(tree, hf_rdp_serverSecurityData, tvb, offset, length, ENC_NA); \ next_tree = proto_item_add_subtree(pi, ett_rdp_serverSecurityData); @@ -1889,7 +1889,7 @@ dissect_rdp_ServerData(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { case SC_NET: if(tvb_length_remaining(tvb, offset) >= length) { - pi = proto_tree_add_item(tree, hf_rdp_serverNetworkData, tvb, offset, length, FALSE); \ + pi = proto_tree_add_item(tree, hf_rdp_serverNetworkData, tvb, offset, length, ENC_NA); \ next_tree = proto_item_add_subtree(pi, ett_rdp_serverNetworkData); @@ -1929,7 +1929,7 @@ dissect_rdp_ServerData(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { default: if(tvb_length_remaining(tvb, offset) >= length) { - pi = proto_tree_add_item(tree, hf_rdp_serverUnknownData, tvb, offset, length, FALSE); \ + pi = proto_tree_add_item(tree, hf_rdp_serverUnknownData, tvb, offset, length, ENC_NA); \ next_tree = proto_item_add_subtree(pi, ett_rdp_serverUnknownData); diff --git a/epan/dissectors/packet-rdt.c b/epan/dissectors/packet-rdt.c index 674ff46131..502eb347cf 100644 --- a/epan/dissectors/packet-rdt.c +++ b/epan/dissectors/packet-rdt.c @@ -527,7 +527,7 @@ guint dissect_rdt_data_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre stream_id, asm_rule_number, sequence_number, timestamp); /* The remaining data is unparsed. */ - proto_tree_add_item(tree, hf_rdt_data, tvb, offset, -1, FALSE); + proto_tree_add_item(tree, hf_rdt_data, tvb, offset, -1, ENC_NA); offset += tvb_length_remaining(tvb, offset); if (packet_length < (offset - start_offset) || @@ -609,7 +609,7 @@ guint dissect_rdt_asm_action_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tre stream_id, rel_seqno); /* The remaining data is unparsed. */ - proto_tree_add_item(tree, hf_rdt_data, tvb, offset, -1, FALSE); + proto_tree_add_item(tree, hf_rdt_data, tvb, offset, -1, ENC_NA); if (packet_length < (offset - start_offset) || packet_length > tvb_length_remaining(tvb, start_offset)) @@ -737,7 +737,7 @@ guint dissect_rdt_ack_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree } /* XXX: The remaining data is unparsed. */ - proto_tree_add_item(tree, hf_rdt_data, tvb, offset, -1, FALSE); + proto_tree_add_item(tree, hf_rdt_data, tvb, offset, -1, ENC_NA); col_append_fstr(pinfo->cinfo, COL_INFO, "ACK: lh=%u ", lost_high_flag); @@ -933,7 +933,7 @@ guint dissect_rdt_report_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t col_append_str(pinfo->cinfo, COL_INFO, "REPORT: "); /* The remaining data is unparsed. */ - proto_tree_add_item(tree, hf_rdt_data, tvb, offset, -1, FALSE); + proto_tree_add_item(tree, hf_rdt_data, tvb, offset, -1, ENC_NA); if (packet_length < (offset - start_offset) || packet_length > tvb_length_remaining(tvb, start_offset)) @@ -1219,7 +1219,7 @@ guint dissect_rdt_unknown_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree offset += 2; /* The remaining data is unparsed. */ - proto_tree_add_item(tree, hf_rdt_data, tvb, offset, -1, FALSE); + proto_tree_add_item(tree, hf_rdt_data, tvb, offset, -1, ENC_NA); offset += tvb_length_remaining(tvb, offset); col_append_str(pinfo->cinfo, COL_INFO, "UNKNOWN-CTL: "); diff --git a/epan/dissectors/packet-redback.c b/epan/dissectors/packet-redback.c index 1ae6ec7920..07676be356 100644 --- a/epan/dissectors/packet-redback.c +++ b/epan/dissectors/packet-redback.c @@ -81,7 +81,7 @@ dissect_redback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(rbtree, hf_redback_l3offset, tvb, 22, 2, FALSE); if (dataoff > 24) { - proto_tree_add_item(rbtree, hf_redback_padding, tvb, 24, dataoff-24, FALSE); + proto_tree_add_item(rbtree, hf_redback_padding, tvb, 24, dataoff-24, ENC_NA); } } @@ -136,7 +136,7 @@ dissect_redback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) next_tvb = tvb_new_subset_remaining(tvb, dataoff); } else { if (tree) - proto_tree_add_item(rbtree, hf_redback_unknown, tvb, dataoff, 4, FALSE); + proto_tree_add_item(rbtree, hf_redback_unknown, tvb, dataoff, 4, ENC_NA); next_tvb = tvb_new_subset_remaining(tvb, dataoff+4); } diff --git a/epan/dissectors/packet-redbackli.c b/epan/dissectors/packet-redbackli.c index deb38a1829..afb96f6c82 100644 --- a/epan/dissectors/packet-redbackli.c +++ b/epan/dissectors/packet-redbackli.c @@ -114,7 +114,7 @@ redbackli_dissect_avp(guint8 avptype, guint8 avplen, tvbuff_t *tvb, gint offset, break; case(RB_AVP_EOH): proto_tree_add_item(st, hf_redbackli_eohpad, tvb, - offset+2, avplen, FALSE); + offset+2, avplen, ENC_NA); break; case(RB_AVP_DIR): proto_tree_add_item(st, hf_redbackli_dir, tvb, @@ -122,11 +122,11 @@ redbackli_dissect_avp(guint8 avptype, guint8 avplen, tvbuff_t *tvb, gint offset, break; case(RB_AVP_ACCTID): proto_tree_add_item(st, hf_redbackli_acctid, tvb, - offset+2, avplen, FALSE); + offset+2, avplen, ENC_NA); break; default: proto_tree_add_item(st, hf_redbackli_unknownavp, tvb, - offset+2, avplen, FALSE); + offset+2, avplen, ENC_NA); break; } diff --git a/epan/dissectors/packet-reload.c b/epan/dissectors/packet-reload.c index 3c59e7c00f..e916040331 100644 --- a/epan/dissectors/packet-reload.c +++ b/epan/dissectors/packet-reload.c @@ -578,7 +578,7 @@ dissect_opaque(tvbuff_t *tvb, packet_info *pinfo,proto_tree *tree, int anchor_in opaque_tree = proto_item_add_subtree(ti_anchor, ett_reload_opaque); proto_tree_add_uint(opaque_tree, length_index, tvb, offset, length_size, (guint)length); - proto_tree_add_item(opaque_tree, hf_reload_opaque_data, tvb, offset + length_size, length, FALSE); + proto_tree_add_item(opaque_tree, hf_reload_opaque_data, tvb, offset + length_size, length, ENC_NA); return (length_size + length); } @@ -603,7 +603,7 @@ dissect_destination(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint16 proto_item *ti_destination; destination_length = tvb_get_guint8(tvb,offset+1); - ti_destination = proto_tree_add_item(tree, hf_reload_destination, tvb, offset, 2+destination_length, FALSE); + ti_destination = proto_tree_add_item(tree, hf_reload_destination, tvb, offset, 2+destination_length, ENC_NA); destination_tree = proto_item_add_subtree(ti_destination, ett_reload_destination); proto_item_append_text(ti_destination, " (%s)", val_to_str(destination_type, destinationtypes, "Unknown")); @@ -625,7 +625,7 @@ dissect_destination(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint16 else { nodeid_length = reload_nodeid_length; } - ti_nodeid = proto_tree_add_item(destination_tree, hf_reload_nodeid, tvb, offset+ 2, nodeid_length, FALSE); + ti_nodeid = proto_tree_add_item(destination_tree, hf_reload_nodeid, tvb, offset+ 2, nodeid_length, ENC_NA); if ((nodeid_length < 16) || (nodeid_length > 20)) { expert_add_info_format(pinfo, ti_nodeid, PI_PROTOCOL, PI_ERROR, "Node ID length is not in the correct range"); } @@ -672,11 +672,11 @@ dissect_probe_information(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g probe_length = tvb_get_guint8(tvb, offset + 1); if (probe_length + 2 > length) { - ti_probe_information = proto_tree_add_item(tree, hf_reload_probe_information, tvb, offset, length, FALSE); + ti_probe_information = proto_tree_add_item(tree, hf_reload_probe_information, tvb, offset, length, ENC_NA); expert_add_info_format(pinfo, ti_probe_information, PI_PROTOCOL, PI_ERROR, "Truncated probe information"); return length; } - ti_probe_information = proto_tree_add_item(tree, hf_reload_probe_information, tvb, offset, 2 + probe_length, FALSE); + ti_probe_information = proto_tree_add_item(tree, hf_reload_probe_information, tvb, offset, 2 + probe_length, ENC_NA); probe_information_tree = proto_item_add_subtree(ti_probe_information, ett_reload_probe_information); proto_tree_add_item(probe_information_tree, hf_reload_probe_information_type, tvb, offset, 1, FALSE); @@ -722,7 +722,7 @@ dissect_ipaddressport(tvbuff_t *tvb, proto_tree *tree, guint16 offset) guint8 ipaddressport_length; ipaddressport_length = tvb_get_guint8(tvb, offset+1); - ti_ipaddressport = proto_tree_add_item(tree, hf_reload_ipaddressport, tvb, offset, ipaddressport_length+2, FALSE); + ti_ipaddressport = proto_tree_add_item(tree, hf_reload_ipaddressport, tvb, offset, ipaddressport_length+2, ENC_NA); ipaddressport_type = tvb_get_guint8(tvb, offset); proto_item_append_text(ti_ipaddressport, " %s ", val_to_str(ipaddressport_type, ipaddressporttypes,"Unknown Type")); ipaddressport_tree = proto_item_add_subtree(ti_ipaddressport, ett_reload_ipaddressport); @@ -760,12 +760,12 @@ dissect_icecandidates(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint icecandidates_length = tvb_get_ntohs(tvb, offset); /* Precalculate the length of the icecandidate list */ if (2+icecandidates_length > length) { - ti_icecandidates = proto_tree_add_item(tree, hf_reload_icecandidates, tvb, offset, length, FALSE); + ti_icecandidates = proto_tree_add_item(tree, hf_reload_icecandidates, tvb, offset, length, ENC_NA); expert_add_info_format(pinfo, ti_icecandidates, PI_PROTOCOL, PI_ERROR, "Truncated ice candidates"); return length; } - ti_icecandidates = proto_tree_add_item(tree, hf_reload_icecandidates, tvb, offset, 2+icecandidates_length, FALSE); + ti_icecandidates = proto_tree_add_item(tree, hf_reload_icecandidates, tvb, offset, 2+icecandidates_length, ENC_NA); icecandidates_tree = proto_item_add_subtree(ti_icecandidates, ett_reload_icecandidates); proto_tree_add_uint(icecandidates_tree, hf_reload_icecandidates_length, tvb, offset+local_offset, 2, icecandidates_length); local_offset += 2; @@ -810,7 +810,7 @@ dissect_icecandidates(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint expert_add_info_format(pinfo, ti_icecandidates, PI_PROTOCOL, PI_ERROR, "Truncated ice candidate"); break; } - ti_icecandidate = proto_tree_add_item(icecandidates_tree, hf_reload_icecandidate, tvb, offset+local_offset+ icecandidates_offset, icecandidate_offset, FALSE); + ti_icecandidate = proto_tree_add_item(icecandidates_tree, hf_reload_icecandidate, tvb, offset+local_offset+ icecandidates_offset, icecandidate_offset, ENC_NA); icecandidate_tree = proto_item_add_subtree(ti_icecandidate, ett_reload_icecandidate); /* parse from start */ icecandidate_offset = 0; @@ -887,12 +887,12 @@ dissect_icecandidates(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint } ti_iceextension = proto_tree_add_item(icecandidate_tree, hf_reload_iceextension, tvb, - offset+local_offset + icecandidates_offset + icecandidate_offset + iceextensions_offset, 4 + iceextension_name_length + iceextension_value_length, FALSE); + offset+local_offset + icecandidates_offset + icecandidate_offset + iceextensions_offset, 4 + iceextension_name_length + iceextension_value_length, ENC_NA); iceextension_tree = proto_item_add_subtree(ti_iceextension, ett_reload_iceextension); proto_tree_add_item(iceextension_tree, hf_reload_iceextension_name, tvb, - offset+local_offset+ icecandidates_offset + icecandidate_offset + iceextensions_offset, 2 + iceextension_name_length, FALSE); + offset+local_offset+ icecandidates_offset + icecandidate_offset + iceextensions_offset, 2 + iceextension_name_length, ENC_NA); proto_tree_add_item(iceextension_tree, hf_reload_iceextension_value, tvb, - offset+local_offset + icecandidates_offset + icecandidate_offset + iceextensions_offset +2 + iceextension_name_length, 2 + iceextension_value_length, FALSE); + offset+local_offset + icecandidates_offset + icecandidate_offset + iceextensions_offset +2 + iceextension_name_length, 2 + iceextension_value_length, ENC_NA); iceextensions_offset += 4 + iceextension_name_length + iceextension_value_length; } } @@ -917,7 +917,7 @@ dissect_attachreqans(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint1 ufrag_length = tvb_get_guint8(tvb,offset+local_offset); local_offset += 1; if (local_offset + ufrag_length > length) { - ti_attachreqans = proto_tree_add_item(tree, hf_reload_attachreqans, tvb, offset, length, FALSE); + ti_attachreqans = proto_tree_add_item(tree, hf_reload_attachreqans, tvb, offset, length, ENC_NA); expert_add_info_format(pinfo, ti_attachreqans, PI_PROTOCOL, PI_ERROR, "Truncated attach_reqans"); return length; } @@ -925,7 +925,7 @@ dissect_attachreqans(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint1 password_length = tvb_get_guint8(tvb,offset+local_offset); local_offset += 1; if (local_offset + password_length > length) { - ti_attachreqans = proto_tree_add_item(tree, hf_reload_attachreqans, tvb, offset, length, FALSE); + ti_attachreqans = proto_tree_add_item(tree, hf_reload_attachreqans, tvb, offset, length, ENC_NA); expert_add_info_format(pinfo, ti_attachreqans, PI_PROTOCOL, PI_ERROR, "Truncated attach_reqans"); return length; } @@ -933,7 +933,7 @@ dissect_attachreqans(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint1 role_length = tvb_get_guint8(tvb,offset+local_offset); local_offset += 1; if (local_offset + role_length > length) { - ti_attachreqans = proto_tree_add_item(tree, hf_reload_attachreqans, tvb, offset, length, FALSE); + ti_attachreqans = proto_tree_add_item(tree, hf_reload_attachreqans, tvb, offset, length, ENC_NA); expert_add_info_format(pinfo, ti_attachreqans, PI_PROTOCOL, PI_ERROR, "Truncated attach_reqans"); return length; } @@ -941,13 +941,13 @@ dissect_attachreqans(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint1 icecandidates_length = tvb_get_ntohs(tvb, offset+local_offset); local_offset += 2; if (local_offset +icecandidates_length > length) { - ti_attachreqans = proto_tree_add_item(tree, hf_reload_attachreqans, tvb, offset, length, FALSE); + ti_attachreqans = proto_tree_add_item(tree, hf_reload_attachreqans, tvb, offset, length, ENC_NA); expert_add_info_format(pinfo, ti_attachreqans, PI_PROTOCOL, PI_ERROR, "Truncated attach_reqans"); return length; } local_offset += icecandidates_length; - ti_attachreqans = proto_tree_add_item(tree, hf_reload_attachreqans, tvb, offset, local_offset, FALSE); + ti_attachreqans = proto_tree_add_item(tree, hf_reload_attachreqans, tvb, offset, local_offset, ENC_NA); attachreqans_tree = proto_item_add_subtree(ti_attachreqans, ett_reload_attachreqans); /* restart parsing, field by field */ @@ -975,13 +975,13 @@ dissect_storeddata(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint16 local_offset += 4; if (storeddata_length + 4 > length) { - ti_storeddata = proto_tree_add_item(tree, hf_reload_storeddata, tvb, offset, length, FALSE); + ti_storeddata = proto_tree_add_item(tree, hf_reload_storeddata, tvb, offset, length, ENC_NA); expert_add_info_format(pinfo, ti_storeddata, PI_PROTOCOL, PI_ERROR, "Truncated storeddata"); return length; } local_offset = 0; - ti_storeddata = proto_tree_add_item(tree, hf_reload_storeddata, tvb, offset, 4 + storeddata_length, FALSE); + ti_storeddata = proto_tree_add_item(tree, hf_reload_storeddata, tvb, offset, 4 + storeddata_length, ENC_NA); storeddata_tree = proto_item_add_subtree(ti_storeddata, ett_reload_storeddata); proto_tree_add_uint(storeddata_tree, hf_reload_storeddata_length, tvb, offset + local_offset, 4, storeddata_length); @@ -1004,11 +1004,11 @@ dissect_kinddata(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint16 of values_length = tvb_get_ntohl(tvb, offset + 4 + 8); if (12 + values_length > length) { - ti_kinddata = proto_tree_add_item(tree, hf_reload_kinddata, tvb, offset, length, FALSE); + ti_kinddata = proto_tree_add_item(tree, hf_reload_kinddata, tvb, offset, length, ENC_NA); expert_add_info_format(pinfo, ti_kinddata, PI_PROTOCOL, PI_ERROR, "Truncated kind data"); return length; } - ti_kinddata = proto_tree_add_item(tree, hf_reload_kinddata, tvb, offset, 12+values_length, FALSE); + ti_kinddata = proto_tree_add_item(tree, hf_reload_kinddata, tvb, offset, 12+values_length, ENC_NA); kinddata_tree = proto_item_add_subtree(ti_kinddata, ett_reload_kinddata); proto_tree_add_item(kinddata_tree, hf_reload_kindid, tvb, offset+local_offset, 4, FALSE); @@ -1043,14 +1043,14 @@ dissect_storereq(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint16 of local_offset += get_opaque_length(tvb, offset, 1) + 1; /* resource id length */ if (local_offset > length) { - ti_storereq = proto_tree_add_item(tree, hf_reload_storereq, tvb, offset, length, FALSE); + ti_storereq = proto_tree_add_item(tree, hf_reload_storereq, tvb, offset, length, ENC_NA); expert_add_info_format(pinfo, ti_storereq, PI_PROTOCOL, PI_ERROR, "Truncated storereq: resource too long"); return length; } local_offset += 1; /* replica_num */ if (local_offset > length) { - ti_storereq = proto_tree_add_item(tree, hf_reload_storereq, tvb, offset, length, FALSE); + ti_storereq = proto_tree_add_item(tree, hf_reload_storereq, tvb, offset, length, ENC_NA); expert_add_info_format(pinfo, ti_storereq, PI_PROTOCOL, PI_ERROR, "Truncated storereq: no room for replica_number"); return length; } @@ -1058,13 +1058,13 @@ dissect_storereq(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint16 of kind_data_length = tvb_get_ntohl(tvb, offset + local_offset); local_offset += 4; if (local_offset + kind_data_length > length) { - ti_storereq = proto_tree_add_item(tree, hf_reload_storereq, tvb, offset, length, FALSE); + ti_storereq = proto_tree_add_item(tree, hf_reload_storereq, tvb, offset, length, ENC_NA); expert_add_info_format(pinfo, ti_storereq, PI_PROTOCOL, PI_ERROR, "Truncated storereq: kind_date too long"); return length; } local_offset += kind_data_length; - ti_storereq = proto_tree_add_item(tree, hf_reload_storereq, tvb, offset, local_offset, FALSE); + ti_storereq = proto_tree_add_item(tree, hf_reload_storereq, tvb, offset, local_offset, ENC_NA); storereq_tree = proto_item_add_subtree(ti_storereq, ett_reload_storereq); /* Parse from start */ @@ -1100,11 +1100,11 @@ dissect_fetchans(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint16 of kind_responses_length = tvb_get_ntohl(tvb, offset); if (4 + kind_responses_length > length) { - ti_fetchans = proto_tree_add_item(tree, hf_reload_fetchans, tvb, offset, length, FALSE); + ti_fetchans = proto_tree_add_item(tree, hf_reload_fetchans, tvb, offset, length, ENC_NA); expert_add_info_format(pinfo, ti_fetchans, PI_PROTOCOL, PI_ERROR, "Truncated storereq"); return length; } - ti_fetchans = proto_tree_add_item(tree, hf_reload_fetchans, tvb, offset, 4 + kind_responses_length, FALSE); + ti_fetchans = proto_tree_add_item(tree, hf_reload_fetchans, tvb, offset, 4 + kind_responses_length, ENC_NA); fetchans_tree = proto_item_add_subtree(ti_fetchans, ett_reload_fetchans); proto_tree_add_uint(fetchans_tree, hf_reload_kind_responses_length, tvb, offset, 4, FALSE); @@ -1132,11 +1132,11 @@ dissect_statans(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint16 off kind_responses_length = tvb_get_ntohl(tvb, offset); if (4 + kind_responses_length > length) { - ti_statans = proto_tree_add_item(tree, hf_reload_statans, tvb, offset, length, FALSE); + ti_statans = proto_tree_add_item(tree, hf_reload_statans, tvb, offset, length, ENC_NA); expert_add_info_format(pinfo, ti_statans, PI_PROTOCOL, PI_ERROR, "Truncated statans"); return length; } - ti_statans = proto_tree_add_item(tree, hf_reload_statans, tvb, offset, 4 + kind_responses_length, FALSE); + ti_statans = proto_tree_add_item(tree, hf_reload_statans, tvb, offset, 4 + kind_responses_length, ENC_NA); statans_tree = proto_item_add_subtree(ti_statans, ett_reload_statans); proto_tree_add_uint(statans_tree, hf_reload_kind_responses_length, tvb, offset, 4, FALSE); @@ -1343,7 +1343,7 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* * Forwarding Header */ - ti = proto_tree_add_item(reload_tree, hf_reload_forwarding, tvb, 0, forwarding_length, FALSE); + ti = proto_tree_add_item(reload_tree, hf_reload_forwarding, tvb, 0, forwarding_length, ENC_NA); reload_forwarding_tree = proto_item_add_subtree(ti, ett_reload_forwarding); proto_tree_add_uint(reload_forwarding_tree, hf_reload_token, tvb, 0, 4, relo_token); @@ -1401,7 +1401,7 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (via_list_length > 0) { proto_item *ti_vialist; proto_tree *vialist_tree; - ti_vialist = proto_tree_add_item(reload_forwarding_tree, hf_reload_via_list, tvb, offset, via_list_length, FALSE); + ti_vialist = proto_tree_add_item(reload_forwarding_tree, hf_reload_via_list, tvb, offset, via_list_length, ENC_NA); vialist_tree = proto_item_add_subtree(ti_vialist, ett_reload_via_list); dissect_destination_list(tvb, pinfo, vialist_tree, offset, via_list_length); @@ -1416,7 +1416,7 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (destination_list_length > 0) { proto_item *ti_destination_list; proto_tree *destination_list_tree; - ti_destination_list = proto_tree_add_item(reload_forwarding_tree, hf_reload_destination_list, tvb, offset, destination_list_length, FALSE); + ti_destination_list = proto_tree_add_item(reload_forwarding_tree, hf_reload_destination_list, tvb, offset, destination_list_length, ENC_NA); destination_list_tree = proto_item_add_subtree(ti_destination_list, ett_reload_destination_list); dissect_destination_list(tvb, pinfo, destination_list_tree, offset, destination_list_length); @@ -1437,7 +1437,7 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint16 option_length = tvb_get_ntohs(tvb, offset+local_offset + 2); proto_tree *option_tree; - ti_option = proto_tree_add_item(reload_forwarding_tree, hf_reload_forwarding_option, tvb, offset+local_offset, option_length + 4, FALSE); + ti_option = proto_tree_add_item(reload_forwarding_tree, hf_reload_forwarding_option, tvb, offset+local_offset, option_length + 4, ENC_NA); proto_item_append_text(ti_option, " type=%s, flags=%02x, length=%d", val_to_str(option_type, forwardingoptiontypes, "Unknown"), option_flags, option_length); option_tree = proto_item_add_subtree(ti_option, ett_reload_forwarding_option); @@ -1462,7 +1462,7 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) switch (option_type) { default: - proto_tree_add_item(option_tree, hf_reload_forwarding_option_data, tvb, offset+local_offset, option_length, FALSE); + proto_tree_add_item(option_tree, hf_reload_forwarding_option_data, tvb, offset+local_offset, option_length, ENC_NA); break; } local_offset += option_length; @@ -1518,12 +1518,12 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) message_body_length = tvb_get_ntohl(tvb, offset + 2); extensions_length = tvb_get_ntohl(tvb, offset + 2 + 4 + message_body_length); if (forwarding_length + 2 + 4 + message_body_length + 4 + extensions_length > msg_length) { - ti_message_contents = proto_tree_add_item(reload_tree, hf_reload_message_contents, tvb, offset, (msg_length - forwarding_length), FALSE); + ti_message_contents = proto_tree_add_item(reload_tree, hf_reload_message_contents, tvb, offset, (msg_length - forwarding_length), ENC_NA); expert_add_info_format(pinfo, ti_message_contents, PI_PROTOCOL, PI_ERROR, "Truncated message contents"); return msg_length; } - ti_message_contents = proto_tree_add_item(reload_tree, hf_reload_message_contents, tvb, offset, 2 + 4 + message_body_length + 4 + extensions_length, FALSE); + ti_message_contents = proto_tree_add_item(reload_tree, hf_reload_message_contents, tvb, offset, 2 + 4 + message_body_length + 4 + extensions_length, ENC_NA); message_contents_tree = proto_item_add_subtree(ti_message_contents, ett_reload_message_contents); if (message_code != RELOAD_ERROR) { @@ -1537,7 +1537,7 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) "%s-%s", msg_method_str, msg_class_str); offset += 2; /* Message body */ - ti_message_body = proto_tree_add_item(message_contents_tree, hf_reload_message_body, tvb, offset, 4 + message_body_length, FALSE); + ti_message_body = proto_tree_add_item(message_contents_tree, hf_reload_message_body, tvb, offset, 4 + message_body_length, ENC_NA); message_body_tree = proto_item_add_subtree(ti_message_body, ett_reload_message_body); proto_tree_add_uint(message_body_tree, hf_reload_opaque_length_uint32, tvb, offset, 4, message_body_length); offset +=4; @@ -1550,7 +1550,7 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item * ti_routequeryreq; proto_tree * routequeryreq_tree; int destination_length; - ti_routequeryreq = proto_tree_add_item(message_body_tree, hf_reload_routequeryreq, tvb, offset, message_body_length, FALSE); + ti_routequeryreq = proto_tree_add_item(message_body_tree, hf_reload_routequeryreq, tvb, offset, message_body_length, ENC_NA); routequeryreq_tree = proto_item_add_subtree(ti_routequeryreq, ett_reload_routequeryreq); proto_tree_add_item(routequeryreq_tree, hf_reload_sendupdate, tvb, offset, 1, FALSE); destination_length = dissect_destination(tvb, pinfo, routequeryreq_tree, offset + 1, message_body_length - 1 - 2); @@ -1567,7 +1567,7 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item * ti_probereq; proto_tree * probereq_tree; guint8 info_list_length = 0; - ti_probereq = proto_tree_add_item(message_body_tree, hf_reload_probereq, tvb, offset, message_body_length, FALSE); + ti_probereq = proto_tree_add_item(message_body_tree, hf_reload_probereq, tvb, offset, message_body_length, ENC_NA); probereq_tree = proto_item_add_subtree(ti_probereq, ett_reload_probereq); info_list_length = tvb_get_guint8(tvb, offset); @@ -1591,7 +1591,7 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree * probeans_tree; guint16 info_list_length = 0; - ti_probeans = proto_tree_add_item(message_body_tree, hf_reload_probeans, tvb, offset, message_body_length, FALSE); + ti_probeans = proto_tree_add_item(message_body_tree, hf_reload_probeans, tvb, offset, message_body_length, ENC_NA); probeans_tree = proto_item_add_subtree(ti_probeans, ett_reload_probeans); info_list_length = tvb_get_ntohs(tvb, offset); @@ -1630,7 +1630,7 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint16 local_offset = 0; proto_item *ti_appattach; proto_tree *appattach_tree; - ti_appattach = proto_tree_add_item(message_body_tree, hf_reload_appattach, tvb, offset+local_offset, message_body_length, FALSE); + ti_appattach = proto_tree_add_item(message_body_tree, hf_reload_appattach, tvb, offset+local_offset, message_body_length, ENC_NA); appattach_tree = proto_item_add_subtree(ti_appattach, ett_reload_appattach); local_offset += dissect_opaque(tvb, pinfo,appattach_tree, hf_reload_ufrag,offset+local_offset, 1, message_body_length-local_offset); local_offset += dissect_opaque(tvb, pinfo,appattach_tree, hf_reload_password,offset+local_offset, 1, message_body_length-local_offset); @@ -1667,7 +1667,7 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *configupdate_tree; guint8 configupdate_type; guint32 configupdate_length; - ti_configupdate = proto_tree_add_item(message_body_tree, hf_reload_configupdatereq, tvb, offset+local_offset, message_body_length, FALSE); + ti_configupdate = proto_tree_add_item(message_body_tree, hf_reload_configupdatereq, tvb, offset+local_offset, message_body_length, ENC_NA); configupdate_tree = proto_item_add_subtree(ti_configupdate, ett_reload_configupdatereq); configupdate_type = tvb_get_guint8(tvb, offset + local_offset); proto_tree_add_uint(configupdate_tree, hf_reload_configupdatereq_type, tvb, offset+local_offset, 1, configupdate_type); @@ -1708,7 +1708,7 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint32 local_offset = 0; proto_item *ti_storeans_kind_responses; proto_tree *storeans_kind_responses_tree; - ti_storeans_kind_responses = proto_tree_add_item(message_body_tree, hf_reload_storeans_kind_responses, tvb, offset, message_body_length, FALSE); + ti_storeans_kind_responses = proto_tree_add_item(message_body_tree, hf_reload_storeans_kind_responses, tvb, offset, message_body_length, ENC_NA); storeans_kind_responses_tree = proto_item_add_subtree(ti_storeans_kind_responses, ett_reload_storeans_kind_responses); storeans_kind_responses_length = tvb_get_ntohs(tvb, offset); proto_tree_add_uint(storeans_kind_responses_tree, hf_reload_storeans_kind_responses_length, tvb, offset, 2, storeans_kind_responses_length); @@ -1726,7 +1726,7 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; } ti_storekindresponse = - proto_tree_add_item(storeans_kind_responses_tree, hf_reload_storekindresponse, tvb, offset+2+local_offset, 4+ 8 + 2 + replicas_length, FALSE); + proto_tree_add_item(storeans_kind_responses_tree, hf_reload_storekindresponse, tvb, offset+2+local_offset, 4+ 8 + 2 + replicas_length, ENC_NA); storekindresponse_tree = proto_item_add_subtree(ti_storekindresponse, ett_reload_storekindresponse); proto_tree_add_item(storekindresponse_tree, hf_reload_kindid, tvb, offset+2+local_offset, 4, FALSE); local_offset += 4; @@ -1739,7 +1739,7 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint16 replicas_offset = 0; replicas_length = tvb_get_ntohs(tvb, offset + 2 + local_offset); ti_replicas = proto_tree_add_item(storekindresponse_tree, hf_reload_storekindresponse_replicas, tvb, - offset+2+local_offset, 2 + replicas_length, FALSE); + offset+2+local_offset, 2 + replicas_length, ENC_NA); replicas_tree = proto_item_add_subtree(storekindresponse_tree, ett_reload_storekindresponse_replicas); proto_tree_add_uint(replicas_tree, hf_reload_opaque_length_uint16, tvb, offset + 2+local_offset, 2, replicas_length); local_offset +=2; @@ -1749,7 +1749,7 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; } proto_tree_add_item(replicas_tree, hf_reload_nodeid, tvb, offset+2+local_offset+replicas_offset, - reload_nodeid_length, FALSE); + reload_nodeid_length, ENC_NA); replicas_offset += reload_nodeid_length; } local_offset += replicas_length; @@ -1828,11 +1828,11 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint16 findkinddata_length; findkinddata_length = 4/*kind id */ + 1 + get_opaque_length(tvb,offset + 2 + results_offset + 4, 1)/* resourceId */; if (results_offset + findkinddata_length > results_length) { - ti_findkinddata = proto_tree_add_item(message_body_tree, hf_reload_findkinddata, tvb, offset + results_offset, results_length - results_offset, FALSE); + ti_findkinddata = proto_tree_add_item(message_body_tree, hf_reload_findkinddata, tvb, offset + results_offset, results_length - results_offset, ENC_NA); expert_add_info_format(pinfo, ti_findkinddata, PI_PROTOCOL, PI_ERROR, "Truncated FindKindData"); break; } - ti_findkinddata = proto_tree_add_item(message_body_tree, hf_reload_findkinddata, tvb, offset + 2 + results_offset, findkinddata_length, FALSE); + ti_findkinddata = proto_tree_add_item(message_body_tree, hf_reload_findkinddata, tvb, offset + 2 + results_offset, findkinddata_length, ENC_NA); findkinddata_tree = proto_item_add_subtree(ti_findkinddata, ett_reload_findkinddata); proto_tree_add_item(findkinddata_tree, hf_reload_kindid, tvb, offset + 2 + results_offset, 4, FALSE); @@ -1849,7 +1849,7 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case METHOD_JOIN: { if (IS_REQUEST(message_code)) { - proto_tree_add_item(message_body_tree, hf_reload_nodeid, tvb, offset, reload_nodeid_length, FALSE); + proto_tree_add_item(message_body_tree, hf_reload_nodeid, tvb, offset, reload_nodeid_length, ENC_NA); dissect_opaque(tvb, pinfo, message_body_tree, hf_reload_overlay_specific, offset + reload_nodeid_length, 2, message_body_length - reload_nodeid_length); } @@ -1876,7 +1876,7 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 2; /* Message body */ - ti_message_body = proto_tree_add_item(message_contents_tree, hf_reload_message_body, tvb, offset, 4 + message_body_length, FALSE); + ti_message_body = proto_tree_add_item(message_contents_tree, hf_reload_message_body, tvb, offset, 4 + message_body_length, ENC_NA); message_body_tree = proto_item_add_subtree(ti_message_body, ett_reload_message_body); proto_tree_add_uint(message_body_tree, hf_reload_opaque_length_uint32, tvb, offset, 4, message_body_length); offset +=4; @@ -1887,7 +1887,7 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) return msg_length; } - ti_error = proto_tree_add_item(message_body_tree, hf_reload_error_response, tvb, offset, 2 + 2 + error_length, FALSE); + ti_error = proto_tree_add_item(message_body_tree, hf_reload_error_response, tvb, offset, 2 + 2 + error_length, ENC_NA); error_tree = proto_item_add_subtree(ti_error, ett_reload_error_response); proto_tree_add_item(error_tree, hf_reload_error_response_code, tvb, offset, 2, FALSE); dissect_opaque(tvb, pinfo, error_tree, hf_reload_error_response_info, offset+2, 2, -1); @@ -1907,7 +1907,7 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) expert_add_info_format(pinfo, ti_message_contents, PI_PROTOCOL, PI_ERROR, "Truncated message extensions"); break; } - ti_extension = proto_tree_add_item(message_contents_tree, hf_reload_message_extension, tvb, offset+ extension_offset, 3 + 4 + extension_content_length, FALSE); + ti_extension = proto_tree_add_item(message_contents_tree, hf_reload_message_extension, tvb, offset+ extension_offset, 3 + 4 + extension_content_length, ENC_NA); extension_tree = proto_item_add_subtree(ti_extension, ett_reload_message_extension); proto_tree_add_item(extension_tree, hf_reload_message_extension_type, tvb, offset+ extension_offset, 2, FALSE); proto_tree_add_item(extension_tree, hf_reload_message_extension_critical, tvb, offset+ extension_offset + 2, 1, FALSE); @@ -1939,7 +1939,7 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) security_block_offset += signaturevalue_length; ti_security_block = proto_tree_add_item(reload_tree, hf_reload_security_block, tvb, offset, - security_block_offset, FALSE); + security_block_offset, ENC_NA); security_block_tree = proto_item_add_subtree(ti_security_block, ett_reload_security_block); /* start parsing from the beginning */ security_block_offset = 0; @@ -1961,7 +1961,7 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti_certificate = proto_tree_add_item(security_block_tree, hf_reload_certificates, tvb, offset + security_block_offset + certificate_offset, 1 + 2 + certificate_length, - FALSE); + ENC_NA); certificate_tree = proto_item_add_subtree(ti_certificate, ett_reload_certificate); proto_tree_add_item(certificate_tree, hf_reload_certificate_type, tvb, @@ -1995,7 +1995,7 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 2 +/* SignatureAndHashAlgorithm */ 1 + 2 + signatureidentityvalue_length +/* SignatureIdenty length*/ 2 + signaturevalue_length, - FALSE); + ENC_NA); signature_tree = proto_item_add_subtree(ti_signature, ett_reload_signature); proto_tree_add_item(signature_tree, hf_reload_hash_algorithm, tvb, offset + security_block_offset, 1, FALSE); @@ -2012,7 +2012,7 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) hf_reload_signature_identity, tvb, offset+security_block_offset, 1 + 2 + signatureidentityvalue_length, - FALSE); + ENC_NA); signatureidentity_tree = proto_item_add_subtree(ti_signatureidentity, ett_reload_signature_identity); identity_type = tvb_get_guint8(tvb, offset + security_block_offset); proto_tree_add_item(signatureidentity_tree, hf_reload_signature_identity_type, tvb, @@ -2038,7 +2038,7 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) hf_reload_signature_identity_value, tvb, offset + security_block_offset + signatureidentityvalue_offset, 1 + 1 + certificate_hash_length, - FALSE); + ENC_NA); signatureidentityvalue_tree = proto_item_add_subtree(ti_signatureidentityvalue, ett_reload_signature_identity_value); proto_tree_add_item(signatureidentityvalue_tree, hf_reload_hash_algorithm, tvb, offset + security_block_offset +signatureidentityvalue_offset, 1, FALSE); diff --git a/epan/dissectors/packet-ripng.c b/epan/dissectors/packet-ripng.c index 0ab0f895e3..56d9a68164 100644 --- a/epan/dissectors/packet-ripng.c +++ b/epan/dissectors/packet-ripng.c @@ -86,13 +86,13 @@ dissect_ripng(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { offset += 1; /* Reserved */ - proto_tree_add_item(ripng_tree, hf_ripng_reserved, tvb, offset, 2, FALSE); + proto_tree_add_item(ripng_tree, hf_ripng_reserved, tvb, offset, 2, ENC_NA); offset += 2; /* Route Table Entry */ while (tvb_reported_length_remaining(tvb, offset) > 0) { - rte_ti = proto_tree_add_item(ripng_tree, hf_ripng_rte, tvb, offset, 16 + 2 + 1 + 1, FALSE); + rte_ti = proto_tree_add_item(ripng_tree, hf_ripng_rte, tvb, offset, 16 + 2 + 1 + 1, ENC_NA); rte_tree = proto_item_add_subtree(rte_ti, ett_ripng_rte); /* IPv6 Prefix */ diff --git a/epan/dissectors/packet-rlc-lte.c b/epan/dissectors/packet-rlc-lte.c index b2ee504ba9..0487398a27 100644 --- a/epan/dissectors/packet-rlc-lte.c +++ b/epan/dissectors/packet-rlc-lte.c @@ -532,7 +532,7 @@ static void reassembly_show_source(rlc_channel_reassembly_info *reassembly_info, tvb, (n == reassembly_info->number_of_segments-1) ? offset : 0, (n == reassembly_info->number_of_segments-1) ? segment->length : 0, - FALSE); + ENC_NA); segment_tree = proto_item_add_subtree(segment_ti, ett_rlc_lte_reassembly_source_segment); proto_item_append_text(segment_ti, " (SN=%u frame=%u length=%u)", segment->SN, segment->frameNum, segment->length); @@ -1664,7 +1664,7 @@ static void dissect_rlc_lte_tm(tvbuff_t *tvb, packet_info *pinfo, PROTO_ITEM_SET_HIDDEN(tm_ti); /* Remaining bytes are all data */ - raw_tm_ti = proto_tree_add_item(tree, hf_rlc_lte_tm_data, tvb, offset, -1, FALSE); + raw_tm_ti = proto_tree_add_item(tree, hf_rlc_lte_tm_data, tvb, offset, -1, ENC_NA); if (!global_rlc_lte_call_rrc) { write_pdu_label_and_info(top_ti, NULL, pinfo, " [%u-bytes]", tvb_length_remaining(tvb, offset)); @@ -2547,7 +2547,7 @@ static void dissect_rlc_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case RLC_PREDEF: /* Predefined data (i.e. not containing a valid RLC header */ - proto_tree_add_item(rlc_lte_tree, hf_rlc_lte_predefined_pdu, tvb, offset, -1, FALSE); + proto_tree_add_item(rlc_lte_tree, hf_rlc_lte_predefined_pdu, tvb, offset, -1, ENC_NA); write_pdu_label_and_info(top_ti, NULL, pinfo, " [%u-bytes]", tvb_length_remaining(tvb, offset)); break; diff --git a/epan/dissectors/packet-rlc.c b/epan/dissectors/packet-rlc.c index 75aa14364c..86e9cb8b5d 100644 --- a/epan/dissectors/packet-rlc.c +++ b/epan/dissectors/packet-rlc.c @@ -474,7 +474,7 @@ static void tree_add_fragment_list(struct rlc_sdu *sdu, tvbuff_t *tvb, proto_tre proto_tree *frag_tree; guint16 offset; struct rlc_frag *sdufrag; - ti = proto_tree_add_item(tree, hf_rlc_frags, tvb, 0, -1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, hf_rlc_frags, tvb, 0, -1, ENC_NA); frag_tree = proto_item_add_subtree(ti, ett_rlc_fragments); proto_item_append_text(ti, " (%u bytes, %u fragments): ", sdu->len, sdu->fragcnt); @@ -496,7 +496,7 @@ static void tree_add_fragment_list_incomplete(struct rlc_sdu *sdu, tvbuff_t *tvb proto_tree *frag_tree; guint16 offset; struct rlc_frag *sdufrag; - ti = proto_tree_add_item(tree, hf_rlc_frags, tvb, 0, 0, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, hf_rlc_frags, tvb, 0, 0, ENC_NA); frag_tree = proto_item_add_subtree(ti, ett_rlc_fragments); proto_item_append_text(ti, " (%u bytes, %u fragments): ", sdu->len, sdu->fragcnt); @@ -523,7 +523,7 @@ static proto_tree *tree_add_li(enum rlc_mode mode, struct rlc_li *li, guint8 li_ if (li_is_on_2_bytes) { li_offs = hdr_offs + li_idx*2; - ti = proto_tree_add_item(tree, hf_rlc_li, tvb, li_offs, 2, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, hf_rlc_li, tvb, li_offs, 2, ENC_NA); li_tree = proto_item_add_subtree(ti, ett_rlc_frag); ti = proto_tree_add_bits_item(li_tree, hf_rlc_li_value, tvb, li_offs*8, 15, ENC_BIG_ENDIAN); switch (li->li) { @@ -570,7 +570,7 @@ static proto_tree *tree_add_li(enum rlc_mode mode, struct rlc_li *li, guint8 li_ proto_tree_add_bits_item(li_tree, hf_rlc_li_ext, tvb, li_offs*8+15, 1, ENC_BIG_ENDIAN); } else { li_offs = hdr_offs + li_idx; - ti = proto_tree_add_item(tree, hf_rlc_li, tvb, li_offs, 1, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, hf_rlc_li, tvb, li_offs, 1, ENC_NA); li_tree = proto_item_add_subtree(ti, ett_rlc_frag); ti = proto_tree_add_bits_item(li_tree, hf_rlc_li_value, tvb, li_offs*8, 7, ENC_BIG_ENDIAN); switch (li->li) { @@ -610,7 +610,7 @@ static proto_tree *tree_add_li(enum rlc_mode mode, struct rlc_li *li, guint8 li_ if (li->len > 0) { if (li->li > tvb_length_remaining(tvb, hdr_offs)) return li_tree; if (li->len > li->li) return li_tree; - ti = proto_tree_add_item(li_tree, hf_rlc_li_data, tvb, hdr_offs + li->li - li->len, li->len, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(li_tree, hf_rlc_li_data, tvb, hdr_offs + li->li - li->len, li->len, ENC_NA); PROTO_ITEM_SET_HIDDEN(ti); } @@ -901,7 +901,7 @@ static void dissect_rlc_tm(enum channel_type channel, tvbuff_t *tvb, packet_info proto_tree *top_level, proto_tree *tree) { if (tree) { - proto_tree_add_item(tree, hf_rlc_data, tvb, 0, -1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_rlc_data, tvb, 0, -1, ENC_NA); } rlc_call_subdissector(channel, tvb, pinfo, top_level); } @@ -920,7 +920,7 @@ static void rlc_um_reassemble(tvbuff_t *tvb, guint8 offs, packet_info *pinfo, pr if ((!li_is_on_2_bytes && (li[i].li == 0x7f)) || (li[i].li == 0x7fff)) { /* padding, must be last LI */ if (tree) { - proto_tree_add_item(tree, hf_rlc_pad, tvb, offs, -1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_rlc_pad, tvb, offs, -1, ENC_NA); } offs += tvb_length_remaining(tvb, offs); } else if ((!li_is_on_2_bytes && (li[i].li == 0x7c)) || (li[i].li == 0x7ffc)) { @@ -932,7 +932,7 @@ static void rlc_um_reassemble(tvbuff_t *tvb, guint8 offs, packet_info *pinfo, pr if (length > 1) { length--; if (tree && length) { - proto_tree_add_item(tree, hf_rlc_data, tvb, offs, length, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_rlc_data, tvb, offs, length, ENC_NA); } if (global_rlc_perform_reassemby) { add_fragment(RLC_UM, tvb, pinfo, li[i].tree, offs, seq, i, length, TRUE); @@ -941,12 +941,12 @@ static void rlc_um_reassemble(tvbuff_t *tvb, guint8 offs, packet_info *pinfo, pr offs += length; } if (tree) { - proto_tree_add_item(tree, hf_rlc_pad, tvb, offs, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_rlc_pad, tvb, offs, 1, ENC_NA); } offs += 1; } else { if (tree && li[i].len) { - proto_tree_add_item(tree, hf_rlc_data, tvb, offs, li[i].len, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_rlc_data, tvb, offs, li[i].len, ENC_NA); } if (global_rlc_perform_reassemby) { add_fragment(RLC_UM, tvb, pinfo, li[i].tree, offs, seq, i, li[i].len, TRUE); @@ -964,7 +964,7 @@ static void rlc_um_reassemble(tvbuff_t *tvb, guint8 offs, packet_info *pinfo, pr /* is there data left? */ if (tvb_length_remaining(tvb, offs) > 0) { if (tree) { - proto_tree_add_item(tree, hf_rlc_data, tvb, offs, -1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_rlc_data, tvb, offs, -1, ENC_NA); } if (global_rlc_perform_reassemby) { /* add remaining data as fragment */ @@ -1206,7 +1206,7 @@ static void dissect_rlc_status(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree while (tvb_length_remaining(tvb, bit_offset/8) > 0) { sufi_type = tvb_get_bits8(tvb, bit_offset, 4); - sufi_item = proto_tree_add_item(tree, hf_rlc_sufi, tvb, 0, 0, ENC_BIG_ENDIAN); + sufi_item = proto_tree_add_item(tree, hf_rlc_sufi, tvb, 0, 0, ENC_NA); sufi_tree = proto_item_add_subtree(sufi_item, ett_rlc_sufi); proto_tree_add_bits_item(sufi_tree, hf_rlc_sufi_type, tvb, bit_offset, 4, ENC_BIG_ENDIAN); bit_offset += 4; @@ -1249,7 +1249,7 @@ static void dissect_rlc_status(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree len++; /* bitmap is len + 1 */ proto_tree_add_bits_ret_val(sufi_tree, hf_rlc_sufi_fsn, tvb, bit_offset, 12, &sn, ENC_BIG_ENDIAN); bit_offset += 12; - proto_tree_add_item(sufi_tree, hf_rlc_sufi_bitmap, tvb, bit_offset/8, (gint)len, ENC_BIG_ENDIAN); + proto_tree_add_item(sufi_tree, hf_rlc_sufi_bitmap, tvb, bit_offset/8, (gint)len, ENC_NA); ti = proto_tree_add_text(sufi_tree, tvb, bit_offset/8, (gint)len, "Decoded bitmap:"); bitmap_tree = proto_item_add_subtree(ti, ett_rlc_bitmap); buff = ep_alloc(BUFF_SIZE); @@ -1408,12 +1408,12 @@ static void rlc_am_reassemble(tvbuff_t *tvb, guint8 offs, packet_info *pinfo, pr } else if ((!li_is_on_2_bytes && (li[i].li == 0x7f)) || (li[i].li == 0x7fff)) { /* padding, must be last LI */ if (tree && tvb_length_remaining(tvb, offs) > 0) { - proto_tree_add_item(tree, hf_rlc_pad, tvb, offs, -1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_rlc_pad, tvb, offs, -1, ENC_NA); } offs += tvb_length_remaining(tvb, offs); } else { if (tree && li[i].len) { - proto_tree_add_item(tree, hf_rlc_data, tvb, offs, li[i].len, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_rlc_data, tvb, offs, li[i].len, ENC_NA); } if (global_rlc_perform_reassemby) { add_fragment(RLC_AM, tvb, pinfo, li[i].tree, offs, seq, i, li[i].len, TRUE); @@ -1434,7 +1434,7 @@ static void rlc_am_reassemble(tvbuff_t *tvb, guint8 offs, packet_info *pinfo, pr if (tvb_length_remaining(tvb, offs) > 0) { /* we have remaining data, which we need to mark in the tree */ if (tree) { - proto_tree_add_item(tree, hf_rlc_data, tvb, offs, -1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_rlc_data, tvb, offs, -1, ENC_NA); } if (global_rlc_perform_reassemby) { add_fragment(RLC_AM, tvb, pinfo, tree, offs, seq, i, diff --git a/epan/dissectors/packet-rlogin.c b/epan/dissectors/packet-rlogin.c index 870d1e575a..797a7ba676 100644 --- a/epan/dissectors/packet-rlogin.c +++ b/epan/dissectors/packet-rlogin.c @@ -332,7 +332,7 @@ static void rlogin_display(rlogin_hash_entry_t *hash_info, /* Create window info tree */ window_info_item = - proto_tree_add_item(rlogin_tree, hf_window_info, tvb, offset, 12, FALSE); + proto_tree_add_item(rlogin_tree, hf_window_info, tvb, offset, 12, ENC_NA); window_tree = proto_item_add_subtree(window_info_item, ett_rlogin_window); /* Cookie */ diff --git a/epan/dissectors/packet-rohc.c b/epan/dissectors/packet-rohc.c index cd22f1b56b..57fc8449d2 100644 --- a/epan/dissectors/packet-rohc.c +++ b/epan/dissectors/packet-rohc.c @@ -629,7 +629,7 @@ start_over: offset++; oct = tvb_get_guint8(tvb,offset); } - proto_tree_add_item(rohc_tree, hf_rohc_padding, tvb, 0, offset, ENC_BIG_ENDIAN); + proto_tree_add_item(rohc_tree, hf_rohc_padding, tvb, 0, offset, ENC_NA); } /* 2) If the first remaining octet starts with 1110, it is an Add-CID octet: * remember the Add-CID octet; remove the octet. diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c index afd00a3a3f..3895923263 100644 --- a/epan/dissectors/packet-rpc.c +++ b/epan/dissectors/packet-rpc.c @@ -2154,7 +2154,7 @@ dissect_rpc_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, "[RPC retransmission of #%d]", rpc_call->req_num); proto_tree_add_item(rpc_tree, hf_rpc_dup, tvb, - 0, 0, TRUE); + 0, 0, ENC_NA); proto_tree_add_uint(rpc_tree, hf_rpc_call_dup, tvb, 0,0, rpc_call->req_num); } @@ -2333,7 +2333,7 @@ dissect_rpc_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, col_prepend_fstr(pinfo->cinfo, COL_INFO, "[RPC duplicate of #%d]", rpc_call->rep_num); tmp_item=proto_tree_add_item(rpc_tree, - hf_rpc_dup, tvb, 0,0, TRUE); + hf_rpc_dup, tvb, 0,0, ENC_NA); PROTO_ITEM_SET_GENERATED(tmp_item); tmp_item=proto_tree_add_uint(rpc_tree, diff --git a/epan/dissectors/packet-rpcap.c b/epan/dissectors/packet-rpcap.c index 1ded94652b..38575ef571 100644 --- a/epan/dissectors/packet-rpcap.c +++ b/epan/dissectors/packet-rpcap.c @@ -428,10 +428,10 @@ dissect_rpcap_ifaddr (tvbuff_t *tvb, packet_info *pinfo, proto_tree_add_item (tree, hf_if_ip, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item (tree, hf_if_padding, tvb, offset, 120, ENC_BIG_ENDIAN); + proto_tree_add_item (tree, hf_if_padding, tvb, offset, 120, ENC_NA); offset += 120; } else { - ti = proto_tree_add_item (tree, hf_if_unknown, tvb, offset, 126, ENC_BIG_ENDIAN); + ti = proto_tree_add_item (tree, hf_if_unknown, tvb, offset, 126, ENC_NA); if (af != AF_UNSPEC) { expert_add_info_format (pinfo, ti, PI_UNDECODED, PI_CHAT, "Unknown address family: %d", af); diff --git a/epan/dissectors/packet-rpl.c b/epan/dissectors/packet-rpl.c index 2c13da9584..b3eb4f80e7 100644 --- a/epan/dissectors/packet-rpl.c +++ b/epan/dissectors/packet-rpl.c @@ -211,13 +211,13 @@ dissect_rpl_container(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case 0x4018: proto_tree_add_item(tree, hf_rpl_data, - tvb, offset, len-4, FALSE); + tvb, offset, len-4, ENC_NA); offset += len - 4; break; case 0xc005: proto_tree_add_item(tree, hf_rpl_config, - tvb, offset, 8, FALSE); + tvb, offset, 8, ENC_NA); offset += 8; proto_tree_add_item(tree, hf_rpl_equipment, tvb, offset, 2, FALSE); @@ -229,13 +229,13 @@ dissect_rpl_container(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb, offset, 2, FALSE); offset += 2; proto_tree_add_item(tree, hf_rpl_ec, - tvb, offset, 6, FALSE); + tvb, offset, 6, ENC_NA); offset += 6; proto_tree_add_item(tree, hf_rpl_adapterid, tvb, offset, 2, FALSE); offset += 2; proto_tree_add_item(tree, hf_rpl_shortname, - tvb, offset, 10, FALSE); + tvb, offset, 10, ENC_NA); offset += 10; break; diff --git a/epan/dissectors/packet-rquota.c b/epan/dissectors/packet-rquota.c index dea52f269b..7009b75400 100644 --- a/epan/dissectors/packet-rquota.c +++ b/epan/dissectors/packet-rquota.c @@ -77,7 +77,7 @@ dissect_rquota(tvbuff_t *tvb, int offset, proto_tree *tree) proto_tree *lock_tree = NULL; lock_item = proto_tree_add_item(tree, hf_rquota_rquota, tvb, - offset, -1, FALSE); + offset, -1, ENC_NA); lock_tree = proto_item_add_subtree(lock_item, ett_rquota_rquota); diff --git a/epan/dissectors/packet-rsip.c b/epan/dissectors/packet-rsip.c index 86182b23f0..cf81135f17 100644 --- a/epan/dissectors/packet-rsip.c +++ b/epan/dissectors/packet-rsip.c @@ -284,7 +284,7 @@ rsip_parameter(tvbuff_t *tvb, proto_tree *rsip_tree, int off, int eoff) return consumed; vti = proto_tree_add_item(p_tree, hf_rsip_parameter_value, - tvb, off + 3, paramlen, FALSE); + tvb, off + 3, paramlen, ENC_NA); v_tree = proto_item_add_subtree(vti, ett_rsip_param_val); switch (paramtype) { @@ -480,7 +480,7 @@ rsip_parameter(tvbuff_t *tvb, proto_tree *rsip_tree, int off, int eoff) 2, FALSE); proto_tree_add_item(v_tree, hf_rsip_parameter_vendor_specific_value, tvb, off + 9, - paramlen - 4, FALSE); + paramlen - 4, ENC_NA); break; case 22: /* SPI */ proto_tree_add_item(v_tree, hf_rsip_parameter_spi_number, tvb, diff --git a/epan/dissectors/packet-rsl.c b/epan/dissectors/packet-rsl.c index f1ca488f8d..85185e1e7c 100644 --- a/epan/dissectors/packet-rsl.c +++ b/epan/dissectors/packet-rsl.c @@ -999,7 +999,7 @@ dissect_rsl_ie_enc_inf(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_tree_add_item(ie_tree, hf_rsl_alg_id, tvb, offset, 1, ENC_BIG_ENDIAN); /* key */ - proto_tree_add_item(ie_tree, hf_rsl_key, tvb, offset+1, length -1, ENC_BIG_ENDIAN); + proto_tree_add_item(ie_tree, hf_rsl_key, tvb, offset+1, length -1, ENC_NA); return offset + length; @@ -1321,7 +1321,7 @@ dissect_rsl_ie_phy_ctx(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, * This information should not be analysed by BSC, but merely * forwarded from one TRX/channel to another. */ - proto_tree_add_item(ie_tree, hf_rsl_phy_ctx, tvb, offset, length, ENC_BIG_ENDIAN); + proto_tree_add_item(ie_tree, hf_rsl_phy_ctx, tvb, offset, length, ENC_NA); offset = offset + length; return offset; diff --git a/epan/dissectors/packet-rsync.c b/epan/dissectors/packet-rsync.c index de50a76ce2..25e8de1917 100644 --- a/epan/dissectors/packet-rsync.c +++ b/epan/dissectors/packet-rsync.c @@ -225,7 +225,7 @@ dissect_rsync_encap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, case RSYNC_DATA: /* then we are still sending commands */ - proto_tree_add_item(rsync_tree, hf_rsync_data, tvb, offset, -1, TRUE); + proto_tree_add_item(rsync_tree, hf_rsync_data, tvb, offset, -1, ENC_NA); col_append_str(pinfo->cinfo, COL_INFO, "Data"); diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c index 7604512647..8e959a112a 100644 --- a/epan/dissectors/packet-rtcp.c +++ b/epan/dissectors/packet-rtcp.c @@ -893,7 +893,7 @@ dissect_rtcp_rtpfb( tvbuff_t *tvb, int offset, proto_tree *rtcp_tree, proto_item offset = dissect_rtcp_rtpfb_tmmbr(tvb, offset, rtcp_tree, top_item, counter, 1); } else { /* Unknown FMT */ - proto_tree_add_item(rtcp_tree, hf_rtcp_fci, tvb, offset, start_offset + packet_length - offset, FALSE ); + proto_tree_add_item(rtcp_tree, hf_rtcp_fci, tvb, offset, start_offset + packet_length - offset, ENC_NA ); offset = start_offset + packet_length; } } @@ -959,7 +959,7 @@ dissect_rtcp_psfb( tvbuff_t *tvb, int offset, proto_tree *rtcp_tree, /* Append undecoded FCI information */ if ((packet_length - (offset - base_offset)) > 0) { - proto_tree_add_item( rtcp_tree, hf_rtcp_fci, tvb, offset, packet_length - (offset - base_offset), FALSE ); + proto_tree_add_item( rtcp_tree, hf_rtcp_fci, tvb, offset, packet_length - (offset - base_offset), ENC_NA ); offset = base_offset + packet_length; } return offset; @@ -1041,7 +1041,7 @@ dissect_rtcp_app( tvbuff_t *tvb,packet_info *pinfo, int offset, proto_tree *tree the length */ /* Top-level poc tree */ - PoC1_item = proto_tree_add_item(tree, hf_rtcp_app_poc1, tvb, offset, packet_len, ENC_BIG_ENDIAN); + PoC1_item = proto_tree_add_item(tree, hf_rtcp_app_poc1, tvb, offset, packet_len, ENC_NA); PoC1_tree = proto_item_add_subtree( PoC1_item, ett_PoC1 ); /* Dissect it according to its subtype */ @@ -1534,7 +1534,7 @@ dissect_rtcp_app( tvbuff_t *tvb,packet_info *pinfo, int offset, proto_tree *tree { guint16 local_port = 0; - proto_item* mux_item = proto_tree_add_item(tree, hf_rtcp_app_mux, tvb, offset, packet_len, ENC_BIG_ENDIAN); + proto_item* mux_item = proto_tree_add_item(tree, hf_rtcp_app_mux, tvb, offset, packet_len, ENC_NA); proto_tree* mux_tree = proto_item_add_subtree( mux_item, ett_mux ); proto_tree_add_item( mux_tree, hf_rtcp_app_mux_mux, tvb, offset, 1, FALSE ); proto_tree_add_item( mux_tree, hf_rtcp_app_mux_cp, tvb, offset, 1, FALSE ); @@ -1545,7 +1545,7 @@ dissect_rtcp_app( tvbuff_t *tvb,packet_info *pinfo, int offset, proto_tree *tree else { /* fall back to just showing the data if it's the wrong length */ - proto_tree_add_item( tree, hf_rtcp_app_data, tvb, offset, packet_len, FALSE ); + proto_tree_add_item( tree, hf_rtcp_app_data, tvb, offset, packet_len, ENC_NA ); } offset += packet_len; @@ -1585,7 +1585,7 @@ dissect_rtcp_app( tvbuff_t *tvb,packet_info *pinfo, int offset, proto_tree *tree */ packet_len -= tvb_get_guint8( tvb, offset + packet_len - 1 ); } - proto_tree_add_item( tree, hf_rtcp_app_data, tvb, offset, packet_len, FALSE ); + proto_tree_add_item( tree, hf_rtcp_app_data, tvb, offset, packet_len, ENC_NA ); offset += packet_len; return offset; @@ -2318,7 +2318,7 @@ dissect_rtcp_rr( packet_info *pinfo, tvbuff_t *tvb, int offset, proto_tree *tree if ((offset-rr_offset) < (int)packet_length) { proto_tree_add_item(tree, hf_rtcp_profile_specific_extension, tvb, offset, - packet_length - (offset - rr_offset), ENC_BIG_ENDIAN); + packet_length - (offset - rr_offset), ENC_NA); offset = rr_offset + packet_length; } @@ -2373,7 +2373,7 @@ dissect_rtcp_sr( packet_info *pinfo, tvbuff_t *tvb, int offset, proto_tree *tree if ((offset-sr_offset) < (int)packet_length) { proto_tree_add_item(tree, hf_rtcp_profile_specific_extension, tvb, offset, - packet_length - (offset - sr_offset), ENC_BIG_ENDIAN); + packet_length - (offset - sr_offset), ENC_NA); offset = sr_offset + packet_length; } } @@ -2922,7 +2922,7 @@ dissect_rtcp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) /* This length includes the padding length byte itself, so 0 is not * a valid value. */ if (padding_length != 0) { - proto_tree_add_item( rtcp_tree, hf_rtcp_padding_data, tvb, offset, padding_length - 1, FALSE ); + proto_tree_add_item( rtcp_tree, hf_rtcp_padding_data, tvb, offset, padding_length - 1, ENC_NA ); offset += padding_length - 1; } proto_tree_add_item( rtcp_tree, hf_rtcp_padding_count, tvb, offset, 1, FALSE ); @@ -2936,12 +2936,12 @@ dissect_rtcp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) proto_tree_add_uint(rtcp_tree, hf_srtcp_index, tvb, srtcp_offset, 4, srtcp_index); srtcp_offset += 4; if (srtcp_info->mki_len) { - proto_tree_add_item(rtcp_tree, hf_srtcp_mki, tvb, srtcp_offset, srtcp_info->mki_len, ENC_BIG_ENDIAN); + proto_tree_add_item(rtcp_tree, hf_srtcp_mki, tvb, srtcp_offset, srtcp_info->mki_len, ENC_NA); srtcp_offset += srtcp_info->mki_len; } if (srtcp_info->auth_tag_len) { - proto_tree_add_item(rtcp_tree, hf_srtcp_auth_tag, tvb, srtcp_offset, srtcp_info->auth_tag_len, ENC_BIG_ENDIAN); + proto_tree_add_item(rtcp_tree, hf_srtcp_auth_tag, tvb, srtcp_offset, srtcp_info->auth_tag_len, ENC_NA); srtcp_offset += srtcp_info->auth_tag_len; } } diff --git a/epan/dissectors/packet-rtmpt.c b/epan/dissectors/packet-rtmpt.c index e8c1038abb..6e669b197a 100644 --- a/epan/dissectors/packet-rtmpt.c +++ b/epan/dissectors/packet-rtmpt.c @@ -1016,7 +1016,7 @@ dissect_rtmpt_body_audio(tvbuff_t *tvb, gint offset, proto_tree *rtmpt_tree) proto_tree_add_uint(at, hf_rtmpt_audio_rate, tvb, offset, 1, iCtl); proto_tree_add_uint(at, hf_rtmpt_audio_size, tvb, offset, 1, iCtl); proto_tree_add_uint(at, hf_rtmpt_audio_type, tvb, offset, 1, iCtl); - proto_tree_add_item(rtmpt_tree, hf_rtmpt_audio_data, tvb, offset+1, -1, FALSE); + proto_tree_add_item(rtmpt_tree, hf_rtmpt_audio_data, tvb, offset+1, -1, ENC_NA); } static void @@ -1035,7 +1035,7 @@ dissect_rtmpt_body_video(tvbuff_t *tvb, gint offset, proto_tree *rtmpt_tree) vt = proto_item_add_subtree(vi, ett_rtmpt_video_control); proto_tree_add_uint(vt, hf_rtmpt_video_type, tvb, offset, 1, iCtl); proto_tree_add_uint(vt, hf_rtmpt_video_format, tvb, offset, 1, iCtl); - proto_tree_add_item(rtmpt_tree, hf_rtmpt_video_data, tvb, offset+1, -1, FALSE); + proto_tree_add_item(rtmpt_tree, hf_rtmpt_video_data, tvb, offset+1, -1, ENC_NA); } static void @@ -1174,18 +1174,18 @@ dissect_rtmpt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, rtmpt_conv_t if (tp->id == RTMPT_TYPE_HANDSHAKE_1) { - proto_tree_add_item(rtmpt_tree, hf_rtmpt_handshake_c0, tvb, 0, 1, FALSE); - proto_tree_add_item(rtmpt_tree, hf_rtmpt_handshake_c1, tvb, 1, 1536, FALSE); + proto_tree_add_item(rtmpt_tree, hf_rtmpt_handshake_c0, tvb, 0, 1, ENC_NA); + proto_tree_add_item(rtmpt_tree, hf_rtmpt_handshake_c1, tvb, 1, 1536, ENC_NA); } else if (tp->id == RTMPT_TYPE_HANDSHAKE_2) { - proto_tree_add_item(rtmpt_tree, hf_rtmpt_handshake_s0, tvb, 0, 1, FALSE); - proto_tree_add_item(rtmpt_tree, hf_rtmpt_handshake_s1, tvb, 1, 1536, FALSE); - proto_tree_add_item(rtmpt_tree, hf_rtmpt_handshake_s2, tvb, 1537, 1536, FALSE); + proto_tree_add_item(rtmpt_tree, hf_rtmpt_handshake_s0, tvb, 0, 1, ENC_NA); + proto_tree_add_item(rtmpt_tree, hf_rtmpt_handshake_s1, tvb, 1, 1536, ENC_NA); + proto_tree_add_item(rtmpt_tree, hf_rtmpt_handshake_s2, tvb, 1537, 1536, ENC_NA); } else if (tp->id == RTMPT_TYPE_HANDSHAKE_3) { - proto_tree_add_item(rtmpt_tree, hf_rtmpt_handshake_c2, tvb, 0, 1536, FALSE); + proto_tree_add_item(rtmpt_tree, hf_rtmpt_handshake_c2, tvb, 0, 1536, ENC_NA); } return; diff --git a/epan/dissectors/packet-rtnet.c b/epan/dissectors/packet-rtnet.c index efc3e83780..1c9a5a16e6 100644 --- a/epan/dissectors/packet-rtnet.c +++ b/epan/dissectors/packet-rtnet.c @@ -326,7 +326,7 @@ dissect_rtnet_tdma_ack_ack_conf(tvbuff_t *tvb, guint offset, proto_tree *tree) { offset += 1; proto_tree_add_item(tree, hf_tdma_v1_msg_ack_ack_conf_padding, tvb, - offset, 3, FALSE ); + offset, 3, ENC_NA ); offset += 3; return offset; @@ -345,7 +345,7 @@ dissect_rtnet_tdma_station_list(tvbuff_t *tvb, guint offset, proto_tree *tree) offset += 1; proto_tree_add_item(tree, hf_tdma_v1_msg_station_list_padding, tvb, - offset, 3, FALSE ); + offset, 3, ENC_NA ); offset += 3; @@ -362,7 +362,7 @@ dissect_rtnet_tdma_station_list(tvbuff_t *tvb, guint offset, proto_tree *tree) offset += 1; proto_tree_add_item(tree, hf_tdma_v1_msg_station_list_padding, tvb, - offset, 3, FALSE ); + offset, 3, ENC_NA ); offset += 3; } @@ -737,7 +737,7 @@ dissect_rtcfg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { offset += 2; if( config_length > 0 ) { - proto_tree_add_item( rtcfg_tree, hf_rtcfg_config_data, tvb, offset, config_length, FALSE ); + proto_tree_add_item( rtcfg_tree, hf_rtcfg_config_data, tvb, offset, config_length, ENC_NA ); offset += config_length; } @@ -827,7 +827,7 @@ dissect_rtcfg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if( config_length > 0 ) { len = tvb_reported_length_remaining(tvb, offset); - proto_tree_add_item( rtcfg_tree, hf_rtcfg_config_data, tvb, offset, len, FALSE ); + proto_tree_add_item( rtcfg_tree, hf_rtcfg_config_data, tvb, offset, len, ENC_NA ); offset += len; } @@ -838,7 +838,7 @@ dissect_rtcfg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { offset += 4; len = tvb_reported_length_remaining(tvb, offset); - proto_tree_add_item( rtcfg_tree, hf_rtcfg_config_data, tvb, offset, len, FALSE ); + proto_tree_add_item( rtcfg_tree, hf_rtcfg_config_data, tvb, offset, len, ENC_NA ); offset += len; break; @@ -879,7 +879,7 @@ dissect_rtcfg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { break; default: - proto_tree_add_item( rtcfg_tree, hf_rtcfg_client_hw_address, tvb, offset, 32, FALSE ); + proto_tree_add_item( rtcfg_tree, hf_rtcfg_client_hw_address, tvb, offset, 32, ENC_NA ); break; } offset += 32; diff --git a/epan/dissectors/packet-rtp.c b/epan/dissectors/packet-rtp.c index a11468cc37..d02ea28b7e 100644 --- a/epan/dissectors/packet-rtp.c +++ b/epan/dissectors/packet-rtp.c @@ -770,18 +770,18 @@ process_rtp_payload(tvbuff_t *newtvb, packet_info *pinfo, proto_tree *tree, #endif { if (rtp_tree) - proto_tree_add_item(rtp_tree, hf_srtp_encrypted_payload, newtvb, offset, payload_len, FALSE); + proto_tree_add_item(rtp_tree, hf_srtp_encrypted_payload, newtvb, offset, payload_len, ENC_NA); found_match = TRUE; /* use this flag to prevent dissection below */ } offset += payload_len; if (srtp_info->mki_len) { - proto_tree_add_item(rtp_tree, hf_srtp_mki, newtvb, offset, srtp_info->mki_len, FALSE); + proto_tree_add_item(rtp_tree, hf_srtp_mki, newtvb, offset, srtp_info->mki_len, ENC_NA); offset += srtp_info->mki_len; } if (srtp_info->auth_tag_len) { - proto_tree_add_item(rtp_tree, hf_srtp_auth_tag, newtvb, offset, srtp_info->auth_tag_len, FALSE); + proto_tree_add_item(rtp_tree, hf_srtp_auth_tag, newtvb, offset, srtp_info->auth_tag_len, ENC_NA); offset += srtp_info->auth_tag_len; } } @@ -805,7 +805,7 @@ process_rtp_payload(tvbuff_t *newtvb, packet_info *pinfo, proto_tree *tree, * Just add it as data. */ if(found_match==FALSE) - proto_tree_add_item( rtp_tree, hf_rtp_data, newtvb, 0, -1, FALSE ); + proto_tree_add_item( rtp_tree, hf_rtp_data, newtvb, 0, -1, ENC_NA ); return; } @@ -814,7 +814,7 @@ process_rtp_payload(tvbuff_t *newtvb, packet_info *pinfo, proto_tree *tree, /* if we don't found, it is static OR could be set static from the preferences */ if (!found_match && !dissector_try_uint(rtp_pt_dissector_table, payload_type, newtvb, pinfo, tree)) - proto_tree_add_item( rtp_tree, hf_rtp_data, newtvb, 0, -1, FALSE ); + proto_tree_add_item( rtp_tree, hf_rtp_data, newtvb, 0, -1, ENC_NA ); } @@ -1381,7 +1381,7 @@ dissect_rtp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) if ( csrc_count > 0 ) { if ( tree ) { ti = proto_tree_add_item(rtp_tree, hf_rtp_csrc_items, tvb, offset, - csrc_count * 4, FALSE); + csrc_count * 4, ENC_NA); proto_item_append_text(ti, " (%u items)", csrc_count); rtp_csrc_tree = proto_item_add_subtree( ti, ett_csrc_list ); } @@ -1407,7 +1407,7 @@ dissect_rtp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) offset += 2; if ( hdr_extension > 0 ) { if ( tree ) { - ti = proto_tree_add_item(rtp_tree, hf_rtp_hdr_exts, tvb, offset, hdr_extension * 4, FALSE); + ti = proto_tree_add_item(rtp_tree, hf_rtp_hdr_exts, tvb, offset, hdr_extension * 4, ENC_NA); rtp_hext_tree = proto_item_add_subtree( ti, ett_hdr_ext ); } @@ -1490,7 +1490,7 @@ dissect_rtp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) * data. */ if ( tree ) proto_tree_add_item( rtp_tree, hf_rtp_padding_data, - tvb, offset, padding_count - 1, FALSE ); + tvb, offset, padding_count - 1, ENC_NA ); offset += padding_count - 1; } /* diff --git a/epan/dissectors/packet-rx.c b/epan/dissectors/packet-rx.c index 5e3b915774..af0420715c 100644 --- a/epan/dissectors/packet-rx.c +++ b/epan/dissectors/packet-rx.c @@ -144,7 +144,7 @@ dissect_rx_response_encrypted(tvbuff_t *tvb, proto_tree *parent_tree, int offset int i; guint32 callnumber; - item = proto_tree_add_item(parent_tree, hf_rx_encrypted, tvb, offset, -1, FALSE); + item = proto_tree_add_item(parent_tree, hf_rx_encrypted, tvb, offset, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_rx_encrypted); /* epoch : 4 bytes */ @@ -212,7 +212,7 @@ dissect_rx_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, ); } - item = proto_tree_add_item(parent_tree, hf_rx_response, tvb, offset, -1, FALSE); + item = proto_tree_add_item(parent_tree, hf_rx_response, tvb, offset, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_rx_response); version = tvb_get_ntohl(tvb, offset); @@ -238,7 +238,7 @@ dissect_rx_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, offset += 4; tvb_ensure_bytes_exist(tvb, offset, tl); - proto_tree_add_item(tree, hf_rx_ticket, tvb, offset, tl, FALSE); + proto_tree_add_item(tree, hf_rx_ticket, tvb, offset, tl, ENC_NA); offset += tl; } @@ -267,7 +267,7 @@ dissect_rx_abort(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int ); } - item = proto_tree_add_item(parent_tree, hf_rx_abort, tvb, offset, -1, FALSE); + item = proto_tree_add_item(parent_tree, hf_rx_abort, tvb, offset, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_rx_abort); /* kvno */ @@ -301,7 +301,7 @@ dissect_rx_challenge(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, ); } - item = proto_tree_add_item(parent_tree, hf_rx_challenge, tvb, offset, -1, FALSE); + item = proto_tree_add_item(parent_tree, hf_rx_challenge, tvb, offset, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_rx_challenge); version = tvb_get_ntohl(tvb, offset); @@ -343,7 +343,7 @@ dissect_rx_acks(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int ); } - item = proto_tree_add_item(parent_tree, hf_rx_ack, tvb, offset, -1, FALSE); + item = proto_tree_add_item(parent_tree, hf_rx_ack, tvb, offset, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_rx_ack); diff --git a/epan/dissectors/packet-s5066.c b/epan/dissectors/packet-s5066.c index 64a1156dc0..73728d6025 100644 --- a/epan/dissectors/packet-s5066.c +++ b/epan/dissectors/packet-s5066.c @@ -1045,7 +1045,7 @@ dissect_s5066_18(tvbuff_t *tvb, guint offset, proto_tree *tree, guint pdu_size) guint body_size = 0; proto_tree_add_item(tree, hf_s5066_18_type, tvb, offset, 1, FALSE); offset++; body_size = pdu_size - offset; - proto_tree_add_item(tree, hf_s5066_18_body, tvb, offset, body_size, FALSE); offset += body_size; + proto_tree_add_item(tree, hf_s5066_18_body, tvb, offset, body_size, ENC_NA); offset += body_size; return offset; } @@ -1056,7 +1056,7 @@ dissect_s5066_19(tvbuff_t *tvb, guint offset, proto_tree *tree, guint pdu_size) guint body_size = 0; proto_tree_add_item(tree, hf_s5066_19_type, tvb, offset, 1, FALSE); offset++; body_size = pdu_size - offset; - proto_tree_add_item(tree, hf_s5066_19_body, tvb, offset, body_size, FALSE); offset += body_size; + proto_tree_add_item(tree, hf_s5066_19_body, tvb, offset, body_size, ENC_NA); offset += body_size; return offset; } @@ -1138,7 +1138,7 @@ dissect_s5066_22(tvbuff_t *tvb, guint offset, proto_tree *tree) offset = dissect_s5066_address(tvb, offset, tree, FALSE); pdu_size = tvb_get_ntohs(tvb, offset); proto_tree_add_item(tree, hf_s5066_22_size, tvb, offset, 2, FALSE); offset += 2; - proto_tree_add_item(tree, hf_s5066_22_data, tvb, offset, pdu_size, FALSE); offset += pdu_size; + proto_tree_add_item(tree, hf_s5066_22_data, tvb, offset, pdu_size, ENC_NA); offset += pdu_size; return offset; } @@ -1153,7 +1153,7 @@ dissect_s5066_23(tvbuff_t *tvb, guint offset, proto_tree *tree) offset = dissect_s5066_address(tvb, offset, tree, FALSE); pdu_size = tvb_get_ntohs(tvb, offset); proto_tree_add_item(tree, hf_s5066_23_size, tvb, offset, 2, FALSE); offset += 2; - proto_tree_add_item(tree, hf_s5066_23_data, tvb, offset, pdu_size, FALSE); offset += pdu_size; + proto_tree_add_item(tree, hf_s5066_23_data, tvb, offset, pdu_size, ENC_NA); offset += pdu_size; return offset; } @@ -1236,7 +1236,7 @@ dissect_s5066_26(tvbuff_t *tvb, guint offset, proto_tree *tree) offset = dissect_s5066_address(tvb, offset, tree, FALSE); pdu_size = tvb_get_ntohs(tvb, offset); proto_tree_add_item(tree, hf_s5066_26_size, tvb, offset, 2, FALSE); offset += 2; - proto_tree_add_item(tree, hf_s5066_26_data, tvb, offset, pdu_size, FALSE); offset += pdu_size; + proto_tree_add_item(tree, hf_s5066_26_data, tvb, offset, pdu_size, ENC_NA); offset += pdu_size; return offset; } @@ -1251,7 +1251,7 @@ dissect_s5066_27(tvbuff_t *tvb, guint offset, proto_tree *tree) offset = dissect_s5066_address(tvb, offset, tree, FALSE); pdu_size = tvb_get_ntohs(tvb, offset); proto_tree_add_item(tree, hf_s5066_27_size, tvb, offset, 2, FALSE); offset += 2; - proto_tree_add_item(tree, hf_s5066_27_data, tvb, offset, pdu_size, FALSE); offset += pdu_size; + proto_tree_add_item(tree, hf_s5066_27_data, tvb, offset, pdu_size, ENC_NA); offset += pdu_size; return offset; } diff --git a/epan/dissectors/packet-sap.c b/epan/dissectors/packet-sap.c index 8054b7a2d5..06a8a10220 100644 --- a/epan/dissectors/packet-sap.c +++ b/epan/dissectors/packet-sap.c @@ -180,7 +180,7 @@ dissect_sap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) auth_data_len = auth_len * sizeof(guint32); - sdi = proto_tree_add_item(sap_tree, hf_auth_data, tvb, offset, auth_data_len, FALSE); + sdi = proto_tree_add_item(sap_tree, hf_auth_data, tvb, offset, auth_data_len, ENC_NA); sa_tree = proto_item_add_subtree(sdi, ett_sap_auth); auth_flags = tvb_get_guint8(tvb, offset); diff --git a/epan/dissectors/packet-scriptingservice.c b/epan/dissectors/packet-scriptingservice.c index 8a35875811..b06c41db83 100644 --- a/epan/dissectors/packet-scriptingservice.c +++ b/epan/dissectors/packet-scriptingservice.c @@ -144,7 +144,7 @@ dissect_ssprotocol_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree case SS_DOWNLOAD_TYPE: data_length = tvb_get_ntohs(message_tvb, MESSAGE_LENGTH_OFFSET) - MESSAGE_DATA_OFFSET; if (data_length > 0) { - proto_tree_add_item(ssprotocol_tree, hf_message_data, message_tvb, MESSAGE_DATA_OFFSET, data_length, FALSE); + proto_tree_add_item(ssprotocol_tree, hf_message_data, message_tvb, MESSAGE_DATA_OFFSET, data_length, ENC_NA); total_length += data_length; } break; @@ -166,7 +166,7 @@ dissect_ssprotocol_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree case SS_ENVIRONMENT_TYPE: flags_tree = proto_item_add_subtree(flags_item, ett_environment_flags); proto_tree_add_item(flags_tree, hf_environment_u_bit, message_tvb, MESSAGE_FLAGS_OFFSET, MESSAGE_FLAGS_LENGTH, ENC_BIG_ENDIAN); - proto_tree_add_item(ssprotocol_tree, hf_message_hash, message_tvb, MESSAGE_ENVIRON_HASH_OFFSET, MESSAGE_ENVIRON_HASH_LENGTH, FALSE); + proto_tree_add_item(ssprotocol_tree, hf_message_hash, message_tvb, MESSAGE_ENVIRON_HASH_OFFSET, MESSAGE_ENVIRON_HASH_LENGTH, ENC_NA); break; default: break; diff --git a/epan/dissectors/packet-sctp.c b/epan/dissectors/packet-sctp.c index 9f657327b7..d067057a44 100644 --- a/epan/dissectors/packet-sctp.c +++ b/epan/dissectors/packet-sctp.c @@ -931,7 +931,7 @@ dissect_heartbeat_info_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_ heartbeat_info_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH; if (heartbeat_info_length > 0) - proto_tree_add_item(parameter_tree, hf_heartbeat_info, parameter_tvb, HEARTBEAT_INFO_PARAMETER_INFO_OFFSET, heartbeat_info_length, ENC_BIG_ENDIAN); + proto_tree_add_item(parameter_tree, hf_heartbeat_info, parameter_tvb, HEARTBEAT_INFO_PARAMETER_INFO_OFFSET, heartbeat_info_length, ENC_NA); proto_item_append_text(parameter_item, " (Information: %u byte%s)", heartbeat_info_length, plurality(heartbeat_info_length, "", "s")); } @@ -984,7 +984,7 @@ dissect_state_cookie_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tr state_cookie_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH; if (state_cookie_length > 0) - proto_tree_add_item(parameter_tree, hf_state_cookie, parameter_tvb, STATE_COOKIE_PARAMETER_COOKIE_OFFSET, state_cookie_length, ENC_BIG_ENDIAN); + proto_tree_add_item(parameter_tree, hf_state_cookie, parameter_tvb, STATE_COOKIE_PARAMETER_COOKIE_OFFSET, state_cookie_length, ENC_NA); proto_item_append_text(parameter_item, " (Cookie length: %u byte%s)", state_cookie_length, plurality(state_cookie_length, "", "s")); } @@ -1172,7 +1172,7 @@ dissect_random_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree) number_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH; if (number_length > 0) - proto_tree_add_item(parameter_tree, hf_random_number, parameter_tvb, RANDOM_NUMBER_OFFSET, number_length, ENC_BIG_ENDIAN); + proto_tree_add_item(parameter_tree, hf_random_number, parameter_tvb, RANDOM_NUMBER_OFFSET, number_length, ENC_NA); } static void @@ -1329,7 +1329,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, value length: %u byte%s)", type, parameter_value_length, plurality(parameter_value_length, "", "s")); } @@ -1514,7 +1514,7 @@ dissect_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *chunk } 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 @@ -1702,7 +1702,7 @@ dissect_user_initiated_abort_cause(tvbuff_t *cause_tvb, proto_tree *cause_tree) cause_info_length = tvb_get_ntohs(cause_tvb, CAUSE_LENGTH_OFFSET) - CAUSE_HEADER_LENGTH; if (cause_info_length > 0) - proto_tree_add_item(cause_tree, hf_cause_info, cause_tvb, CAUSE_INFO_OFFSET, cause_info_length, ENC_BIG_ENDIAN); + proto_tree_add_item(cause_tree, hf_cause_info, cause_tvb, CAUSE_INFO_OFFSET, cause_info_length, ENC_NA); } static void @@ -1712,7 +1712,7 @@ dissect_protocol_violation_cause(tvbuff_t *cause_tvb, proto_tree *cause_tree) cause_info_length = tvb_get_ntohs(cause_tvb, CAUSE_LENGTH_OFFSET) - CAUSE_HEADER_LENGTH; if (cause_info_length > 0) - proto_tree_add_item(cause_tree, hf_cause_info, cause_tvb, CAUSE_INFO_OFFSET, cause_info_length, ENC_BIG_ENDIAN); + proto_tree_add_item(cause_tree, hf_cause_info, cause_tvb, CAUSE_INFO_OFFSET, cause_info_length, ENC_NA); } static void @@ -1784,7 +1784,7 @@ dissect_unknown_cause(tvbuff_t *cause_tvb, proto_tree *cause_tree, proto_item *c cause_info_length = tvb_get_ntohs(cause_tvb, CAUSE_LENGTH_OFFSET) - CAUSE_HEADER_LENGTH; if (cause_info_length > 0) - proto_tree_add_item(cause_tree, hf_cause_info, cause_tvb, CAUSE_INFO_OFFSET, cause_info_length, ENC_BIG_ENDIAN); + proto_tree_add_item(cause_tree, hf_cause_info, cause_tvb, CAUSE_INFO_OFFSET, cause_info_length, ENC_NA); proto_item_append_text(cause_item, " (Code: %u, information length: %u byte%s)", tvb_get_ntohs(cause_tvb, CAUSE_CODE_OFFSET), cause_info_length, plurality(cause_info_length, "", "s")); } @@ -1910,7 +1910,7 @@ dissect_error_cause(tvbuff_t *cause_tvb, packet_info *pinfo, proto_tree *chunk_t } 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 @@ -2341,7 +2341,7 @@ fragment_reassembly(tvbuff_t *tvb, sctp_fragment* fragment, add_new_data_source(pinfo, new_tvb, "Reassembled SCTP Message"); /* display reassembly info */ - item = proto_tree_add_item(tree, hf_sctp_fragments, tvb, 0, -1, FALSE); + item = proto_tree_add_item(tree, hf_sctp_fragments, tvb, 0, -1, ENC_NA); ptree = proto_item_add_subtree(item, ett_sctp_fragments); proto_item_append_text(item, " (%u bytes, %u fragments): ", message->len, message->end - message->begin + 1); @@ -2575,7 +2575,7 @@ fragment_reassembly(tvbuff_t *tvb, sctp_fragment* fragment, add_new_data_source(pinfo, new_tvb, "Reassembled SCTP Message"); /* display reassembly info */ - item = proto_tree_add_item(tree, hf_sctp_fragments, tvb, 0, -1, FALSE); + item = proto_tree_add_item(tree, hf_sctp_fragments, tvb, 0, -1, ENC_NA); ptree = proto_item_add_subtree(item, ett_sctp_fragments); proto_item_append_text(item, " (%u bytes, %u fragments): ", message->len, message->end - message->begin + 1); @@ -3330,7 +3330,7 @@ static void dissect_cookie_echo_chunk(tvbuff_t *chunk_tvb, guint16 chunk_length, proto_tree *chunk_tree, proto_item *chunk_item) { if (chunk_tree) { - proto_tree_add_item(chunk_tree, hf_cookie, chunk_tvb, COOKIE_OFFSET, chunk_length - CHUNK_HEADER_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(chunk_tree, hf_cookie, chunk_tvb, COOKIE_OFFSET, chunk_length - CHUNK_HEADER_LENGTH, ENC_NA); proto_item_append_text(chunk_item, " (Cookie length: %u byte%s)", chunk_length - CHUNK_HEADER_LENGTH, plurality(chunk_length - CHUNK_HEADER_LENGTH, "", "s")); } } @@ -3450,7 +3450,7 @@ dissect_auth_chunk(tvbuff_t *chunk_tvb, guint16 chunk_length, proto_tree *chunk_ proto_tree_add_item(chunk_tree, hf_shared_key_id, chunk_tvb, SHARED_KEY_ID_OFFSET, SHARED_KEY_ID_LENGTH, ENC_BIG_ENDIAN); proto_tree_add_item(chunk_tree, hf_hmac_id, chunk_tvb, HMAC_ID_OFFSET, HMAC_ID_LENGTH, ENC_BIG_ENDIAN); if (hmac_length > 0) - proto_tree_add_item(chunk_tree, hf_hmac, chunk_tvb, HMAC_OFFSET, hmac_length, ENC_BIG_ENDIAN); + proto_tree_add_item(chunk_tree, hf_hmac, chunk_tvb, HMAC_OFFSET, hmac_length, ENC_NA); } #define SCTP_SERIAL_NUMBER_LENGTH 4 @@ -3567,7 +3567,7 @@ dissect_pktdrop_chunk(tvbuff_t *chunk_tvb, guint16 chunk_length, packet_info *pi /* XXX - set pinfo->in_error_pkt? */ if (chunk_length > 0) { if (tvb_get_guint8(chunk_tvb, CHUNK_FLAGS_OFFSET) & SCTP_PKTDROP_CHUNK_T_BIT) - proto_tree_add_item(chunk_tree, hf_pktdrop_chunk_data_field, chunk_tvb, PKTDROP_CHUNK_DATA_FIELD_OFFSET, chunk_length, ENC_BIG_ENDIAN); + proto_tree_add_item(chunk_tree, hf_pktdrop_chunk_data_field, chunk_tvb, PKTDROP_CHUNK_DATA_FIELD_OFFSET, chunk_length, ENC_NA); else dissect_sctp_packet(data_field_tvb, pinfo, chunk_tree, TRUE); } @@ -3579,7 +3579,7 @@ dissect_unknown_chunk(tvbuff_t *chunk_tvb, guint16 chunk_length, guint8 chunk_ty { if (chunk_tree) { if (chunk_length > CHUNK_HEADER_LENGTH) - proto_tree_add_item(chunk_tree, hf_chunk_value, chunk_tvb, CHUNK_VALUE_OFFSET, chunk_length - CHUNK_HEADER_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(chunk_tree, hf_chunk_value, chunk_tvb, CHUNK_VALUE_OFFSET, chunk_length - CHUNK_HEADER_LENGTH, ENC_NA); proto_item_append_text(chunk_item, " (Type: %u, value length: %u byte%s)", chunk_type, chunk_length, plurality(chunk_length - CHUNK_HEADER_LENGTH, "", "s")); } } @@ -3744,7 +3744,7 @@ dissect_sctp_chunk(tvbuff_t *chunk_tvb, } if (padding_length > 0) - proto_tree_add_item(chunk_tree, hf_chunk_padding, chunk_tvb, CHUNK_HEADER_OFFSET + length, padding_length, ENC_BIG_ENDIAN); + proto_tree_add_item(chunk_tree, hf_chunk_padding, chunk_tvb, CHUNK_HEADER_OFFSET + length, padding_length, ENC_NA); if (useinfo && ((type == SCTP_DATA_CHUNK_ID) || show_always_control_chunks)) col_set_fence(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-sdp.c b/epan/dissectors/packet-sdp.c index ce4620e148..a8e8717647 100644 --- a/epan/dissectors/packet-sdp.c +++ b/epan/dissectors/packet-sdp.c @@ -974,12 +974,12 @@ static void dissect_key_mgmt(tvbuff_t *tvb, packet_info * pinfo, proto_item * ti if (found_match) { proto_item *ti2 = proto_tree_add_item(key_tree, hf_key_mgmt_data, - keymgmt_tvb, 0, -1, FALSE); + keymgmt_tvb, 0, -1, ENC_NA); PROTO_ITEM_SET_HIDDEN(ti2); } else { proto_tree_add_item(key_tree, hf_key_mgmt_data, - keymgmt_tvb, 0, -1, FALSE); + keymgmt_tvb, 0, -1, ENC_NA); } } diff --git a/epan/dissectors/packet-sercosiii.c b/epan/dissectors/packet-sercosiii.c index a4bb494565..4049648ae9 100644 --- a/epan/dissectors/packet-sercosiii.c +++ b/epan/dissectors/packet-sercosiii.c @@ -813,7 +813,7 @@ void dissect_siii_mdt_hp(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree proto_tree_add_item(subtree2, hf_siii_mdt_hotplug_control_svc_switch, tvb, 2, 2, TRUE); proto_tree_add_item(subtree2, hf_siii_mdt_hotplug_control_param, tvb, 2, 2, TRUE); - proto_tree_add_item(subtree, hf_siii_mdt_hp_info, tvb, 4, 4, TRUE); + proto_tree_add_item(subtree, hf_siii_mdt_hp_info, tvb, 4, 4, ENC_NA); } void dissect_siii_mdt_devctrl(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) @@ -846,7 +846,7 @@ void dissect_siii_mdt_svc(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre proto_tree_add_item(subtree, hf_siii_mdt_svch_rw, tvb, 0, 2, TRUE); /* read or write */ proto_tree_add_item(subtree, hf_siii_mdt_svch_mhs, tvb, 0, 2, TRUE); /* master hand shake */ - ti = proto_tree_add_item(tree, hf_siii_mdt_svch_info, tvb, 2, 4, TRUE); + ti = proto_tree_add_item(tree, hf_siii_mdt_svch_info, tvb, 2, 4, ENC_NA); if(1 == svc_dbe) { @@ -991,7 +991,7 @@ void dissect_siii_at_svc(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree proto_tree_add_item(subtree, hf_siii_at_svch_busy, tvb, 0, 2, TRUE); proto_tree_add_item(subtree, hf_siii_at_svch_ahs, tvb, 0, 2, TRUE); - proto_tree_add_item(tree, hf_siii_at_svch_info, tvb, 2, 4, TRUE); + proto_tree_add_item(tree, hf_siii_at_svch_info, tvb, 2, 4, ENC_NA); } void dissect_siii_at_devstat(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) @@ -1030,7 +1030,7 @@ void dissect_siii_at_hp(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) proto_tree_add_item(subtree2, hf_siii_at_hotplug_status_hp0_finished, tvb, 2, 2, TRUE); proto_tree_add_item(subtree2, hf_siii_at_hotplug_status_param, tvb, 2, 2, TRUE); - proto_tree_add_item(subtree, hf_siii_at_hp_info, tvb, 4, 4, TRUE); + proto_tree_add_item(subtree, hf_siii_at_hp_info, tvb, 4, 4, ENC_NA); } static void dissect_siii_at_cp0(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) diff --git a/epan/dissectors/packet-ses.c b/epan/dissectors/packet-ses.c index 09115acf4b..7cd054652f 100644 --- a/epan/dissectors/packet-ses.c +++ b/epan/dissectors/packet-ses.c @@ -399,7 +399,7 @@ dissect_parameter(tvbuff_t *tvb, int offset, proto_tree *tree, { proto_tree_add_item(param_tree, hf_called_ss_user_reference, - tvb, offset, param_len, FALSE); + tvb, offset, param_len, ENC_NA); } break; @@ -410,7 +410,7 @@ dissect_parameter(tvbuff_t *tvb, int offset, proto_tree *tree, { proto_tree_add_item(param_tree, hf_calling_ss_user_reference, - tvb, offset, param_len, FALSE); + tvb, offset, param_len, ENC_NA); } break; @@ -421,7 +421,7 @@ dissect_parameter(tvbuff_t *tvb, int offset, proto_tree *tree, { proto_tree_add_item(param_tree, hf_common_reference, - tvb, offset, param_len, FALSE); + tvb, offset, param_len, ENC_NA); } break; @@ -432,7 +432,7 @@ dissect_parameter(tvbuff_t *tvb, int offset, proto_tree *tree, { proto_tree_add_item(param_tree, hf_additional_reference_information, - tvb, offset, param_len, FALSE); + tvb, offset, param_len, ENC_NA); } break; @@ -788,7 +788,7 @@ PICS. */ { proto_tree_add_item(param_tree, hf_calling_session_selector, - tvb, offset, param_len, FALSE); + tvb, offset, param_len, ENC_NA); } break; @@ -799,7 +799,7 @@ PICS. */ { proto_tree_add_item(param_tree, hf_called_session_selector, - tvb, offset, param_len, FALSE); + tvb, offset, param_len, ENC_NA); } break; @@ -1142,7 +1142,7 @@ dissect_spdu(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, } fragment_len = tvb_reported_length_remaining (tvb, offset); ti = proto_tree_add_item (ses_tree, hf_ses_segment_data, tvb, offset, - fragment_len, FALSE); + fragment_len, ENC_NA); proto_item_append_text (ti, " (%d byte%s)", fragment_len, plurality (fragment_len, "", "s")); frag_msg = fragment_add_seq_next (tvb, offset, pinfo, ses_id, ses_fragment_table, diff --git a/epan/dissectors/packet-sflow.c b/epan/dissectors/packet-sflow.c index 400d920682..7338e554aa 100644 --- a/epan/dissectors/packet-sflow.c +++ b/epan/dissectors/packet-sflow.c @@ -739,7 +739,7 @@ dissect_sflow_245_sampled_header(tvbuff_t *tvb, packet_info *pinfo, header_length += 4 - (header_length % 4); - ti = proto_tree_add_item(tree, hf_sflow_245_header, tvb, offset, header_length, FALSE); + ti = proto_tree_add_item(tree, hf_sflow_245_header, tvb, offset, header_length, ENC_NA); sflow_245_header_tree = proto_item_add_subtree(ti, ett_sflow_245_sampled_header); /* hand the header off to the appropriate dissector. It's probably diff --git a/epan/dissectors/packet-sigcomp.c b/epan/dissectors/packet-sigcomp.c index 4640e26b0f..a60bf31f52 100644 --- a/epan/dissectors/packet-sigcomp.c +++ b/epan/dissectors/packet-sigcomp.c @@ -762,7 +762,7 @@ dissect_sigcomp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *sigcomp_tr /* TODO Check if buff needs to be free'd */ udvm_exe_item = proto_tree_add_item(sigcomp_tree, hf_udvm_execution_trace, udvm2_tvb, 0, state_length, - ENC_BIG_ENDIAN); + ENC_NA); sigcomp_udvm_exe_tree = proto_item_add_subtree( udvm_exe_item, ett_sigcomp_udvm_exe); decomp_tvb = decompress_sigcomp_message(udvm2_tvb, msg_tvb, pinfo, @@ -838,7 +838,7 @@ dissect_sigcomp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *sigcomp_tr proto_tree_add_item(sigcomp_tree,hf_sigcomp_nack_pc, tvb, offset, 2, ENC_BIG_ENDIAN); offset = offset +2; - proto_tree_add_item(sigcomp_tree,hf_sigcomp_nack_sha1, tvb, offset, 20, ENC_BIG_ENDIAN); + proto_tree_add_item(sigcomp_tree,hf_sigcomp_nack_sha1, tvb, offset, 20, ENC_NA); offset = offset +20; /* Add NACK info to info column */ @@ -851,7 +851,7 @@ dissect_sigcomp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *sigcomp_tr case SIGCOMP_NACK_ID_NOT_UNIQUE: case SIGCOMP_NACK_STATE_TOO_SHORT: /* State ID (6 - 20 bytes) */ - proto_tree_add_item(sigcomp_tree,hf_sigcomp_nack_state_id, tvb, offset, -1, ENC_BIG_ENDIAN); + proto_tree_add_item(sigcomp_tree,hf_sigcomp_nack_state_id, tvb, offset, -1, ENC_NA); break; case SIGCOMP_NACK_CYCLES_EXHAUSTED: /* Cycles Per Bit (1 byte) */ @@ -876,7 +876,7 @@ dissect_sigcomp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *sigcomp_tr bytecode_len = len; bytecode_offset = offset; udvm_bytecode_item = proto_tree_add_item(sigcomp_tree, hf_sigcomp_udvm_bytecode, tvb, - bytecode_offset, bytecode_len, ENC_BIG_ENDIAN); + bytecode_offset, bytecode_len, ENC_NA); proto_item_append_text(udvm_bytecode_item, " %u (0x%x) bytes", bytecode_len, bytecode_len); sigcomp_udvm_tree = proto_item_add_subtree( udvm_bytecode_item, ett_sigcomp_udvm); @@ -899,7 +899,7 @@ dissect_sigcomp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *sigcomp_tr udvm_exe_item = proto_tree_add_item(sigcomp_tree, hf_udvm_execution_trace, tvb, bytecode_offset, bytecode_len, - ENC_BIG_ENDIAN); + ENC_NA); sigcomp_udvm_exe_tree = proto_item_add_subtree( udvm_exe_item, ett_sigcomp_udvm_exe); decomp_tvb = decompress_sigcomp_message(udvm_tvb, msg_tvb, pinfo, sigcomp_udvm_exe_tree, destination, diff --git a/epan/dissectors/packet-simulcrypt.c b/epan/dissectors/packet-simulcrypt.c index e3f99b8c15..57b281db44 100644 --- a/epan/dissectors/packet-simulcrypt.c +++ b/epan/dissectors/packet-simulcrypt.c @@ -839,7 +839,7 @@ dissect_ecmg_parameter_value (proto_tree *tree, tvbuff_t *tvb, packet_info *pinf proto_item_append_text(simulcrypt_item, " ms"); break; case SIMULCRYPT_ECMG_ACCESS_CRITERIA: - proto_tree_add_item(tree, hf_simulcrypt_access_criteria, tvb, offset, plen, FALSE); + proto_tree_add_item(tree, hf_simulcrypt_access_criteria, tvb, offset, plen, ENC_NA); break; case SIMULCRYPT_ECMG_ECM_STREAM_ID: proto_tree_add_item(tree, hf_simulcrypt_ecm_stream_id, tvb, offset, plen, FALSE); @@ -865,10 +865,10 @@ dissect_ecmg_parameter_value (proto_tree *tree, tvbuff_t *tvb, packet_info *pinf proto_item_append_text(simulcrypt_item, " (%d ms)", pvaluedec); break; case SIMULCRYPT_ECMG_CP_CW_COMBINATION: - proto_tree_add_item(tree, hf_simulcrypt_cp_cw_combination, tvb, offset, plen, FALSE); + proto_tree_add_item(tree, hf_simulcrypt_cp_cw_combination, tvb, offset, plen, ENC_NA); break; case SIMULCRYPT_ECMG_ECM_DATAGRAM: - simulcrypt_item = proto_tree_add_item(tree, hf_simulcrypt_ecm_datagram, tvb, offset, plen, FALSE); + simulcrypt_item = proto_tree_add_item(tree, hf_simulcrypt_ecm_datagram, tvb, offset, plen, ENC_NA); /* Test srcport against table of ECMG ports & CA_System_ID for known protocol types */ for(i=0;i<ECM_INTERPRETATION_SIZE;i++) { @@ -885,7 +885,7 @@ dissect_ecmg_parameter_value (proto_tree *tree, tvbuff_t *tvb, packet_info *pinf } break; case SIMULCRYPT_ECMG_CW_ENCRYPTION: - proto_tree_add_item(tree, hf_simulcrypt_cw_encryption, tvb, offset, plen, FALSE); + proto_tree_add_item(tree, hf_simulcrypt_cw_encryption, tvb, offset, plen, ENC_NA); break; case SIMULCRYPT_ECMG_ECM_ID: proto_tree_add_item(tree, hf_simulcrypt_ecm_id, tvb, offset, plen, FALSE); @@ -894,7 +894,7 @@ dissect_ecmg_parameter_value (proto_tree *tree, tvbuff_t *tvb, packet_info *pinf proto_tree_add_item(tree, hf_simulcrypt_ecmg_error_status, tvb, offset, plen, FALSE); break; case SIMULCRYPT_ECMG_ERROR_INFORMATION: - proto_tree_add_item(tree, hf_simulcrypt_error_information, tvb, offset, plen, FALSE); + proto_tree_add_item(tree, hf_simulcrypt_error_information, tvb, offset, plen, ENC_NA); break; default: /* Unknown parameter type */ proto_tree_add_text(tree, tvb, offset, plen, "Parameter Value: %s", pvalue_char); @@ -922,7 +922,7 @@ dissect_emmg_parameter_value (proto_tree *tree, tvbuff_t *tvb, packet_info *pinf proto_tree_add_item(tree, hf_simulcrypt_data_stream_id, tvb, offset, plen, FALSE); break; case SIMULCRYPT_EMMG_DATAGRAM: - proto_tree_add_item(tree, hf_simulcrypt_datagram, tvb, offset, plen, FALSE); + proto_tree_add_item(tree, hf_simulcrypt_datagram, tvb, offset, plen, ENC_NA); break; case SIMULCRYPT_EMMG_BANDWIDTH: simulcrypt_item = proto_tree_add_item(tree, hf_simulcrypt_bandwidth, tvb, offset, plen, FALSE); @@ -938,7 +938,7 @@ dissect_emmg_parameter_value (proto_tree *tree, tvbuff_t *tvb, packet_info *pinf proto_tree_add_item(tree, hf_simulcrypt_emmg_error_status, tvb, offset, plen, FALSE); break; case SIMULCRYPT_EMMG_ERROR_INFORMATION: - proto_tree_add_item(tree, hf_simulcrypt_error_information, tvb, offset, plen, FALSE); + proto_tree_add_item(tree, hf_simulcrypt_error_information, tvb, offset, plen, ENC_NA); break; default: /* Unknown parameter type */ proto_tree_add_text(tree, tvb, offset, plen, "Parameter Value: %s", pvalue_char); @@ -974,7 +974,7 @@ dissect_eis_parameter_value (proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo break; case SIMULCRYPT_EIS_ECM_GROUP: /* add ECM_Group item */ - simulcrypt_item = proto_tree_add_item(tree, hf_simulcrypt_ecm_group, tvb, offset, plen, FALSE); /* value item */ + simulcrypt_item = proto_tree_add_item(tree, hf_simulcrypt_ecm_group, tvb, offset, plen, ENC_NA); /* value item */ /* create subtree */ simulcrypt_ecm_group_tree = proto_item_add_subtree(simulcrypt_item, ett_simulcrypt_ecm_group); @@ -1013,10 +1013,10 @@ dissect_eis_parameter_value (proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo proto_tree_add_item(tree, hf_simulcrypt_ecm_id, tvb, offset, plen, FALSE); break; case SIMULCRYPT_EIS_ACCESS_CRITERIA: - proto_tree_add_item(tree, hf_simulcrypt_access_criteria, tvb, offset, plen, FALSE); + proto_tree_add_item(tree, hf_simulcrypt_access_criteria, tvb, offset, plen, ENC_NA); break; case SIMULCRYPT_EIS_ACTIVATION_TIME: - simulcrypt_item = proto_tree_add_item(tree, hf_simulcrypt_activation_time, tvb, offset, plen, FALSE); /* value item */ + simulcrypt_item = proto_tree_add_item(tree, hf_simulcrypt_activation_time, tvb, offset, plen, ENC_NA); /* value item */ /* create subtree */ simulcrypt_activation_time_tree = proto_item_add_subtree(simulcrypt_item, ett_simulcrypt_activation_time); @@ -1076,7 +1076,7 @@ dissect_eis_parameter_value (proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo proto_tree_add_item(tree, hf_simulcrypt_eis_error_status, tvb, offset, plen, FALSE); break; case SIMULCRYPT_EIS_ERROR_INFORMATION: - proto_tree_add_item(tree, hf_simulcrypt_error_information, tvb, offset, plen, FALSE); + proto_tree_add_item(tree, hf_simulcrypt_error_information, tvb, offset, plen, ENC_NA); break; case SIMULCRYPT_EIS_ERROR_DESCRIPTION: proto_tree_add_item(tree, hf_simulcrypt_error_description, tvb, offset, plen, FALSE); @@ -1137,7 +1137,7 @@ dissect_psig_parameter_value (proto_tree *tree, tvbuff_t *tvb, packet_info *pinf proto_tree_add_item(tree, hf_simulcrypt_max_stream, tvb, offset, plen, FALSE); break; case SIMULCRYPT_PSIG_TABLE_PERIOD_PAIR: - simulcrypt_item = proto_tree_add_item(tree, hf_simulcrypt_table_period_pair, tvb, offset, plen, FALSE); /* value item */ + simulcrypt_item = proto_tree_add_item(tree, hf_simulcrypt_table_period_pair, tvb, offset, plen, ENC_NA); /* value item */ /* create subtree */ simulcrypt_psig_table_period_pair_tree = proto_item_add_subtree(simulcrypt_item, ett_simulcrypt_table_period_pair); @@ -1146,13 +1146,13 @@ dissect_psig_parameter_value (proto_tree *tree, tvbuff_t *tvb, packet_info *pinf dissect_simulcrypt_data(simulcrypt_psig_table_period_pair_tree, simulcrypt_item, pinfo, tvb, tree, offset, plen, SIMULCRYPT_MUX_CIM, TRUE); break; case SIMULCRYPT_PSIG_MPEG_SECTION: - proto_tree_add_item(tree, hf_simulcrypt_mpeg_section, tvb, offset, plen, FALSE); + proto_tree_add_item(tree, hf_simulcrypt_mpeg_section, tvb, offset, plen, ENC_NA); break; case SIMULCRYPT_PSIG_REPETITION_RATE: proto_tree_add_item(tree, hf_simulcrypt_repetition_rate, tvb, offset, plen, FALSE); break; case SIMULCRYPT_PSIG_ACTIVATION_TIME: - simulcrypt_item = proto_tree_add_item(tree, hf_simulcrypt_activation_time, tvb, offset, plen, FALSE); /* value item */ + simulcrypt_item = proto_tree_add_item(tree, hf_simulcrypt_activation_time, tvb, offset, plen, ENC_NA); /* value item */ /* create subtree */ simulcrypt_activation_time_tree = proto_item_add_subtree(simulcrypt_item, ett_simulcrypt_activation_time); @@ -1167,7 +1167,7 @@ dissect_psig_parameter_value (proto_tree *tree, tvbuff_t *tvb, packet_info *pinf proto_tree_add_item(simulcrypt_activation_time_tree, hf_simulcrypt_hundredth_second, tvb, offset+7, 1, FALSE); /* eighth byte */ break; case SIMULCRYPT_PSIG_DATAGRAM: - proto_tree_add_item(tree, hf_simulcrypt_datagram, tvb, offset, plen, FALSE); + proto_tree_add_item(tree, hf_simulcrypt_datagram, tvb, offset, plen, ENC_NA); break; case SIMULCRYPT_PSIG_BANDWIDTH: simulcrypt_item = proto_tree_add_item(tree, hf_simulcrypt_bandwidth, tvb, offset, plen, FALSE); @@ -1188,7 +1188,7 @@ dissect_psig_parameter_value (proto_tree *tree, tvbuff_t *tvb, packet_info *pinf proto_tree_add_item(tree, hf_simulcrypt_psig_error_status, tvb, offset, plen, FALSE); break; case SIMULCRYPT_PSIG_ERROR_INFORMATION: - proto_tree_add_item(tree, hf_simulcrypt_error_information, tvb, offset, plen, FALSE); + proto_tree_add_item(tree, hf_simulcrypt_error_information, tvb, offset, plen, ENC_NA); break; default: /* Unknown parameter type */ proto_tree_add_text(tree, tvb, offset, plen, "Parameter Value: %s", pvalue_char); @@ -1231,7 +1231,7 @@ dissect_simulcrypt_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Simulcrypt_tree analysis */ /* we are being asked for details */ /* ADD HEADER BRANCH */ - simulcrypt_item = proto_tree_add_item(simulcrypt_tree, hf_simulcrypt_header, tvb, offset, 5, FALSE ); + simulcrypt_item = proto_tree_add_item(simulcrypt_tree, hf_simulcrypt_header, tvb, offset, 5, ENC_NA ); simulcrypt_header_tree = proto_item_add_subtree(simulcrypt_item, ett_simulcrypt_header); proto_item_append_text(simulcrypt_header_tree, ", Length: %s", "5 bytes"); /* add text to Header tree indicating Length 5 bytes */ @@ -1254,7 +1254,7 @@ dissect_simulcrypt_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset+=2; /* ADD MESSAGE BRANCH */ - simulcrypt_item = proto_tree_add_item(simulcrypt_tree, hf_simulcrypt_message, tvb, offset, -1, FALSE ); + simulcrypt_item = proto_tree_add_item(simulcrypt_tree, hf_simulcrypt_message, tvb, offset, -1, ENC_NA ); simulcrypt_message_tree = proto_item_add_subtree(simulcrypt_item, ett_simulcrypt_message); proto_item_append_text(simulcrypt_message_tree, " containing TLV parameters"); /* add text to Message tree */ proto_item_append_text(simulcrypt_message_tree, ", Length: %d (bytes)", msg_length); /* add length info to message_tree */ @@ -1303,7 +1303,7 @@ dissect_simulcrypt_data(proto_tree *simulcrypt_tree, proto_item *simulcrypt_item /* Parameter Value plen Bytes */ pvalue_char = tvb_bytes_to_str(tvb, offset+4, plen); - simulcrypt_item = proto_tree_add_item(simulcrypt_tree, hf_simulcrypt_parameter, tvb, offset, plen+2+2, FALSE ); + simulcrypt_item = proto_tree_add_item(simulcrypt_tree, hf_simulcrypt_parameter, tvb, offset, plen+2+2, ENC_NA ); /* add length and value info to type */ switch (iftype) { diff --git a/epan/dissectors/packet-sip.c b/epan/dissectors/packet-sip.c index 51116a4079..a362918023 100644 --- a/epan/dissectors/packet-sip.c +++ b/epan/dissectors/packet-sip.c @@ -2698,7 +2698,7 @@ dissect_sip_common(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr next_tvb = tvb_new_subset(tvb, offset, datalen, reported_datalen); if(sip_tree) { ti_a = proto_tree_add_item(sip_tree, hf_sip_msg_body, next_tvb, 0, -1, - FALSE); + ENC_NA); message_body_tree = proto_item_add_subtree(ti_a, ett_sip_message_body); } diff --git a/epan/dissectors/packet-skinny.c b/epan/dissectors/packet-skinny.c index fe628f0c0f..e423e5fa6e 100644 --- a/epan/dissectors/packet-skinny.c +++ b/epan/dissectors/packet-skinny.c @@ -2904,7 +2904,7 @@ dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; default: - proto_tree_add_item(skinny_tree, hf_skinny_rawData, tvb, offset+12, hdr_data_length-4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(skinny_tree, hf_skinny_rawData, tvb, offset+12, hdr_data_length-4, ENC_NA); break; } } diff --git a/epan/dissectors/packet-sll.c b/epan/dissectors/packet-sll.c index 5b35e4e5ec..a21ab4b6c2 100644 --- a/epan/dissectors/packet-sll.c +++ b/epan/dissectors/packet-sll.c @@ -223,7 +223,7 @@ dissect_sll(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) default: if (tree) { proto_tree_add_item(fh_tree, hf_sll_src_other, tvb, - 6, halen > 8 ? 8 : halen, FALSE); + 6, halen > 8 ? 8 : halen, ENC_NA); } break; } diff --git a/epan/dissectors/packet-slowprotocols.c b/epan/dissectors/packet-slowprotocols.c index fd5f837ce0..334a35404c 100644 --- a/epan/dissectors/packet-slowprotocols.c +++ b/epan/dissectors/packet-slowprotocols.c @@ -1704,7 +1704,7 @@ dissect_esmc_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *treex) { proto_item *item_b; guint8 type; - item_b = proto_tree_add_item(tree_a, hf_esmc_tlv, tvb, offset, 4, FALSE); + item_b = proto_tree_add_item(tree_a, hf_esmc_tlv, tvb, offset, 4, ENC_NA); { proto_tree *tree_b; tree_b = proto_item_add_subtree(item_b, ett_esmc); @@ -1783,7 +1783,7 @@ dissect_esmc_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *treex) if (timestamp_valid_flag || type == ESMC_TIMESTAMP_TLV_TYPE) { proto_item *item_b; - item_b = proto_tree_add_item(tree_a, hf_esmc_tlv, tvb, offset, 8, FALSE); + item_b = proto_tree_add_item(tree_a, hf_esmc_tlv, tvb, offset, 8, ENC_NA); { proto_tree *tree_b; tree_b = proto_item_add_subtree(item_b, ett_esmc); @@ -1857,7 +1857,7 @@ dissect_esmc_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *treex) proto_item* item_b; tvbuff_t* tvb_next; tvb_next = tvb_new_subset(tvb, offset, padding_size, -1); - item_b = proto_tree_add_item(tree_a, hf_esmc_padding, tvb_next, 0, -1, FALSE); + item_b = proto_tree_add_item(tree_a, hf_esmc_padding, tvb_next, 0, -1, ENC_NA); proto_item_append_text(item_b, ", %d %s%s", padding_size , "octet", plurality(padding_size,"","s")); { diff --git a/epan/dissectors/packet-smb-logon.c b/epan/dissectors/packet-smb-logon.c index 6d610cfff2..4a67cf8734 100644 --- a/epan/dissectors/packet-smb-logon.c +++ b/epan/dissectors/packet-smb-logon.c @@ -755,7 +755,7 @@ dissect_smb_pdc_response_ads(tvbuff_t *tvb, packet_info *pinfo _U_, offset += 4; /* Domain GUID */ - proto_tree_add_item(tree, hf_domain_guid, tvb, offset, 16, TRUE); + proto_tree_add_item(tree, hf_domain_guid, tvb, offset, 16, ENC_NA); offset += 16; /* forest dns name */ diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c index 0db76602f7..37b6dd5a60 100644 --- a/epan/dissectors/packet-smb.c +++ b/epan/dissectors/packet-smb.c @@ -2367,7 +2367,7 @@ dissect_negprot_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, in /* challenge/response encryption key */ if(ekl){ CHECK_BYTE_COUNT(ekl); - proto_tree_add_item(tree, hf_smb_encryption_key, tvb, offset, ekl, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_smb_encryption_key, tvb, offset, ekl, ENC_NA); COUNT_BYTES(ekl); } @@ -2401,7 +2401,7 @@ dissect_negprot_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, in if(ekl){ CHECK_BYTE_COUNT(ekl); proto_tree_add_item(tree, hf_smb_encryption_key, - tvb, offset, ekl, ENC_LITTLE_ENDIAN); + tvb, offset, ekl, ENC_NA); COUNT_BYTES(ekl); } @@ -8535,7 +8535,7 @@ dissect_nt_trans_data_request(tvbuff_t *tvb, packet_info *pinfo, int offset, pro /* extended attributes */ if(ntd->ea_len){ - proto_tree_add_item(tree, hf_smb_extended_attributes, tvb, offset, ntd->ea_len, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_smb_extended_attributes, tvb, offset, ntd->ea_len, ENC_NA); offset += ntd->ea_len; } diff --git a/epan/dissectors/packet-smb2.c b/epan/dissectors/packet-smb2.c index c589c1d879..1b5c57526f 100644 --- a/epan/dissectors/packet-smb2.c +++ b/epan/dissectors/packet-smb2.c @@ -4642,7 +4642,7 @@ dissect_smb2_QFid_buffer_response(tvbuff_t *tvb, packet_info *pinfo _U_, proto_t sub_tree = proto_item_add_subtree(sub_item, ett_smb2_QFid_buffer); } - proto_tree_add_item(sub_tree, hf_smb2_qfid_fid, tvb, offset, 32, FALSE); + proto_tree_add_item(sub_tree, hf_smb2_qfid_fid, tvb, offset, 32, ENC_NA); } static void @@ -6340,7 +6340,7 @@ dissect_smb2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, gboolea offset = dissect_smb2_tid_sesid(pinfo, header_tree, tvb, offset, si); /* Signature */ - proto_tree_add_item(header_tree, hf_smb2_signature, tvb, offset, 16, FALSE); + proto_tree_add_item(header_tree, hf_smb2_signature, tvb, offset, 16, ENC_NA); offset += 16; proto_item_set_len(header_item, offset); diff --git a/epan/dissectors/packet-smpp.c b/epan/dissectors/packet-smpp.c index e6e5f6a97e..0bfab31c34 100644 --- a/epan/dissectors/packet-smpp.c +++ b/epan/dissectors/packet-smpp.c @@ -1313,7 +1313,7 @@ smpp_handle_dlist(proto_tree *tree, tvbuff_t *tvb, int *offset) if ((entries = tvb_get_guint8(tvb, tmpoff++))) { proto_item *pi; - pi = proto_tree_add_item(tree, hf_smpp_dlist, tvb, *offset, 1, FALSE); + pi = proto_tree_add_item(tree, hf_smpp_dlist, tvb, *offset, 1, ENC_NA); sub_tree = proto_item_add_subtree(pi, ett_dlist); } while (entries--) @@ -1352,7 +1352,7 @@ smpp_handle_dlist_resp(proto_tree *tree, tvbuff_t *tvb, int *offset) if ((entries = tvb_get_guint8(tvb, tmpoff++))) { proto_item *pi; pi = proto_tree_add_item(tree, hf_smpp_dlist_resp, - tvb, *offset, 1, FALSE); + tvb, *offset, 1, ENC_NA); sub_tree = proto_item_add_subtree(pi, ett_dlist_resp); } while (entries--) @@ -1383,7 +1383,7 @@ smpp_handle_tlv(proto_tree *tree, tvbuff_t *tvb, int *offset) if (tvb_reported_length_remaining(tvb, *offset) >= 1) { pi = proto_tree_add_item(tree, hf_smpp_opt_params, - tvb, *offset, -1, FALSE); + tvb, *offset, -1, ENC_NA); tlvs_tree = proto_item_add_subtree(pi, ett_opt_params); } @@ -1475,14 +1475,14 @@ smpp_handle_tlv(proto_tree *tree, tvbuff_t *tvb, int *offset) case 0x0202: /* source_subaddress */ if (length) { proto_tree_add_item(sub_tree, hf_smpp_source_subaddress, - tvb, *offset, length, FALSE); + tvb, *offset, length, ENC_NA); (*offset) += length; } break; case 0x0203: /* dest_subaddress */ if (length) { proto_tree_add_item(sub_tree, hf_smpp_dest_subaddress, - tvb, *offset, length, FALSE); + tvb, *offset, length, ENC_NA); (*offset) += length; } break; @@ -1538,7 +1538,7 @@ smpp_handle_tlv(proto_tree *tree, tvbuff_t *tvb, int *offset) case 0x0303: /* callback_num_atag */ if (length) proto_tree_add_item(sub_tree, hf_smpp_callback_num_atag, - tvb, *offset, length, FALSE); + tvb, *offset, length, ENC_NA); (*offset) += length; break; case 0x0304: /* number_of_messages */ @@ -1548,7 +1548,7 @@ smpp_handle_tlv(proto_tree *tree, tvbuff_t *tvb, int *offset) case 0x0381: /* callback_num */ if (length) proto_tree_add_item(sub_tree, hf_smpp_callback_num, - tvb, *offset, length, FALSE); + tvb, *offset, length, ENC_NA); (*offset) += length; break; case 0x0420: /* dpf_result */ @@ -1572,7 +1572,7 @@ smpp_handle_tlv(proto_tree *tree, tvbuff_t *tvb, int *offset) case 0x0424: /* message_payload */ if (length) proto_tree_add_item(sub_tree, hf_smpp_message_payload, - tvb, *offset, length, FALSE); + tvb, *offset, length, ENC_NA); (*offset) += length; break; case 0x0425: /* delivery_failure_reason */ @@ -1611,7 +1611,7 @@ smpp_handle_tlv(proto_tree *tree, tvbuff_t *tvb, int *offset) case 0x0602: /* broadcast_content_type_info */ if (length) proto_tree_add_item(sub_tree, hf_smpp_broadcast_content_type_info, - tvb, *offset, length, FALSE); + tvb, *offset, length, ENC_NA); (*offset) += length; break; case 0x0603: /* broadcast_message_class */ @@ -1634,7 +1634,7 @@ smpp_handle_tlv(proto_tree *tree, tvbuff_t *tvb, int *offset) field = tvb_get_guint8(tvb, *offset); proto_tree_add_uint(sub_tree, hf_smpp_broadcast_area_identifier_format, tvb, *offset, 1, field); proto_tree_add_item(sub_tree, hf_smpp_broadcast_area_identifier, - tvb, *offset, length, FALSE); + tvb, *offset, length, ENC_NA); (*offset) += length; break; case 0x0607: /* broadcast_error_status */ @@ -1652,13 +1652,13 @@ smpp_handle_tlv(proto_tree *tree, tvbuff_t *tvb, int *offset) case 0x060A: /* broadcast_service_group */ if (length) proto_tree_add_item(sub_tree, hf_smpp_broadcast_service_group, - tvb, *offset, length, FALSE); + tvb, *offset, length, ENC_NA); (*offset) += length; break; case 0x060B: /* billing_identification */ if (length) proto_tree_add_item(sub_tree, hf_smpp_billing_identification, - tvb, *offset, length, FALSE); + tvb, *offset, length, ENC_NA); (*offset) += length; break; /* 0x060C is skipped in the specs for some reason :-? */ @@ -1673,13 +1673,13 @@ smpp_handle_tlv(proto_tree *tree, tvbuff_t *tvb, int *offset) case 0x060F: /* source_node_id */ if (length) proto_tree_add_item(sub_tree, hf_smpp_source_node_id, - tvb, *offset, length, FALSE); + tvb, *offset, length, ENC_NA); (*offset) += length; break; case 0x0610: /* dest_node_id */ if (length) proto_tree_add_item(sub_tree, hf_smpp_dest_node_id, - tvb, *offset, length, FALSE); + tvb, *offset, length, ENC_NA); (*offset) += length; break; case 0x0611: /* dest_addr_np_resolution */ @@ -1689,14 +1689,14 @@ smpp_handle_tlv(proto_tree *tree, tvbuff_t *tvb, int *offset) case 0x0612: /* dest_addr_np_information */ if (length) proto_tree_add_item(sub_tree, hf_smpp_dest_addr_np_information, - tvb, *offset, length, FALSE); + tvb, *offset, length, ENC_NA); (*offset) += length; break; case 0x0613: /* dest_addr_np_country */ /* TODO : Fetch values from packet-e164? */ if (length) proto_tree_add_item(sub_tree, hf_smpp_dest_addr_np_country, - tvb, *offset, length, FALSE); + tvb, *offset, length, ENC_NA); (*offset) += length; break; case 0x1201: /* display_time */ @@ -1716,7 +1716,7 @@ smpp_handle_tlv(proto_tree *tree, tvbuff_t *tvb, int *offset) if (length == 0) { proto_tree_add_item(sub_tree, hf_smpp_alert_on_message_delivery_null, - tvb, *offset, length, FALSE); + tvb, *offset, length, ENC_NA); } else { smpp_handle_int1(sub_tree, tvb, hf_smpp_alert_on_message_delivery, offset); @@ -1742,10 +1742,10 @@ smpp_handle_tlv(proto_tree *tree, tvbuff_t *tvb, int *offset) * from a dictionary before treating them as unknown! */ if ((tag >= 0x1400) && (tag <= 0x3FFF)) { proto_tree_add_item(sub_tree, hf_smpp_vendor_op, tvb, - *offset, length, FALSE); + *offset, length, ENC_NA); } else { proto_tree_add_item(sub_tree, hf_smpp_reserved_op, tvb, - *offset, length, FALSE); + *offset, length, ENC_NA); } proto_item_append_text(sub_tree,": %s", tvb_bytes_to_str(tvb,*offset,length)); @@ -1942,7 +1942,7 @@ submit_sm(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, if (length) { proto_tree_add_item(tree, hf_smpp_short_message, - tvb, offset, length, FALSE); + tvb, offset, length, ENC_NA); if (udhi) /* UDHI indicator present */ { DebugLog(("UDHI present - set addresses\n")); @@ -2002,7 +2002,7 @@ replace_sm(proto_tree *tree, tvbuff_t *tvb) proto_tree_add_uint(tree, hf_smpp_sm_length, tvb, offset++, 1, length); if (length) proto_tree_add_item(tree, hf_smpp_short_message, - tvb, offset, length, FALSE); + tvb, offset, length, ENC_NA); offset += length; } @@ -2071,7 +2071,7 @@ submit_multi(proto_tree *tree, tvbuff_t *tvb) proto_tree_add_uint(tree, hf_smpp_sm_length, tvb, offset++, 1, length); if (length) proto_tree_add_item(tree, hf_smpp_short_message, - tvb, offset, length, FALSE); + tvb, offset, length, ENC_NA); offset += length; smpp_handle_tlv(tree, tvb, &offset); } diff --git a/epan/dissectors/packet-sna.c b/epan/dissectors/packet-sna.c index 57fb1507f7..841332c117 100644 --- a/epan/dissectors/packet-sna.c +++ b/epan/dissectors/packet-sna.c @@ -921,7 +921,7 @@ dissect_optional_10(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) return; proto_tree_add_text(tree, tvb, 2, 2, "Reserved"); - proto_tree_add_item(tree, hf_sna_nlp_opti_10_tcid, tvb, 4, 8, FALSE); + proto_tree_add_item(tree, hf_sna_nlp_opti_10_tcid, tvb, 4, 8, ENC_NA); if (tvb_offset_exists(tvb, 12)) call_dissector(data_handle, tvb_new_subset_remaining(tvb, 12), pinfo, tree); @@ -934,7 +934,7 @@ dissect_optional_12(tvbuff_t *tvb, proto_tree *tree) return; proto_tree_add_text(tree, tvb, 2, 2, "Reserved"); - proto_tree_add_item(tree, hf_sna_nlp_opti_12_sense, tvb, 4, -1, FALSE); + proto_tree_add_item(tree, hf_sna_nlp_opti_12_sense, tvb, 4, -1, ENC_NA); } static void @@ -1215,7 +1215,7 @@ dissect_nlp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* Don't bother setting length. We'll set it later after we * find the lengths of NHDR */ nlp_item = proto_tree_add_item(tree, hf_sna_nlp_nhdr, tvb, - index, -1, FALSE); + index, -1, ENC_NA); nlp_tree = proto_item_add_subtree(nlp_item, ett_sna_nlp_nhdr); bf_item = proto_tree_add_uint(nlp_tree, hf_sna_nlp_nhdr_0, tvb, @@ -1252,7 +1252,7 @@ dissect_nlp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } while (nhdr_x != 0xff); if (tree) proto_tree_add_item(nlp_tree, - hf_sna_nlp_fra, tvb, index, counter, FALSE); + hf_sna_nlp_fra, tvb, index, counter, ENC_NA); index += counter; if (tree) proto_tree_add_text(nlp_tree, tvb, index, 1, @@ -1283,7 +1283,7 @@ dissect_nlp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } while (nhdr_x != 0xff); if (tree) proto_tree_add_item(nlp_tree, hf_sna_nlp_anr, - tvb, index, counter, FALSE); + tvb, index, counter, ENC_NA); index += counter; if (tree) @@ -1302,11 +1302,11 @@ dissect_nlp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (tree) { nlp_item = proto_tree_add_item(tree, hf_sna_nlp_thdr, tvb, - index, thdr_len << 2, FALSE); + index, thdr_len << 2, ENC_NA); nlp_tree = proto_item_add_subtree(nlp_item, ett_sna_nlp_thdr); proto_tree_add_item(nlp_tree, hf_sna_nlp_tcid, tvb, - index, 8, FALSE); + index, 8, ENC_NA); bf_item = proto_tree_add_uint(nlp_tree, hf_sna_nlp_thdr_8, tvb, index+8, 1, thdr_8); bf_tree = proto_item_add_subtree(bf_item, ett_sna_nlp_thdr_8); @@ -2097,7 +2097,7 @@ dissect_fid5(tvbuff_t *tvb, proto_tree *tree) proto_tree_add_text(tree, tvb, 1, 1, "Reserved"); proto_tree_add_item(tree, hf_sna_th_snf, tvb, 2, 2, FALSE); - proto_tree_add_item(tree, hf_sna_th_sa, tvb, 4, 8, FALSE); + proto_tree_add_item(tree, hf_sna_th_sa, tvb, 4, 8, ENC_NA); return bytes_in_header; @@ -2164,7 +2164,7 @@ dissect_fid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* Don't bother setting length. We'll set it later after we * find the length of TH */ th_ti = proto_tree_add_item(tree, hf_sna_th, tvb, 0, -1, - FALSE); + ENC_NA); th_tree = proto_item_add_subtree(th_ti, ett_sna_th); } @@ -2219,7 +2219,7 @@ dissect_fid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* --- RH --- */ rh_ti = proto_tree_add_item(tree, hf_sna_rh, rh_tvb, rh_offset, - RH_LEN, FALSE); + RH_LEN, ENC_NA); rh_tree = proto_item_add_subtree(rh_ti, ett_sna_rh); dissect_rh(rh_tvb, rh_offset, rh_tree); } @@ -2531,7 +2531,7 @@ dissect_gds(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, return; if (tree) { gds_item = proto_tree_add_item(tree, hf_sna_gds, tvb, - offset, length, FALSE); + offset, length, ENC_NA); gds_tree = proto_item_add_subtree(gds_item, ett_sna_gds); diff --git a/epan/dissectors/packet-socks.c b/epan/dissectors/packet-socks.c index 5ac8fa928e..e27e0ab565 100644 --- a/epan/dissectors/packet-socks.c +++ b/epan/dissectors/packet-socks.c @@ -631,7 +631,7 @@ display_socks_v5(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree_add_item( tree, hf_gssapi_length, tvb, offset+1, 2, FALSE); len = tvb_get_ntohs(tvb, offset+1); if (len > 0) - proto_tree_add_item( tree, hf_gssapi_payload, tvb, offset+3, len, FALSE); + proto_tree_add_item( tree, hf_gssapi_payload, tvb, offset+3, len, ENC_NA); } else if (compare_packet( hash_info->gssapi_auth_failure_row)) { proto_tree_add_item( tree, hf_gssapi_command, tvb, offset, 1, FALSE); @@ -642,7 +642,7 @@ display_socks_v5(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree_add_item( tree, hf_gssapi_length, tvb, offset+1, 2, FALSE); len = tvb_get_ntohs(tvb, offset+1); if (len > 0) - proto_tree_add_item( tree, hf_gssapi_payload, tvb, offset+3, len, FALSE); + proto_tree_add_item( tree, hf_gssapi_payload, tvb, offset+3, len, ENC_NA); } else if ((compare_packet( hash_info->command_row)) || (compare_packet( hash_info->cmd_reply_row)) || diff --git a/epan/dissectors/packet-spice.c b/epan/dissectors/packet-spice.c index a30b3218ad..1a501d1906 100644 --- a/epan/dissectors/packet-spice.c +++ b/epan/dissectors/packet-spice.c @@ -2451,7 +2451,7 @@ dissect_spice_data_server_pdu(tvbuff_t *tvb, proto_tree *tree, packet_info *pinf msg_ti = proto_tree_add_text(tree, tvb, offset, 0, "%s (%d bytes)", get_message_type_string(message_type, spice_info, FALSE), message_size + sizeof_SpiceDataHeader); message_tree = proto_item_add_subtree(msg_ti, ett_message); - ti = proto_tree_add_item(message_tree, hf_data, tvb, 0, sizeof_SpiceDataHeader, ENC_LITTLE_ENDIAN); + ti = proto_tree_add_item(message_tree, hf_data, tvb, 0, sizeof_SpiceDataHeader, ENC_NA); data_header_tree = proto_item_add_subtree(ti, ett_data); dissect_spice_data_header(tvb, data_header_tree, spice_info, FALSE, message_type, &sublist_size, offset); @@ -2509,7 +2509,7 @@ dissect_spice_data_client_pdu(tvbuff_t *tvb, proto_tree *tree, packet_info *pinf guint16 message_type; guint32 /** message_size,**/ sublist_size; - ti = proto_tree_add_item(tree, hf_data, tvb, 0, sizeof_SpiceDataHeader, ENC_LITTLE_ENDIAN); + ti = proto_tree_add_item(tree, hf_data, tvb, 0, sizeof_SpiceDataHeader, ENC_NA); data_header_tree = proto_item_add_subtree(ti, ett_data); message_type = tvb_get_letohs(tvb, offset + 8); @@ -2615,7 +2615,7 @@ dissect_spice_link_client_pdu(tvbuff_t *tvb, proto_tree *tree, spice_conversatio proto_tree *caps_tree = NULL; if (tree) { - ti = proto_tree_add_item(tree, hf_link_client, tvb, 0, sizeof_SpiceLinkHeader, ENC_LITTLE_ENDIAN); + ti = proto_tree_add_item(tree, hf_link_client, tvb, 0, sizeof_SpiceLinkHeader, ENC_NA); link_header_tree = proto_item_add_subtree(ti, ett_link_client); dissect_spice_link_common_header(tvb, link_header_tree); @@ -2664,7 +2664,7 @@ dissect_spice_link_server_pdu(tvbuff_t *tvb, proto_tree *tree, spice_conversatio proto_tree *caps_tree = NULL; if (tree) { - ti = proto_tree_add_item(tree, hf_link_server, tvb, 0, sizeof_SpiceLinkHeader, ENC_LITTLE_ENDIAN); + ti = proto_tree_add_item(tree, hf_link_server, tvb, 0, sizeof_SpiceLinkHeader, ENC_NA); link_tree = proto_item_add_subtree(ti, ett_link_server); dissect_spice_link_common_header(tvb, link_tree); @@ -2835,7 +2835,7 @@ dissect_spice(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_spice, tvb, 0, -1, ENC_NA); spice_tree = proto_item_add_subtree(ti, ett_ticket_client); - proto_tree_add_item(spice_tree, hf_ticket_client, tvb, 0, -1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(spice_tree, hf_ticket_client, tvb, 0, -1, ENC_NA); } spice_info->next_state = SPICE_TICKET_SERVER; return 128; diff --git a/epan/dissectors/packet-spray.c b/epan/dissectors/packet-spray.c index 326498e2e4..0a91e9c9db 100644 --- a/epan/dissectors/packet-spray.c +++ b/epan/dissectors/packet-spray.c @@ -53,7 +53,7 @@ dissect_get_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree hf_spray_counter, offset); lock_item = proto_tree_add_item(tree, hf_spray_clock, tvb, - offset, -1, FALSE); + offset, -1, ENC_NA); lock_tree = proto_item_add_subtree(lock_item, ett_spray_clock); diff --git a/epan/dissectors/packet-ssh.c b/epan/dissectors/packet-ssh.c index d58e6f3137..5d7b639b2d 100644 --- a/epan/dissectors/packet-ssh.c +++ b/epan/dissectors/packet-ssh.c @@ -588,7 +588,7 @@ ssh_dissect_ssh1(tvbuff_t *tvb, packet_info *pinfo, /* payload */ if (ssh1_tree ) { ssh_proto_tree_add_item(ssh1_tree, hf_ssh_payload, - tvb, offset, len, FALSE); + tvb, offset, len, ENC_NA); } offset+=len; @@ -741,13 +741,13 @@ ssh_dissect_key_exchange(tvbuff_t *tvb, packet_info *pinfo, /* DH GEX Request (min/nbits/max) */ if (msg_code == 34) { ssh_proto_tree_add_item(key_ex_tree, hf_ssh_dh_gex_min, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_NA); offset+=4; ssh_proto_tree_add_item(key_ex_tree, hf_ssh_dh_gex_nbits, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_NA); offset+=4; ssh_proto_tree_add_item(key_ex_tree, hf_ssh_dh_gex_max, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_NA); offset+=4; } /* DH Key Exchange Reply (g/p) */ @@ -770,14 +770,14 @@ ssh_dissect_key_exchange(tvbuff_t *tvb, packet_info *pinfo, len = plen+4-padding_length-(offset-last_offset); if (tree ) { ssh_proto_tree_add_item(key_ex_tree, hf_ssh_payload, - tvb, offset, len, FALSE); + tvb, offset, len, ENC_NA); } offset +=len; /* padding */ if(tree) { ssh_proto_tree_add_item(key_ex_tree, hf_ssh_padding_string, - tvb, offset, padding_length, FALSE); + tvb, offset, padding_length, ENC_NA); } offset+= padding_length; @@ -787,7 +787,7 @@ ssh_dissect_key_exchange(tvbuff_t *tvb, packet_info *pinfo, if(len == 16) { if(tree) { proto_tree_add_item(key_ex_tree, hf_ssh_mac_string, - tvb, offset, len , FALSE); + tvb, offset, len , ENC_NA); } offset+=len; } @@ -814,12 +814,12 @@ ssh_dissect_encrypted_packet(tvbuff_t *tvb, packet_info *pinfo, encrypted_len -= global_data->mac_length; ssh_proto_tree_add_item(tree, hf_ssh_encrypted_packet, - tvb, offset, encrypted_len, FALSE); + tvb, offset, encrypted_len, ENC_NA); if (global_data && global_data->mac_length>0) ssh_proto_tree_add_item(tree, hf_ssh_mac_string, tvb, offset+encrypted_len, - global_data->mac_length , FALSE); + global_data->mac_length , ENC_NA); } offset+=len; return offset; @@ -1016,7 +1016,7 @@ ssh_dissect_key_init(tvbuff_t *tvb, int offset, proto_tree *tree, tf=proto_tree_add_text(tree,tvb,offset,-1,"Algorithms"); key_init_tree = proto_item_add_subtree(tf, ett_key_init); proto_tree_add_item(key_init_tree, hf_ssh_cookie, - tvb, offset, 16, FALSE); + tvb, offset, 16, ENC_NA); } offset += 16; @@ -1071,7 +1071,7 @@ ssh_dissect_key_init(tvbuff_t *tvb, int offset, proto_tree *tree, offset+=1; ssh_proto_tree_add_item(key_init_tree, hf_ssh_kex_reserved, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_NA); offset+=4; if (tf != NULL) { diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c index e637e29a64..2990f7ebc8 100644 --- a/epan/dissectors/packet-ssl.c +++ b/epan/dissectors/packet-ssl.c @@ -1662,7 +1662,7 @@ dissect_ssl3_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_ssl_change_cipher_spec, tvb, - offset++, 1, ENC_BIG_ENDIAN); + offset++, 1, ENC_NA); } } @@ -2122,7 +2122,7 @@ dissect_ssl3_hnd_hello_common(tvbuff_t *tvb, proto_tree *tree, /* show the random bytes */ proto_tree_add_item(ssl_rnd_tree, hf_ssl_handshake_random_bytes, - tvb, offset, 28, ENC_BIG_ENDIAN); + tvb, offset, 28, ENC_NA); offset += 28; /* show the session id */ @@ -2790,25 +2790,25 @@ dissect_ssl3_hnd_srv_keyex_dh(tvbuff_t *tvb, proto_tree *tree, proto_tree_add_uint(ssl_dh_tree, hf_ssl_handshake_server_keyex_p_len, tvb, p_len_offset, 2, p_len); proto_tree_add_item(ssl_dh_tree, hf_ssl_handshake_server_keyex_p, - tvb, p_len_offset + 2, p_len, ENC_BIG_ENDIAN); + tvb, p_len_offset + 2, p_len, ENC_NA); /* g */ proto_tree_add_uint(ssl_dh_tree, hf_ssl_handshake_server_keyex_g_len, tvb, g_len_offset, 2, g_len); proto_tree_add_item(ssl_dh_tree, hf_ssl_handshake_server_keyex_g, - tvb, g_len_offset + 2, g_len, ENC_BIG_ENDIAN); + tvb, g_len_offset + 2, g_len, ENC_NA); /* Ys */ proto_tree_add_uint(ssl_dh_tree, hf_ssl_handshake_server_keyex_ys_len, tvb, ys_len_offset, 2, ys_len); proto_tree_add_item(ssl_dh_tree, hf_ssl_handshake_server_keyex_ys, - tvb, ys_len_offset + 2, ys_len, ENC_BIG_ENDIAN); + tvb, ys_len_offset + 2, ys_len, ENC_NA); /* Sig */ proto_tree_add_uint(ssl_dh_tree, hf_ssl_handshake_server_keyex_sig_len, tvb, sig_len_offset, 2, sig_len); proto_tree_add_item(ssl_dh_tree, hf_ssl_handshake_server_keyex_sig, - tvb, sig_len_offset + 2, sig_len, ENC_BIG_ENDIAN); + tvb, sig_len_offset + 2, sig_len, ENC_NA); } @@ -2838,7 +2838,7 @@ dissect_ssl3_hnd_cli_keyex_dh(tvbuff_t *tvb, proto_tree *tree, proto_tree_add_uint(ssl_dh_tree, hf_ssl_handshake_client_keyex_yc_len, tvb, yc_len_offset, 2, yc_len); proto_tree_add_item(ssl_dh_tree, hf_ssl_handshake_client_keyex_yc, - tvb, yc_len_offset + 2, yc_len, ENC_BIG_ENDIAN); + tvb, yc_len_offset + 2, yc_len, ENC_NA); } @@ -2871,7 +2871,7 @@ dissect_ssl3_hnd_finished(tvbuff_t *tvb, case SSL_VER_TLSv1DOT1: case SSL_VER_TLSv1DOT2: proto_tree_add_item(tree, hf_ssl_handshake_finished, - tvb, offset, 12, ENC_BIG_ENDIAN); + tvb, offset, 12, ENC_NA); break; case SSL_VER_SSLv3: @@ -3446,7 +3446,7 @@ dissect_pct_msg_client_hello(tvbuff_t *tvb, if(CH_CIPHER_SPECS_LENGTH) { tvb_ensure_bytes_exist(tvb, offset, CH_CIPHER_SPECS_LENGTH); - CH_CIPHER_SPECS_ti = proto_tree_add_item(tree, hf_pct_handshake_cipher_spec, tvb, offset, CH_CIPHER_SPECS_LENGTH, ENC_BIG_ENDIAN); + CH_CIPHER_SPECS_ti = proto_tree_add_item(tree, hf_pct_handshake_cipher_spec, tvb, offset, CH_CIPHER_SPECS_LENGTH, ENC_NA); CH_CIPHER_SPECS_tree = proto_item_add_subtree(CH_CIPHER_SPECS_ti, ett_pct_cipher_suites); for(i=0; i<(CH_CIPHER_SPECS_LENGTH/4); i++) { @@ -3461,7 +3461,7 @@ dissect_pct_msg_client_hello(tvbuff_t *tvb, if(CH_HASH_SPECS_LENGTH) { tvb_ensure_bytes_exist(tvb, offset, CH_HASH_SPECS_LENGTH); - CH_HASH_SPECS_ti = proto_tree_add_item(tree, hf_pct_handshake_hash_spec, tvb, offset, CH_HASH_SPECS_LENGTH, ENC_BIG_ENDIAN); + CH_HASH_SPECS_ti = proto_tree_add_item(tree, hf_pct_handshake_hash_spec, tvb, offset, CH_HASH_SPECS_LENGTH, ENC_NA); CH_HASH_SPECS_tree = proto_item_add_subtree(CH_HASH_SPECS_ti, ett_pct_hash_suites); for(i=0; i<(CH_HASH_SPECS_LENGTH/2); i++) { @@ -3472,7 +3472,7 @@ dissect_pct_msg_client_hello(tvbuff_t *tvb, if(CH_CERT_SPECS_LENGTH) { tvb_ensure_bytes_exist(tvb, offset, CH_CERT_SPECS_LENGTH); - CH_CERT_SPECS_ti = proto_tree_add_item(tree, hf_pct_handshake_cert_spec, tvb, offset, CH_CERT_SPECS_LENGTH, ENC_BIG_ENDIAN); + CH_CERT_SPECS_ti = proto_tree_add_item(tree, hf_pct_handshake_cert_spec, tvb, offset, CH_CERT_SPECS_LENGTH, ENC_NA); CH_CERT_SPECS_tree = proto_item_add_subtree(CH_CERT_SPECS_ti, ett_pct_cert_suites); for(i=0; i< (CH_CERT_SPECS_LENGTH/2); i++) { @@ -3483,7 +3483,7 @@ dissect_pct_msg_client_hello(tvbuff_t *tvb, if(CH_EXCH_SPECS_LENGTH) { tvb_ensure_bytes_exist(tvb, offset, CH_EXCH_SPECS_LENGTH); - CH_EXCH_SPECS_ti = proto_tree_add_item(tree, hf_pct_handshake_exch_spec, tvb, offset, CH_EXCH_SPECS_LENGTH, ENC_BIG_ENDIAN); + CH_EXCH_SPECS_ti = proto_tree_add_item(tree, hf_pct_handshake_exch_spec, tvb, offset, CH_EXCH_SPECS_LENGTH, ENC_NA); CH_EXCH_SPECS_tree = proto_item_add_subtree(CH_EXCH_SPECS_ti, ett_pct_exch_suites); for(i=0; i<(CH_EXCH_SPECS_LENGTH/2); i++) { @@ -3785,7 +3785,7 @@ dissect_ssl2_hnd_client_master_key(tvbuff_t *tvb, { tvb_ensure_bytes_exist(tvb, offset, clear_key_length); proto_tree_add_item(tree, hf_ssl2_handshake_clear_key, - tvb, offset, clear_key_length, ENC_BIG_ENDIAN); + tvb, offset, clear_key_length, ENC_NA); offset += clear_key_length; } @@ -3793,7 +3793,7 @@ dissect_ssl2_hnd_client_master_key(tvbuff_t *tvb, { tvb_ensure_bytes_exist(tvb, offset, encrypted_key_length); proto_tree_add_item(tree, hf_ssl2_handshake_enc_key, - tvb, offset, encrypted_key_length, ENC_BIG_ENDIAN); + tvb, offset, encrypted_key_length, ENC_NA); offset += encrypted_key_length; } @@ -3918,7 +3918,7 @@ dissect_ssl2_hnd_server_hello(tvbuff_t *tvb, { tvb_ensure_bytes_exist(tvb, offset, connection_id_length); proto_tree_add_item(tree, hf_ssl2_handshake_connection_id, - tvb, offset, connection_id_length, ENC_BIG_ENDIAN); + tvb, offset, connection_id_length, ENC_NA); } } diff --git a/epan/dissectors/packet-stat-notify.c b/epan/dissectors/packet-stat-notify.c index 11242d090a..e5473f87a1 100644 --- a/epan/dissectors/packet-stat-notify.c +++ b/epan/dissectors/packet-stat-notify.c @@ -48,7 +48,7 @@ dissect_statnotify_mon(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_ offset = dissect_rpc_uint32(tvb,tree,hf_statnotify_state,offset); - proto_tree_add_item(tree,hf_statnotify_priv,tvb,offset,16,FALSE); + proto_tree_add_item(tree,hf_statnotify_priv,tvb,offset,16,ENC_NA); offset += 16; return offset; diff --git a/epan/dissectors/packet-stat.c b/epan/dissectors/packet-stat.c index a6efc5a58b..2b248ee518 100644 --- a/epan/dissectors/packet-stat.c +++ b/epan/dissectors/packet-stat.c @@ -125,7 +125,7 @@ dissect_stat_stat_res(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_t if (tree) { sub_item = proto_tree_add_item(tree, hf_stat_stat_res, tvb, - offset, -1, FALSE); + offset, -1, ENC_NA); if (sub_item) sub_tree = proto_item_add_subtree(sub_item, ett_stat_stat_res); } @@ -150,7 +150,7 @@ dissect_stat_my_id(tvbuff_t *tvb, int offset, proto_tree *tree) if (tree) { sub_item = proto_tree_add_item(tree, hf_stat_my_id, tvb, - offset, my_id_len(tvb,offset), FALSE); + offset, my_id_len(tvb,offset), ENC_NA); if (sub_item) sub_tree = proto_item_add_subtree(sub_item, ett_stat_my_id); } @@ -171,7 +171,7 @@ dissect_stat_mon_id(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre if (tree) { sub_item = proto_tree_add_item(tree, hf_stat_mon, tvb, - offset, mon_id_len(tvb,offset), FALSE); + offset, mon_id_len(tvb,offset), ENC_NA); if (sub_item) sub_tree = proto_item_add_subtree(sub_item, ett_stat_mon); } @@ -187,7 +187,7 @@ dissect_stat_mon_id(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre static int dissect_stat_priv(tvbuff_t *tvb, int offset, proto_tree *tree) { - proto_tree_add_item(tree, hf_stat_priv, tvb, offset, 16, FALSE); + proto_tree_add_item(tree, hf_stat_priv, tvb, offset, 16, ENC_NA); offset += 16; return offset; @@ -220,7 +220,7 @@ dissect_stat_notify(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre if (tree) { sub_item = proto_tree_add_item(tree, hf_stat_stat_chge, tvb, - offset, -1, FALSE); + offset, -1, ENC_NA); if (sub_item) sub_tree = proto_item_add_subtree(sub_item, ett_stat_stat_chge); } diff --git a/epan/dissectors/packet-stun.c b/epan/dissectors/packet-stun.c index 06f1a60241..eb9c6dc3fb 100644 --- a/epan/dissectors/packet-stun.c +++ b/epan/dissectors/packet-stun.c @@ -575,8 +575,8 @@ dissect_stun_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) PROTO_ITEM_SET_GENERATED(ti); proto_tree_add_item(stun_tree, hf_stun_length, tvb, 2, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(stun_tree, hf_stun_cookie, tvb, 4, 4, ENC_BIG_ENDIAN); - proto_tree_add_item(stun_tree, hf_stun_id, tvb, 8, 12, ENC_BIG_ENDIAN); + proto_tree_add_item(stun_tree, hf_stun_cookie, tvb, 4, 4, ENC_NA); + proto_tree_add_item(stun_tree, hf_stun_id, tvb, 8, 12, ENC_NA); /* Remember this (in host order) so we can show clear xor'd addresses */ magic_cookie_first_word = tvb_get_ntohl(tvb, 4); @@ -584,7 +584,7 @@ dissect_stun_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (msg_length != 0) { guint offset; - ti = proto_tree_add_item(stun_tree, hf_stun_attributes, tvb, STUN_HDR_LEN, msg_length, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(stun_tree, hf_stun_attributes, tvb, STUN_HDR_LEN, msg_length, ENC_NA); att_all_tree = proto_item_add_subtree(ti, ett_stun_att_all); offset = STUN_HDR_LEN; @@ -692,7 +692,7 @@ dissect_stun_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case MESSAGE_INTEGRITY: if (att_length < 20) break; - proto_tree_add_item(att_tree, stun_att_hmac, tvb, offset, att_length, ENC_BIG_ENDIAN); + proto_tree_add_item(att_tree, stun_att_hmac, tvb, offset, att_length, ENC_NA); break; case ERROR_CODE: @@ -779,7 +779,7 @@ dissect_stun_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(att_tree, stun_att_family, tvb, offset+1, 1, ENC_BIG_ENDIAN); if (att_length < 4) break; - proto_tree_add_item(att_tree, stun_att_xor_port, tvb, offset+2, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(att_tree, stun_att_xor_port, tvb, offset+2, 2, ENC_NA); /* Show the port 'in the clear' XOR (host order) transid with (host order) xor-port. @@ -792,7 +792,7 @@ dissect_stun_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; switch (tvb_get_guint8(tvb, offset+1)) { case 1: - proto_tree_add_item(att_tree, stun_att_xor_ipv4, tvb, offset+4, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(att_tree, stun_att_xor_ipv4, tvb, offset+4, 4, ENC_NA); /* Show the address 'in the clear'. XOR (host order) transid with (host order) xor-address. @@ -823,7 +823,7 @@ dissect_stun_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case 2: if (att_length < 20) break; - proto_tree_add_item(att_tree, stun_att_xor_ipv6, tvb, offset+4, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(att_tree, stun_att_xor_ipv6, tvb, offset+4, 16, ENC_NA); { guint32 IPv6[4]; IPv6[0] = g_htonl(tvb_get_ntohl(tvb, offset+4) ^ magic_cookie_first_word); @@ -856,7 +856,7 @@ case EVEN_PORT: case RESERVATION_TOKEN: if (att_length < 8) break; - proto_tree_add_item(att_tree, stun_att_token, tvb, offset, 8, ENC_BIG_ENDIAN); + proto_tree_add_item(att_tree, stun_att_token, tvb, offset, 8, ENC_NA); break; case PRIORITY: @@ -898,13 +898,13 @@ case EVEN_PORT: case ICE_CONTROLLING: if (att_length < 8) break; - proto_tree_add_item(att_tree, stun_att_tie_breaker, tvb, offset, 8, ENC_BIG_ENDIAN); + proto_tree_add_item(att_tree, stun_att_tie_breaker, tvb, offset, 8, ENC_NA); break; case DATA: if (att_length > 0) { tvbuff_t *next_tvb; - proto_tree_add_item(att_tree, stun_att_value, tvb, offset, att_length, ENC_BIG_ENDIAN); + proto_tree_add_item(att_tree, stun_att_value, tvb, offset, att_length, ENC_NA); if (att_length % 4 != 0) { guint pad; pad = 4-(att_length % 4); @@ -980,7 +980,7 @@ case EVEN_PORT: default: if (att_length > 0) - proto_tree_add_item(att_tree, stun_att_value, tvb, offset, att_length, ENC_BIG_ENDIAN); + proto_tree_add_item(att_tree, stun_att_value, tvb, offset, att_length, ENC_NA); if (att_length % 4 != 0) proto_tree_add_uint(att_tree, stun_att_padding, tvb, offset+att_length, 4-(att_length % 4), 4-(att_length % 4)); diff --git a/epan/dissectors/packet-sua.c b/epan/dissectors/packet-sua.c index 507ebeb715..0b826f1331 100644 --- a/epan/dissectors/packet-sua.c +++ b/epan/dissectors/packet-sua.c @@ -525,7 +525,7 @@ dissect_common_header(tvbuff_t *common_header_tvb, packet_info *pinfo, proto_tre if (sua_tree) { /* add the components of the common header to the protocol tree */ proto_tree_add_item(sua_tree, hf_sua_version, common_header_tvb, VERSION_OFFSET, VERSION_LENGTH, ENC_BIG_ENDIAN); - proto_tree_add_item(sua_tree, hf_sua_reserved, common_header_tvb, RESERVED_OFFSET, RESERVED_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(sua_tree, hf_sua_reserved, common_header_tvb, RESERVED_OFFSET, RESERVED_LENGTH, ENC_NA); proto_tree_add_item(sua_tree, hf_sua_message_class, common_header_tvb, MESSAGE_CLASS_OFFSET, MESSAGE_CLASS_LENGTH, ENC_BIG_ENDIAN); proto_tree_add_uint_format(sua_tree, hf_sua_message_type, common_header_tvb, MESSAGE_TYPE_OFFSET, MESSAGE_TYPE_LENGTH, message_type, "Message Type: %s (%u)", val_to_str(message_class * 256 + message_type, message_class_type_values, "reserved"), message_type); @@ -571,7 +571,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_sua_diagnostic_information_info, parameter_tvb, DIAGNOSTIC_INFO_OFFSET, diag_info_length, ENC_BIG_ENDIAN); + proto_tree_add_item(parameter_tree, hf_sua_diagnostic_information_info, parameter_tvb, DIAGNOSTIC_INFO_OFFSET, diag_info_length, ENC_NA); proto_item_append_text(parameter_item, " (%u byte%s)", diag_info_length, plurality(diag_info_length, "", "s")); } @@ -583,7 +583,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_sua_heartbeat_data, parameter_tvb, HEARTBEAT_DATA_OFFSET, heartbeat_data_length, ENC_BIG_ENDIAN); + proto_tree_add_item(parameter_tree, hf_sua_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")); } @@ -836,7 +836,7 @@ dissect_local_routing_key_identifier_parameter(tvbuff_t *parameter_tvb, proto_tr static void dissect_ss7_hop_counter_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { - proto_tree_add_item(parameter_tree, hf_sua_ss7_hop_counter_reserved, parameter_tvb, PARAMETER_VALUE_OFFSET, RESERVED_3_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(parameter_tree, hf_sua_ss7_hop_counter_reserved, parameter_tvb, PARAMETER_VALUE_OFFSET, RESERVED_3_LENGTH, ENC_NA); proto_tree_add_item(parameter_tree, hf_sua_ss7_hop_counter_counter, parameter_tvb, SS7_HOP_COUNTER_OFFSET, SS7_HOP_COUNTER_LENGTH, ENC_BIG_ENDIAN); proto_item_append_text(parameter_item, " (%u)", tvb_get_guint8(parameter_tvb, SS7_HOP_COUNTER_OFFSET)); } @@ -961,7 +961,7 @@ dissect_sccp_cause_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree proto_item *pi; const gchar *cause_string; - proto_tree_add_item(parameter_tree, hf_sua_cause_reserved, parameter_tvb, PARAMETER_VALUE_OFFSET, RESERVED_2_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(parameter_tree, hf_sua_cause_reserved, parameter_tvb, PARAMETER_VALUE_OFFSET, RESERVED_2_LENGTH, ENC_NA); proto_tree_add_item(parameter_tree, hf_sua_cause_type, parameter_tvb, CAUSE_TYPE_OFFSET, CAUSE_TYPE_LENGTH, ENC_BIG_ENDIAN); cause_type = tvb_get_guint8(parameter_tvb, CAUSE_TYPE_OFFSET); pi = proto_tree_add_item(parameter_tree, hf_sua_cause_value, parameter_tvb, CAUSE_VALUE_OFFSET, CAUSE_VALUE_LENGTH, ENC_BIG_ENDIAN); @@ -1013,7 +1013,7 @@ dissect_sequence_number_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter proto_item *receive_sequence_number_item; proto_tree *receive_sequence_number_tree; - proto_tree_add_item(parameter_tree, hf_sua_sequence_number_reserved, parameter_tvb, PARAMETER_VALUE_OFFSET, RESERVED_2_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(parameter_tree, hf_sua_sequence_number_reserved, parameter_tvb, PARAMETER_VALUE_OFFSET, RESERVED_2_LENGTH, ENC_NA); receive_sequence_number_item = proto_tree_add_text(parameter_tree, parameter_tvb, SEQUENCE_NUMBER_REC_SEQ_OFFSET, SEQUENCE_NUMBER_REC_SEQ_LENGTH, "Receive Sequence Number"); receive_sequence_number_tree = proto_item_add_subtree(receive_sequence_number_item, ett_sua_sequence_number_rec_number); @@ -1035,7 +1035,7 @@ dissect_receive_sequence_number_parameter(tvbuff_t *parameter_tvb, proto_tree *p proto_item *receive_sequence_number_item; proto_tree *receive_sequence_number_tree; - proto_tree_add_item(parameter_tree, hf_sua_receive_sequence_number_reserved, parameter_tvb, PARAMETER_VALUE_OFFSET, RESERVED_3_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(parameter_tree, hf_sua_receive_sequence_number_reserved, parameter_tvb, PARAMETER_VALUE_OFFSET, RESERVED_3_LENGTH, ENC_NA); receive_sequence_number_item = proto_tree_add_text(parameter_tree, parameter_tvb, RECEIVE_SEQUENCE_NUMBER_REC_SEQ_OFFSET, RECEIVE_SEQUENCE_NUMBER_REC_SEQ_LENGTH, "Receive Sequence Number"); receive_sequence_number_tree = proto_item_add_subtree(receive_sequence_number_item, ett_sua_receive_sequence_number_number); proto_tree_add_item(receive_sequence_number_tree, hf_sua_receive_sequence_number_number, parameter_tvb, RECEIVE_SEQUENCE_NUMBER_REC_SEQ_OFFSET, RECEIVE_SEQUENCE_NUMBER_REC_SEQ_LENGTH, ENC_BIG_ENDIAN); @@ -1066,7 +1066,7 @@ dissect_asp_capabilities_parameter(tvbuff_t *parameter_tvb, proto_tree *paramete proto_item *protocol_classes_item; proto_tree *protocol_classes_tree; - proto_tree_add_item(parameter_tree, hf_sua_asp_capabilities_reserved, parameter_tvb, PARAMETER_VALUE_OFFSET, RESERVED_2_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(parameter_tree, hf_sua_asp_capabilities_reserved, parameter_tvb, PARAMETER_VALUE_OFFSET, RESERVED_2_LENGTH, ENC_NA); protocol_classes_item = proto_tree_add_text(parameter_tree, parameter_tvb, PROTOCOL_CLASSES_OFFSET, PROTOCOL_CLASSES_LENGTH, "Protocol classes"); protocol_classes_tree = proto_item_add_subtree(protocol_classes_item, ett_sua_protcol_classes); proto_tree_add_item(protocol_classes_tree, hf_sua_asp_capabilities_reserved_bits, parameter_tvb, PROTOCOL_CLASSES_OFFSET, PROTOCOL_CLASSES_LENGTH, ENC_BIG_ENDIAN); @@ -1097,7 +1097,7 @@ dissect_data_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, prot data_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH; if(parameter_tree) { - proto_tree_add_item(parameter_tree, hf_sua_data, parameter_tvb, DATA_PARAMETER_DATA_OFFSET, data_length, ENC_BIG_ENDIAN); + proto_tree_add_item(parameter_tree, hf_sua_data, parameter_tvb, DATA_PARAMETER_DATA_OFFSET, data_length, ENC_NA); proto_item_append_text(parameter_item, " (SS7 message of %u byte%s)", data_length, plurality(data_length, "", "s")); } @@ -1193,7 +1193,7 @@ dissect_address_range_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_t static void dissect_smi_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { - proto_tree_add_item(parameter_tree, hf_sua_smi_reserved, parameter_tvb, PARAMETER_VALUE_OFFSET, RESERVED_3_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(parameter_tree, hf_sua_smi_reserved, parameter_tvb, PARAMETER_VALUE_OFFSET, RESERVED_3_LENGTH, ENC_NA); proto_tree_add_item(parameter_tree, hf_sua_smi, parameter_tvb, SMI_OFFSET, SMI_LENGTH, ENC_BIG_ENDIAN); proto_item_append_text(parameter_item, " (%u)", tvb_get_guint8(parameter_tvb, SMI_OFFSET)); } @@ -1204,7 +1204,7 @@ dissect_smi_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto static void dissect_importance_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { - proto_tree_add_item(parameter_tree, hf_sua_importance_reserved, parameter_tvb, PARAMETER_VALUE_OFFSET, RESERVED_3_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(parameter_tree, hf_sua_importance_reserved, parameter_tvb, PARAMETER_VALUE_OFFSET, RESERVED_3_LENGTH, ENC_NA); proto_tree_add_item(parameter_tree, hf_sua_importance, parameter_tvb, IMPORTANCE_OFFSET, IMPORTANCE_LENGTH, ENC_BIG_ENDIAN); proto_item_append_text(parameter_item, " (%u)", tvb_get_guint8(parameter_tvb, IMPORTANCE_OFFSET)); } @@ -1215,7 +1215,7 @@ dissect_importance_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree static void dissect_message_priority_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { - proto_tree_add_item(parameter_tree, hf_sua_message_priority_reserved, parameter_tvb, PARAMETER_VALUE_OFFSET, RESERVED_3_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(parameter_tree, hf_sua_message_priority_reserved, parameter_tvb, PARAMETER_VALUE_OFFSET, RESERVED_3_LENGTH, ENC_NA); proto_tree_add_item(parameter_tree, hf_sua_message_priority, parameter_tvb, MESSAGE_PRIORITY_OFFSET, MESSAGE_PRIORITY_LENGTH, ENC_BIG_ENDIAN); proto_item_append_text(parameter_item, " (%u)", tvb_get_guint8(parameter_tvb, MESSAGE_PRIORITY_OFFSET)); } @@ -1238,7 +1238,7 @@ dissect_protocol_class_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_ proto_item *protocol_class_item; proto_tree *protocol_class_tree; - proto_tree_add_item(parameter_tree, hf_sua_protocol_class_reserved, parameter_tvb, PARAMETER_VALUE_OFFSET, RESERVED_3_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(parameter_tree, hf_sua_protocol_class_reserved, parameter_tvb, PARAMETER_VALUE_OFFSET, RESERVED_3_LENGTH, ENC_NA); protocol_class_item = proto_tree_add_text(parameter_tree, parameter_tvb, PROTOCOL_CLASS_OFFSET, PROTOCOL_CLASS_LENGTH, "Protocol Class"); protocol_class_tree = proto_item_add_subtree(protocol_class_item, ett_sua_return_on_error_bit_and_protocol_class); @@ -1355,7 +1355,7 @@ dissect_global_title_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tr global_title_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - (PARAMETER_HEADER_LENGTH + RESERVED_3_LENGTH + GTI_LENGTH + NO_OF_DIGITS_LENGTH + TRANSLATION_TYPE_LENGTH + NUMBERING_PLAN_LENGTH + NATURE_OF_ADDRESS_LENGTH); - proto_tree_add_item(parameter_tree, hf_sua_gt_reserved, parameter_tvb, PARAMETER_VALUE_OFFSET, RESERVED_3_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(parameter_tree, hf_sua_gt_reserved, parameter_tvb, PARAMETER_VALUE_OFFSET, RESERVED_3_LENGTH, ENC_NA); proto_tree_add_item(parameter_tree, hf_sua_gti, parameter_tvb, GTI_OFFSET, GTI_LENGTH, ENC_BIG_ENDIAN); proto_tree_add_item(parameter_tree, hf_sua_number_of_digits, parameter_tvb, NO_OF_DIGITS_OFFSET, NO_OF_DIGITS_LENGTH, ENC_BIG_ENDIAN); proto_tree_add_item(parameter_tree, hf_sua_translation_type, parameter_tvb, TRANSLATION_TYPE_OFFSET, TRANSLATION_TYPE_LENGTH, ENC_BIG_ENDIAN); @@ -1430,7 +1430,7 @@ dissect_ssn_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto *ssn = tvb_get_guint8(parameter_tvb, SSN_OFFSET); if(parameter_tree) { - proto_tree_add_item(parameter_tree, hf_sua_ssn_reserved, parameter_tvb, PARAMETER_VALUE_OFFSET, RESERVED_3_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(parameter_tree, hf_sua_ssn_reserved, parameter_tvb, PARAMETER_VALUE_OFFSET, RESERVED_3_LENGTH, ENC_NA); proto_tree_add_item(parameter_tree, hf_sua_ssn_number, parameter_tvb, SSN_OFFSET, SSN_LENGTH, ENC_BIG_ENDIAN); proto_item_append_text(parameter_item, " (%u)", *ssn); } @@ -1475,7 +1475,7 @@ dissect_unknown_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, p guint16 parameter_value_length; parameter_value_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH; - proto_tree_add_item(parameter_tree, hf_sua_parameter_value, parameter_tvb, PARAMETER_VALUE_OFFSET, parameter_value_length, ENC_BIG_ENDIAN); + proto_tree_add_item(parameter_tree, hf_sua_parameter_value, parameter_tvb, PARAMETER_VALUE_OFFSET, parameter_value_length, ENC_NA); proto_item_append_text(parameter_item, "(tag %u and %u byte%s value)", tvb_get_ntohs(parameter_tvb, PARAMETER_TAG_OFFSET), parameter_value_length, plurality(parameter_value_length, "", "s")); } @@ -1750,7 +1750,7 @@ dissect_v8_parameter(tvbuff_t *parameter_tvb, proto_tree *tree, tvbuff_t **data_ break; }; if (parameter_tree && (padding_length > 0)) - proto_tree_add_item(parameter_tree, hf_sua_parameter_padding, parameter_tvb, PARAMETER_HEADER_OFFSET + length, padding_length, ENC_BIG_ENDIAN); + proto_tree_add_item(parameter_tree, hf_sua_parameter_padding, parameter_tvb, PARAMETER_HEADER_OFFSET + length, padding_length, ENC_NA); } #define INFO_STRING_PARAMETER_TAG 0x0004 @@ -2042,7 +2042,7 @@ dissect_parameter(tvbuff_t *parameter_tvb, proto_tree *tree, tvbuff_t **data_tvb break; }; if (parameter_tree && (padding_length > 0)) - proto_tree_add_item(parameter_tree, hf_sua_parameter_padding, parameter_tvb, PARAMETER_HEADER_OFFSET + length, padding_length, ENC_BIG_ENDIAN); + proto_tree_add_item(parameter_tree, hf_sua_parameter_padding, parameter_tvb, PARAMETER_HEADER_OFFSET + length, padding_length, ENC_NA); } static void diff --git a/epan/dissectors/packet-synergy.c b/epan/dissectors/packet-synergy.c index 6c6605948a..0ff44f8155 100644 --- a/epan/dissectors/packet-synergy.c +++ b/epan/dissectors/packet-synergy.c @@ -163,23 +163,23 @@ dissect_synergy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(strncmp(buffer,"Synergy",7)==0) dissect_synergy_handshake(tvb,pinfo,synergy_tree,offset+4); else if(strncmp(buffer,"CNOP",4)==0) - proto_tree_add_item(synergy_tree,hf_synergy_cnop,tvb,offset+4,-1,FALSE); + proto_tree_add_item(synergy_tree,hf_synergy_cnop,tvb,offset+4,-1,ENC_NA); else if(strncmp(buffer,"CALV",4)==0) - proto_tree_add_item(synergy_tree,hf_synergy_calv,tvb,offset+4,-1,FALSE); + proto_tree_add_item(synergy_tree,hf_synergy_calv,tvb,offset+4,-1,ENC_NA); else if(strncmp(buffer,"CBYE",4)==0) - proto_tree_add_item(synergy_tree,hf_synergy_cbye,tvb,offset+4,-1,FALSE); + proto_tree_add_item(synergy_tree,hf_synergy_cbye,tvb,offset+4,-1,ENC_NA); else if(strncmp(buffer,"CINN",4)==0) dissect_synergy_cinn(tvb,pinfo,synergy_tree,offset+4); else if(strncmp(buffer,"COUT",4)==0) - proto_tree_add_item(synergy_tree,hf_synergy_cout,tvb,offset+4,-1,FALSE); + proto_tree_add_item(synergy_tree,hf_synergy_cout,tvb,offset+4,-1,ENC_NA); else if(strncmp(buffer,"CCLP",4)==0) dissect_synergy_cclp(tvb,pinfo,synergy_tree,offset+4); else if(strncmp(buffer,"CSEC",4)==0) proto_tree_add_item(synergy_tree,hf_synergy_csec,tvb,offset+4,1,FALSE); else if(strncmp(buffer,"CROP",4)==0) - proto_tree_add_item(synergy_tree,hf_synergy_crop,tvb,offset+4,-1,FALSE); + proto_tree_add_item(synergy_tree,hf_synergy_crop,tvb,offset+4,-1,ENC_NA); else if(strncmp(buffer,"CIAK",4)==0) - proto_tree_add_item(synergy_tree,hf_synergy_ciak,tvb,offset+4,-1,FALSE); + proto_tree_add_item(synergy_tree,hf_synergy_ciak,tvb,offset+4,-1,ENC_NA); else if(strncmp(buffer,"DKDN",4)==0) dissect_synergy_dkdn(tvb,pinfo,synergy_tree,offset+4); else if(strncmp(buffer,"DKRP",4)==0) @@ -203,17 +203,17 @@ dissect_synergy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) else if(strncmp(buffer,"DSOP",4)==0) proto_tree_add_item(synergy_tree,hf_synergy_dsop,tvb,offset+4,4,FALSE); else if(strncmp(buffer,"QINF",4)==0) - proto_tree_add_item(synergy_tree,hf_synergy_qinf,tvb,offset+4,-1,FALSE); + proto_tree_add_item(synergy_tree,hf_synergy_qinf,tvb,offset+4,-1,ENC_NA); else if(strncmp(buffer,"EICV",4)==0) dissect_synergy_eicv(tvb,pinfo,synergy_tree,offset+4); else if(strncmp(buffer,"EBSY",4)==0) - proto_tree_add_item(synergy_tree,hf_synergy_ebsy,tvb,offset+4,-1,FALSE); + proto_tree_add_item(synergy_tree,hf_synergy_ebsy,tvb,offset+4,-1,ENC_NA); else if(strncmp(buffer,"EUNK",4)==0) - proto_tree_add_item(synergy_tree,hf_synergy_eunk,tvb,offset+4,-1,FALSE); + proto_tree_add_item(synergy_tree,hf_synergy_eunk,tvb,offset+4,-1,ENC_NA); else if(strncmp(buffer,"EBAD",4)==0) - proto_tree_add_item(synergy_tree,hf_synergy_ebad,tvb,offset+4,-1,FALSE); + proto_tree_add_item(synergy_tree,hf_synergy_ebad,tvb,offset+4,-1,ENC_NA); else - proto_tree_add_item(synergy_tree,hf_synergy_unknown,tvb,offset+4,-1,FALSE); + proto_tree_add_item(synergy_tree,hf_synergy_unknown,tvb,offset+4,-1,ENC_NA); } } @@ -221,7 +221,7 @@ static void dissect_synergy_handshake( tvbuff_t *tvb, packet_info *pinfo _U_, pr { proto_item *ti = NULL; proto_tree *sub_tree = NULL; - ti = proto_tree_add_item(tree, hf_synergy_handshake, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, hf_synergy_handshake, tvb, offset, -1, ENC_NA); sub_tree = proto_item_add_subtree(ti, ett_synergy); proto_tree_add_item(sub_tree, hf_synergy_handshake_majorversion, tvb, offset + 7, 2, FALSE); @@ -229,7 +229,7 @@ static void dissect_synergy_handshake( tvbuff_t *tvb, packet_info *pinfo _U_, pr if (tvb_length_remaining(tvb, offset + 11) != 0) { - proto_tree_add_item(sub_tree, hf_synergy_unknown, tvb, offset + 11, 4, FALSE); + proto_tree_add_item(sub_tree, hf_synergy_unknown, tvb, offset + 11, 4, ENC_NA); proto_tree_add_item(sub_tree, hf_synergy_handshake_clientname, tvb, offset + 15, -1, FALSE); } } @@ -238,7 +238,7 @@ static void dissect_synergy_cinn( tvbuff_t *tvb, packet_info *pinfo _U_, proto_t { proto_item *ti = NULL; proto_tree *sub_tree = NULL; - ti = proto_tree_add_item(tree, hf_synergy_cinn, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, hf_synergy_cinn, tvb, offset, -1, ENC_NA); sub_tree = proto_item_add_subtree(ti, ett_synergy); proto_tree_add_item(sub_tree, hf_synergy_cinn_x, tvb, offset + 4, 2, FALSE); @@ -251,7 +251,7 @@ static void dissect_synergy_cclp( tvbuff_t *tvb, packet_info *pinfo _U_, proto_t { proto_item *ti = NULL; proto_tree *sub_tree = NULL; - ti = proto_tree_add_item(tree, hf_synergy_cclp, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, hf_synergy_cclp, tvb, offset, -1, ENC_NA); sub_tree = proto_item_add_subtree(ti, ett_synergy); proto_tree_add_item(sub_tree, hf_synergy_cclp_clipboardidentifier, tvb, offset + 4, 1, FALSE); @@ -262,7 +262,7 @@ static void dissect_synergy_dkdn( tvbuff_t *tvb, packet_info *pinfo _U_, proto_t { proto_item *ti = NULL; proto_tree *sub_tree = NULL; - ti = proto_tree_add_item(tree, hf_synergy_dkdn, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, hf_synergy_dkdn, tvb, offset, -1, ENC_NA); sub_tree = proto_item_add_subtree(ti, ett_synergy); proto_tree_add_item(sub_tree, hf_synergy_dkdn_keyid, tvb, offset + 4, 2, FALSE); @@ -276,7 +276,7 @@ static void dissect_synergy_dkrp( tvbuff_t *tvb, packet_info *pinfo _U_, proto_t { proto_item *ti = NULL; proto_tree *sub_tree = NULL; - ti = proto_tree_add_item(tree, hf_synergy_dkrp, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, hf_synergy_dkrp, tvb, offset, -1, ENC_NA); sub_tree = proto_item_add_subtree(ti, ett_synergy); proto_tree_add_item(sub_tree, hf_synergy_dkrp_keyid, tvb, offset + 4, 2, FALSE); @@ -291,7 +291,7 @@ static void dissect_synergy_dkup( tvbuff_t *tvb, packet_info *pinfo _U_, proto_t { proto_item *ti = NULL; proto_tree *sub_tree = NULL; - ti = proto_tree_add_item(tree, hf_synergy_dkup, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, hf_synergy_dkup, tvb, offset, -1, ENC_NA); sub_tree = proto_item_add_subtree(ti, ett_synergy); proto_tree_add_item(sub_tree, hf_synergy_dkup_keyid, tvb, offset + 4, 2, FALSE); @@ -305,7 +305,7 @@ static void dissect_synergy_dmmv( tvbuff_t *tvb, packet_info *pinfo _U_, proto_t { proto_item *ti = NULL; proto_tree *sub_tree = NULL; - ti = proto_tree_add_item(tree, hf_synergy_dmmv, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, hf_synergy_dmmv, tvb, offset, -1, ENC_NA); sub_tree = proto_item_add_subtree(ti, ett_synergy); proto_tree_add_item(sub_tree, hf_synergy_dmmv_x, tvb, offset + 4, 2, FALSE); @@ -316,7 +316,7 @@ static void dissect_synergy_dmrm( tvbuff_t *tvb, packet_info *pinfo _U_, proto_t { proto_item *ti = NULL; proto_tree *sub_tree = NULL; - ti = proto_tree_add_item(tree, hf_synergy_dmrm, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, hf_synergy_dmrm, tvb, offset, -1, ENC_NA); sub_tree = proto_item_add_subtree(ti, ett_synergy); proto_tree_add_item(sub_tree, hf_synergy_dmrm_x, tvb, offset + 4, 2, FALSE); @@ -327,7 +327,7 @@ static void dissect_synergy_dclp( tvbuff_t *tvb, packet_info *pinfo _U_, proto_t { proto_item *ti = NULL; proto_tree *sub_tree = NULL; - ti = proto_tree_add_item(tree, hf_synergy_dclp, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, hf_synergy_dclp, tvb, offset, -1, ENC_NA); sub_tree = proto_item_add_subtree(ti, ett_synergy); proto_tree_add_item(sub_tree, hf_synergy_dclp_clipboardidentifier, tvb, offset + 4, 1, FALSE); @@ -339,7 +339,7 @@ static void dissect_synergy_dinf( tvbuff_t *tvb, packet_info *pinfo _U_, proto_t { proto_item *ti = NULL; proto_tree *sub_tree = NULL; - ti = proto_tree_add_item(tree, hf_synergy_dinf, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, hf_synergy_dinf, tvb, offset, -1, ENC_NA); sub_tree = proto_item_add_subtree(ti, ett_synergy); proto_tree_add_item(sub_tree, hf_synergy_dinf_clp, tvb, offset + 4, 2, FALSE); @@ -355,7 +355,7 @@ static void dissect_synergy_eicv( tvbuff_t *tvb, packet_info *pinfo _U_, proto_t { proto_item *ti = NULL; proto_tree *sub_tree = NULL; - ti = proto_tree_add_item(tree, hf_synergy_eicv, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, hf_synergy_eicv, tvb, offset, -1, ENC_NA); sub_tree = proto_item_add_subtree(ti, ett_synergy); proto_tree_add_item(sub_tree, hf_synergy_eicv_majorversion, tvb, offset + 4, 2, FALSE); diff --git a/epan/dissectors/packet-tapa.c b/epan/dissectors/packet-tapa.c index 4a658d841a..6ade3b5267 100644 --- a/epan/dissectors/packet-tapa.c +++ b/epan/dissectors/packet-tapa.c @@ -171,7 +171,7 @@ dissect_tapa_discover_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tapa_ remaining -= 6; proto_tree_add_item(tapa_discover_tree, hf_tapa_discover_reply_pad, tvb, offset, remaining, - ENC_BIG_ENDIAN); + ENC_NA); offset += remaining; return offset; @@ -217,7 +217,7 @@ dissect_tapa_discover_req(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tapa_di ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(tapa_discover_item_tree, hf_tapa_discover_req_value, tvb, offset, item_length, - ENC_BIG_ENDIAN); + ENC_NA); offset += item_length; remaining -= (item_length + 4); @@ -276,7 +276,7 @@ dissect_tapa_discover_unknown_new_tlv(tvbuff_t *tvb, packet_info *pinfo, proto_t tvb, offset, item_length, ENC_BIG_ENDIAN); else proto_tree_add_item(tapa_discover_item_tree, hf_tapa_discover_newtlv_valuehex, - tvb, offset, item_length, ENC_BIG_ENDIAN); + tvb, offset, item_length, ENC_NA); offset += item_length; remaining -= (item_length + 4); @@ -334,7 +334,7 @@ dissect_tapa_discover(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; default: proto_tree_add_item(tapa_discover_tree, hf_tapa_discover_unknown, tvb, offset, - remaining, ENC_BIG_ENDIAN); + remaining, ENC_NA); offset += 1; break; @@ -378,7 +378,7 @@ dissect_tapa_tunnel(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 1; proto_tree_add_item(tapa_tunnel_tree, hf_tapa_tunnel_zero, tvb, offset, 8, - ENC_BIG_ENDIAN); + ENC_NA); offset += 8; proto_tree_add_item(tapa_tunnel_tree, hf_tapa_tunnel_dmac, tvb, offset, 6, @@ -416,7 +416,7 @@ dissect_tapa_tunnel(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* FIXME: This is just to help figuring out what the bytes mean */ proto_tree_add_item(tapa_tunnel_tree, hf_tapa_tunnel_remaining, tvb, - offset, remaining - offset, ENC_BIG_ENDIAN); + offset, remaining - offset, ENC_NA); offset = remaining; } diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c index f84b4ccb84..38035c3270 100644 --- a/epan/dissectors/packet-tcp.c +++ b/epan/dissectors/packet-tcp.c @@ -1524,7 +1524,7 @@ tcp_print_sequence_number_analysis(packet_info *pinfo, tvbuff_t *tvb, proto_tree } if(ta->flags){ - item = proto_tree_add_item(tree, hf_tcp_analysis_flags, tvb, 0, 0, FALSE); + item = proto_tree_add_item(tree, hf_tcp_analysis_flags, tvb, 0, 0, ENC_NA); PROTO_ITEM_SET_GENERATED(item); flags_tree=proto_item_add_subtree(item, ett_tcp_analysis); @@ -2270,12 +2270,12 @@ dissect_tcpopt_exp(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, proto_tree *exp_tree; item = proto_tree_add_item(opt_tree, hf_tcp_option_exp, tvb, - offset, optlen, FALSE); + offset, optlen, ENC_NA); exp_tree = proto_item_add_subtree(item, ett_tcp_option_exp); proto_tree_add_item(exp_tree, hf_tcp_option_kind, tvb, offset, 1, FALSE); proto_tree_add_item(exp_tree, hf_tcp_option_len, tvb, offset + 1, 1, FALSE); proto_tree_add_item(exp_tree, hf_tcp_option_exp_data, tvb, - offset + 2, optlen - 2, FALSE); + offset + 2, optlen - 2, ENC_NA); tcp_info_append_uint(pinfo, "Expxx", TRUE); } diff --git a/epan/dissectors/packet-tds.c b/epan/dissectors/packet-tds.c index ad4e9f8906..8921e5997d 100644 --- a/epan/dissectors/packet-tds.c +++ b/epan/dissectors/packet-tds.c @@ -896,7 +896,7 @@ dissect_tds_all_headers(tvbuff_t *tvb, guint *offset, packet_info *pinfo, proto_ * then the headers are most likely absent. */ if(total_length >= 0x100) return; - item = proto_tree_add_item(tree, hf_tds_all_headers, tvb, *offset, total_length, TRUE); + item = proto_tree_add_item(tree, hf_tds_all_headers, tvb, *offset, total_length, ENC_NA); sub_tree = proto_item_add_subtree(item, ett_tds_all_headers); total_length_item = proto_tree_add_item(sub_tree, hf_tds_all_headers_total_length, tvb, *offset, 4, TRUE); @@ -1699,7 +1699,7 @@ dissect_tds_type_info(tvbuff_t *tvb, guint *offset, packet_info *pinfo, proto_tr guint8 data_type; *plp = FALSE; /* most types are not Partially Length-Prefixed */ - item = proto_tree_add_item(tree, hf_tds_type_info, tvb, *offset, 0, TRUE); + item = proto_tree_add_item(tree, hf_tds_type_info, tvb, *offset, 0, ENC_NA); data_type = tvb_get_guint8(tvb, *offset); proto_item_append_text(item, " (%s)", val_to_str(data_type, tds_data_type_names, "Invalid data type: %02X")); sub_tree = proto_item_add_subtree(item, ett_tds_type_info); @@ -1808,7 +1808,7 @@ dissect_tds_type_info(tvbuff_t *tvb, guint *offset, packet_info *pinfo, proto_tr case TDS_DATA_TYPE_NTEXT: /* NText */ case TDS_DATA_TYPE_NCHAR: /* NChar */ case TDS_DATA_TYPE_NVARCHAR: /* NVarChar */ - item1 = proto_tree_add_item(sub_tree, hf_tds_type_info_collation, tvb, *offset, 5, TRUE); + item1 = proto_tree_add_item(sub_tree, hf_tds_type_info_collation, tvb, *offset, 5, ENC_NA); collation_tree = proto_item_add_subtree(item1, ett_tds_type_info_collation); proto_tree_add_item(collation_tree, hf_tds_type_info_collation_lcid, tvb, *offset, 4, TRUE); proto_tree_add_item(collation_tree, hf_tds_type_info_collation_ign_case, tvb, *offset, 4, TRUE); @@ -1858,7 +1858,7 @@ dissect_tds_type_varbyte(tvbuff_t *tvb, guint *offset, packet_info *pinfo, proto } switch(data_type) { case TDS_DATA_TYPE_BIGVARBIN: /* VarBinary */ - proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_bytes, tvb, *offset, length, TRUE); + proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_bytes, tvb, *offset, length, ENC_NA); break; case TDS_DATA_TYPE_BIGVARCHR: /* VarChar */ proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_string, tvb, *offset, length, TRUE); @@ -1929,7 +1929,7 @@ dissect_tds_type_varbyte(tvbuff_t *tvb, guint *offset, packet_info *pinfo, proto length = tvb_get_guint8(tvb, *offset); length_item = proto_tree_add_uint(sub_tree, hf_tds_type_varbyte_length, tvb, *offset, 1, length); switch(length) { - case GEN_NULL: proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_null, tvb, *offset, 0, TRUE); break; + case GEN_NULL: proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_null, tvb, *offset, 0, ENC_NA); break; case 16: proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_guid, tvb, *offset + 1, length, TRUE); break; default: expert_add_info_format(pinfo, length_item, PI_MALFORMED, PI_ERROR, "Invalid length"); } @@ -1939,7 +1939,7 @@ dissect_tds_type_varbyte(tvbuff_t *tvb, guint *offset, packet_info *pinfo, proto length = tvb_get_guint8(tvb, *offset); length_item = proto_tree_add_uint(sub_tree, hf_tds_type_varbyte_length, tvb, *offset, 1, length); switch(length) { - case GEN_NULL: proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_null, tvb, *offset, 0, TRUE); break; + case GEN_NULL: proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_null, tvb, *offset, 0, ENC_NA); break; case 1: proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_boolean, tvb, *offset + 1, 1, TRUE); break; default: expert_add_info_format(pinfo, length_item, PI_MALFORMED, PI_ERROR, "Invalid length"); } @@ -1949,7 +1949,7 @@ dissect_tds_type_varbyte(tvbuff_t *tvb, guint *offset, packet_info *pinfo, proto length = tvb_get_guint8(tvb, *offset); length_item = proto_tree_add_uint(sub_tree, hf_tds_type_varbyte_length, tvb, *offset, 1, length); switch(length) { - case GEN_NULL: proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_null, tvb, *offset, 0, TRUE); break; + case GEN_NULL: proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_null, tvb, *offset, 0, ENC_NA); break; case 1: proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_int1, tvb, *offset + 1, 1, TRUE); break; case 2: proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_int2, tvb, *offset + 1, 2, TRUE); break; case 4: proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_int4, tvb, *offset + 1, 4, TRUE); break; @@ -1962,7 +1962,7 @@ dissect_tds_type_varbyte(tvbuff_t *tvb, guint *offset, packet_info *pinfo, proto length = tvb_get_guint8(tvb, *offset); length_item = proto_tree_add_uint(sub_tree, hf_tds_type_varbyte_length, tvb, *offset, 1, length); switch(length) { - case GEN_NULL: proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_null, tvb, *offset, 0, TRUE); break; + case GEN_NULL: proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_null, tvb, *offset, 0, ENC_NA); break; case 4: proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_float, tvb, *offset + 1, 4, TRUE); break; case 8: proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_double, tvb, *offset + 1, 8, TRUE); break; default: expert_add_info_format(pinfo, length_item, PI_MALFORMED, PI_ERROR, "Invalid length"); @@ -1987,7 +1987,7 @@ dissect_tds_type_varbyte(tvbuff_t *tvb, guint *offset, packet_info *pinfo, proto proto_tree_add_uint(sub_tree, hf_tds_type_varbyte_length, tvb, *offset, 1, length); *offset += 1; if(length > 0) { - proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_bytes, tvb, *offset, length, TRUE); + proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_bytes, tvb, *offset, length, ENC_NA); *offset += length; } break; @@ -2004,13 +2004,13 @@ dissect_tds_type_varbyte(tvbuff_t *tvb, guint *offset, packet_info *pinfo, proto *offset += 2; if(length == CHARBIN_NULL) { proto_item_append_text(length_item, " (CHARBIN_NULL)"); - proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_null, tvb, *offset, 0, TRUE); + proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_null, tvb, *offset, 0, ENC_NA); } else { switch(data_type) { case TDS_DATA_TYPE_BIGVARBIN: /* VarBinary */ case TDS_DATA_TYPE_BIGBINARY: /* Binary */ - proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_bytes, tvb, *offset, length, TRUE); + proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_bytes, tvb, *offset, length, ENC_NA); break; case TDS_DATA_TYPE_BIGVARCHR: /* VarChar */ case TDS_DATA_TYPE_BIGCHAR: /* Char */ @@ -2040,7 +2040,7 @@ dissect_tds_type_varbyte(tvbuff_t *tvb, guint *offset, packet_info *pinfo, proto *offset += 4; if(length == CHARBIN_NULL32) { proto_item_append_text(length_item, " (CHARBIN_NULL)"); - proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_null, tvb, *offset, 0, TRUE); + proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_null, tvb, *offset, 0, ENC_NA); } else { switch(data_type) { @@ -2070,7 +2070,7 @@ dissect_tds_rpc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) char *val; guint8 data_type; - item = proto_tree_add_item(tree, hf_tds_rpc, tvb, 0, -1, TRUE); + item = proto_tree_add_item(tree, hf_tds_rpc, tvb, 0, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_tds_message); dissect_tds_all_headers(tvb, &offset, pinfo, tree); @@ -2123,7 +2123,7 @@ dissect_tds_rpc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ++offset; break; } - param_item = proto_tree_add_item(tree, hf_tds_rpc_parameter, tvb, offset, 0, TRUE); + param_item = proto_tree_add_item(tree, hf_tds_rpc_parameter, tvb, offset, 0, ENC_NA); sub_tree = proto_item_add_subtree(param_item, ett_tds_rpc_parameter); proto_tree_add_item(sub_tree, hf_tds_rpc_parameter_name_length, tvb, offset, 1, TRUE); ++offset; diff --git a/epan/dissectors/packet-teamspeak2.c b/epan/dissectors/packet-teamspeak2.c index eec8748787..fc2bb0dee6 100644 --- a/epan/dissectors/packet-teamspeak2.c +++ b/epan/dissectors/packet-teamspeak2.c @@ -507,7 +507,7 @@ static void ts2_parse_newplayerjoined(tvbuff_t *tvb, proto_tree *ts2_tree) offset+=4; proto_tree_add_item(ts2_tree, hf_ts2_channel_id, tvb, offset, 4, TRUE); offset+=4; - proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, offset, 6, TRUE); + proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, offset, 6, ENC_NA); offset+=6; proto_tree_add_item(ts2_tree, hf_ts2_nick, tvb, offset, 1, TRUE); offset+=30; @@ -518,7 +518,7 @@ static void ts2_parse_loginend(tvbuff_t *tvb, proto_tree *ts2_tree) { gint32 offset; offset=0; - proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, offset, tvb_length_remaining(tvb, offset), TRUE); + proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, offset, tvb_length_remaining(tvb, offset), ENC_NA); } /* Parses a ts2 known player joined (TS2_KNOWNPLAYERUPDATE) packet and adds it to the tree */ @@ -554,7 +554,7 @@ static void ts2_parse_channelchange(tvbuff_t *tvb, proto_tree *ts2_tree) offset+=4; proto_tree_add_item(ts2_tree, hf_ts2_channel_id, tvb, offset, 4, TRUE); offset+=4; - proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, offset, 2, TRUE); + proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, offset, 2, ENC_NA); } @@ -575,11 +575,11 @@ static void ts2_parse_playerleft(tvbuff_t *tvb, proto_tree *ts2_tree) offset=0; proto_tree_add_item(ts2_tree, hf_ts2_player_id, tvb, offset, 4, TRUE); offset+=4; - proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, offset, 4, TRUE); + proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, offset, 4, ENC_NA); offset+=4; - proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, offset, 4, TRUE); + proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, offset, 4, ENC_NA); offset+=4; - proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, offset, tvb_length_remaining(tvb, offset), TRUE); + proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, offset, tvb_length_remaining(tvb, offset), ENC_NA); } /* Parses a ts2 login part 2 (TS2T_LOGINPART2) packet and adds it to the tree */ @@ -587,7 +587,7 @@ static void ts2_parse_loginpart2(tvbuff_t *tvb, proto_tree *ts2_tree) { gint32 offset; offset=0; - proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, 0, 2, TRUE); + proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, 0, 2, ENC_NA); offset+=2; proto_tree_add_item(ts2_tree, hf_ts2_channel, tvb, offset, 1, TRUE); offset+=30; @@ -595,7 +595,7 @@ static void ts2_parse_loginpart2(tvbuff_t *tvb, proto_tree *ts2_tree) offset+=30; proto_tree_add_item(ts2_tree, hf_ts2_channelpassword, tvb, offset, 1, TRUE); offset+=30; - proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, offset, 4, TRUE); + proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, offset, 4, ENC_NA); } /* Parses a ts2 channel list (TS2T_CHANNELLIST) and adds it to the tree */ @@ -624,7 +624,7 @@ static void ts2_parse_channellist(tvbuff_t *tvb, proto_tree *ts2_tree) proto_tree_add_item(subtree, hf_ts2_channel_default, tvb, offset, 1, FALSE); offset+=1; - proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, offset, 1, TRUE); + proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, offset, 1, ENC_NA); offset+=1; proto_tree_add_item(ts2_tree, hf_ts2_codec, tvb, offset, 2, TRUE); offset+=2; @@ -673,7 +673,7 @@ static void ts2_parse_playerlist(tvbuff_t *tvb, proto_tree *ts2_tree) offset+=4; proto_tree_add_item(ts2_tree, hf_ts2_channel_id, tvb, offset, 4, TRUE); offset+=4; - proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, offset, 4, TRUE); + proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, offset, 4, ENC_NA); offset+=4; proto_tree_add_item(ts2_tree, hf_ts2_player_status_flags, tvb, offset, 2, TRUE); ts2_add_statusflags(tvb, ts2_tree, offset); @@ -682,7 +682,7 @@ static void ts2_parse_playerlist(tvbuff_t *tvb, proto_tree *ts2_tree) offset+=30; x++; } - proto_tree_add_item(ts2_tree, hf_ts2_emptyspace, tvb, offset, tvb_length_remaining(tvb, 0), TRUE); + proto_tree_add_item(ts2_tree, hf_ts2_emptyspace, tvb, offset, tvb_length_remaining(tvb, 0), ENC_NA); } @@ -784,7 +784,7 @@ static void dissect_ts2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case TS2T_LOGINREQUEST: proto_tree_add_item(ts2_tree, hf_ts2_protocol_string, tvb, 20, 1, TRUE); proto_tree_add_item(ts2_tree, hf_ts2_platform_string, tvb, 50, 1, TRUE); - proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, 80, 9, TRUE); + proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, 80, 9, ENC_NA); proto_tree_add_item(ts2_tree, hf_ts2_registeredlogin, tvb, 90, 1, TRUE); proto_tree_add_item(ts2_tree, hf_ts2_name, tvb, 90, 1, TRUE); proto_tree_add_item(ts2_tree, hf_ts2_password, tvb, 120, 1, TRUE); @@ -797,11 +797,11 @@ static void dissect_ts2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case TS2T_LOGINREPLY: proto_tree_add_item(ts2_tree, hf_ts2_server_name, tvb, 20, 1, TRUE); proto_tree_add_item(ts2_tree, hf_ts2_platform_string, tvb, 50, 1, TRUE); - proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, 80, 9, TRUE); + proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, 80, 9, ENC_NA); proto_tree_add_item(ts2_tree, hf_ts2_badlogin, tvb, 89, 3, TRUE); - proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, 92, 80, TRUE); + proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, 92, 80, ENC_NA); proto_tree_add_item(ts2_tree, hf_ts2_sessionkey, tvb, 172, 4, TRUE); - proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, 178, 3, TRUE); + proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, 178, 3, ENC_NA); proto_tree_add_item(ts2_tree, hf_ts2_server_welcome_message, tvb, 180, 1, TRUE); break; } diff --git a/epan/dissectors/packet-telkonet.c b/epan/dissectors/packet-telkonet.c index 4f754e6c32..4845d681f9 100644 --- a/epan/dissectors/packet-telkonet.c +++ b/epan/dissectors/packet-telkonet.c @@ -77,7 +77,7 @@ dissect_telkonet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti = proto_tree_add_item(tree, proto_telkonet, tvb, 0, 8, ENC_BIG_ENDIAN); telkonet_tree = proto_item_add_subtree(ti, ett_telkonet); - proto_tree_add_item(telkonet_tree, hf_telkonet_type, tvb, 0, 8, ENC_BIG_ENDIAN); + proto_tree_add_item(telkonet_tree, hf_telkonet_type, tvb, 0, 8, ENC_NA); offset += 8; if (type == TELKONET_TYPE_TUNNEL) diff --git a/epan/dissectors/packet-teredo.c b/epan/dissectors/packet-teredo.c index ef7b74e472..f24da70e34 100644 --- a/epan/dissectors/packet-teredo.c +++ b/epan/dissectors/packet-teredo.c @@ -107,7 +107,7 @@ parse_teredo_auth(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_item *ti; ti = proto_tree_add_item(tree, hf_teredo_auth, tvb, offset-4, - 13 + idlen + aulen, FALSE); + 13 + idlen + aulen, ENC_NA); tree = proto_item_add_subtree(ti, ett_teredo_auth); proto_tree_add_item(tree, hf_teredo_auth_idlen, tvb, @@ -118,23 +118,23 @@ parse_teredo_auth(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* idlen is usually zero */ if (idlen) { proto_tree_add_item(tree, hf_teredo_auth_id, tvb, - offset, idlen, FALSE); + offset, idlen, ENC_NA); offset += idlen; } /* aulen is usually zero */ if (aulen) { proto_tree_add_item(tree, hf_teredo_auth_value, tvb, - offset, aulen, FALSE); + offset, aulen, ENC_NA); offset += aulen; } proto_tree_add_item(tree, hf_teredo_auth_nonce, tvb, - offset, 8, FALSE); + offset, 8, ENC_NA); offset += 8; proto_tree_add_item(tree, hf_teredo_auth_conf, tvb, - offset, 1, FALSE); + offset, 1, ENC_NA); offset++; } else @@ -159,7 +159,7 @@ parse_teredo_orig(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (tree) { ti = proto_tree_add_item(tree, hf_teredo_orig, tvb, offset, - 8, FALSE); + 8, ENC_NA); tree = proto_item_add_subtree(ti, ett_teredo_orig); } offset += 2; diff --git a/epan/dissectors/packet-tipc.c b/epan/dissectors/packet-tipc.c index 72331145b2..1bf7fade59 100644 --- a/epan/dissectors/packet-tipc.c +++ b/epan/dissectors/packet-tipc.c @@ -1484,14 +1484,14 @@ w9:| | offset = offset + 4; if (handle_v2_as & (V2_AS_1_6)) { /* W5 - W9 Bearer Level Originating Address: */ - proto_tree_add_item(tipc_tree, hf_tipcv2_bearer_level_orig_addr, tipc_tvb, offset, 20, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_bearer_level_orig_addr, tipc_tvb, offset, 20, ENC_NA); offset = offset + 20; } else { /* W5 */ proto_tree_add_item(tipc_tree, hf_tipcv2_media_id, tipc_tvb, offset, 4, FALSE); offset = offset + 4; /* W6 - W9 Bearer Level Originating Address: */ - proto_tree_add_item(tipc_tree, hf_tipcv2_bearer_level_orig_addr, tipc_tvb, offset, 16, FALSE); + proto_tree_add_item(tipc_tree, hf_tipcv2_bearer_level_orig_addr, tipc_tvb, offset, 16, ENC_NA); offset = offset + 16; } if (msg_size-(orig_hdr_size*4) != 0) { diff --git a/epan/dissectors/packet-tnef.c b/epan/dissectors/packet-tnef.c index e480645e7e..ac0436381c 100644 --- a/epan/dissectors/packet-tnef.c +++ b/epan/dissectors/packet-tnef.c @@ -370,7 +370,7 @@ static void dissect_mapiprops(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre /* get the property tag */ - prop_item = proto_tree_add_item(tree, hf_tnef_property, tvb, offset, -1, TRUE); + prop_item = proto_tree_add_item(tree, hf_tnef_property, tvb, offset, -1, ENC_NA); prop_tree = proto_item_add_subtree(prop_item, ett_tnef_property); item = proto_tree_add_item(prop_tree, hf_tnef_property_tag, tvb, offset, 4, TRUE); @@ -414,7 +414,7 @@ static void dissect_mapiprops(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre offset += tag_length; if((padding = (4 - tag_length % 4)) != 4) { - proto_tree_add_item(tag_tree, hf_tnef_property_padding, tvb, offset, padding, TRUE); + proto_tree_add_item(tag_tree, hf_tnef_property_padding, tvb, offset, padding, ENC_NA); offset += padding; } @@ -489,7 +489,7 @@ static void dissect_mapiprops(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre if((padding = (4 - (offset - start_offset) % 4)) != 4) { /* we need to pad */ - proto_tree_add_item(prop_tree, hf_tnef_property_padding, tvb, offset, padding, TRUE); + proto_tree_add_item(prop_tree, hf_tnef_property_padding, tvb, offset, padding, ENC_NA); offset += padding; } @@ -544,7 +544,7 @@ static void dissect_tnef(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) start_offset = offset; - attr_item = proto_tree_add_item(tree, hf_tnef_attribute, tvb, offset, -1, TRUE); + attr_item = proto_tree_add_item(tree, hf_tnef_attribute, tvb, offset, -1, ENC_NA); attr_tree = proto_item_add_subtree(attr_item, ett_tnef_attribute); proto_tree_add_item(attr_tree, hf_tnef_attribute_lvl, tvb, offset, 1, TRUE); @@ -582,7 +582,7 @@ static void dissect_tnef(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(attr_tree, hf_tnef_original_message_class, tvb, offset, length, TRUE); break; case ATT_MAPI_PROPS: - item = proto_tree_add_item(attr_tree, hf_tnef_mapi_props, tvb, offset, length, TRUE); + item = proto_tree_add_item(attr_tree, hf_tnef_mapi_props, tvb, offset, length, ENC_NA); props_tree = proto_item_add_subtree(item, ett_tnef_mapi_props); next_tvb = tvb_new_subset(tvb, offset, length, length); @@ -604,7 +604,7 @@ static void dissect_tnef(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* just do it on the type */ switch((tag >> 16) & 0xffff) { case ATP_DATE: - item = proto_tree_add_item(attr_tree, hf_tnef_attribute_date, tvb, offset, length, TRUE); + item = proto_tree_add_item(attr_tree, hf_tnef_attribute_date, tvb, offset, length, ENC_NA); date_tree = proto_item_add_subtree(item, ett_tnef_attribute_date); next_tvb = tvb_new_subset(tvb, offset, length, length); @@ -617,7 +617,7 @@ static void dissect_tnef(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item_append_text(attr_item, " %s", tvb_get_ephemeral_string(tvb, offset, length)); break; default: - proto_tree_add_item(attr_tree, hf_tnef_attribute_value, tvb, offset, length, TRUE); + proto_tree_add_item(attr_tree, hf_tnef_attribute_value, tvb, offset, length, ENC_NA); break; } } @@ -632,7 +632,7 @@ static void dissect_tnef(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* there may be some padding */ if(tvb_reported_length_remaining(tvb, offset)) /* XXX: Not sure if they is really padding or not */ - proto_tree_add_item(tree, hf_tnef_padding, tvb, offset, tvb_reported_length_remaining(tvb, offset), TRUE); + proto_tree_add_item(tree, hf_tnef_padding, tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_NA); } static void dissect_tnef_file(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) diff --git a/epan/dissectors/packet-tns.c b/epan/dissectors/packet-tns.c index 924b3e26eb..56b76efe3e 100644 --- a/epan/dissectors/packet-tns.c +++ b/epan/dissectors/packet-tns.c @@ -416,7 +416,7 @@ static void dissect_tns_connect(tvbuff_t *tvb, int offset, packet_info *pinfo, if ( connect_tree ) { proto_tree_add_item(connect_tree, hf_tns_value_of_one, tvb, - offset, 2, FALSE); + offset, 2, ENC_NA); } offset += 2; @@ -565,7 +565,7 @@ static void dissect_tns_accept(tvbuff_t *tvb, int offset, packet_info *pinfo, if ( accept_tree ) { proto_tree_add_item(accept_tree, hf_tns_value_of_one, tvb, - offset, 2, FALSE); + offset, 2, ENC_NA); } offset += 2; @@ -837,7 +837,7 @@ static void dissect_tns_control(tvbuff_t *tvb, int offset, packet_info *pinfo, if ( control_tree ) { proto_tree_add_item(control_tree, hf_tns_control_data, tvb, - offset, -1, FALSE); + offset, -1, ENC_NA); } return; } @@ -942,7 +942,7 @@ dissect_tns_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if ( tree ) { proto_tree_add_item(tns_tree, hf_tns_reserved_byte, tvb, - offset, 1, FALSE); + offset, 1, ENC_NA); } offset += 1; diff --git a/epan/dissectors/packet-trill.c b/epan/dissectors/packet-trill.c index d428544195..7d2bfed9d6 100644 --- a/epan/dissectors/packet-trill.c +++ b/epan/dissectors/packet-trill.c @@ -135,7 +135,7 @@ dissect_trill( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) offset += TRILL_NICKNAME_LEN ; if( op_len != 0 ) { proto_tree_add_item( trill_tree, hf_trill_options, tvb, - offset, op_len, FALSE ) ; + offset, op_len, ENC_NA ) ; } } diff --git a/epan/dissectors/packet-tte-pcf.c b/epan/dissectors/packet-tte-pcf.c index 4b66f5f767..e80465c077 100644 --- a/epan/dissectors/packet-tte-pcf.c +++ b/epan/dissectors/packet-tte-pcf.c @@ -132,7 +132,7 @@ dissect_tte_pcf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* proto_tree_add_item(tte_pcf_tree, hf_tte_pcf_res1, tvb, TTE_PCF_IC_LENGTH+TTE_PCF_MN_LENGTH+ TTE_PCF_RES0_LENGTH+TTE_PCF_SP_LENGTH+TTE_PCF_SD_LENGTH+ - TTE_PCF_TYPE_LENGTH, TTE_PCF_RES1_LENGTH, FALSE); */ + TTE_PCF_TYPE_LENGTH, TTE_PCF_RES1_LENGTH, ENC_NA); */ proto_tree_add_item(tte_pcf_tree, hf_tte_pcf_tc, tvb, TTE_PCF_IC_LENGTH+TTE_PCF_MN_LENGTH+ diff --git a/epan/dissectors/packet-ua.c b/epan/dissectors/packet-ua.c index 3561b4e85a..ae6e14ea4d 100644 --- a/epan/dissectors/packet-ua.c +++ b/epan/dissectors/packet-ua.c @@ -329,7 +329,7 @@ static int DissectNOE(tvbuff_t *pTvb, proto_tree *pRootUA) nLen = tvb_length(pTvb); if(pRootUA) { - proto_item *pNoeItem = proto_tree_add_item(pRootUA, hf_noe, pTvb, 0, nLen, FALSE); + proto_item *pNoeItem = proto_tree_add_item(pRootUA, hf_noe, pTvb, 0, nLen, ENC_NA); if(pNoeItem) { proto_tree* pSubTreeNOE; diff --git a/epan/dissectors/packet-ucp.c b/epan/dissectors/packet-ucp.c index f3e51a3e43..f171c4ce35 100644 --- a/epan/dissectors/packet-ucp.c +++ b/epan/dissectors/packet-ucp.c @@ -1650,7 +1650,7 @@ add_5xO(proto_tree *tree, tvbuff_t *tvb) int len = tmpoff - offset - 1; proto_tree *subtree; - ti = proto_tree_add_item(tree, hf_ucp_parm_XSer, tvb, offset, len, FALSE); + ti = proto_tree_add_item(tree, hf_ucp_parm_XSer, tvb, offset, len, ENC_NA); tmptvb = tvb_new_subset(tvb, offset, len + 1, len + 1); subtree = proto_item_add_subtree(ti, ett_XSer); ucp_handle_XSer(subtree, tmptvb); @@ -1864,7 +1864,7 @@ dissect_ucp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tmp_tvb = tvb_new_subset_remaining(tvb, offset); sub_ti = proto_tree_add_item(ucp_tree, hf_ucp_oper_section, tvb, - offset, endpkt - offset, FALSE); + offset, endpkt - offset, ENC_NA); sub_tree = proto_item_add_subtree(sub_ti, ett_sub); switch (OT) { diff --git a/epan/dissectors/packet-uma.c b/epan/dissectors/packet-uma.c index b9a11befb3..322c809449 100644 --- a/epan/dissectors/packet-uma.c +++ b/epan/dissectors/packet-uma.c @@ -1126,7 +1126,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) * using the GA-CSR protocol or the GA-RRC protocol between the MS and the core network. */ proto_tree_add_item(urr_ie_tree, hf_uma_urr_L3_protocol_discriminator, tvb, ie_offset, 1, FALSE); - proto_tree_add_item(urr_ie_tree, hf_uma_urr_L3_Message, tvb, ie_offset, ie_len, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_L3_Message, tvb, ie_offset, ie_len, ENC_NA); l3_tvb = tvb_new_subset(tvb, ie_offset,ie_len, ie_len ); if (!dissector_try_uint(bssap_pdu_type_table,BSSAP_PDU_TYPE_DTAP, l3_tvb, pinfo, urr_ie_tree)) call_dissector(data_handle, l3_tvb, pinfo, urr_ie_tree); @@ -1169,7 +1169,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) * HANDOVER TO UTRAN COMMAND message in [TS 25.331]. */ proto_tree_add_item(urr_ie_tree, hf_uma_urr_L3_protocol_discriminator, tvb, ie_offset, 1, FALSE); - proto_tree_add_item(urr_ie_tree, hf_uma_urr_L3_Message, tvb, ie_offset, ie_len, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_L3_Message, tvb, ie_offset, ie_len, ENC_NA); /* XXX the dissector to call should depend on the RAT type ??? */ l3_tvb = tvb_new_subset(tvb, ie_offset,ie_len, ie_len ); if (!dissector_try_uint(bssap_pdu_type_table,BSSAP_PDU_TYPE_DTAP, l3_tvb, pinfo, urr_ie_tree)) @@ -1238,7 +1238,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) * The rest of the IE is coded as in [GEOPRIV], not including IEI and length, if present * http://www.ietf.org/internet-drafts/draft-ietf-geopriv-dhcp-civil-05.txt */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_ap_location, tvb, ie_offset, ie_len, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_ap_location, tvb, ie_offset, ie_len, ENC_NA); break; case 43: /* 11.2.43 TU4001 Timer */ proto_tree_add_item(urr_ie_tree, hf_uma_urr_TU4001_timer, tvb, ie_offset, 2, FALSE); @@ -1250,10 +1250,10 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) proto_tree_add_item(urr_ie_tree, hf_uma_urr_cipher_res, tvb, ie_offset, 1, FALSE); break; case 46: /* Ciphering Command RAND */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_rand_val, tvb, ie_offset, ie_len, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_rand_val, tvb, ie_offset, ie_len, ENC_NA); break; case 47: /* Ciphering Command MAC (Message Authentication Code)*/ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_ciphering_command_mac, tvb, ie_offset, ie_len, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_ciphering_command_mac, tvb, ie_offset, ie_len, ENC_NA); break; case 48: /* Ciphering Key Sequence Number */ proto_tree_add_item(urr_ie_tree, hf_uma_urr_ciphering_key_seq_num, tvb, ie_offset, 1, FALSE); @@ -1298,7 +1298,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) /* 11.2.57 LLC-PDU * The rest of the IE is coded as in [TS 48.018], not including IEI and length, if present */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_LLC_PDU, tvb, ie_offset, ie_len, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_LLC_PDU, tvb, ie_offset, ie_len, ENC_NA); llc_tvb = tvb_new_subset(tvb, ie_offset,ie_len, ie_len ); if (llc_handle) { col_append_str(pinfo->cinfo, COL_PROTOCOL, "/"); @@ -1729,7 +1729,7 @@ dissect_uma(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_add_str(pinfo->cinfo, COL_INFO, val_to_str_ext(octet, &uma_urlc_msg_type_vals_ext, "Unknown URLC (%u)")); col_set_fence(pinfo->cinfo,COL_INFO); offset++; - proto_tree_add_item(uma_tree, hf_uma_urlc_TLLI, tvb, offset, 4, FALSE); + proto_tree_add_item(uma_tree, hf_uma_urlc_TLLI, tvb, offset, 4, ENC_NA); offset = offset + 3; while ((msg_len + 1) > offset ){ offset++; @@ -1787,9 +1787,9 @@ dissect_uma_urlc_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case 6: /* URLC-UFC-REQ */ case 7: /* URLC-DFC-REQ only allowed message types*/ offset++; - proto_tree_add_item(uma_tree, hf_uma_urlc_TLLI, tvb, offset, 4, FALSE); + proto_tree_add_item(uma_tree, hf_uma_urlc_TLLI, tvb, offset, 4, ENC_NA); offset = offset + 4; - proto_tree_add_item(uma_tree, hf_uma_urlc_seq_nr, tvb, offset, 2, FALSE); + proto_tree_add_item(uma_tree, hf_uma_urlc_seq_nr, tvb, offset, 2, ENC_NA); offset++; while (msg_len > offset){ offset++; diff --git a/epan/dissectors/packet-umts_fp.c b/epan/dissectors/packet-umts_fp.c index 2ef7c956a0..d6a412c6e4 100644 --- a/epan/dissectors/packet-umts_fp.c +++ b/epan/dissectors/packet-umts_fp.c @@ -551,7 +551,7 @@ static int dissect_tb_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (tree) { /* Add data subtree */ - tree_ti = proto_tree_add_item(tree, hf_fp_data, tvb, offset, -1, ENC_BIG_ENDIAN); + tree_ti = proto_tree_add_item(tree, hf_fp_data, tvb, offset, -1, ENC_NA); proto_item_set_text(tree_ti, "TB data for %u chans", p_fp_info->num_chans); data_tree = proto_item_add_subtree(tree_ti, ett_fp_data); } @@ -582,7 +582,7 @@ static int dissect_tb_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, ti = proto_tree_add_item(data_tree, hf_fp_tb, tvb, offset + (bit_offset/8), ((bit_offset % 8) + p_fp_info->chan_tf_size[chan] + 7) / 8, - ENC_BIG_ENDIAN); + ENC_NA); proto_item_set_text(ti, "TB (chan %u, tb %u, %u bits)", chan+1, n+1, p_fp_info->chan_tf_size[chan]); } @@ -641,7 +641,7 @@ static int dissect_macd_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree * /* Add data subtree */ if (tree) { - pdus_ti = proto_tree_add_item(tree, hf_fp_data, tvb, offset, -1, ENC_BIG_ENDIAN); + pdus_ti = proto_tree_add_item(tree, hf_fp_data, tvb, offset, -1, ENC_NA); proto_item_set_text(pdus_ti, "%u MAC-d PDUs of %u bits", number_of_pdus, length); data_tree = proto_item_add_subtree(pdus_ti, ett_fp_data); } @@ -662,7 +662,7 @@ static int dissect_macd_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree * pdu_ti = proto_tree_add_item(data_tree, hf_fp_mac_d_pdu, tvb, offset + (bit_offset/8), ((bit_offset % 8) + length + 7) / 8, - ENC_BIG_ENDIAN); + ENC_NA); proto_item_set_text(pdu_ti, "MAC-d PDU (PDU %u)", pdu+1); } if (preferences_call_mac_dissectors) { @@ -713,7 +713,7 @@ static int dissect_macd_pdu_data_type_2(tvbuff_t *tvb, packet_info *pinfo, proto /* Add data subtree */ if (tree) { - pdus_ti = proto_tree_add_item(tree, hf_fp_data, tvb, offset, -1, ENC_BIG_ENDIAN); + pdus_ti = proto_tree_add_item(tree, hf_fp_data, tvb, offset, -1, ENC_NA); proto_item_set_text(pdus_ti, "%u MAC-d PDUs of %u bytes", number_of_pdus, length); data_tree = proto_item_add_subtree(pdus_ti, ett_fp_data); } @@ -727,7 +727,7 @@ static int dissect_macd_pdu_data_type_2(tvbuff_t *tvb, packet_info *pinfo, proto if (data_tree) { pdu_ti = proto_tree_add_item(data_tree, hf_fp_mac_d_pdu, tvb, - offset, length, ENC_BIG_ENDIAN); + offset, length, ENC_NA); proto_item_set_text(pdu_ti, "MAC-d PDU (PDU %u)", pdu+1); if (preferences_call_mac_dissectors) { tvbuff_t *next_tvb = tvb_new_subset(tvb, offset, length, -1); @@ -766,7 +766,7 @@ static int dissect_crci_bits(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree /* Add CRCIs subtree */ if (tree) { - ti = proto_tree_add_item(tree, hf_fp_crcis, tvb, offset, (num_tbs+7)/8, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(tree, hf_fp_crcis, tvb, offset, (num_tbs+7)/8, ENC_NA); proto_item_set_text(ti, "CRCI bits for %u tbs", num_tbs); crcis_tree = proto_item_add_subtree(ti, ett_fp_crcis); } @@ -818,7 +818,7 @@ static void dissect_spare_extension_and_crc(tvbuff_t *tvb, packet_info *pinfo, if (remain > crc_size) { ti = proto_tree_add_item(tree, hf_fp_spare_extension, tvb, - offset, remain-crc_size, ENC_BIG_ENDIAN); + offset, remain-crc_size, ENC_NA); proto_item_append_text(ti, " (%u octets)", remain-crc_size); expert_add_info_format(pinfo, ti, PI_UNDECODED, PI_WARN, @@ -1068,7 +1068,7 @@ static int dissect_hsdpa_capacity_allocation(packet_info *pinfo, proto_tree *tre /* Calculated and show effective rate enabled */ if (credits == 2047) { - rate_ti = proto_tree_add_item(tree, hf_fp_hsdsch_unlimited_rate, tvb, 0, 0, ENC_BIG_ENDIAN); + rate_ti = proto_tree_add_item(tree, hf_fp_hsdsch_unlimited_rate, tvb, 0, 0, ENC_NA); PROTO_ITEM_SET_GENERATED(rate_ti); } else @@ -1154,7 +1154,7 @@ static int dissect_hsdpa_capacity_allocation_type_2(packet_info *pinfo, proto_tr /* Calculated and show effective rate enabled */ if (credits == 65535) { - rate_ti = proto_tree_add_item(tree, hf_fp_hsdsch_unlimited_rate, tvb, 0, 0, ENC_BIG_ENDIAN); + rate_ti = proto_tree_add_item(tree, hf_fp_hsdsch_unlimited_rate, tvb, 0, 0, ENC_NA); PROTO_ITEM_SET_GENERATED(rate_ti); } else @@ -1806,7 +1806,7 @@ static void dissect_pch_channel_info(tvbuff_t *tvb, packet_info *pinfo, proto_tr ti = proto_tree_add_item(tree, hf_fp_paging_indication_bitmap, tvb, offset, (p_fp_info->paging_indications+7) / 8, - ENC_BIG_ENDIAN); + ENC_NA); proto_item_append_text(ti, " (%u bits)", p_fp_info->paging_indications); offset += ((p_fp_info->paging_indications+7) / 8); } @@ -2562,7 +2562,7 @@ static void dissect_e_dch_channel_info(tvbuff_t *tvb, packet_info *pinfo, proto_ ti = proto_tree_add_item(subframe_tree, hf_fp_edch_mac_es_pdu, tvb, offset + (bit_offset/8), ((bit_offset % 8) + send_size + 7) / 8, - ENC_BIG_ENDIAN); + ENC_NA); proto_item_append_text(ti, " (%u * %u = %u bits, PDU %d)", size, subframes[n].number_of_mac_d_pdus[i], send_size, n); @@ -2585,7 +2585,7 @@ static void dissect_e_dch_channel_info(tvbuff_t *tvb, packet_info *pinfo, proto_ proto_tree_add_item(maces_tree, hf_fp_mac_d_pdu, tvb, offset + (bit_offset/8), ((bit_offset % 8) + size + 7) / 8, - ENC_BIG_ENDIAN); + ENC_NA); } bit_offset += size; } @@ -2826,7 +2826,7 @@ static void dissect_e_dch_t2_or_common_channel_info(tvbuff_t *tvb, packet_info * ti = proto_tree_add_item(macis_pdu_tree, hf_fp_edch_macis_sdu, tvb, offset, subframes[n].mac_is_length[pdu_no][sdu_no], - ENC_BIG_ENDIAN); + ENC_NA); proto_item_append_text(ti, " (%s Len=%u): %s", val_to_str_const(subframes[n].mac_is_lchid[pdu_no][sdu_no], lchid_vals, "Unknown"), subframes[n].mac_is_length[pdu_no][sdu_no], @@ -3249,7 +3249,7 @@ void dissect_fp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *release_tree; proto_item *temp_ti; - release_ti = proto_tree_add_item(fp_tree, hf_fp_release, tvb, 0, 0, ENC_BIG_ENDIAN); + release_ti = proto_tree_add_item(fp_tree, hf_fp_release, tvb, 0, 0, ENC_NA); PROTO_ITEM_SET_GENERATED(release_ti); proto_item_append_text(release_ti, " R%u (%d/%d)", p_fp_info->release, p_fp_info->release_year, p_fp_info->release_month); diff --git a/epan/dissectors/packet-usb-hid.c b/epan/dissectors/packet-usb-hid.c index a65c1da3bd..b6e35253dc 100644 --- a/epan/dissectors/packet-usb-hid.c +++ b/epan/dissectors/packet-usb-hid.c @@ -317,7 +317,7 @@ dissect_usb_hid_report_mainitem_data(packet_info *pinfo _U_, proto_tree *tree, t /* No item data */ break; default: - proto_tree_add_item(tree, hf_usb_hid_item_unk_data, tvb, offset, bSize, TRUE); + proto_tree_add_item(tree, hf_usb_hid_item_unk_data, tvb, offset, bSize, ENC_NA); break; } offset += bSize; @@ -379,7 +379,7 @@ dissect_usb_hid_report_globalitem_data(packet_info *pinfo _U_, proto_tree *tree, proto_tree_add_item(tree, hf_usb_hid_globalitem_pop, tvb, offset, bSize, TRUE); break; default: - proto_tree_add_item(tree, hf_usb_hid_item_unk_data, tvb, offset, bSize, TRUE); + proto_tree_add_item(tree, hf_usb_hid_item_unk_data, tvb, offset, bSize, ENC_NA); break; } offset += bSize; @@ -436,7 +436,7 @@ dissect_usb_hid_report_localitem_data(packet_info *pinfo _U_, proto_tree *tree, proto_tree_add_item(tree, hf_usb_hid_localitem_delimiter, tvb, offset, bSize, TRUE); break; default: - proto_tree_add_item(tree, hf_usb_hid_item_unk_data, tvb, offset, bSize, TRUE); + proto_tree_add_item(tree, hf_usb_hid_item_unk_data, tvb, offset, bSize, ENC_NA); break; } offset += bSize; @@ -505,7 +505,7 @@ dissect_usb_hid_report_item(packet_info *pinfo _U_, proto_tree *parent_tree, tvb offset++; proto_tree_add_item(subtree, hf_usb_hid_item_bLongItemTag, tvb, offset, 1, TRUE); offset++; - proto_tree_add_item(subtree, hf_usb_hid_item_unk_data, tvb, offset, bSize, TRUE); + proto_tree_add_item(subtree, hf_usb_hid_item_unk_data, tvb, offset, bSize, ENC_NA); offset += bSize; } else { /* Short item */ @@ -520,7 +520,7 @@ dissect_usb_hid_report_item(packet_info *pinfo _U_, proto_tree *parent_tree, tvb offset = dissect_usb_hid_report_localitem_data(pinfo, subtree, tvb, offset, bSize, bTag, &cur_global); break; default: /* Only USBHID_ITEMTYPE_LONG, but keep compiler happy */ - proto_tree_add_item(subtree, hf_usb_hid_item_unk_data, tvb, offset, bSize, TRUE); + proto_tree_add_item(subtree, hf_usb_hid_item_unk_data, tvb, offset, bSize, ENC_NA); offset += bSize; break; } diff --git a/epan/dissectors/packet-usb.c b/epan/dissectors/packet-usb.c index d94055c51c..a33f12b358 100644 --- a/epan/dissectors/packet-usb.c +++ b/epan/dissectors/packet-usb.c @@ -2293,7 +2293,7 @@ dissect_linux_usb_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent, * fully captured then show this data. */ if (!iso_status && iso_len && data_base + iso_off + iso_len <= tvb_length(tvb)) - proto_tree_add_item(tree, hf_usb_iso_data, tvb, data_base + iso_off, iso_len, TRUE); + proto_tree_add_item(tree, hf_usb_iso_data, tvb, data_base + iso_off, iso_len, ENC_NA); tvb_memcpy(tvb, (guint8 *)&iso_pad, offset, 4); proto_tree_add_uint(tree, hf_usb_iso_pad, tvb, offset, 4, iso_pad); @@ -2343,7 +2343,7 @@ dissect_linux_usb_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent, if (tvb_reported_length_remaining(tvb, offset) != 0) { /* There is leftover capture data to add (padding?) */ - proto_tree_add_item(tree, hf_usb_capdata, tvb, offset, -1, FALSE); + proto_tree_add_item(tree, hf_usb_capdata, tvb, offset, -1, ENC_NA); } } diff --git a/epan/dissectors/packet-v5ua.c b/epan/dissectors/packet-v5ua.c index 6a1bd73862..6829919f4c 100644 --- a/epan/dissectors/packet-v5ua.c +++ b/epan/dissectors/packet-v5ua.c @@ -413,7 +413,7 @@ dissect_diagnostic_information_parameter(tvbuff_t *parameter_tvb, proto_tree *pa guint16 diag_info_length; diag_info_length = tvb_get_ntohs(parameter_tvb, MGMT_ERROR_MSG_LENGTH_OFFSET) - MGMT_ERROR_MSG_HEADER_LENGTH; - proto_tree_add_item(parameter_tree, hf_diagnostic_info, parameter_tvb, PARAMETER_VALUE_OFFSET, diag_info_length, FALSE); + proto_tree_add_item(parameter_tree, hf_diagnostic_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")); } /*----------------------Error Indication (RFC)---------------------------------*/ @@ -573,7 +573,7 @@ dissect_heartbeat_data_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_ guint16 heartbeat_data_length; heartbeat_data_length = tvb_get_ntohs(parameter_tvb, HEARTBEAT_MSG_LENGTH_OFFSET) - HEARTBEAT_MSG_HEADER_LENGTH; - proto_tree_add_item(parameter_tree, hf_heartbeat_data, parameter_tvb, HEARTBEAT_DATA_OFFSET, heartbeat_data_length, FALSE); + 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")); } /*----------------------Heartbeat Data (RFC)-----------------------------------*/ @@ -840,7 +840,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, FALSE); + 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")); @@ -1038,7 +1038,7 @@ dissect_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *v5ua_ }; if (padding_length > 0){ - proto_tree_add_item(parameter_tree, hf_parameter_padding, parameter_tvb, PARAMETER_HEADER_OFFSET + length, padding_length, FALSE); + proto_tree_add_item(parameter_tree, hf_parameter_padding, parameter_tvb, PARAMETER_HEADER_OFFSET + length, padding_length, ENC_NA); } } /* dissect the V5UA-Parameters into subsets which are separated by Tag-Length-Header and call up the dissector for the subsets */ diff --git a/epan/dissectors/packet-vnc.c b/epan/dissectors/packet-vnc.c index a910655f8e..29503397f2 100644 --- a/epan/dissectors/packet-vnc.c +++ b/epan/dissectors/packet-vnc.c @@ -1068,7 +1068,7 @@ vnc_startup_messages(tvbuff_t *tvb, packet_info *pinfo, gint offset, col_set_str(pinfo->cinfo, COL_INFO, "Authentication challenge from server"); proto_tree_add_item(tree, hf_vnc_auth_challenge, tvb, - offset, 16, FALSE); + offset, 16, ENC_NA); per_conversation_info->vnc_next_state = VNC_SESSION_STATE_VNC_AUTHENTICATION_RESPONSE; @@ -1078,7 +1078,7 @@ vnc_startup_messages(tvbuff_t *tvb, packet_info *pinfo, gint offset, col_set_str(pinfo->cinfo, COL_INFO, "Authentication response from client"); proto_tree_add_item(tree, hf_vnc_auth_response, tvb, - offset, 16, FALSE); + offset, 16, ENC_NA); per_conversation_info->vnc_next_state = VNC_SESSION_STATE_SECURITY_RESULT; break; @@ -1180,7 +1180,7 @@ vnc_startup_messages(tvbuff_t *tvb, packet_info *pinfo, gint offset, offset += 1; proto_tree_add_item(tree, hf_vnc_padding, - tvb, offset, 3, FALSE); + tvb, offset, 3, ENC_NA); offset += 3; /* Skip over 3 bytes of padding */ if(tvb_length_remaining(tvb, offset) > 4) { @@ -1221,7 +1221,7 @@ vnc_startup_messages(tvbuff_t *tvb, packet_info *pinfo, gint offset, offset += 2; proto_tree_add_item(tree, hf_vnc_padding, tvb, offset, 2, - FALSE); + ENC_NA); offset += 2; offset = process_tight_capabilities(tree, @@ -1378,7 +1378,7 @@ vnc_client_set_pixel_format(tvbuff_t *tvb, packet_info *pinfo, gint *offset, col_set_str(pinfo->cinfo, COL_INFO, "Client set pixel format"); proto_tree_add_item(tree, hf_vnc_padding, tvb, *offset, - 3, FALSE); + 3, ENC_NA); *offset += 3; /* Skip over 3 bytes of padding */ proto_tree_add_item(tree, hf_vnc_client_bits_per_pixel, tvb, *offset, @@ -1425,7 +1425,7 @@ vnc_client_set_pixel_format(tvbuff_t *tvb, packet_info *pinfo, gint *offset, 1, FALSE); *offset += 1; - proto_tree_add_item(tree, hf_vnc_padding, tvb, *offset, 3, FALSE); + proto_tree_add_item(tree, hf_vnc_padding, tvb, *offset, 3, ENC_NA); *offset += 3; /* Skip over 3 bytes of padding */ } @@ -1445,7 +1445,7 @@ vnc_client_set_encodings(tvbuff_t *tvb, packet_info *pinfo, gint *offset, col_set_str(pinfo->cinfo, COL_INFO, "Client set encodings"); proto_tree_add_item(tree, hf_vnc_padding, - tvb, *offset, 1, FALSE); + tvb, *offset, 1, ENC_NA); *offset += 1; /* Skip over 1 byte of padding */ number_of_encodings = tvb_get_ntohs(tvb, *offset); @@ -1527,7 +1527,7 @@ vnc_client_key_event(tvbuff_t *tvb, packet_info *pinfo, gint *offset, proto_tree_add_item(tree, hf_vnc_key_down, tvb, *offset, 1, FALSE); *offset += 1; - proto_tree_add_item(tree, hf_vnc_padding, tvb, *offset, 2, FALSE); + proto_tree_add_item(tree, hf_vnc_padding, tvb, *offset, 2, ENC_NA); *offset += 2; /* Skip over 2 bytes of padding */ proto_tree_add_item(tree, hf_vnc_key, tvb, *offset, 4, FALSE); @@ -1567,7 +1567,7 @@ vnc_client_cut_text(tvbuff_t *tvb, packet_info *pinfo, gint *offset, col_set_str(pinfo->cinfo, COL_INFO, "Client cut text"); - proto_tree_add_item(tree, hf_vnc_padding, tvb, *offset, 3, FALSE); + proto_tree_add_item(tree, hf_vnc_padding, tvb, *offset, 3, ENC_NA); *offset += 3; /* Skip over 3 bytes of padding */ text_len = tvb_get_ntohl(tvb, *offset); @@ -1595,7 +1595,7 @@ vnc_server_framebuffer_update(tvbuff_t *tvb, packet_info *pinfo, gint *offset, col_set_str(pinfo->cinfo, COL_INFO, "Server framebuffer update"); - proto_tree_add_item(tree, hf_vnc_padding, tvb, *offset, 1, FALSE); + proto_tree_add_item(tree, hf_vnc_padding, tvb, *offset, 1, ENC_NA); *offset += 1; num_rects = tvb_get_ntohs(tvb, *offset); @@ -1787,7 +1787,7 @@ vnc_raw_encoding(tvbuff_t *tvb, packet_info *pinfo, gint *offset, VNC_BYTES_NEEDED(length); proto_tree_add_item(tree, hf_vnc_raw_pixel_data, tvb, *offset, - length, FALSE); + length, ENC_NA); *offset += length; return 0; /* bytes_needed */ @@ -1835,7 +1835,7 @@ vnc_rre_encoding(tvbuff_t *tvb, packet_info *pinfo, gint *offset, *offset += 2; VNC_BYTES_NEEDED(bytes_per_pixel); proto_tree_add_item(tree, hf_vnc_rre_bg_pixel, tvb, *offset, - bytes_per_pixel, FALSE); + bytes_per_pixel, ENC_NA); *offset += bytes_per_pixel; /* We know we need (at least) all these bytes, so ask for them now @@ -1851,7 +1851,7 @@ vnc_rre_encoding(tvbuff_t *tvb, packet_info *pinfo, gint *offset, proto_item_add_subtree(ti, ett_vnc_rre_subrect); proto_tree_add_item(subrect_tree, hf_vnc_rre_subrect_pixel, - tvb, *offset, bytes_per_pixel, FALSE); + tvb, *offset, bytes_per_pixel, ENC_NA); *offset += bytes_per_pixel; proto_tree_add_item(subrect_tree, hf_vnc_rre_subrect_x_pos, @@ -1934,7 +1934,7 @@ vnc_hextile_encoding(tvbuff_t *tvb, packet_info *pinfo, gint *offset, raw_length = tile_width * tile_height * bytes_per_pixel; proto_tree_add_item(tile_tree, hf_vnc_hextile_raw_value, tvb, - *offset, raw_length, FALSE); + *offset, raw_length, ENC_NA); VNC_BYTES_NEEDED(raw_length); *offset += raw_length; } else { @@ -1942,7 +1942,7 @@ vnc_hextile_encoding(tvbuff_t *tvb, packet_info *pinfo, gint *offset, VNC_BYTES_NEEDED(bytes_per_pixel); proto_tree_add_item(tile_tree, hf_vnc_hextile_bg_value, tvb, *offset, bytes_per_pixel, - FALSE); + ENC_NA); *offset += bytes_per_pixel; } @@ -1950,7 +1950,7 @@ vnc_hextile_encoding(tvbuff_t *tvb, packet_info *pinfo, gint *offset, VNC_BYTES_NEEDED(bytes_per_pixel); proto_tree_add_item(tile_tree, hf_vnc_hextile_fg_value, tvb, *offset, bytes_per_pixel, - FALSE); + ENC_NA); *offset += bytes_per_pixel; } @@ -1981,7 +1981,7 @@ vnc_hextile_encoding(tvbuff_t *tvb, packet_info *pinfo, gint *offset, if(subencoding_mask & 0x10) { /* Subrects Colored */ - proto_tree_add_item(subrect_tree, hf_vnc_hextile_subrect_pixel_value, tvb, *offset, bytes_per_pixel, FALSE); + proto_tree_add_item(subrect_tree, hf_vnc_hextile_subrect_pixel_value, tvb, *offset, bytes_per_pixel, ENC_NA); *offset += bytes_per_pixel; } @@ -2038,7 +2038,7 @@ vnc_zrle_encoding(tvbuff_t *tvb, packet_info *pinfo _U_, gint *offset, VNC_BYTES_NEEDED(data_len); proto_tree_add_item(tree, hf_vnc_zrle_data, tvb, *offset, - data_len, FALSE); + data_len, ENC_NA); #ifdef HAVE_LIBZ uncomp_tvb = tvb_child_uncompress(tvb, tvb, *offset, data_len); @@ -2072,7 +2072,7 @@ vnc_zrle_encoding(tvbuff_t *tvb, packet_info *pinfo _U_, gint *offset, proto_tree_add_item(zrle_subencoding_tree, hf_vnc_zrle_raw, uncomp_tvb, - uncomp_offset, length, FALSE); + uncomp_offset, length, ENC_NA); } else if(subencoding_type >= 130 && subencoding_type <= 255) { length = palette_size * bytes_per_cpixel; @@ -2080,7 +2080,7 @@ vnc_zrle_encoding(tvbuff_t *tvb, packet_info *pinfo _U_, gint *offset, proto_tree_add_item(zrle_subencoding_tree, hf_vnc_zrle_palette, uncomp_tvb, - uncomp_offset, length, FALSE); + uncomp_offset, length, ENC_NA); /* XXX - Not complete! */ } @@ -2337,11 +2337,11 @@ decode_cursor(tvbuff_t *tvb, gint *offset, proto_tree *tree, VNC_BYTES_NEEDED (total_bytes); proto_tree_add_item(tree, hf_vnc_cursor_encoding_pixels, tvb, *offset, - pixels_bytes, FALSE); + pixels_bytes, ENC_NA); *offset += pixels_bytes; proto_tree_add_item(tree, hf_vnc_cursor_encoding_bitmask, tvb, *offset, - mask_bytes, FALSE); + mask_bytes, ENC_NA); *offset += mask_bytes; return 0; /* bytes_needed */ @@ -2371,7 +2371,7 @@ vnc_x_cursor_encoding(tvbuff_t *tvb, packet_info *pinfo _U_, gint *offset, gint mask_bytes = bitmap_row_bytes * height; VNC_BYTES_NEEDED (6); - proto_tree_add_item(tree, hf_vnc_cursor_x_fore_back, tvb, *offset, 6, FALSE); + proto_tree_add_item(tree, hf_vnc_cursor_x_fore_back, tvb, *offset, 6, ENC_NA); *offset += 6; /* The length of the pixel data is the same as the length of the mask data (X cursors are strictly black/white) */ @@ -2394,7 +2394,7 @@ vnc_server_set_colormap_entries(tvbuff_t *tvb, packet_info *pinfo, gint *offset, number_of_colors = tvb_get_ntohs(tvb, 4); VNC_BYTES_NEEDED(3); - proto_tree_add_item(tree, hf_vnc_padding, tvb, *offset, 1, FALSE); + proto_tree_add_item(tree, hf_vnc_padding, tvb, *offset, 1, ENC_NA); *offset += 1; /* Skip over 1 byte of padding */ proto_tree_add_item(tree, hf_vnc_colormap_first_color, @@ -2420,7 +2420,7 @@ vnc_server_set_colormap_entries(tvbuff_t *tvb, packet_info *pinfo, gint *offset, *offset += 2; ti = proto_tree_add_item(tree, hf_vnc_color_groups, tvb, - *offset, number_of_colors * 6, FALSE); + *offset, number_of_colors * 6, ENC_NA); vnc_colormap_num_groups = proto_item_add_subtree(ti, ett_vnc_colormap_num_groups); diff --git a/epan/dissectors/packet-vtp.c b/epan/dissectors/packet-vtp.c index 169ea97ec7..554a1b075b 100644 --- a/epan/dissectors/packet-vtp.c +++ b/epan/dissectors/packet-vtp.c @@ -189,7 +189,7 @@ dissect_vtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 12; proto_tree_add_item(vtp_tree, hf_vtp_md5_digest, tvb, - offset, 16, FALSE); + offset, 16, ENC_NA); break; case SUBSET_ADVERT: diff --git a/epan/dissectors/packet-vuze-dht.c b/epan/dissectors/packet-vuze-dht.c index 0532c202d5..c9dda7f42c 100644 --- a/epan/dissectors/packet-vuze-dht.c +++ b/epan/dissectors/packet-vuze-dht.c @@ -379,13 +379,13 @@ dissect_vuze_dht_key(tvbuff_t *tvb, packet_info _U_*pinfo, proto_tree *tree, int guint key_len; key_len = tvb_get_guint8( tvb, offset ); - ti = proto_tree_add_item( tree, hf_vuze_dht_key, tvb, offset, key_len+1, FALSE ); + ti = proto_tree_add_item( tree, hf_vuze_dht_key, tvb, offset, key_len+1, ENC_NA ); sub_tree = proto_item_add_subtree(ti, ett_vuze_dht_key); proto_tree_add_item( sub_tree, hf_vuze_dht_key_len, tvb, offset, TL_BYTE, FALSE ); offset += TL_BYTE; - proto_tree_add_item( sub_tree, hf_vuze_dht_key_data, tvb, offset, key_len, FALSE ); + proto_tree_add_item( sub_tree, hf_vuze_dht_key_data, tvb, offset, key_len, ENC_NA ); proto_item_append_text( ti, ": %d bytes ( %s )", key_len, tvb_bytes_to_str(tvb, offset, key_len ) ); offset += key_len; @@ -435,7 +435,7 @@ dissect_vuze_dht_value(tvbuff_t *tvb, packet_info _U_*pinfo, proto_tree *tree, i proto_tree *sub_tree; int value_ver = -1; - ti = proto_tree_add_item( tree, hf_vuze_dht_value, tvb, offset, 0, FALSE ); + ti = proto_tree_add_item( tree, hf_vuze_dht_value, tvb, offset, 0, ENC_NA ); sub_tree = proto_item_add_subtree(ti, ett_vuze_dht_value); if( ver >= PV_REMOVE_DIST_ADD_VER ) { @@ -471,7 +471,7 @@ dissect_vuze_dht_value(tvbuff_t *tvb, packet_info _U_*pinfo, proto_tree *tree, i value_bytes_count = tvb_get_ntohs(tvb, offset); offset += TL_SHORT; - proto_tree_add_item(sub_tree, hf_vuze_dht_value_bytes, tvb, offset, value_bytes_count, FALSE); + proto_tree_add_item(sub_tree, hf_vuze_dht_value_bytes, tvb, offset, value_bytes_count, ENC_NA); proto_item_append_text( ti, ": %d bytes ( %s )", value_bytes_count, tvb_bytes_to_str(tvb, offset, value_bytes_count ) ); offset += value_bytes_count; @@ -547,7 +547,7 @@ dissect_vuze_dht_network_coordinate(tvbuff_t *tvb, packet_info _U_*pinfo, proto_ coordinate_size = tvb_get_guint8( tvb, offset+1 ); - ti = proto_tree_add_item( tree, hf_vuze_dht_network_coordinate, tvb, offset, coordinate_size+2, FALSE ); + ti = proto_tree_add_item( tree, hf_vuze_dht_network_coordinate, tvb, offset, coordinate_size+2, ENC_NA ); sub_tree = proto_item_add_subtree(ti, ett_vuze_dht_network_coordinate); proto_item_append_text( ti, ": type %d, length %d ( %s )", @@ -557,7 +557,7 @@ dissect_vuze_dht_network_coordinate(tvbuff_t *tvb, packet_info _U_*pinfo, proto_ offset += TL_BYTE; proto_tree_add_item( sub_tree, hf_vuze_dht_network_coordinate_size, tvb, offset, TL_BYTE, FALSE ); offset += TL_BYTE; - proto_tree_add_item( sub_tree, hf_vuze_dht_network_coordinate_data, tvb, offset, coordinate_size, FALSE ); + proto_tree_add_item( sub_tree, hf_vuze_dht_network_coordinate_data, tvb, offset, coordinate_size, ENC_NA ); offset += coordinate_size; return offset; @@ -766,7 +766,7 @@ dissect_vuze_dht_reply_store(tvbuff_t *tvb, packet_info _U_*pinfo, proto_tree *t diversifications_len = tvb_get_guint8( tvb, offset ); offset += TL_BYTE; - proto_tree_add_item(tree, hf_vuze_dht_diversifications, tvb, offset, diversifications_len, FALSE); + proto_tree_add_item(tree, hf_vuze_dht_diversifications, tvb, offset, diversifications_len, ENC_NA); offset += diversifications_len; } @@ -791,7 +791,7 @@ dissect_vuze_dht_request_find_node(tvbuff_t *tvb, packet_info _U_*pinfo, proto_t id_len = tvb_get_guint8( tvb, offset ); offset += TL_BYTE; - proto_tree_add_item(tree, hf_vuze_dht_id, tvb, offset, id_len, FALSE); + proto_tree_add_item(tree, hf_vuze_dht_id, tvb, offset, id_len, ENC_NA); offset += id_len; if( ver >= PV_MORE_NODE_STATUS ) @@ -963,14 +963,14 @@ dissect_vuze_dht_reply_error(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree key_block_request_len = tvb_get_guint8( tvb, offset ); offset += TL_BYTE; - proto_tree_add_item(tree, hf_vuze_dht_key_block_request, tvb, offset, key_block_request_len, FALSE); + proto_tree_add_item(tree, hf_vuze_dht_key_block_request, tvb, offset, key_block_request_len, ENC_NA); offset += key_block_request_len; proto_tree_add_item(tree, hf_vuze_dht_signature_len, tvb, offset, TL_SHORT, FALSE); signature_len = tvb_get_ntohs( tvb, offset ); offset += TL_SHORT; - proto_tree_add_item(tree, hf_vuze_dht_signature, tvb, offset, signature_len, FALSE); + proto_tree_add_item(tree, hf_vuze_dht_signature, tvb, offset, signature_len, ENC_NA); offset += signature_len; break; default: @@ -1003,14 +1003,14 @@ dissect_vuze_dht_request_key_block(tvbuff_t *tvb, packet_info _U_*pinfo, proto_t key_block_request_len = tvb_get_guint8( tvb, offset ); offset += TL_BYTE; - proto_tree_add_item(tree, hf_vuze_dht_key_block_request, tvb, offset, key_block_request_len, FALSE); + proto_tree_add_item(tree, hf_vuze_dht_key_block_request, tvb, offset, key_block_request_len, ENC_NA); offset += key_block_request_len; proto_tree_add_item(tree, hf_vuze_dht_signature_len, tvb, offset, TL_SHORT, FALSE); signature_len = tvb_get_ntohs( tvb, offset ); offset += TL_SHORT; - proto_tree_add_item(tree, hf_vuze_dht_signature, tvb, offset, signature_len, FALSE); + proto_tree_add_item(tree, hf_vuze_dht_signature, tvb, offset, signature_len, ENC_NA); offset += signature_len; return offset; diff --git a/epan/dissectors/packet-wai.c b/epan/dissectors/packet-wai.c index 3711148ac1..9f494281ce 100644 --- a/epan/dissectors/packet-wai.c +++ b/epan/dissectors/packet-wai.c @@ -264,48 +264,48 @@ dissect_flag(tvbuff_t *tvb, guint offset, proto_tree *tree) inline static void dissect_bkid(tvbuff_t *tvb, guint offset, proto_tree *tree) { - proto_tree_add_item(tree, hf_wai_bkid, tvb, offset, 16, FALSE); + proto_tree_add_item(tree, hf_wai_bkid, tvb, offset, 16, ENC_NA); } inline static void dissect_uskid(tvbuff_t *tvb, guint offset, proto_tree *tree) { - proto_tree_add_item(tree, hf_wai_uskid, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_wai_uskid, tvb, offset, 1, ENC_NA); } inline static void dissect_wie(tvbuff_t *tvb, guint offset, guint length, proto_tree *tree) { - proto_tree_add_item(tree, hf_wai_wie, tvb, offset, length, FALSE); + proto_tree_add_item(tree, hf_wai_wie, tvb, offset, length, ENC_NA); } inline static void dissect_message_auth_code(tvbuff_t *tvb, guint offset, proto_tree *tree) { - proto_tree_add_item(tree, hf_wai_message_auth_code, tvb, offset, 20, FALSE); + proto_tree_add_item(tree, hf_wai_message_auth_code, tvb, offset, 20, ENC_NA); } inline static void dissect_mskid(tvbuff_t *tvb, guint offset, proto_tree *tree) { - proto_tree_add_item(tree, hf_wai_mskid, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_wai_mskid, tvb, offset, 1, ENC_NA); } inline static void dissect_key_announcement_identifier(tvbuff_t *tvb, guint offset, proto_tree *tree) { - proto_tree_add_item(tree, hf_wai_key_ann_id, tvb, offset, 16, FALSE); + proto_tree_add_item(tree, hf_wai_key_ann_id, tvb, offset, 16, ENC_NA); } inline static void dissect_counter(tvbuff_t *tvb, guint offset, proto_tree *tree) { - proto_tree_add_item(tree, hf_wai_counter, tvb, offset, 16, FALSE); + proto_tree_add_item(tree, hf_wai_counter, tvb, offset, 16, ENC_NA); } inline static void dissect_authentication_id(tvbuff_t *tvb, guint offset, proto_tree *tree) { - proto_tree_add_item(tree, hf_wai_auth_id, tvb, offset, 32, FALSE); + proto_tree_add_item(tree, hf_wai_auth_id, tvb, offset, 32, ENC_NA); } static void @@ -331,12 +331,12 @@ dissect_identity(tvbuff_t * tvb, const guint16 offset, proto_tree * tree, length = tvb_get_ntohs(tvb, offset+2); - id_item = proto_tree_add_item(tree, hf_wai_identity, tvb, offset, length+4, FALSE); + id_item = proto_tree_add_item(tree, hf_wai_identity, tvb, offset, length+4, ENC_NA); id_tree = proto_item_add_subtree(id_item, ett_wai_identity); proto_item_set_text(id_item, "%sIdentity", ((label==NULL)?"":label)); proto_tree_add_item(id_tree, hf_wai_identity_id, tvb, offset, 2, FALSE); proto_tree_add_item(id_tree, hf_wai_identity_len, tvb, offset+2, 2, FALSE); - proto_tree_add_item(id_tree, hf_wai_identity_data, tvb, offset+4, length, FALSE); + proto_tree_add_item(id_tree, hf_wai_identity_data, tvb, offset+4, length, ENC_NA); return length + 4; } @@ -362,14 +362,14 @@ dissect_certificate(tvbuff_t * tvb, const gint offset, proto_tree * tree, length = tvb_get_ntohs(tvb, offset+2); - certificate_item = proto_tree_add_item(tree, hf_wai_cert, tvb, offset, length+4, FALSE); + certificate_item = proto_tree_add_item(tree, hf_wai_cert, tvb, offset, length+4, ENC_NA); proto_item_set_text(certificate_item, "%sCertificate", ((label==NULL)?"":label)); certificate_tree = proto_item_add_subtree(certificate_item, ett_wai_certificate); id_item = proto_tree_add_item(certificate_tree, hf_wai_cert_id, tvb, offset, 2, FALSE); proto_item_set_text(id_item, "Certificate Identifier: %s (%#x)", id_name, id); proto_tree_add_item(certificate_tree, hf_wai_cert_len, tvb, offset+2, 2, FALSE); - proto_tree_add_item(certificate_tree, hf_wai_cert_data, tvb, offset+4, length, FALSE); + proto_tree_add_item(certificate_tree, hf_wai_cert_data, tvb, offset+4, length, ENC_NA); return length + 4; } @@ -394,12 +394,12 @@ dissect_ecdh_parameter(tvbuff_t * tvb, const gint offset, proto_tree * tree) ecdh_len = tvb_get_ntohs(tvb, offset+1); - ecdh_item = proto_tree_add_item(tree, hf_wai_ecdh, tvb, offset, ecdh_len+3, FALSE); + ecdh_item = proto_tree_add_item(tree, hf_wai_ecdh, tvb, offset, ecdh_len+3, ENC_NA); ecdh_tree = proto_item_add_subtree(ecdh_item, ett_wai_ecdh_param); ecdh_id_item = proto_tree_add_item(ecdh_tree, hf_wai_ecdh_id, tvb, offset, 1, FALSE); proto_item_set_text(ecdh_id_item, "ID: %s (%#x)", id_name, ecdh_id); proto_tree_add_item(ecdh_tree, hf_wai_ecdh_len, tvb, offset+1, 2, FALSE); - proto_tree_add_item(ecdh_tree, hf_wai_ecdh_content, tvb, offset+3, ecdh_len, FALSE); + proto_tree_add_item(ecdh_tree, hf_wai_ecdh_content, tvb, offset+3, ecdh_len, ENC_NA); return ecdh_len + 3; } @@ -410,7 +410,7 @@ dissect_challenge(tvbuff_t *tvb, guint offset, proto_tree *tree, const gchar * c proto_item *challenge_item; const guint16 challenge_length = 32; - challenge_item = proto_tree_add_item(tree, hf_wai_challenge, tvb, offset, 32, FALSE); + challenge_item = proto_tree_add_item(tree, hf_wai_challenge, tvb, offset, 32, ENC_NA); proto_item_append_text(challenge_item, "(%schallenge)", ((label==NULL)?"":label)); return challenge_length; @@ -425,13 +425,13 @@ dissect_key_data(tvbuff_t *tvb, guint offset, proto_tree *tree, const gchar *con length = tvb_get_guint8(tvb, offset); - key_data_item = proto_tree_add_item(tree, hf_wai_key_data, tvb, offset, length+1, FALSE); + key_data_item = proto_tree_add_item(tree, hf_wai_key_data, tvb, offset, length+1, ENC_NA); proto_item_set_text(key_data_item, "%sKey Data", ((label==NULL)?"":label)); key_data_tree = proto_item_add_subtree(key_data_item, ett_wai_key_data); proto_tree_add_item(key_data_tree, hf_wai_key_data_len, tvb, offset, 1, FALSE); if (length > 0) { - proto_tree_add_item(key_data_tree, hf_wai_key_data_content, tvb, offset+1, length, FALSE); + proto_tree_add_item(key_data_tree, hf_wai_key_data_content, tvb, offset+1, length, ENC_NA); } return length + 1; @@ -447,16 +447,16 @@ dissect_multiple_certificate(tvbuff_t * tvb, guint offset, proto_tree *tree) guint length; length = tvb_get_ntohs(tvb, offset+1); - multicert_item = proto_tree_add_item(tree, hf_wai_cert_ver, tvb, offset, length+3, FALSE); + multicert_item = proto_tree_add_item(tree, hf_wai_cert_ver, tvb, offset, length+3, ENC_NA); multicert_tree = proto_item_add_subtree(multicert_item, ett_wai_certificate_verification); proto_tree_add_item(multicert_tree, hf_wai_type, tvb, offset, 1, FALSE); offset++; proto_tree_add_item(multicert_tree, hf_wai_length, tvb, offset, 2, FALSE); offset += 2; - nonce_1_item = proto_tree_add_item(multicert_tree, hf_wai_nonce, tvb, offset, 32, FALSE); + nonce_1_item = proto_tree_add_item(multicert_tree, hf_wai_nonce, tvb, offset, 32, ENC_NA); offset += 32; proto_item_append_text(nonce_1_item, " 1"); - nonce_2_item = proto_tree_add_item(multicert_tree, hf_wai_nonce, tvb, offset, 32, FALSE); + nonce_2_item = proto_tree_add_item(multicert_tree, hf_wai_nonce, tvb, offset, 32, ENC_NA); offset += 32; proto_item_append_text(nonce_2_item, " 2"); proto_tree_add_item(multicert_tree, hf_wai_ver_res, tvb, offset, 1, FALSE); @@ -479,7 +479,7 @@ dissect_identity_list(tvbuff_t *tvb, guint offset, proto_tree *tree) guint16 i; length = tvb_get_ntohs(tvb, offset+1); - id_list_item = proto_tree_add_item(tree, hf_wai_identity_list, tvb, offset, length+3, FALSE); + id_list_item = proto_tree_add_item(tree, hf_wai_identity_list, tvb, offset, length+3, ENC_NA); id_list_tree = proto_item_add_subtree(id_list_item, ett_wai_identity_list); proto_tree_add_item(id_list_tree, hf_wai_type, tvb, offset, 1, FALSE); offset++; @@ -517,7 +517,7 @@ dissect_signature_algorithm(tvbuff_t *tvb, guint offset, proto_tree *tree) length = tvb_get_ntohs(tvb, offset); - sa_item = proto_tree_add_item(tree, hf_wai_sign_alg, tvb, offset, length+2, FALSE); + sa_item = proto_tree_add_item(tree, hf_wai_sign_alg, tvb, offset, length+2, ENC_NA); sa_tree = proto_item_add_subtree(sa_item, ett_wai_sign_alg); proto_tree_add_item(sa_tree, hf_wai_length, tvb, offset, 2, FALSE); @@ -540,13 +540,13 @@ dissect_signature_algorithm(tvbuff_t *tvb, guint offset, proto_tree *tree) offset += 1; param_len = tvb_get_ntohs(tvb, offset+1); - param_item = proto_tree_add_item(sa_tree, hf_wai_param, tvb, offset, param_len+3, FALSE); + param_item = proto_tree_add_item(sa_tree, hf_wai_param, tvb, offset, param_len+3, ENC_NA); param_tree = proto_item_add_subtree(param_item, ett_wai_parameter); - proto_tree_add_item(param_tree, hf_wai_param_id, tvb, offset, 1, FALSE); + proto_tree_add_item(param_tree, hf_wai_param_id, tvb, offset, 1, ENC_NA); offset += 1; proto_tree_add_item(param_tree, hf_wai_length, tvb, offset, 2, FALSE); offset += 2; - proto_tree_add_item(param_tree, hf_wai_param_content, tvb, offset, param_len, FALSE); + proto_tree_add_item(param_tree, hf_wai_param_content, tvb, offset, param_len, ENC_NA); return length + 2; } @@ -560,13 +560,13 @@ dissect_signature_value(tvbuff_t *tvb, guint offset, proto_tree *tree) length = tvb_get_ntohs(tvb, offset); - sv_item = proto_tree_add_item(tree, hf_wai_sign_val, tvb, offset, length+2, FALSE); + sv_item = proto_tree_add_item(tree, hf_wai_sign_val, tvb, offset, length+2, ENC_NA); sv_tree = proto_item_add_subtree(sv_item, ett_wai_sign_val); proto_tree_add_item(sv_tree, hf_wai_length, tvb, offset, 2, FALSE); offset += 2; - proto_tree_add_item(sv_tree, hf_wai_sign_content, tvb, offset, length, FALSE); + proto_tree_add_item(sv_tree, hf_wai_sign_content, tvb, offset, length, ENC_NA); return length + 2; } @@ -580,7 +580,7 @@ dissect_signature(tvbuff_t *tvb, guint offset, proto_tree *tree, const gchar *co length = tvb_get_ntohs(tvb, offset+1); - ss_item = proto_tree_add_item(tree, hf_wai_sign, tvb, offset, length+3, FALSE); + ss_item = proto_tree_add_item(tree, hf_wai_sign, tvb, offset, length+3, ENC_NA); proto_item_set_text(ss_item, "%s", (label==NULL)?"Signature":label); ss_tree = proto_item_add_subtree(ss_item, ett_wai_sign); @@ -605,7 +605,7 @@ dissect_wai_data(tvbuff_t *tvb, proto_tree *tree, guint8 subtype, guint16 length proto_tree *data_tree; const gchar *type_name; - data_item = proto_tree_add_item(tree, hf_wai_data, tvb, 0, length, FALSE); + data_item = proto_tree_add_item(tree, hf_wai_data, tvb, 0, length, ENC_NA); data_tree = proto_item_add_subtree (data_item, ett_wai_data); type_name = val_to_str_const(subtype, wai_subtype_names, "Unknown type"); @@ -787,7 +787,7 @@ dissect_wai_data(tvbuff_t *tvb, proto_tree *tree, guint8 subtype, guint16 length offset += 1; dissect_addid(tvb, offset, data_tree); offset += 12; - proto_tree_add_item(data_tree, hf_wai_data_pack_num, tvb, offset, 16, FALSE); + proto_tree_add_item(data_tree, hf_wai_data_pack_num, tvb, offset, 16, ENC_NA); offset += 16; dissect_key_announcement_identifier(tvb, offset, data_tree); offset += 16; diff --git a/epan/dissectors/packet-wassp.c b/epan/dissectors/packet-wassp.c index 315fd63214..222f9ab05b 100644 --- a/epan/dissectors/packet-wassp.c +++ b/epan/dissectors/packet-wassp.c @@ -879,7 +879,7 @@ dissect_tlv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *wassp_tree, tvb, offset, tlv_length, ENC_BIG_ENDIAN); } else { proto_tree_add_item(tlv_tree, hf_wassp_tlv_data, - tvb, offset, tlv_length, ENC_BIG_ENDIAN); + tvb, offset, tlv_length, ENC_NA); } if ( type_index != -1 && value_array[type_index].specialfunction ) { guint32 newoffset; diff --git a/epan/dissectors/packet-who.c b/epan/dissectors/packet-who.c index 0559fb2755..636d2bf409 100644 --- a/epan/dissectors/packet-who.c +++ b/epan/dissectors/packet-who.c @@ -196,7 +196,7 @@ dissect_whoent(tvbuff_t *tvb, int offset, proto_tree *tree) while (tvb_reported_length_remaining(tvb, line_offset) > 0 && whoent_num < MAX_NUM_WHOENTS) { whoent_ti = proto_tree_add_item(tree, hf_who_whoent, tvb, - line_offset, SIZE_OF_WHOENT, FALSE); + line_offset, SIZE_OF_WHOENT, ENC_NA); whoent_tree = proto_item_add_subtree(whoent_ti, ett_whoent); tvb_get_nstringz0(tvb, line_offset, sizeof(out_line), (guint8*)out_line); diff --git a/epan/dissectors/packet-wifi-p2p.c b/epan/dissectors/packet-wifi-p2p.c index 027d2e9497..48d2096a18 100644 --- a/epan/dissectors/packet-wifi-p2p.c +++ b/epan/dissectors/packet-wifi-p2p.c @@ -500,7 +500,7 @@ static void dissect_channel_list(proto_item *tlv_root, tvbuff_t *tvb, s_offset++; proto_tree_add_item(tlv_root, hf_p2p_attr_channel_list_chan, tvb, - s_offset, num_chan, FALSE); + s_offset, num_chan, ENC_NA); s_offset += num_chan; } } @@ -553,11 +553,11 @@ static void dissect_wifi_p2p_device_info(packet_info *pinfo, s_offset += 2; proto_tree_add_item(tlv_root, hf_p2p_attr_dev_info_pri_dev_type, tvb, - s_offset, 8, FALSE); + s_offset, 8, ENC_NA); proto_tree_add_item(tlv_root, hf_p2p_attr_dev_info_pri_dev_type_category, tvb, s_offset, 2, FALSE); proto_tree_add_item(tlv_root, hf_p2p_attr_dev_info_pri_dev_type_oui, - tvb, s_offset + 2, 4, FALSE); + tvb, s_offset + 2, 4, ENC_NA); proto_tree_add_item(tlv_root, hf_p2p_attr_dev_info_pri_dev_type_subcategory, tvb, s_offset + 6, 2, FALSE); s_offset += 8; @@ -569,7 +569,7 @@ static void dissect_wifi_p2p_device_info(packet_info *pinfo, while (num_sec > 0) { proto_tree_add_item(tlv_root, hf_p2p_attr_dev_info_sec_dev_type, - tvb, s_offset, 8, FALSE); + tvb, s_offset, 8, ENC_NA); s_offset += 8; num_sec--; } @@ -780,11 +780,11 @@ static void dissect_wifi_p2p_group_info(packet_info *pinfo, s_offset += 2; proto_tree_add_item(tlv_root, hf_p2p_attr_gi_pri_dev_type, tvb, - s_offset, 8, FALSE); + s_offset, 8, ENC_NA); proto_tree_add_item(tlv_root, hf_p2p_attr_gi_pri_dev_type_category, tvb, s_offset, 2, FALSE); proto_tree_add_item(tlv_root, hf_p2p_attr_gi_pri_dev_type_oui, - tvb, s_offset + 2, 4, FALSE); + tvb, s_offset + 2, 4, ENC_NA); proto_tree_add_item(tlv_root, hf_p2p_attr_gi_pri_dev_type_subcategory, tvb, s_offset + 6, 2, FALSE); s_offset += 8; @@ -801,7 +801,7 @@ static void dissect_wifi_p2p_group_info(packet_info *pinfo, } while (num_sec > 0) { proto_tree_add_item(tlv_root, hf_p2p_attr_gi_sec_dev_type, - tvb, s_offset, 8, FALSE); + tvb, s_offset, 8, ENC_NA); s_offset += 8; num_sec--; } @@ -1032,12 +1032,12 @@ void dissect_wifi_p2p_anqp(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, offset + 1, 1, FALSE); if (request) { proto_tree_add_item(tlv, hf_p2p_anqp_query_data, tvb, - offset + 2, len - 2, FALSE); + offset + 2, len - 2, ENC_NA); } else { proto_tree_add_item(tlv, hf_p2p_anqp_status_code, tvb, offset + 2, 1, FALSE); proto_tree_add_item(tlv, hf_p2p_anqp_response_data, tvb, - offset + 3, len - 3, FALSE); + offset + 3, len - 3, ENC_NA); } offset += len; } diff --git a/epan/dissectors/packet-wlccp.c b/epan/dissectors/packet-wlccp.c index 8e84bc85c4..9783274f27 100644 --- a/epan/dissectors/packet-wlccp.c +++ b/epan/dissectors/packet-wlccp.c @@ -1364,7 +1364,7 @@ handle things. To be investigated further */ if (_aaa_msg_type == 0x2) /*EAPOL*/ { _ti = proto_tree_add_item(_tree, hf_wlccp_eapol_msg, - _tvb, _offset, 6, ENC_BIG_ENDIAN); + _tvb, _offset, 6, ENC_NA); _wlccp_eapol_msg_tree = proto_item_add_subtree( _ti, ett_wlccp_eapol_msg_tree); @@ -1392,7 +1392,7 @@ handle things. To be investigated further */ _offset += 2; proto_tree_add_item(_wlccp_eapol_msg_tree, hf_wlccp_eap_msg, - _tvb, _offset, _eap_msg_length, ENC_BIG_ENDIAN); + _tvb, _offset, _eap_msg_length, ENC_NA); _offset += _eap_msg_length; } /* if _eapol_type == 0 */ @@ -1402,7 +1402,7 @@ handle things. To be investigated further */ if (_aaa_msg_type == 0x3) /*Cisco proprietary message*/ { proto_tree_add_item(_tree, hf_wlccp_cisco_acctg_msg, - _tvb, _offset, -1, ENC_BIG_ENDIAN); + _tvb, _offset, -1, ENC_NA); } /* if aaa_msg_type == 0x3 */ break; @@ -1707,7 +1707,7 @@ static guint dissect_wlccp_nm_msg(proto_tree *_tree, tvbuff_t *_tvb, guint _offs _offset += 3; /*kan - skip some apparently unused bytes */ _ti = proto_tree_add_item(_tree, hf_wlccp_ap_node_id, - _tvb, _offset, 8, ENC_BIG_ENDIAN); + _tvb, _offset, 8, ENC_NA); _wlccp_ap_node_id_tree = proto_item_add_subtree( _ti, ett_wlccp_ap_node_id); @@ -1846,7 +1846,7 @@ static guint dissect_wlccp_tlvs( proto_tree *_tree, tvbuff_t *_tvb, guint _offse _tlv_end = _offset + _length; /* this TLV is _length bytes long */ - _ti = proto_tree_add_item(_tree, hf_wlccp_tlv, _tvb, _offset, _length, ENC_BIG_ENDIAN); + _ti = proto_tree_add_item(_tree, hf_wlccp_tlv, _tvb, _offset, _length, ENC_NA); /* create the TLV sub tree */ _tlv_tree = proto_item_add_subtree(_ti, ett_wlccp_tlv_tree); @@ -2052,7 +2052,7 @@ static guint dissect_wlccp_ccm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off case 0x00: /* NULL TLV */ { proto_item_append_text(_ti, " NULL TLV"); - proto_tree_add_item(_tree, hf_wlccp_null_tlv , _tvb, _offset, _length, ENC_BIG_ENDIAN); + proto_tree_add_item(_tree, hf_wlccp_null_tlv , _tvb, _offset, _length, ENC_NA); _offset += _length; break; @@ -2076,7 +2076,7 @@ static guint dissect_wlccp_ccm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off /* for unknown types, just add them to the tree as a blob */ proto_item_append_text(_ti, " Unknown"); - proto_tree_add_item(_tree, hf_wlccp_tlv_unknown_value, _tvb, _offset, _length, ENC_BIG_ENDIAN); + proto_tree_add_item(_tree, hf_wlccp_tlv_unknown_value, _tvb, _offset, _length, ENC_NA); _offset += _length; break; @@ -2140,7 +2140,7 @@ static guint dissect_wlccp_sec_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off proto_tree_add_item(_tree, hf_wlccp_key_mgmt_type, _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; - proto_tree_add_item(_tree, hf_wlccp_nonce, _tvb, _offset, 32, ENC_BIG_ENDIAN); + proto_tree_add_item(_tree, hf_wlccp_nonce, _tvb, _offset, 32, ENC_NA); _offset += 32; break; @@ -2173,7 +2173,7 @@ static guint dissect_wlccp_sec_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off proto_tree_add_item(_tree, hf_wlccp_status, _tvb, _offset, 1, ENC_BIG_ENDIAN); _offset += 1; - proto_tree_add_item(_tree, hf_wlccp_nonce, _tvb, _offset, 32, ENC_BIG_ENDIAN); + proto_tree_add_item(_tree, hf_wlccp_nonce, _tvb, _offset, 32, ENC_NA); _offset += 32; break; @@ -2193,7 +2193,7 @@ static guint dissect_wlccp_sec_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off _mic_length = tvb_get_ntohs(_tvb,_offset); _offset += 2; - proto_tree_add_item(_tree, hf_wlccp_mic_value, _tvb, _offset, _mic_length, ENC_BIG_ENDIAN); + proto_tree_add_item(_tree, hf_wlccp_mic_value, _tvb, _offset, _mic_length, ENC_NA); _offset += _mic_length; break; @@ -2220,7 +2220,7 @@ static guint dissect_wlccp_sec_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off proto_tree_add_item(_tree, hf_wlccp_supp_node_id, _tvb, _offset, 6, ENC_BIG_ENDIAN); _offset += 6; - proto_tree_add_item(_tree, hf_wlccp_nonce, _tvb, _offset, 32, ENC_BIG_ENDIAN); + proto_tree_add_item(_tree, hf_wlccp_nonce, _tvb, _offset, 32, ENC_NA); _offset += 32; proto_tree_add_item(_tree, hf_wlccp_session_timeout, _tvb, _offset, 4, ENC_BIG_ENDIAN); @@ -2235,7 +2235,7 @@ static guint dissect_wlccp_sec_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off { /* for unknown types, just add them to the tree as a blob */ proto_item_append_text(_ti, " Unknown"); - proto_tree_add_item(_tree, hf_wlccp_tlv_unknown_value, _tvb, _offset, _length, ENC_BIG_ENDIAN); + proto_tree_add_item(_tree, hf_wlccp_tlv_unknown_value, _tvb, _offset, _length, ENC_NA); _offset += _length; break; @@ -2381,7 +2381,7 @@ static guint dissect_wlccp_rrm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off if (_arraylen > 0) { - _fr_ti = proto_tree_add_item(_tree, hf_framereport_elements, _tvb, _offset, (_length-10), ENC_BIG_ENDIAN); + _fr_ti = proto_tree_add_item(_tree, hf_framereport_elements, _tvb, _offset, (_length-10), ENC_NA); _fr_elems_tree = proto_item_add_subtree(_fr_ti, ett_framereport_elements_tree); for(_counter=0; _counter < _arraylen; _counter++) @@ -2503,7 +2503,7 @@ static guint dissect_wlccp_rrm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off _rpi_density_length = _length - 6 - 4; - proto_tree_add_item(_tree, hf_wlccp_rpidensity, _tvb, _offset, _rpi_density_length, ENC_BIG_ENDIAN); + proto_tree_add_item(_tree, hf_wlccp_rpidensity, _tvb, _offset, _rpi_density_length, ENC_NA); _offset += _rpi_density_length; break; @@ -2624,7 +2624,7 @@ static guint dissect_wlccp_rrm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off _tlv80211length = _length - 13 - 4; /* This TLV could be decoded per the 802.11 information element spec's */ - proto_tree_add_item(_tree, hf_wlccp_tlv80211, _tvb, _offset, _tlv80211length, ENC_BIG_ENDIAN); + proto_tree_add_item(_tree, hf_wlccp_tlv80211, _tvb, _offset, _tlv80211length, ENC_NA); _offset += _tlv80211length; break; @@ -2775,7 +2775,7 @@ static guint dissect_wlccp_rrm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off /* for unknown types, just add them to the tree as a blob */ proto_item_append_text(_ti, " Unknown"); - proto_tree_add_item(_tree, hf_wlccp_tlv_unknown_value, _tvb, _offset, _length, ENC_BIG_ENDIAN); + proto_tree_add_item(_tree, hf_wlccp_tlv_unknown_value, _tvb, _offset, _length, ENC_NA); _offset += _length; break; @@ -2798,7 +2798,7 @@ static guint dissect_wlccp_qos_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off /* for unknown types, just add them to the tree as a blob */ proto_item_append_text(_ti, " Unknown"); - proto_tree_add_item(_tree, hf_wlccp_tlv_unknown_value, _tvb, _offset, _length, ENC_BIG_ENDIAN); + proto_tree_add_item(_tree, hf_wlccp_tlv_unknown_value, _tvb, _offset, _length, ENC_NA); _offset += _length; break; @@ -2999,7 +2999,7 @@ static guint dissect_wlccp_nm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _offs /* for unknown types, just add them to the tree as a blob */ proto_item_append_text(_ti, " Unknown"); - proto_tree_add_item(_tree, hf_wlccp_tlv_unknown_value, _tvb, _offset, _length, ENC_BIG_ENDIAN); + proto_tree_add_item(_tree, hf_wlccp_tlv_unknown_value, _tvb, _offset, _length, ENC_NA); _offset += _length; break; @@ -3024,7 +3024,7 @@ static guint dissect_wlccp_mip_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off /* for unknown types, just add them to the tree as a blob */ proto_item_append_text(_ti, " Unknown"); - proto_tree_add_item(_tree, hf_wlccp_tlv_unknown_value, _tvb, _offset, _length, ENC_BIG_ENDIAN); + proto_tree_add_item(_tree, hf_wlccp_tlv_unknown_value, _tvb, _offset, _length, ENC_NA); _offset += _length; break; diff --git a/epan/dissectors/packet-wol.c b/epan/dissectors/packet-wol.c index 5e26eaa61c..1392c70ea2 100644 --- a/epan/dissectors/packet-wol.c +++ b/epan/dissectors/packet-wol.c @@ -253,7 +253,7 @@ dissect_wol(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) wol_tree = proto_item_add_subtree(ti, ett_wol); /* add an item to the subtree, see section 1.6 for more information */ - proto_tree_add_item(wol_tree, hf_wol_sync, tvb, 0, 6, FALSE); + proto_tree_add_item(wol_tree, hf_wol_sync, tvb, 0, 6, ENC_NA); /* Continue adding tree items to process the packet here */ mti = proto_tree_add_text(wol_tree, tvb, 6, 96, "MAC: %s (%s)", diff --git a/epan/dissectors/packet-wow.c b/epan/dissectors/packet-wow.c index 06cf4b1232..5d09ddc08a 100644 --- a/epan/dissectors/packet-wow.c +++ b/epan/dissectors/packet-wow.c @@ -302,7 +302,7 @@ dissect_wow_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 1; /* Unknown field */ proto_tree_add_item(wow_tree, hf_wow_srp_b, tvb, - offset, 32, TRUE); + offset, 32, ENC_NA); offset += 32; proto_tree_add_item(wow_tree, hf_wow_srp_g_len, @@ -311,7 +311,7 @@ dissect_wow_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 1; proto_tree_add_item(wow_tree, hf_wow_srp_g, tvb, - offset, srp_g_len, TRUE); + offset, srp_g_len, ENC_NA); offset += srp_g_len; proto_tree_add_item(wow_tree, hf_wow_srp_n_len, @@ -320,11 +320,11 @@ dissect_wow_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 1; proto_tree_add_item(wow_tree, hf_wow_srp_n, tvb, - offset, srp_n_len, TRUE); + offset, srp_n_len, ENC_NA); offset += srp_n_len; proto_tree_add_item(wow_tree, hf_wow_srp_s, tvb, - offset, 32, TRUE); + offset, 32, ENC_NA); offset += 32; offset += 16; /* Unknown field */ @@ -336,15 +336,15 @@ dissect_wow_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(WOW_CLIENT_TO_SERVER) { proto_tree_add_item(wow_tree, hf_wow_srp_a, tvb, - offset, 32, TRUE); + offset, 32, ENC_NA); offset += 32; proto_tree_add_item(wow_tree, hf_wow_srp_m1, - tvb, offset, 20, TRUE); + tvb, offset, 20, ENC_NA); offset += 20; proto_tree_add_item(wow_tree, hf_wow_crc_hash, - tvb, offset, 20, TRUE); + tvb, offset, 20, ENC_NA); offset += 20; proto_tree_add_item(wow_tree, hf_wow_num_keys, @@ -359,7 +359,7 @@ dissect_wow_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 1; proto_tree_add_item(wow_tree, hf_wow_srp_m2, - tvb, offset, 20, TRUE); + tvb, offset, 20, ENC_NA); offset += 20; offset += 4; /* Unknown field */ diff --git a/epan/dissectors/packet-wps.c b/epan/dissectors/packet-wps.c index 98b7c8bc99..255bd5aa8f 100644 --- a/epan/dissectors/packet-wps.c +++ b/epan/dissectors/packet-wps.c @@ -810,7 +810,7 @@ static void add_wps_wfa_ext(guint8 id, proto_tree *tree, tvbuff_t *tvb, break; case WPS_WFA_EXT_AUTHORIZEDMACS: proto_tree_add_item(elem, hf_eapwps_wfa_ext_authorizedmacs, - tvb, offset, size, FALSE); + tvb, offset, size, ENC_NA); break; case WPS_WFA_EXT_NETWORK_KEY_SHAREABLE: val8 = tvb_get_guint8(tvb, offset); @@ -942,7 +942,7 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, break; case WPS_TLV_TYPE_AUTHENTICATOR: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_authenticator, tvb, offset+4, 8, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_authenticator, tvb, offset+4, 8, ENC_NA); hfindex = hf_eapwps_tlv_authenticator; proto_item_append_text(tmp_item, " (1st 64 bits of HMAC)"); @@ -1027,7 +1027,7 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, case WPS_TLV_TYPE_E_HASH1: /* assert tlv_len == 32 */ - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_e_hash1, tvb, offset+4, 32, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_e_hash1, tvb, offset+4, 32, ENC_NA); hfindex = hf_eapwps_tlv_e_hash1; if (tlv_len != 32 && pinfo) expert_add_info_format(pinfo, tmp_item, PI_MALFORMED, PI_ERROR, fmt_length_warn, 32); @@ -1036,7 +1036,7 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, case WPS_TLV_TYPE_E_HASH2: /* assert tlv_len == 32 */ - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_e_hash2, tvb, offset+4, 32, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_e_hash2, tvb, offset+4, 32, ENC_NA); hfindex = hf_eapwps_tlv_e_hash2; if (tlv_len != 32 && pinfo) expert_add_info_format(pinfo, tmp_item, PI_MALFORMED, PI_ERROR, fmt_length_warn, 32); @@ -1045,7 +1045,7 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, case WPS_TLV_TYPE_E_SNONCE1: /* assert tlv_len == 16 */ - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_e_snonce1, tvb, offset+4, 16, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_e_snonce1, tvb, offset+4, 16, ENC_NA); hfindex = hf_eapwps_tlv_e_snonce1; if (tlv_len != 16 && pinfo) expert_add_info_format(pinfo, tmp_item, PI_MALFORMED, PI_ERROR, fmt_length_warn, 16); @@ -1053,7 +1053,7 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, break; case WPS_TLV_TYPE_E_SNONCE2: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_e_snonce2, tvb, offset+4, 16, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_e_snonce2, tvb, offset+4, 16, ENC_NA); hfindex = hf_eapwps_tlv_e_snonce2; if (tlv_len != 16 && pinfo) expert_add_info_format(pinfo, tmp_item, PI_MALFORMED, PI_ERROR, fmt_length_warn, 16); @@ -1085,7 +1085,7 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, case WPS_TLV_TYPE_ENROLLEE_NONCE: /* assert tlv_len == 16 */ - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_enrollee_nonce, tvb, offset+4, 16, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_enrollee_nonce, tvb, offset+4, 16, ENC_NA); hfindex = hf_eapwps_tlv_enrollee_nonce; if (tlv_len != 16 && pinfo) expert_add_info_format(pinfo, tmp_item, PI_MALFORMED, PI_ERROR, fmt_length_warn, 16); @@ -1114,13 +1114,13 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, break; case WPS_TLV_TYPE_KEY_WRAP_AUTHENTICATOR: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_key_wrap_authenticator, tvb, offset+4, 8, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_key_wrap_authenticator, tvb, offset+4, 8, ENC_NA); hfindex = hf_eapwps_tlv_key_wrap_authenticator; break; case WPS_TLV_TYPE_KEY_IDENTIFIER: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_key_identifier, tvb, offset+4, 16, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_key_identifier, tvb, offset+4, 16, ENC_NA); hfindex = hf_eapwps_tlv_key_identifier; break; @@ -1175,7 +1175,7 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, case WPS_TLV_TYPE_NETWORK_KEY: /* check tlv_len <= 64 byte */ - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_network_key, tvb, offset+4, tlv_len, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_network_key, tvb, offset+4, tlv_len, ENC_NA); hfindex = hf_eapwps_tlv_network_key; if (tlv_len > 64 && pinfo) expert_add_info_format(pinfo, tmp_item, PI_MALFORMED, PI_ERROR, fmt_warn_too_long, tlv_len); @@ -1190,7 +1190,7 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, case WPS_TLV_TYPE_NEW_DEVICE_NAME: /* check tlv_len <= 32 byte */ - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_new_device_name, tvb, offset+4, tlv_len, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_new_device_name, tvb, offset+4, tlv_len, ENC_NA); hfindex = hf_eapwps_tlv_new_device_name; if (tlv_len > 32 && pinfo) expert_add_info_format(pinfo, tmp_item, PI_MALFORMED, PI_ERROR, fmt_warn_too_long, tlv_len); @@ -1199,7 +1199,7 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, case WPS_TLV_TYPE_NEW_PASSWORD: /* check tlv_len <= 64 byte */ - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_new_password, tvb, offset+4, tlv_len, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_new_password, tvb, offset+4, tlv_len, ENC_NA); hfindex = hf_eapwps_tlv_new_password; if (tlv_len > 64 && pinfo) expert_add_info_format(pinfo, tmp_item, PI_MALFORMED, PI_ERROR, fmt_warn_too_long, tlv_len); @@ -1208,7 +1208,7 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, case WPS_TLV_TYPE_OOB_DEVICE_PASSWORD: /* check tlv_len <= 56 byte */ - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_oob_device_password, tvb, offset+4, tlv_len, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_oob_device_password, tvb, offset+4, tlv_len, ENC_NA); hfindex = hf_eapwps_tlv_oob_device_password; if (tlv_len > 56 && pinfo) expert_add_info_format(pinfo, tmp_item, PI_MALFORMED, PI_ERROR, fmt_warn_too_long, tlv_len); @@ -1241,7 +1241,7 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, case WPS_TLV_TYPE_PUBLIC_KEY: /* check tlv_len == 192 byte */ - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_public_key, tvb, offset+4, 192, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_public_key, tvb, offset+4, 192, ENC_NA); hfindex = hf_eapwps_tlv_public_key; if (tlv_len != 192 && pinfo) expert_add_info_format(pinfo, tmp_item, PI_MALFORMED, PI_ERROR, fmt_length_warn, 192); @@ -1276,7 +1276,7 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, /* NYI: list is */ /* - 16 bytes uuid */ /* - NULL-Terminated device name string */ - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_registrar_list, tvb, offset+4, tlv_len, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_registrar_list, tvb, offset+4, tlv_len, ENC_NA); hfindex = hf_eapwps_tlv_registrar_list; break; @@ -1288,7 +1288,7 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, break; case WPS_TLV_TYPE_REGISTRAR_NONCE: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_registrar_nonce, tvb, offset+4, 16, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_registrar_nonce, tvb, offset+4, 16, ENC_NA); hfindex = hf_eapwps_tlv_registrar_nonce; break; @@ -1312,25 +1312,25 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, break; case WPS_TLV_TYPE_R_HASH1: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_r_hash1, tvb, offset+4, 32, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_r_hash1, tvb, offset+4, 32, ENC_NA); hfindex = hf_eapwps_tlv_r_hash1; break; case WPS_TLV_TYPE_R_HASH2: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_r_hash2, tvb, offset+4, 32, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_r_hash2, tvb, offset+4, 32, ENC_NA); hfindex = hf_eapwps_tlv_r_hash2; break; case WPS_TLV_TYPE_R_SNONCE1: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_r_snonce1, tvb, offset+4, 16, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_r_snonce1, tvb, offset+4, 16, ENC_NA); hfindex = hf_eapwps_tlv_r_snonce1; break; case WPS_TLV_TYPE_R_SNONCE2: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_r_snonce2, tvb, offset+4, 16, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_r_snonce2, tvb, offset+4, 16, ENC_NA); hfindex = hf_eapwps_tlv_r_snonce2; break; @@ -1372,7 +1372,7 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, break; case WPS_TLV_TYPE_UUID_E: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_uuid_e, tvb, offset+4, tlv_len, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_uuid_e, tvb, offset+4, tlv_len, ENC_NA); hfindex = hf_eapwps_tlv_uuid_e; if (tlv_len > 16 && pinfo) expert_add_info_format(pinfo, tmp_item, PI_MALFORMED, PI_ERROR, fmt_warn_too_long, tlv_len); @@ -1380,7 +1380,7 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, break; case WPS_TLV_TYPE_UUID_R: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_uuid_r, tvb, offset+4, tlv_len, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_uuid_r, tvb, offset+4, tlv_len, ENC_NA); hfindex = hf_eapwps_tlv_uuid_r; if (tlv_len > 16 && pinfo) expert_add_info_format(pinfo, tmp_item, PI_MALFORMED, PI_ERROR, fmt_warn_too_long, tlv_len); @@ -1388,7 +1388,7 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, break; case WPS_TLV_TYPE_VENDOR_EXTENSION: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_vendor_extension, tvb, offset+4, tlv_len, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_vendor_extension, tvb, offset+4, tlv_len, ENC_NA); hfindex = hf_eapwps_tlv_vendor_extension; break; @@ -1400,20 +1400,20 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, break; case WPS_TLV_TYPE_X509_CERTIFICATE_REQUEST: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_x509_certificate_request, tvb, offset+4, tlv_len, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_x509_certificate_request, tvb, offset+4, tlv_len, ENC_NA); hfindex = hf_eapwps_tlv_x509_certificate_request; break; case WPS_TLV_TYPE_X509_CERTIFICATE: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_x509_certificate, tvb, offset+4, tlv_len, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_x509_certificate, tvb, offset+4, tlv_len, ENC_NA); hfindex = hf_eapwps_tlv_x509_certificate; break; case WPS_TLV_TYPE_EAP_IDENTITY: /* check tlv_len <= 64 byte */ - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_eap_identity, tvb, offset+4, tlv_len, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_eap_identity, tvb, offset+4, tlv_len, ENC_NA); hfindex = hf_eapwps_tlv_eap_identity; if (tlv_len > 64 && pinfo) expert_add_info_format(pinfo, tmp_item, PI_MALFORMED, PI_ERROR, fmt_warn_too_long, tlv_len); @@ -1427,13 +1427,13 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, break; case WPS_TLV_TYPE_PUBLIC_KEY_HASH: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_public_key_hash, tvb, offset+4, 20, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_public_key_hash, tvb, offset+4, 20, ENC_NA); hfindex = hf_eapwps_tlv_public_key_hash; break; case WPS_TLV_TYPE_REKEY_KEY: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_rekey_key, tvb, offset+4, 32, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_rekey_key, tvb, offset+4, 32, ENC_NA); hfindex = hf_eapwps_tlv_rekey_key; break; @@ -1461,7 +1461,7 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, break; case WPS_TLV_TYPE_PRIMARY_DEVICE_TYPE: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_primary_device_type, tvb, offset+4, 8, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_primary_device_type, tvb, offset+4, 8, ENC_NA); hfindex = hf_eapwps_tlv_primary_device_type; if (tvb_get_ntohl(tvb, offset+6) == WFA_OUI) { guint16 dev_cat = tvb_get_ntohs(tvb, offset+4); @@ -1475,7 +1475,7 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, case WPS_TLV_TYPE_SECONDARY_DEVICE_TYPE_LIST: /* check tlv_len <= 128 byte */ - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_secondary_device_type_list, tvb, offset+4, tlv_len, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_secondary_device_type_list, tvb, offset+4, tlv_len, ENC_NA); hfindex = hf_eapwps_tlv_secondary_device_type_list; if (tlv_len > 128 && pinfo) expert_add_info_format(pinfo, tmp_item, PI_MALFORMED, PI_ERROR, fmt_warn_too_long, tlv_len); @@ -1496,7 +1496,7 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, case WPS_TLV_TYPE_APPLICATION_EXTENSION: /* check tlv_len <= 512 byte */ - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_application_extension, tvb, offset+4, tlv_len, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_application_extension, tvb, offset+4, tlv_len, ENC_NA); hfindex = hf_eapwps_tlv_application_extension; if (tlv_len > 512 && pinfo) expert_add_info_format(pinfo, tmp_item, PI_MALFORMED, PI_ERROR, fmt_warn_too_long, tlv_len); @@ -1505,7 +1505,7 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, case WPS_TLV_TYPE_EAP_TYPE: /* check tlv_len <= 8 byte */ - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_eap_type, tvb, offset+4, tlv_len, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_eap_type, tvb, offset+4, tlv_len, ENC_NA); hfindex = hf_eapwps_tlv_eap_type; if (tlv_len > 8 && pinfo) expert_add_info_format(pinfo, tmp_item, PI_MALFORMED, PI_ERROR, fmt_warn_too_long, tlv_len); @@ -1513,7 +1513,7 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, break; case WPS_TLV_TYPE_INITIALIZATION_VECTOR: - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_initialization_vector, tvb, offset+4, 32, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_initialization_vector, tvb, offset+4, 32, ENC_NA); hfindex = hf_eapwps_tlv_initialization_vector; break; @@ -1532,7 +1532,7 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, case WPS_TLV_TYPE_APPSESSIONKEY: /* check tlv_len <= 128 byte */ - tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_appsessionkey, tvb, offset+4, tlv_len, FALSE); + tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_appsessionkey, tvb, offset+4, tlv_len, ENC_NA); hfindex = hf_eapwps_tlv_appsessionkey; if (tlv_len > 128 && pinfo) expert_add_info_format(pinfo, tmp_item, PI_MALFORMED, PI_ERROR, fmt_warn_too_long, tlv_len); @@ -1548,7 +1548,7 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, case WPS_TLV_TYPE_REQUESTED_DEV_TYPE: tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_requested_dev_type, tvb, - offset + 4, 8, FALSE); + offset + 4, 8, ENC_NA); hfindex = hf_eapwps_tlv_requested_dev_type; break; diff --git a/epan/dissectors/packet-xmcp.c b/epan/dissectors/packet-xmcp.c index f0841b7735..4b36051d37 100644 --- a/epan/dissectors/packet-xmcp.c +++ b/epan/dissectors/packet-xmcp.c @@ -437,7 +437,7 @@ decode_xmcp_attr_value (proto_tree *attr_tree, guint16 attr_type, break; case XMCP_MESSAGE_INTEGRITY: proto_tree_add_item(attr_tree, xmcp_attr_message_integrity, tvb, offset, - attr_length, FALSE); + attr_length, ENC_NA); /* Message-integrity should be the last attribute in the message */ if ((guint)(offset + get_xmcp_attr_padded_len(attr_length)) < tvb_reported_length(tvb)) { expert_add_info_format(pinfo, attr_tree, PI_PROTOCOL, PI_WARN, @@ -626,7 +626,7 @@ decode_xmcp_attr_value (proto_tree *attr_tree, guint16 attr_type, */ if (attr_length < 1) break; - proto_tree_add_item(attr_tree, xmcp_attr_reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(attr_tree, xmcp_attr_reserved, tvb, offset, 1, ENC_NA); if (attr_length < 2) break; proto_tree_add_item(attr_tree, xmcp_attr_servtrans_family, tvb, @@ -678,7 +678,7 @@ decode_xmcp_attr_value (proto_tree *attr_tree, guint16 attr_type, /* Three bytes of padding followed by a 1-byte protocol number */ if (attr_length < 4) break; - proto_tree_add_item(attr_tree, xmcp_attr_reserved, tvb, offset, 3, FALSE); + proto_tree_add_item(attr_tree, xmcp_attr_reserved, tvb, offset, 3, ENC_NA); proto_tree_add_item(attr_tree, xmcp_attr_service_protocol, tvb, (offset+3), 1, FALSE); xmcp_service_protocol = tvb_get_guint8(tvb, (offset+3)); @@ -767,7 +767,7 @@ decode_xmcp_attr_value (proto_tree *attr_tree, guint16 attr_type, break; case XMCP_SERVICE_DATA: proto_tree_add_item(attr_tree, xmcp_attr_service_data, tvb, offset, - attr_length, FALSE); + attr_length, ENC_NA); if (attr_length > 0) { tvbuff_t *next_tvb; guint8 *test_string, *tok; @@ -822,14 +822,14 @@ decode_xmcp_attr_value (proto_tree *attr_tree, guint16 attr_type, break; default: proto_tree_add_item(attr_tree, xmcp_attr_value, tvb, offset, - attr_length, FALSE); + attr_length, ENC_NA); expert_add_info_format(pinfo, attr_tree, PI_PROTOCOL, PI_NOTE, "Unrecognized attribute type 0x%x", attr_type); break; } if (attr_length % 4 != 0) { proto_tree_add_item(attr_tree, xmcp_attr_padding, tvb, (offset+attr_length), - (4 - (attr_length % 4)), FALSE); + (4 - (attr_length % 4)), ENC_NA); } if (attr_length < get_xmcp_attr_min_len(attr_type)) { expert_add_info_format(pinfo, attr_tree, PI_PROTOCOL, PI_WARN, @@ -980,7 +980,7 @@ dissect_xmcp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } /* ...and a 12-byte transaction id */ - ti = proto_tree_add_item(xmcp_tree, hf_xmcp_id, tvb, 8, 12, FALSE); + ti = proto_tree_add_item(xmcp_tree, hf_xmcp_id, tvb, 8, 12, ENC_NA); /* Print state tracking in the tree */ if (xmcp_msg_type_class == XMCP_CLASS_REQUEST) { @@ -1014,7 +1014,7 @@ dissect_xmcp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* The header is then followed by "msg_length" bytes of TLV attributes */ if (msg_length > 0) { ti = proto_tree_add_item(xmcp_tree, hf_xmcp_attributes, tvb, - XMCP_HDR_LEN, msg_length, FALSE); + XMCP_HDR_LEN, msg_length, ENC_NA); attr_all_tree = proto_item_add_subtree(ti, ett_xmcp_attr_all); offset = XMCP_HDR_LEN; diff --git a/epan/dissectors/packet-yppasswd.c b/epan/dissectors/packet-yppasswd.c index ad4865268a..3f42449cac 100644 --- a/epan/dissectors/packet-yppasswd.c +++ b/epan/dissectors/packet-yppasswd.c @@ -57,7 +57,7 @@ dissect_yppasswd_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_t offset, NULL); lock_item = proto_tree_add_item(tree, hf_yppasswd_newpw, tvb, - offset, -1, FALSE); + offset, -1, ENC_NA); lock_tree = proto_item_add_subtree(lock_item, ett_yppasswd_newpw); diff --git a/epan/dissectors/packet-ypserv.c b/epan/dissectors/packet-ypserv.c index fd8fc483d2..fca5ba5de0 100644 --- a/epan/dissectors/packet-ypserv.c +++ b/epan/dissectors/packet-ypserv.c @@ -337,7 +337,7 @@ dissect_xfr_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree * if(tree){ sub_item = proto_tree_add_item(tree, hf_ypserv_map_parms, tvb, - offset, -1, FALSE); + offset, -1, ENC_NA); if(sub_item) sub_tree = proto_item_add_subtree(sub_item, ett_ypserv_map_parms); } diff --git a/epan/dissectors/packet-zbee-aps.c b/epan/dissectors/packet-zbee-aps.c index 793e05ce5d..79c7f95198 100644 --- a/epan/dissectors/packet-zbee-aps.c +++ b/epan/dissectors/packet-zbee-aps.c @@ -1093,7 +1093,7 @@ dissect_zbee_aps_skke_challenge(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre /* Get and display the SKKE data. */ if (tree) { - proto_tree_add_item(tree, hf_zbee_aps_cmd_challenge, tvb, offset, ZBEE_APS_CMD_SKKE_DATA_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_zbee_aps_cmd_challenge, tvb, offset, ZBEE_APS_CMD_SKKE_DATA_LENGTH, ENC_NA); } offset += ZBEE_APS_CMD_SKKE_DATA_LENGTH; @@ -1135,7 +1135,7 @@ dissect_zbee_aps_skke_data(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr /* Get and display the SKKE data. */ if (tree) { - proto_tree_add_item(tree, hf_zbee_aps_cmd_mac, tvb, offset, ZBEE_APS_CMD_SKKE_DATA_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_zbee_aps_cmd_mac, tvb, offset, ZBEE_APS_CMD_SKKE_DATA_LENGTH, ENC_NA); } offset += ZBEE_APS_CMD_SKKE_DATA_LENGTH; @@ -1181,7 +1181,7 @@ dissect_zbee_aps_transport_key(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree key[i] = tvb_get_guint8(tvb, offset+i); } /* for */ if (tree) { - proto_tree_add_item(tree, hf_zbee_aps_cmd_key, tvb, offset, ZBEE_APS_CMD_KEY_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_zbee_aps_cmd_key, tvb, offset, ZBEE_APS_CMD_KEY_LENGTH, ENC_NA); } offset += ZBEE_APS_CMD_KEY_LENGTH; @@ -1480,7 +1480,7 @@ dissect_zbee_aps_auth_challenge(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre /* Get and display the challenge. */ if (tree) { - proto_tree_add_item(tree, hf_zbee_aps_cmd_challenge, tvb, offset, ZBEE_APS_CMD_EA_CHALLENGE_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_zbee_aps_cmd_challenge, tvb, offset, ZBEE_APS_CMD_EA_CHALLENGE_LENGTH, ENC_NA); } offset += ZBEE_APS_CMD_EA_CHALLENGE_LENGTH; @@ -1510,7 +1510,7 @@ dissect_zbee_aps_auth_data(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr /* Display the MAC. */ if (tree) { - proto_tree_add_item(tree, hf_zbee_aps_cmd_mac, tvb, offset, ZBEE_APS_CMD_EA_MAC_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_zbee_aps_cmd_mac, tvb, offset, ZBEE_APS_CMD_EA_MAC_LENGTH, ENC_NA); } offset += ZBEE_APS_CMD_EA_MAC_LENGTH; @@ -1529,7 +1529,7 @@ dissect_zbee_aps_auth_data(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr /* Display the data field. */ if (tree) { - proto_tree_add_item(tree, hf_zbee_aps_cmd_ea_data, tvb, offset, ZBEE_APS_CMD_EA_DATA_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_zbee_aps_cmd_ea_data, tvb, offset, ZBEE_APS_CMD_EA_DATA_LENGTH, ENC_NA); } offset += ZBEE_APS_CMD_EA_DATA_LENGTH; diff --git a/epan/dissectors/packet-zbee-security.c b/epan/dissectors/packet-zbee-security.c index 213134ee2f..8e757695ed 100644 --- a/epan/dissectors/packet-zbee-security.c +++ b/epan/dissectors/packet-zbee-security.c @@ -587,7 +587,7 @@ dissect_zbee_secure(tvbuff_t *tvb, packet_info *pinfo, proto_tree* tree, guint o /* Display the MIC. */ if (tree) { proto_tree_add_item(sec_tree, hf_zbee_sec_mic, tvb, (gint)(tvb_length(tvb)-mic_len), - mic_len, ENC_BIG_ENDIAN); + mic_len, ENC_NA); } } diff --git a/epan/dissectors/packet-zrtp.c b/epan/dissectors/packet-zrtp.c index f8c71c8fb9..1da61867f1 100644 --- a/epan/dissectors/packet-zrtp.c +++ b/epan/dissectors/packet-zrtp.c @@ -518,7 +518,7 @@ dissect_GoClear(tvbuff_t *tvb, packet_info *pinfo, proto_tree *zrtp_tree) { /* Now we should clear the SRT(C)P session... */ - proto_tree_add_item(zrtp_tree,hf_zrtp_msg_hmac,tvb,data_offset+0,8,ENC_BIG_ENDIAN); + proto_tree_add_item(zrtp_tree,hf_zrtp_msg_hmac,tvb,data_offset+0,8,ENC_NA); } static void @@ -537,8 +537,8 @@ dissect_Confirm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *zrtp_tree,int par col_add_fstr(pinfo->cinfo, COL_INFO, (part == 1) ? "Confirm1 Packet" : "Confirm2 Packet"); - proto_tree_add_item(zrtp_tree,hf_zrtp_msg_hmac,tvb,data_offset+0,8,ENC_BIG_ENDIAN); - proto_tree_add_item(zrtp_tree,hf_zrtp_msg_cfb,tvb,data_offset+8,16,ENC_BIG_ENDIAN); + proto_tree_add_item(zrtp_tree,hf_zrtp_msg_hmac,tvb,data_offset+0,8,ENC_NA); + proto_tree_add_item(zrtp_tree,hf_zrtp_msg_cfb,tvb,data_offset+8,16,ENC_NA); linelen = tvb_reported_length_remaining(tvb,data_offset+24); proto_tree_add_protocol_format(zrtp_tree,proto_zrtp,tvb,data_offset+24,linelen-4,"Encrypted Data"); } @@ -550,8 +550,8 @@ dissect_SASrelay(tvbuff_t *tvb, packet_info *pinfo, proto_tree *zrtp_tree) { col_set_str(pinfo->cinfo, COL_INFO, "SASrelay Packet"); - proto_tree_add_item(zrtp_tree,hf_zrtp_msg_hmac,tvb,data_offset+0,8,ENC_BIG_ENDIAN); - proto_tree_add_item(zrtp_tree,hf_zrtp_msg_cfb,tvb,data_offset+8,16,ENC_BIG_ENDIAN); + proto_tree_add_item(zrtp_tree,hf_zrtp_msg_hmac,tvb,data_offset+0,8,ENC_NA); + proto_tree_add_item(zrtp_tree,hf_zrtp_msg_cfb,tvb,data_offset+8,16,ENC_NA); linelen = tvb_reported_length_remaining(tvb,data_offset+24); proto_tree_add_protocol_format(zrtp_tree,proto_zrtp,tvb,data_offset+24,linelen-4,"Encrypted Data"); } @@ -564,15 +564,15 @@ dissect_DHPart(tvbuff_t *tvb, packet_info *pinfo, proto_tree *zrtp_tree,int part col_add_fstr(pinfo->cinfo, COL_INFO, (part == 1) ? "DHPart1 Packet" : "DHPart2 Packet"); - proto_tree_add_item(zrtp_tree,hf_zrtp_msg_hash_image,tvb,msg_offset+12,32,ENC_BIG_ENDIAN); - proto_tree_add_item(zrtp_tree,hf_zrtp_msg_rs1ID,tvb,data_offset+0,8,ENC_BIG_ENDIAN); - proto_tree_add_item(zrtp_tree,hf_zrtp_msg_rs2ID,tvb,data_offset+8,8,ENC_BIG_ENDIAN); - proto_tree_add_item(zrtp_tree,hf_zrtp_msg_auxs,tvb,data_offset+16,8,ENC_BIG_ENDIAN); - proto_tree_add_item(zrtp_tree,hf_zrtp_msg_pbxs,tvb,data_offset+24,8,ENC_BIG_ENDIAN); + proto_tree_add_item(zrtp_tree,hf_zrtp_msg_hash_image,tvb,msg_offset+12,32,ENC_NA); + proto_tree_add_item(zrtp_tree,hf_zrtp_msg_rs1ID,tvb,data_offset+0,8,ENC_NA); + proto_tree_add_item(zrtp_tree,hf_zrtp_msg_rs2ID,tvb,data_offset+8,8,ENC_NA); + proto_tree_add_item(zrtp_tree,hf_zrtp_msg_auxs,tvb,data_offset+16,8,ENC_NA); + proto_tree_add_item(zrtp_tree,hf_zrtp_msg_pbxs,tvb,data_offset+24,8,ENC_NA); linelen = tvb_reported_length_remaining(tvb,data_offset+32); pvr_len = linelen-8-4; proto_tree_add_protocol_format(zrtp_tree,proto_zrtp,tvb,data_offset+32,pvr_len,(part==1)?"pvr Data":"pvi Data"); - proto_tree_add_item(zrtp_tree,hf_zrtp_msg_hmac,tvb,data_offset+32+pvr_len,8,ENC_BIG_ENDIAN); + proto_tree_add_item(zrtp_tree,hf_zrtp_msg_hmac,tvb,data_offset+32+pvr_len,8,ENC_NA); } static void @@ -590,9 +590,9 @@ dissect_Commit(tvbuff_t *tvb, packet_info *pinfo, proto_tree *zrtp_tree) { col_set_str(pinfo->cinfo, COL_INFO, "Commit Packet"); - proto_tree_add_item(zrtp_tree,hf_zrtp_msg_hash_image,tvb,msg_offset+12,32,ENC_BIG_ENDIAN); + proto_tree_add_item(zrtp_tree,hf_zrtp_msg_hash_image,tvb,msg_offset+12,32,ENC_NA); /* ZID */ - proto_tree_add_item(zrtp_tree,hf_zrtp_msg_zid,tvb,data_offset+0,12,ENC_BIG_ENDIAN); + proto_tree_add_item(zrtp_tree,hf_zrtp_msg_zid,tvb,data_offset+0,12,ENC_NA); tvb_memcpy(tvb,(void *)value,data_offset+12,4); value[4]='\0'; proto_tree_add_string_format(zrtp_tree,hf_zrtp_msg_hash,tvb,data_offset+12,4,value, @@ -624,25 +624,25 @@ dissect_Commit(tvbuff_t *tvb, packet_info *pinfo, proto_tree *zrtp_tree) { case 1: /* Mult */ - proto_tree_add_item(zrtp_tree,hf_zrtp_msg_nonce,tvb,data_offset+32,16,ENC_BIG_ENDIAN); + proto_tree_add_item(zrtp_tree,hf_zrtp_msg_nonce,tvb,data_offset+32,16,ENC_NA); offset = 48; break; case 2: /* Prsh */ - proto_tree_add_item(zrtp_tree,hf_zrtp_msg_nonce,tvb,data_offset+32,16,ENC_BIG_ENDIAN); - proto_tree_add_item(zrtp_tree,hf_zrtp_msg_key_id,tvb,data_offset+48,8,ENC_BIG_ENDIAN); + proto_tree_add_item(zrtp_tree,hf_zrtp_msg_nonce,tvb,data_offset+32,16,ENC_NA); + proto_tree_add_item(zrtp_tree,hf_zrtp_msg_key_id,tvb,data_offset+48,8,ENC_NA); offset = 56; break; default: /* other */ - proto_tree_add_item(zrtp_tree,hf_zrtp_msg_hvi,tvb,data_offset+32, 32, ENC_BIG_ENDIAN); + proto_tree_add_item(zrtp_tree,hf_zrtp_msg_hvi,tvb,data_offset+32, 32, ENC_NA); offset = 64; break; } - proto_tree_add_item(zrtp_tree,hf_zrtp_msg_hmac,tvb,data_offset+offset,8,ENC_BIG_ENDIAN); + proto_tree_add_item(zrtp_tree,hf_zrtp_msg_hmac,tvb,data_offset+offset,8,ENC_NA); } static void @@ -668,8 +668,8 @@ dissect_Hello(tvbuff_t *tvb, packet_info *pinfo, proto_tree *zrtp_tree) { } proto_tree_add_item(zrtp_tree,hf_zrtp_msg_version,tvb,msg_offset+12,4,ENC_BIG_ENDIAN); proto_tree_add_item(zrtp_tree,hf_zrtp_msg_client_id,tvb,msg_offset+16,16,ENC_BIG_ENDIAN); - proto_tree_add_item(zrtp_tree,hf_zrtp_msg_hash_image,tvb,msg_offset+32,32,ENC_BIG_ENDIAN); - proto_tree_add_item(zrtp_tree,hf_zrtp_msg_zid,tvb,msg_offset+64,12,ENC_BIG_ENDIAN); + proto_tree_add_item(zrtp_tree,hf_zrtp_msg_hash_image,tvb,msg_offset+32,32,ENC_NA); + proto_tree_add_item(zrtp_tree,hf_zrtp_msg_zid,tvb,msg_offset+64,12,ENC_NA); proto_tree_add_item(zrtp_tree,hf_zrtp_msg_sigcap,tvb,data_offset+0,1,ENC_BIG_ENDIAN); proto_tree_add_item(zrtp_tree,hf_zrtp_msg_mitm,tvb,data_offset+0,1,ENC_BIG_ENDIAN); proto_tree_add_item(zrtp_tree,hf_zrtp_msg_passive,tvb,data_offset+0,1,ENC_BIG_ENDIAN); @@ -737,7 +737,7 @@ dissect_Hello(tvbuff_t *tvb, packet_info *pinfo, proto_tree *zrtp_tree) { run_offset+=4; } - proto_tree_add_item(zrtp_tree,hf_zrtp_msg_hmac,tvb,run_offset,8,ENC_BIG_ENDIAN); + proto_tree_add_item(zrtp_tree,hf_zrtp_msg_hmac,tvb,run_offset,8,ENC_NA); } void |