diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-06-25 22:59:50 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-06-26 11:41:10 +0000 |
| commit | f7987091bab94f2403024c34702e9d5007a5d790 (patch) | |
| tree | a56b8dfd1c87a789563ffa3b8a7277c4bd127afe /epan/dissectors | |
| parent | 732656c6f3636ba7e0672a9d8fc878255f0f8d3f (diff) | |
convert to proto_tree_add_subtree[_format]
Change-Id: I525ac2aae2bdbfd5f3a2f3b35f1bf10dde053f66
Reviewed-on: https://code.wireshark.org/review/2667
Tested-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors')
34 files changed, 642 insertions, 1249 deletions
diff --git a/epan/dissectors/packet-eap.c b/epan/dissectors/packet-eap.c index 25a031a23c..cf3bb80092 100644 --- a/epan/dissectors/packet-eap.c +++ b/epan/dissectors/packet-eap.c @@ -1175,11 +1175,9 @@ dissect_eap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) **********************************************************************/ case EAP_TYPE_EXT: { - proto_item *expti = NULL; - proto_tree *exptree = NULL; + proto_tree *exptree; - expti = proto_tree_add_text(eap_tree, tvb, offset, size, "Expanded Type"); - exptree = proto_item_add_subtree(expti, ett_eap_exp_attr); + exptree = proto_tree_add_subtree(eap_tree, tvb, offset, size, ett_eap_exp_attr, NULL, "Expanded Type"); dissect_exteap(exptree, tvb, offset, size, pinfo); } break; diff --git a/epan/dissectors/packet-eapol.c b/epan/dissectors/packet-eapol.c index f462fd547d..6d1c8e38f1 100644 --- a/epan/dissectors/packet-eapol.c +++ b/epan/dissectors/packet-eapol.c @@ -108,24 +108,21 @@ dissect_eapol(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint16 eapol_len; guint8 keydesc_type; guint len; - proto_tree *ti = NULL; - proto_tree *eapol_tree = NULL; + proto_tree *ti; + proto_tree *eapol_tree; tvbuff_t *next_tvb; col_set_str(pinfo->cinfo, COL_PROTOCOL, "EAPOL"); col_clear(pinfo->cinfo, COL_INFO); - if (tree) { - ti = proto_tree_add_item(tree, proto_eapol, tvb, 0, -1, ENC_NA); - eapol_tree = proto_item_add_subtree(ti, ett_eapol); + ti = proto_tree_add_item(tree, proto_eapol, tvb, 0, -1, ENC_NA); + eapol_tree = proto_item_add_subtree(ti, ett_eapol); - proto_tree_add_item(eapol_tree, hf_eapol_version, tvb, offset, 1, ENC_BIG_ENDIAN); - } + proto_tree_add_item(eapol_tree, hf_eapol_version, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; eapol_type = tvb_get_guint8(tvb, offset); - if (tree) - proto_tree_add_item(eapol_tree, hf_eapol_type, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(eapol_tree, hf_eapol_type, tvb, offset, 1, ENC_BIG_ENDIAN); col_add_str(pinfo->cinfo, COL_INFO, val_to_str(eapol_type, eapol_type_vals, "Unknown Type (0x%02X)")); offset++; @@ -171,7 +168,7 @@ dissect_eapol_rc4_key(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, v int offset = 0; guint16 eapol_key_len; gboolean generated_locally; - proto_tree *ti = NULL; + proto_tree *ti; proto_tree *key_index_tree; gint eapol_len; diff --git a/epan/dissectors/packet-ecp-oui.c b/epan/dissectors/packet-ecp-oui.c index 6e4fee6d9b..8b640aa971 100644 --- a/epan/dissectors/packet-ecp-oui.c +++ b/epan/dissectors/packet-ecp-oui.c @@ -139,8 +139,7 @@ dissect_ecp_unknown_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint16 tempLen; guint16 tempShort; - proto_tree *ecp_unknown_tlv_tree = NULL; - proto_item *ti = NULL; + proto_tree *ecp_unknown_tlv_tree; /* Get tlv type and length */ tempShort = tvb_get_ntohs(tvb, offset); @@ -148,11 +147,7 @@ dissect_ecp_unknown_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, /* Get tlv length */ tempLen = TLV_INFO_LEN(tempShort); - if (tree) - { - ti = proto_tree_add_text(tree, tvb, offset, (tempLen + 2), "Unknown TLV"); - ecp_unknown_tlv_tree = proto_item_add_subtree(ti, ett_ecp); - } + ecp_unknown_tlv_tree = proto_tree_add_subtree(tree, tvb, offset, (tempLen + 2), ett_ecp, NULL, "Unknown TLV"); proto_tree_add_item(ecp_unknown_tlv_tree, hf_ecp_subtype, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -168,17 +163,12 @@ dissect_vdp_fi_macvid(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, g guint32 tempOffset = offset; const guint8 *mac_addr = NULL; - proto_tree *ecp_vdp_tlv_fi_subtree = NULL; - proto_item *ti = NULL; + proto_tree *ecp_vdp_tlv_fi_subtree; entries = tvb_get_ntohs(tvb, offset); - if (tree) - { - ti = proto_tree_add_text(tree, tvb, tempOffset, 2, "%i MAC/VID pair%s", - entries, plurality((entries > 1), "s", "")); - ecp_vdp_tlv_fi_subtree = proto_item_add_subtree(ti, ett_ecp); - } + ecp_vdp_tlv_fi_subtree = proto_tree_add_subtree_format(tree, tvb, tempOffset, 2, ett_ecp, NULL, + "%i MAC/VID pair%s", entries, plurality((entries > 1), "s", "")); tempOffset += 2; @@ -212,8 +202,7 @@ dissect_vdp_org_specific_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * guint8 subType, format; const char *subTypeStr; - proto_tree *ecp_vdp_tlv_subtree = NULL; - proto_item *ti = NULL; + proto_tree *ecp_vdp_tlv_subtree; tempLen = 0; tempShort = tvb_get_ntohs(tvb, offset); @@ -232,6 +221,7 @@ dissect_vdp_org_specific_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * tempOffset += 3; subType = tvb_get_guint8(tvb, tempOffset); + tempOffset++; switch(oui) { case OUI_IEEE_802_1QBG: @@ -242,13 +232,8 @@ dissect_vdp_org_specific_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * break; } - if (tree) { - ti = proto_tree_add_text(tree, tvb, offset, (len + 2), "%s - %s", - ouiStr, subTypeStr); - ecp_vdp_tlv_subtree = proto_item_add_subtree(ti, ett_ecp); - } - - tempOffset++; + ecp_vdp_tlv_subtree = proto_tree_add_subtree_format(tree, tvb, offset, (len + 2), ett_ecp, NULL, + "%s - %s", ouiStr, subTypeStr); proto_tree_add_item(ecp_vdp_tlv_subtree, hf_ecp_vdp_mode, tvb, tempOffset, 1, ENC_BIG_ENDIAN); tempOffset++; @@ -301,8 +286,7 @@ dissect_vdp_end_of_vdpdu_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * guint16 tempLen; guint16 tempShort; - proto_tree *end_of_vdpdu_tree = NULL; - proto_item *tf = NULL; + proto_tree *end_of_vdpdu_tree; /* Get tlv type and length */ tempShort = tvb_get_ntohs(tvb, offset); @@ -313,8 +297,8 @@ dissect_vdp_end_of_vdpdu_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * if (tree) { /* Set port tree */ - tf = proto_tree_add_text(tree, tvb, offset, (tempLen + 2), "End of VDPDU"); - end_of_vdpdu_tree = proto_item_add_subtree(tf, ett_end_of_vdpdu); + end_of_vdpdu_tree = proto_tree_add_subtree(tree, tvb, offset, (tempLen + 2), + ett_end_of_vdpdu, NULL, "End of VDPDU"); proto_tree_add_item(end_of_vdpdu_tree, hf_ecp_tlv_type, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(end_of_vdpdu_tree, hf_ecp_tlv_len, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -326,8 +310,8 @@ dissect_vdp_end_of_vdpdu_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * static void dissect_ecp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - proto_tree *ecp_tree = NULL; - proto_item *ti = NULL; + proto_tree *ecp_tree; + proto_item *ti; gint32 tempLen = 0; guint32 offset = 0; guint16 tempShort; @@ -336,10 +320,8 @@ dissect_ecp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "ECP"); - if (tree) { - ti = proto_tree_add_item(tree, proto_ecp, tvb, 0, -1, ENC_NA); - ecp_tree = proto_item_add_subtree(ti, ett_ecp); - } + ti = proto_tree_add_item(tree, proto_ecp, tvb, 0, -1, ENC_NA); + ecp_tree = proto_item_add_subtree(ti, ett_ecp); proto_tree_add_item(ecp_tree, hf_ecp_subtype, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ecp_tree, hf_ecp_mode, tvb, offset+1, 1, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-edonkey.c b/epan/dissectors/packet-edonkey.c index 0eb1326e98..807976b38c 100644 --- a/epan/dissectors/packet-edonkey.c +++ b/epan/dissectors/packet-edonkey.c @@ -561,9 +561,8 @@ static int dissect_edonkey_list(tvbuff_t *tvb, packet_info *pinfo _U_, int item_start_offset; item_start_offset = offset; - ti = proto_tree_add_text( tree, tvb, item_start_offset, 1, "%s[%u/%u]", listdesc, i+1, listnum); - - subtree = proto_item_add_subtree(ti, ett_edonkey_listitem ); + subtree = proto_tree_add_subtree_format( tree, tvb, item_start_offset, 1, ett_edonkey_listitem, &ti, + "%s[%u/%u]", listdesc, i+1, listnum); /* dissect one list element */ offset = (*item_dissector)(tvb, pinfo, offset, subtree); @@ -2337,8 +2336,7 @@ static int dissect_kademlia_tag(tvbuff_t *tvb, packet_info *pinfo _U_, item_start_offset = offset; /* tag_node length is adjusted at the end of this function */ - tag_node = proto_tree_add_text( tree, tvb, offset, 1, "Tag " ); - subtree = proto_item_add_subtree( tag_node, ett_kademlia_tag ); + subtree = proto_tree_add_subtree( tree, tvb, offset, 1, ett_kademlia_tag, &tag_node, "Tag " ); type = tvb_get_guint8( tvb, offset ); str_type = val_to_str_const(type, kademlia_tag_types, "Unknown" ); @@ -2936,7 +2934,7 @@ static guint get_edonkey_tcp_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, int static int dissect_edonkey_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { proto_item *ti; - proto_tree *edonkey_tree = NULL, *edonkey_msg_tree = NULL, *emule_zlib_tree = NULL; + proto_tree *edonkey_tree, *edonkey_msg_tree = NULL, *emule_zlib_tree = NULL; int offset; guint8 protocol, msg_type; guint32 msg_len; @@ -2946,10 +2944,8 @@ static int dissect_edonkey_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree col_set_str(pinfo->cinfo, COL_PROTOCOL, "eDonkey"); - if (tree) { - ti = proto_tree_add_item(tree, proto_edonkey, tvb, 0, -1, ENC_NA); - edonkey_tree = proto_item_add_subtree(ti, ett_edonkey); - } + ti = proto_tree_add_item(tree, proto_edonkey, tvb, 0, -1, ENC_NA); + edonkey_tree = proto_item_add_subtree(ti, ett_edonkey); offset = 0; protocol = tvb_get_guint8(tvb, offset); diff --git a/epan/dissectors/packet-ehs.c b/epan/dissectors/packet-ehs.c index 1a6f565db4..397ea8d576 100644 --- a/epan/dissectors/packet-ehs.c +++ b/epan/dissectors/packet-ehs.c @@ -861,12 +861,11 @@ ehs_secondary_header_dissector ( int protocol, proto_tree* ehs_secondary_header_ static void aoslos_data_zone_dissector ( proto_tree* ehs_tree, tvbuff_t* tvb, int* offset, packet_info* pinfo _U_) { - proto_item *ehs_data_zone; proto_tree *ehs_data_zone_tree; /* create the data zone tree */ - ehs_data_zone = proto_tree_add_text ( ehs_tree, tvb, *offset, tvb_reported_length(tvb) - *offset, "AOS/LOS Data Zone" ); - ehs_data_zone_tree = proto_item_add_subtree ( ehs_data_zone, ett_ehs_data_zone ); + ehs_data_zone_tree = proto_tree_add_subtree( ehs_tree, tvb, *offset, tvb_reported_length(tvb) - *offset, + ett_ehs_data_zone, NULL, "AOS/LOS Data Zone" ); /* since the aos/los EHS packet data zone is well known, format it for display as well * @@ -894,14 +893,13 @@ aoslos_data_zone_dissector ( proto_tree* ehs_tree, tvbuff_t* tvb, int* offset, p static void udsm_data_zone_dissector ( proto_tree* ehs_tree, tvbuff_t* tvb, int* offset, packet_info* pinfo _U_) { - proto_item *ehs_data_zone; proto_tree *ehs_data_zone_tree; int year, jday, hour, minute, second; /* create the data zone tree */ - ehs_data_zone = proto_tree_add_text ( ehs_tree, tvb, *offset, tvb_reported_length(tvb) - *offset, "UDSM Data Zone" ); - ehs_data_zone_tree = proto_item_add_subtree ( ehs_data_zone, ett_ehs_data_zone ); + ehs_data_zone_tree = proto_tree_add_subtree( ehs_tree, tvb, *offset, tvb_reported_length(tvb) - *offset, + ett_ehs_data_zone, NULL, "UDSM Data Zone" ); proto_tree_add_item ( ehs_data_zone_tree, hf_ehs_dz_udsm_ccsds_vs_bpdu, tvb, *offset, 1, ENC_BIG_ENDIAN ); /* proto_tree_add_item ( ehs_data_zone_tree, hf_ehs_dz_udsm_unused1, tvb, *offset, 1, ENC_BIG_ENDIAN ); */ @@ -1061,10 +1059,8 @@ dissect_ehs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *ehs_packet; proto_tree *ehs_tree; - proto_item *ehs_primary_header; proto_tree *ehs_primary_header_tree; - proto_item *ehs_secondary_header; proto_tree *ehs_secondary_header_tree; int protocol; @@ -1077,8 +1073,8 @@ dissect_ehs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ehs_tree = proto_item_add_subtree ( ehs_packet, ett_ehs ); /* build the ehs primary header tree */ - ehs_primary_header = proto_tree_add_text ( ehs_tree, tvb, offset, EHS_PRIMARY_HEADER_SIZE, "Primary EHS Header" ); - ehs_primary_header_tree = proto_item_add_subtree ( ehs_primary_header, ett_ehs_primary_header ); + ehs_primary_header_tree = proto_tree_add_subtree( ehs_tree, tvb, offset, EHS_PRIMARY_HEADER_SIZE, + ett_ehs_primary_header, NULL, "Primary EHS Header" ); proto_tree_add_item ( ehs_primary_header_tree, hf_ehs_ph_version, tvb, offset, 1, ENC_BIG_ENDIAN ); proto_tree_add_item ( ehs_primary_header_tree, hf_ehs_ph_project, tvb, offset, 1, ENC_BIG_ENDIAN ); @@ -1140,9 +1136,8 @@ dissect_ehs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 2; /* build the ehs secondary header tree */ - ehs_secondary_header = proto_tree_add_text ( ehs_tree, tvb, offset, - ehs_secondary_header_size ( protocol, tvb, offset ), "Secondary EHS Header" ); - ehs_secondary_header_tree = proto_item_add_subtree ( ehs_secondary_header, ett_ehs_secondary_header ); + ehs_secondary_header_tree = proto_tree_add_subtree( ehs_tree, tvb, offset, ehs_secondary_header_size ( protocol, tvb, offset ), + ett_ehs_secondary_header, NULL, "Secondary EHS Header" ); /* since each protocol can have a different ehs secondary header structure, we will offload * this processing to lower levels of code so we don't have to insert all of that complexity diff --git a/epan/dissectors/packet-eigrp.c b/epan/dissectors/packet-eigrp.c index 01c8737ca8..70e2c2a5eb 100644 --- a/epan/dissectors/packet-eigrp.c +++ b/epan/dissectors/packet-eigrp.c @@ -935,7 +935,6 @@ dissect_eigrp_peer_termination (packet_info *pinfo, proto_item *ti) static void dissect_eigrp_peer_tidlist (proto_tree *tree, tvbuff_t *tvb) { - proto_item *sub_ti; proto_tree *sub_tree; int offset = 0; guint16 size; @@ -949,8 +948,7 @@ dissect_eigrp_peer_tidlist (proto_tree *tree, tvbuff_t *tvb) ENC_BIG_ENDIAN); offset += 2; - sub_ti = proto_tree_add_text(tree, tvb, offset, (size*2), "%d TIDs", size); - sub_tree = proto_item_add_subtree(sub_ti, ett_eigrp_tidlist); + sub_tree = proto_tree_add_subtree_format(tree, tvb, offset, (size*2), ett_eigrp_tidlist, NULL, "%d TIDs", size); for (; size ; size--) { proto_tree_add_item(sub_tree, hf_eigrp_tidlist_tid, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -982,13 +980,11 @@ dissect_eigrp_peer_tidlist (proto_tree *tree, tvbuff_t *tvb) static int dissect_eigrp_extdata_flags (proto_tree *tree, tvbuff_t *tvb, int offset) { - proto_item *sub_ti; proto_tree *sub_tree; tvbuff_t *sub_tvb; /* Decode the route flags field */ - sub_ti = proto_tree_add_text(tree, tvb, offset, 1, "External Flags"); - sub_tree = proto_item_add_subtree(sub_ti, ett_eigrp_extdata_flags); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, 1, ett_eigrp_extdata_flags, NULL, "External Flags"); sub_tvb = tvb_new_subset_remaining(tvb, offset); proto_tree_add_item(sub_tree, hf_eigrp_extdata_flag_ext, sub_tvb, 0, 1, @@ -1028,13 +1024,11 @@ dissect_eigrp_extdata_flags (proto_tree *tree, tvbuff_t *tvb, int offset) static int dissect_eigrp_metric_flags (proto_tree *tree, tvbuff_t *tvb, int offset, int limit) { - proto_item *sub_ti; proto_tree *sub_tree; tvbuff_t *sub_tvb; /* Decode the route flags field */ - sub_ti = proto_tree_add_text(tree, tvb, offset, limit, "Flags"); - sub_tree = proto_item_add_subtree(sub_ti, ett_eigrp_metric_flags); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, limit, ett_eigrp_metric_flags, NULL, "Flags"); sub_tvb = tvb_new_subset(tvb, offset, limit, -1); /* just care about 'flags' byte, there are no MP flags for now */ @@ -1248,14 +1242,13 @@ dissect_eigrp_service (proto_item *ti, proto_tree *tree, tvbuff_t *tvb, { int afi, length, remaining; int sub_offset; - proto_item *sub_ti, *reach_ti; + proto_item *sub_ti; proto_tree *sub_tree, *reach_tree; tvbuff_t *sub_tvb, *reach_tvb; guint16 service, sub_service; remaining = tvb_length_remaining(tvb, offset); - sub_ti = proto_tree_add_text(tree, tvb, offset, remaining, "SAF Service "); - sub_tree = proto_item_add_subtree(sub_ti, ett_eigrp_tlv_metric); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, remaining, ett_eigrp_tlv_metric, &sub_ti, "SAF Service "); sub_tvb = tvb_new_subset(tvb, offset, remaining, -1); sub_offset = 0; @@ -1289,9 +1282,8 @@ dissect_eigrp_service (proto_item *ti, proto_tree *tree, tvbuff_t *tvb, /* * Reachability information */ - reach_ti = proto_tree_add_text(sub_tree, sub_tvb, sub_offset, 22, - "Reachability"); - reach_tree = proto_item_add_subtree(reach_ti, ett_eigrp_saf_reachability); + reach_tree = proto_tree_add_subtree(sub_tree, sub_tvb, sub_offset, 22, + ett_eigrp_saf_reachability, NULL, "Reachability"); reach_tvb = tvb_new_subset(sub_tvb, sub_offset, 22, -1); afi = tvb_get_ntohs(reach_tvb, 0); @@ -1386,12 +1378,10 @@ dissect_eigrp_service (proto_item *ti, proto_tree *tree, tvbuff_t *tvb, static int dissect_eigrp_legacy_metric (proto_tree *tree, tvbuff_t *tvb, int offset) { - proto_item *sub_ti; proto_tree *sub_tree; tvbuff_t *sub_tvb; - sub_ti = proto_tree_add_text(tree, tvb, offset, 16, "Legacy Metric"); - sub_tree = proto_item_add_subtree(sub_ti, ett_eigrp_tlv_metric); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, 16, ett_eigrp_tlv_metric, NULL, "Legacy Metric"); sub_tvb = tvb_new_subset(tvb, offset, 16, -1); proto_tree_add_item(sub_tree, hf_eigrp_legacy_metric_delay, sub_tvb, @@ -1448,13 +1438,11 @@ dissect_eigrp_legacy_metric (proto_tree *tree, tvbuff_t *tvb, int offset) static int dissect_eigrp_ipx_extdata (proto_tree *tree, tvbuff_t *tvb, int offset) { - proto_item *sub_ti; proto_tree *sub_tree; tvbuff_t *sub_tvb; int sub_offset = 0; - sub_ti = proto_tree_add_text(tree, tvb, offset, 20, "External Data"); - sub_tree = proto_item_add_subtree(sub_ti, ett_eigrp_tlv_extdata); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, 20, ett_eigrp_tlv_extdata, NULL, "External Data"); sub_tvb = tvb_new_subset(tvb, offset, 20, -1); /* Decode the external route source info */ @@ -1517,13 +1505,11 @@ dissect_eigrp_ipx_extdata (proto_tree *tree, tvbuff_t *tvb, int offset) static int dissect_eigrp_extdata (proto_tree *tree, tvbuff_t *tvb, int offset) { - proto_item *sub_ti; proto_tree *sub_tree; tvbuff_t *sub_tvb; int sub_offset = 0; - sub_ti = proto_tree_add_text(tree, tvb, offset, 20, "External Data"); - sub_tree = proto_item_add_subtree(sub_ti, ett_eigrp_tlv_extdata); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, 20, ett_eigrp_tlv_extdata, NULL, "External Data"); sub_tvb = tvb_new_subset(tvb, offset, 20, -1); /* Decode the external route source info */ @@ -2126,7 +2112,6 @@ static int dissect_eigrp_wide_metric_attr (proto_tree *tree, tvbuff_t *tvb, int offset, int limit) { - proto_item *sub_ti; proto_tree *sub_tree; tvbuff_t *sub_tvb; int sub_offset; @@ -2136,8 +2121,7 @@ dissect_eigrp_wide_metric_attr (proto_tree *tree, tvbuff_t *tvb, limit *= 2; /* words to bytes */ - sub_ti = proto_tree_add_text(tree, tvb, offset, limit, "Attributes"); - sub_tree = proto_item_add_subtree(sub_ti, ett_eigrp_tlv_attr); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, limit, ett_eigrp_tlv_attr, NULL, "Attributes"); sub_tvb = tvb_new_subset(tvb, offset, limit, -1); sub_offset = 0; @@ -2234,14 +2218,12 @@ dissect_eigrp_wide_metric_attr (proto_tree *tree, tvbuff_t *tvb, static int dissect_eigrp_wide_metric (proto_tree *tree, tvbuff_t *tvb, int offset) { - proto_item *sub_ti; proto_tree *sub_tree; tvbuff_t *sub_tvb; gint8 attr_size = 0; guint64 big_num; - sub_ti = proto_tree_add_text(tree, tvb, offset, 24, "Wide Metric"); - sub_tree = proto_item_add_subtree(sub_ti, ett_eigrp_tlv_metric); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, 24, ett_eigrp_tlv_metric, NULL, "Wide Metric"); sub_tvb = tvb_new_subset(tvb, offset, 24, -1); attr_size = tvb_get_guint8(sub_tvb, 0); @@ -2526,10 +2508,9 @@ dissect_eigrp (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ return(tvb_length(tvb)); } - ti = proto_tree_add_text(eigrp_tree, tvb, offset, size, "%s", + tlv_tree = proto_tree_add_subtree(eigrp_tree, tvb, offset, size, ett_eigrp_tlv, &ti, val_to_str(tlv, eigrp_tlv2string, "Unknown TLV (0x%04x)")); - tlv_tree = proto_item_add_subtree(ti, ett_eigrp_tlv); proto_tree_add_item(tlv_tree, hf_eigrp_tlv_type, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_tree, hf_eigrp_tlv_len, tvb, diff --git a/epan/dissectors/packet-eiss.c b/epan/dissectors/packet-eiss.c index 0bca7184b0..dcb5e03978 100644 --- a/epan/dissectors/packet-eiss.c +++ b/epan/dissectors/packet-eiss.c @@ -130,10 +130,8 @@ static guint dissect_etv_bif_platform_ids(tvbuff_t *tvb, proto_tree *tree, guint offset) { proto_tree *platform_tree; - proto_item *pi; - pi = proto_tree_add_text(tree, tvb, offset, 15, "Platform Id"); - platform_tree = proto_item_add_subtree(pi, ett_eiss_platform_id); + platform_tree = proto_tree_add_subtree(tree, tvb, offset, 15, ett_eiss_platform_id, NULL, "Platform Id"); proto_tree_add_item(platform_tree, hf_pdtHWManufacturer, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; proto_tree_add_item(platform_tree, hf_pdtHWModel, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -159,7 +157,6 @@ dissect_etv_bif_platform_ids(tvbuff_t *tvb, proto_tree *tree, guint offset) static guint dissect_eiss_descriptors(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint offset) { - proto_item *pi; proto_tree *sub_tree; guint tag; @@ -169,9 +166,8 @@ dissect_eiss_descriptors(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gu guint total_length; total_length = tvb_get_guint8(tvb, offset+1); - pi = proto_tree_add_text(tree, tvb, offset, (2+total_length), - "ETV Application Information Descriptor"); - sub_tree = proto_item_add_subtree(pi, ett_eiss_desc); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, (2+total_length), + ett_eiss_desc, NULL, "ETV Application Information Descriptor"); proto_tree_add_item(sub_tree, hf_eiss_descriptor_tag, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; @@ -211,9 +207,8 @@ dissect_eiss_descriptors(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gu ENC_ASCII|ENC_NA); return (2+total_length); } else if (0xe1 == tag) { - pi = proto_tree_add_text(tree, tvb, offset, 6, - "ETV Media Time Descriptor"); - sub_tree = proto_item_add_subtree(pi, ett_eiss_desc); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, 6, + ett_eiss_desc, NULL, "ETV Media Time Descriptor"); proto_tree_add_item(sub_tree, hf_eiss_descriptor_tag, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; @@ -228,9 +223,8 @@ dissect_eiss_descriptors(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gu tvbuff_t *payload; tmp = tvb_get_ntohs(tvb, offset+1); - pi = proto_tree_add_text(tree, tvb, offset, (3+tmp), - "ETV Stream Event Descriptor"); - sub_tree = proto_item_add_subtree(pi, ett_eiss_desc); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, (3+tmp), + ett_eiss_desc, NULL, "ETV Stream Event Descriptor"); proto_tree_add_item(sub_tree, hf_eiss_descriptor_tag, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; @@ -359,10 +353,8 @@ dissect_eiss(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (0 < packet_length) { proto_tree *eiss_desc_tree; - pi = proto_tree_add_text(eiss_tree, tvb, offset, - packet_length-offset, - "%s", "EISS Descriptor(s)"); - eiss_desc_tree = proto_item_add_subtree(pi, ett_eiss_desc); + eiss_desc_tree = proto_tree_add_subtree(eiss_tree, tvb, offset, + packet_length-offset, ett_eiss_desc, NULL, "EISS Descriptor(s)"); while (offset < packet_length) { offset += dissect_eiss_descriptors(tvb, pinfo, eiss_desc_tree, offset); diff --git a/epan/dissectors/packet-elmi.c b/epan/dissectors/packet-elmi.c index c2dc077873..c2f62c3834 100644 --- a/epan/dissectors/packet-elmi.c +++ b/epan/dissectors/packet-elmi.c @@ -93,10 +93,9 @@ dissect_elmi_info_elem( if (tag==0) return -1; - tree_pi = proto_tree_add_text( - tree, tvb, offset, -1, "Information element: %s", - val_to_str_const(tag, elmi_info_elem_tag, "unknown")); - info_elem_tree = proto_item_add_subtree(tree_pi, ett_elmi_info_elem); + info_elem_tree = proto_tree_add_subtree_format( + tree, tvb, offset, -1, ett_elmi_info_elem, &tree_pi, + "Information element: %s", val_to_str_const(tag, elmi_info_elem_tag, "unknown")); proto_tree_add_item(info_elem_tree, hf_elmi_info_elem, tvb, offset, 1, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-enip.c b/epan/dissectors/packet-enip.c index 5519d765ec..2edfdf860a 100644 --- a/epan/dissectors/packet-enip.c +++ b/epan/dissectors/packet-enip.c @@ -1767,7 +1767,7 @@ static void dissect_cpf(enip_request_key_t *request_key, int command, tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree *dissector_tree, int offset, guint32 ifacehndl) { - proto_item *temp_item, *count_item, *type_item, *sockaddr_item, *io_item; + proto_item *temp_item, *count_item, *type_item, *io_item; proto_tree *temp_tree, *count_tree, *item_tree, *sockaddr_tree, *io_tree; int item_count, item_length, item, io_length; unsigned char name_length; @@ -1978,8 +1978,7 @@ dissect_cpf(enip_request_key_t *request_key, int command, tvbuff_t *tvb, proto_tree_add_item( item_tree, hf_enip_encapver, tvb, offset+6, 2, ENC_LITTLE_ENDIAN ); /* Socket Address */ - sockaddr_item = proto_tree_add_text( item_tree, tvb, offset+8, 16, "Socket Address"); - sockaddr_tree = proto_item_add_subtree( sockaddr_item, ett_sockadd ); + sockaddr_tree = proto_tree_add_subtree( item_tree, tvb, offset+8, 16, ett_sockadd, NULL, "Socket Address"); /* Socket address struct - sin_family */ proto_tree_add_item(sockaddr_tree, hf_enip_sinfamily, @@ -2191,7 +2190,7 @@ dissect_enip_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data conversation_t *conversation; /* Set up structures needed to add the protocol subtree and manage it */ - proto_item *ti, *encaph, *csf; + proto_item *ti; proto_tree *enip_tree, *header_tree = NULL, *csftree; /* Make entries in Protocol column and Info column on summary display */ @@ -2249,8 +2248,7 @@ dissect_enip_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data enip_tree = proto_item_add_subtree(ti, ett_enip); /* Add encapsulation header tree */ - encaph = proto_tree_add_text( enip_tree, tvb, 0, 24, "Encapsulation Header"); - header_tree = proto_item_add_subtree(encaph, ett_enip); + header_tree = proto_tree_add_subtree( enip_tree, tvb, 0, 24, ett_enip, NULL, "Encapsulation Header"); /* Add EtherNet/IP encapsulation header */ proto_tree_add_item( header_tree, hf_enip_command, tvb, 0, 2, ENC_LITTLE_ENDIAN ); @@ -2295,10 +2293,8 @@ dissect_enip_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data { /* The packet have some command specific data, buid a sub tree for it */ - csf = proto_tree_add_text( enip_tree, tvb, 24, encap_data_length, - "Command Specific Data"); - - csftree = proto_item_add_subtree(csf, ett_command_tree); + csftree = proto_tree_add_subtree( enip_tree, tvb, 24, encap_data_length, + ett_command_tree, NULL, "Command Specific Data"); switch ( encap_cmd ) { @@ -2419,7 +2415,7 @@ static gboolean dissect_dlr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { proto_item *ti; - proto_tree *dlr_tree = NULL; + proto_tree *dlr_tree; guint8 dlr_subtype; guint8 dlr_protover; guint8 dlr_frametype; @@ -2429,12 +2425,9 @@ dissect_dlr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) col_clear(pinfo->cinfo, COL_INFO); - if ( tree ) - { - /* Create display subtree for the protocol */ - ti = proto_tree_add_item(tree, proto_dlr, tvb, 0, -1, ENC_NA ); - dlr_tree = proto_item_add_subtree( ti, ett_dlr ); - } + /* Create display subtree for the protocol */ + ti = proto_tree_add_item(tree, proto_dlr, tvb, 0, -1, ENC_NA ); + dlr_tree = proto_item_add_subtree( ti, ett_dlr ); /* Get values for the Common Frame Header Format */ dlr_subtype = tvb_get_guint8(tvb, DLR_CFH_SUB_TYPE); diff --git a/epan/dissectors/packet-enrp.c b/epan/dissectors/packet-enrp.c index 3d101dc71a..902462a02e 100644 --- a/epan/dissectors/packet-enrp.c +++ b/epan/dissectors/packet-enrp.c @@ -178,8 +178,8 @@ dissect_error_cause(tvbuff_t *cause_tvb, proto_tree *parameter_tree) length = tvb_get_ntohs(cause_tvb, CAUSE_LENGTH_OFFSET); padding_length = tvb_length(cause_tvb) - length; - cause_item = proto_tree_add_text(parameter_tree, cause_tvb, CAUSE_HEADER_OFFSET, tvb_length(cause_tvb), "%s", val_to_str_const(code, cause_code_values, "Unknown error cause")); - cause_tree = proto_item_add_subtree(cause_item, ett_enrp_cause); + cause_tree = proto_tree_add_subtree(parameter_tree, cause_tvb, CAUSE_HEADER_OFFSET, -1, + ett_enrp_cause, &cause_item, val_to_str_const(code, cause_code_values, "Unknown error cause")); proto_tree_add_item(cause_tree, hf_cause_code, cause_tvb, CAUSE_CODE_OFFSET, CAUSE_CODE_LENGTH, ENC_BIG_ENDIAN); proto_tree_add_item(cause_tree, hf_cause_length, cause_tvb, CAUSE_LENGTH_OFFSET, CAUSE_LENGTH_LENGTH, ENC_BIG_ENDIAN); @@ -636,7 +636,7 @@ static void dissect_parameter(tvbuff_t *parameter_tvb, proto_tree *enrp_tree) { guint16 type, length, padding_length; - proto_item *parameter_item; + proto_tree *parameter_item; proto_tree *parameter_tree; /* extract tag and length from the parameter */ @@ -645,8 +645,8 @@ dissect_parameter(tvbuff_t *parameter_tvb, proto_tree *enrp_tree) padding_length = tvb_length(parameter_tvb) - length; /* create proto_tree stuff */ - parameter_item = proto_tree_add_text(enrp_tree, parameter_tvb, PARAMETER_HEADER_OFFSET, tvb_length(parameter_tvb), "%s", val_to_str_const(type, parameter_type_values, "Unknown Parameter")); - parameter_tree = proto_item_add_subtree(parameter_item, ett_enrp_parameter); + parameter_tree = proto_tree_add_subtree(enrp_tree, parameter_tvb, PARAMETER_HEADER_OFFSET, -1, + ett_enrp_parameter, ¶meter_item, val_to_str_const(type, parameter_type_values, "Unknown Parameter")); /* add tag and length to the enrp tree */ proto_tree_add_item(parameter_tree, hf_parameter_type, parameter_tvb, PARAMETER_TYPE_OFFSET, PARAMETER_TYPE_LENGTH, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-epl.c b/epan/dissectors/packet-epl.c index 5c6f85c1b1..6f61e4e66f 100644 --- a/epan/dissectors/packet-epl.c +++ b/epan/dissectors/packet-epl.c @@ -2116,7 +2116,7 @@ dissect_epl_asnd_resp(proto_tree *epl_tree, tvbuff_t *tvb, packet_info *pinfo _U gint dissect_epl_asnd_sres(proto_tree *epl_tree, tvbuff_t *tvb, packet_info *pinfo, guint8 epl_src, gint offset) { - proto_item *ti_seb, *ti_el, *ti_el_entry, *ti_el_entry_type; + proto_item *ti_el_entry, *ti_el_entry_type; proto_tree *epl_seb_tree, *epl_el_tree, *epl_el_entry_tree, *epl_el_entry_type_tree; guint number_of_entries, cnt; /* used for dissection of ErrorCodeList */ guint8 nmt_state; @@ -2143,9 +2143,7 @@ dissect_epl_asnd_sres(proto_tree *epl_tree, tvbuff_t *tvb, packet_info *pinfo, g offset += 4; /* Subtree for the static error bitfield */ - ti_seb = proto_tree_add_text(epl_tree, tvb, offset, 8, "StaticErrorBitfield"); - - epl_seb_tree = proto_item_add_subtree(ti_seb, ett_epl_seb); + epl_seb_tree = proto_tree_add_subtree(epl_tree, tvb, offset, 8, ett_epl_seb, NULL, "StaticErrorBitfield"); proto_tree_add_item(epl_seb_tree, hf_epl_asnd_statusresponse_seb_err_errorregister_u8_bit0, tvb, offset, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(epl_seb_tree, hf_epl_asnd_statusresponse_seb_err_errorregister_u8_bit1, tvb, offset, 1, ENC_LITTLE_ENDIAN); @@ -2163,16 +2161,12 @@ dissect_epl_asnd_sres(proto_tree *epl_tree, tvbuff_t *tvb, packet_info *pinfo, g /* get the number of entries in the error code list*/ number_of_entries = (tvb_reported_length(tvb)-offset)/20; - ti_el = proto_tree_add_text(epl_tree, tvb, offset, -1, "ErrorCodeList: %d entries", number_of_entries); - - epl_el_tree = proto_item_add_subtree(ti_el, ett_epl_el); + epl_el_tree = proto_tree_add_subtree_format(epl_tree, tvb, offset, -1, ett_epl_el, NULL, "ErrorCodeList: %d entries", number_of_entries); /*Dissect the whole Error List (display each entry)*/ for (cnt = 0; cnt<number_of_entries; cnt++) { - ti_el_entry = proto_tree_add_text(epl_el_tree, tvb, offset, 20, "Entry %d", cnt+1); - - epl_el_entry_tree = proto_item_add_subtree(ti_el_entry, ett_epl_el_entry); + epl_el_entry_tree = proto_tree_add_subtree_format(epl_el_tree, tvb, offset, 20, ett_epl_el_entry, &ti_el_entry, "Entry %d", cnt+1); /*Entry Type*/ ti_el_entry_type = proto_tree_add_item(ti_el_entry, diff --git a/epan/dissectors/packet-erf.c b/epan/dissectors/packet-erf.c index 1d38ee92c1..88c7f89207 100644 --- a/epan/dissectors/packet-erf.c +++ b/epan/dissectors/packet-erf.c @@ -1201,7 +1201,8 @@ dissect_erf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 flags; guint8 erf_type; guint32 atm_hdr = 0; - proto_tree *erf_tree = NULL; + proto_tree *erf_tree; + proto_item *erf_item; guint atm_pdu_caplen; const guint8 *atm_pdu; erf_hdlc_type_vals hdlc_type; @@ -1216,16 +1217,13 @@ dissect_erf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_add_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str(erf_type, erf_type_vals, "Unknown type %u")); - if (tree) { - proto_item *erf_item; - erf_item = proto_tree_add_item(tree, proto_erf, tvb, 0, -1, ENC_NA); - erf_tree = proto_item_add_subtree(erf_item, ett_erf); + erf_item = proto_tree_add_item(tree, proto_erf, tvb, 0, -1, ENC_NA); + erf_tree = proto_item_add_subtree(erf_item, ett_erf); - dissect_erf_pseudo_header(tvb, pinfo, erf_tree); - if (pinfo->pseudo_header->erf.phdr.type & 0x80) { - dissect_erf_pseudo_extension_header(tvb, pinfo, erf_tree); + dissect_erf_pseudo_header(tvb, pinfo, erf_tree); + if (pinfo->pseudo_header->erf.phdr.type & 0x80) { + dissect_erf_pseudo_extension_header(tvb, pinfo, erf_tree); } - } flags = pinfo->pseudo_header->erf.phdr.flags; /* diff --git a/epan/dissectors/packet-erldp.c b/epan/dissectors/packet-erldp.c index 64a1772480..9f23e53a76 100644 --- a/epan/dissectors/packet-erldp.c +++ b/epan/dissectors/packet-erldp.c @@ -210,14 +210,12 @@ static gint dissect_etf_dist_header(packet_info *pinfo _U_, tvbuff_t *tvb, gint offset += flen; acrs_offset = offset; - ti_acrs = proto_tree_add_text(tree, tvb, offset, 0, "AtomCacheRefs"); - acrs_tree = proto_item_add_subtree(ti_acrs, ett_etf_acrs); + acrs_tree = proto_tree_add_subtree(tree, tvb, offset, 0, ett_etf_acrs, &ti_acrs, "AtomCacheRefs"); for (i=0; i<num; i++) { flg = tvb_get_guint8(tvb, flg_offset + i / 2); new_entry = flg & (0x08 << 4*(i%2)); acr_offset = offset; - ti_acr = proto_tree_add_text(acrs_tree, tvb, offset, 0, "AtomCacheRef[%2d]:", i); - acr_tree = proto_item_add_subtree(ti_acr, ett_etf_acr); + acr_tree = proto_tree_add_subtree_format(acrs_tree, tvb, offset, 0, ett_etf_acr, &ti_acr, "AtomCacheRef[%2d]:", i); isi = tvb_get_guint8(tvb, offset); proto_tree_add_uint(acr_tree, hf_erldp_internal_segment_index, tvb, offset, 1, isi); proto_item_append_text(ti_acr, " %3d", isi); @@ -358,8 +356,7 @@ static gint dissect_etf_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, return 0; } - ti = proto_tree_add_text(tree, tvb, offset, -1, "%s", (label) ? label : "External Term Format"); - etf_tree = proto_item_add_subtree(ti, ett_etf); + etf_tree = proto_tree_add_subtree(tree, tvb, offset, -1, ett_etf, &ti, (label) ? label : "External Term Format"); proto_tree_add_text(etf_tree, tvb, offset, 1, "VERSION_MAGIC: %d", mag); offset++; @@ -385,8 +382,7 @@ static gint dissect_etf_type(const gchar *label, packet_info *pinfo, tvbuff_t *t proto_tree *etf_tree; gchar *value_str = NULL; - ti = proto_tree_add_text(tree, tvb, offset, -1, "%s", (label) ? label : "External Term Format"); - etf_tree = proto_item_add_subtree(ti, ett_etf); + etf_tree = proto_tree_add_subtree(tree, tvb, offset, -1, ett_etf, &ti, (label) ? label : "External Term Format"); tag = tvb_get_guint8(tvb, offset); proto_tree_add_item(etf_tree, hf_etf_tag, tvb, offset, 1, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-esio.c b/epan/dissectors/packet-esio.c index 17cdd337db..aa4ac5833f 100644 --- a/epan/dissectors/packet-esio.c +++ b/epan/dissectors/packet-esio.c @@ -120,7 +120,7 @@ dissect_esio(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ { /* Set up structures needed to add the protocol subtree and manage it */ - proto_item *ti, *et; + proto_item *ti; proto_tree *esio_tree, *esio_header_tree, *esio_transfer_header_tree, *esio_data_tansfer_tree, *esio_data_tree; @@ -175,8 +175,7 @@ dissect_esio(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ ti = proto_tree_add_item(tree, proto_esio, tvb, offset, -1, ENC_NA); esio_tree = proto_item_add_subtree(ti, ett_esio); /*Add subtree for Ether-S-I/O header*/ - et = proto_tree_add_text(esio_tree, tvb, offset, 12, "Ether-S-I/O header"); - esio_header_tree = proto_item_add_subtree(et, ett_esio_header); + esio_header_tree = proto_tree_add_subtree(esio_tree, tvb, offset, 12, ett_esio_header, NULL, "Ether-S-I/O header"); offset += 4; /*first four bytes are "ESIO"*/ /* add items to the Ether-S-I/O header subtree*/ esio_tlg_type = tvb_get_ntohs(tvb,offset); @@ -196,8 +195,8 @@ dissect_esio(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ case ESIO_TRANSFER: if (tree) { /*Add subtree for Ether-S-I/O header*/ - et = proto_tree_add_text(esio_tree, tvb, offset, 12, "Transfer header"); - esio_transfer_header_tree = proto_item_add_subtree(et, ett_esio_transfer_header); + esio_transfer_header_tree = proto_tree_add_subtree(esio_tree, tvb, offset, 12, + ett_esio_transfer_header, NULL, "Transfer header"); proto_tree_add_item(esio_transfer_header_tree, hf_esio_tlg_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; @@ -215,10 +214,10 @@ dissect_esio(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ /*Add subtree(s) for Ether-S-I/O data transfers*/ esio_transfer_dest_id = tvb_get_ntohl(tvb,(offset+4)); esio_transfer_length = tvb_get_ntohs(tvb,(offset+8)); - et = proto_tree_add_text(esio_tree, tvb, offset, - (esio_transfer_length + 10), "Data transfer to ID: %d ", - esio_transfer_dest_id); - esio_data_tansfer_tree = proto_item_add_subtree(et, ett_esio_transfer_data); + esio_data_tansfer_tree = proto_tree_add_subtree_format(esio_tree, tvb, offset, + (esio_transfer_length + 10), ett_esio_transfer_data, NULL, + "Data transfer to ID: %d ", esio_transfer_dest_id); + proto_tree_add_item(esio_data_tansfer_tree, hf_esio_data_transfer_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; @@ -229,9 +228,8 @@ dissect_esio(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ hf_esio_data_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /*here comes the data*/ - et = proto_tree_add_text(esio_data_tansfer_tree, tvb, offset, - esio_transfer_length, "Data bytes "); - esio_data_tree = proto_item_add_subtree(et, ett_esio_data); + esio_data_tree = proto_tree_add_subtree(esio_data_tansfer_tree, tvb, offset, + esio_transfer_length, ett_esio_data, NULL, "Data bytes "); for (i=((esio_transfer_length)); i>0; i--) { proto_tree_add_item(esio_data_tree, hf_esio_data, tvb, offset, diff --git a/epan/dissectors/packet-evrc.c b/epan/dissectors/packet-evrc.c index bc4baeaa29..219f05b6dd 100644 --- a/epan/dissectors/packet-evrc.c +++ b/epan/dissectors/packet-evrc.c @@ -270,10 +270,8 @@ dissect_evrc_aux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, evrc_varia while (further_entries && (frame_count < sizeof(speech_data_len)) && ((len - offset) > 0)) { - item = - proto_tree_add_text(evrc_tree, tvb, offset, 1, "ToC [%u]", frame_count+1); - - toc_tree = proto_item_add_subtree(item, ett_toc); + toc_tree = + proto_tree_add_subtree_format(evrc_tree, tvb, offset, 1, ett_toc, NULL, "ToC [%u]", frame_count+1); proto_tree_add_item(toc_tree, hf_evrc_legacy_toc_fe_ind, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(toc_tree, hf_evrc_legacy_toc_reduc_rate, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -356,12 +354,10 @@ dissect_evrc_aux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, evrc_varia offset++; saved_offset = offset; - item = - proto_tree_add_text(evrc_tree, tvb, offset, -1, "ToC - %u frame%s", + toc_tree = + proto_tree_add_subtree_format(evrc_tree, tvb, offset, -1, ett_toc, &item, "ToC - %u frame%s", frame_count, plurality(frame_count, "", "s")); - toc_tree = proto_item_add_subtree(item, ett_toc); - i = 0; while ((i < frame_count) && ((len - offset) > 0)) diff --git a/epan/dissectors/packet-extreme.c b/epan/dissectors/packet-extreme.c index 69f23049d2..62cd38f989 100644 --- a/epan/dissectors/packet-extreme.c +++ b/epan/dissectors/packet-extreme.c @@ -383,7 +383,6 @@ static const value_string elsm_subtype_vals[] = { static int dissect_tlv_header(tvbuff_t *tvb, packet_info *pinfo _U_, int offset, int length _U_, proto_tree *tree) { - proto_item *tlv_item; proto_tree *tlv_tree; guint8 tlv_marker; guint8 tlv_type; @@ -393,12 +392,11 @@ dissect_tlv_header(tvbuff_t *tvb, packet_info *pinfo _U_, int offset, int length tlv_type = tvb_get_guint8(tvb, offset + 1); tlv_length = tvb_get_ntohs(tvb, offset + 2); - tlv_item = proto_tree_add_text(tree, tvb, offset, 4, - "Marker 0x%02x, length %d, type %d = %s", + tlv_tree = proto_tree_add_subtree_format(tree, tvb, offset, 4, + ett_edp_tlv_header, NULL, "Marker 0x%02x, length %d, type %d = %s", tlv_marker, tlv_length, tlv_type, val_to_str(tlv_type, edp_type_vals, "Unknown (0x%02x)")); - tlv_tree = proto_item_add_subtree(tlv_item, ett_edp_tlv_header); proto_tree_add_item(tlv_tree, hf_edp_tlv_marker, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; @@ -457,7 +455,6 @@ dissect_null_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length _U_, static int dissect_info_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, proto_tree *tree) { - proto_item *ver_item; proto_tree *ver_tree; guint8 major1, major2, sustaining, internal; guint16 port, slot; @@ -502,12 +499,10 @@ dissect_info_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, prot offset += 6; /* Begin version subtree */ - ver_item = proto_tree_add_text(info_tree, tvb, offset, 4, - "Version: %u.%u.%u Internal: %u", major1, major2, + ver_tree = proto_tree_add_subtree_format(info_tree, tvb, offset, 4, + ett_edp_info_version, NULL, "Version: %u.%u.%u Internal: %u", major1, major2, sustaining, internal); - ver_tree = proto_item_add_subtree(ver_item, ett_edp_info_version); - proto_tree_add_item(ver_tree, hf_edp_info_version, tvb, offset, 4, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-fc.c b/epan/dissectors/packet-fc.c index 4bd49d173f..737c7d1162 100644 --- a/epan/dissectors/packet-fc.c +++ b/epan/dissectors/packet-fc.c @@ -350,7 +350,6 @@ static void dissect_fc_ba_acc (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { /* Set up structures needed to add the protocol subtree and manage it */ - proto_item *ti; proto_tree *acc_tree; int offset = 0; @@ -360,8 +359,7 @@ dissect_fc_ba_acc (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_INFO, "BA_ACC"); if (tree) { - ti = proto_tree_add_text (tree, tvb, 0, tvb_length (tvb), "Basic Link Svc"); - acc_tree = proto_item_add_subtree (ti, ett_fcbls); + acc_tree = proto_tree_add_subtree(tree, tvb, 0, -1, ett_fcbls, NULL, "Basic Link Svc"); proto_tree_add_item (acc_tree, hf_fc_bls_seqid_vld, tvb, offset++, 1, ENC_BIG_ENDIAN); proto_tree_add_item (acc_tree, hf_fc_bls_lastvld_seqid, tvb, offset++, 1, ENC_BIG_ENDIAN); @@ -380,7 +378,6 @@ static void dissect_fc_ba_rjt (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { /* Set up structures needed to add the protocol subtree and manage it */ - proto_item *ti; proto_tree *rjt_tree; int offset = 0; @@ -390,8 +387,7 @@ dissect_fc_ba_rjt (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_INFO, "BA_RJT"); if (tree) { - ti = proto_tree_add_text (tree, tvb, 0, tvb_length (tvb), "Basic Link Svc"); - rjt_tree = proto_item_add_subtree (ti, ett_fcbls); + rjt_tree = proto_tree_add_subtree(tree, tvb, 0, -1, ett_fcbls, NULL, "Basic Link Svc"); proto_tree_add_item (rjt_tree, hf_fc_bls_rjtcode, tvb, offset+1, 1, ENC_BIG_ENDIAN); proto_tree_add_item (rjt_tree, hf_fc_bls_rjtdetail, tvb, offset+2, 1, ENC_BIG_ENDIAN); @@ -565,18 +561,16 @@ dissect_fc_vft(proto_tree *parent_tree, static void dissect_fc_fctl(packet_info *pinfo _U_, proto_tree *parent_tree, tvbuff_t *tvb, int offset) { - proto_item *item=NULL; - proto_tree *tree=NULL; + proto_item *item; + proto_tree *tree; guint32 flags; flags = tvb_get_guint8 (tvb, offset); flags = (flags<<8) | tvb_get_guint8 (tvb, offset+1); flags = (flags<<8) | tvb_get_guint8 (tvb, offset+2); - if(parent_tree){ - item=proto_tree_add_uint(parent_tree, hf_fc_fctl, tvb, offset, 3, flags); - tree=proto_item_add_subtree(item, ett_fctl); - } + item=proto_tree_add_uint(parent_tree, hf_fc_fctl, tvb, offset, 3, flags); + tree=proto_item_add_subtree(item, ett_fctl); proto_tree_add_boolean(tree, hf_fc_fctl_exchange_responder, tvb, offset, 3, flags); if (flags&FC_FCTL_EXCHANGE_RESPONDER){ diff --git a/epan/dissectors/packet-fcdns.c b/epan/dissectors/packet-fcdns.c index 5a61c731a6..d12e5bc819 100644 --- a/epan/dissectors/packet-fcdns.c +++ b/epan/dissectors/packet-fcdns.c @@ -366,17 +366,15 @@ fcdns_init_protocol(void) static void dissect_cos_flags (proto_tree *parent_tree, tvbuff_t *tvb, int offset, const header_field_info *hfinfo) { - proto_item *item=NULL; - proto_tree *tree=NULL; + proto_item *item; + proto_tree *tree; guint32 flags; flags = tvb_get_ntohl (tvb, offset); - if(parent_tree){ - item=proto_tree_add_uint(parent_tree, hfinfo, - tvb, offset, 1, flags); - tree=proto_item_add_subtree(item, ett_cos_flags); - } + item=proto_tree_add_uint(parent_tree, hfinfo, + tvb, offset, 1, flags); + tree=proto_item_add_subtree(item, ett_cos_flags); proto_tree_add_boolean(tree, &hfi_fcdns_cos_f, tvb, offset, 4, flags); if (flags&0x01){ @@ -423,17 +421,16 @@ dissect_cos_flags (proto_tree *parent_tree, tvbuff_t *tvb, int offset, const hea static void dissect_fc4features_and_type (proto_tree *parent_tree, tvbuff_t *tvb, int offset) { - proto_item *item=NULL; - proto_tree *tree=NULL; + proto_item *item; + proto_tree *tree; guint8 flags, type; flags = tvb_get_guint8(tvb, offset); type = tvb_get_guint8(tvb, offset+1); - if(parent_tree){ - item=proto_tree_add_uint(parent_tree, &hfi_fcdns_fc4features, + + item=proto_tree_add_uint(parent_tree, &hfi_fcdns_fc4features, tvb, offset, 1, flags); - tree=proto_item_add_subtree(item, ett_fc4features); - } + tree=proto_item_add_subtree(item, ett_fc4features); if(type==FC_TYPE_SCSI){ proto_tree_add_boolean(tree, &hfi_fcdns_fc4features_i, tvb, offset, 1, flags); @@ -457,16 +454,14 @@ dissect_fc4features_and_type (proto_tree *parent_tree, tvbuff_t *tvb, int offset static void dissect_fc4features (proto_tree *parent_tree, tvbuff_t *tvb, int offset) { - proto_item *item=NULL; - proto_tree *tree=NULL; + proto_item *item; + proto_tree *tree; guint8 flags; flags = tvb_get_guint8(tvb, offset); - if(parent_tree){ - item=proto_tree_add_uint(parent_tree, &hfi_fcdns_fc4features, + item=proto_tree_add_uint(parent_tree, &hfi_fcdns_fc4features, tvb, offset, 1, flags); - tree=proto_item_add_subtree(item, ett_fc4features); - } + tree=proto_item_add_subtree(item, ett_fc4features); proto_tree_add_boolean(tree, &hfi_fcdns_fc4features_i, tvb, offset, 1, flags); if (flags&0x02){ @@ -487,15 +482,13 @@ dissect_fc4features (proto_tree *parent_tree, tvbuff_t *tvb, int offset) static void dissect_fc4type (proto_tree *parent_tree, tvbuff_t *tvb, int offset, header_field_info *hfinfo) { - proto_item *item=NULL; - proto_tree *tree=NULL; + proto_item *item; + proto_tree *tree; guint32 flags; - if(parent_tree){ - item=proto_tree_add_item(parent_tree, hfinfo, tvb, offset, - 32, ENC_NA); - tree=proto_item_add_subtree(item, ett_fc4flags); - } + item=proto_tree_add_item(parent_tree, hfinfo, tvb, offset, + 32, ENC_NA); + tree=proto_item_add_subtree(item, ett_fc4flags); flags = tvb_get_ntohl (tvb, offset); diff --git a/epan/dissectors/packet-fcels.c b/epan/dissectors/packet-fcels.c index 478b6aea1f..f853c96853 100644 --- a/epan/dissectors/packet-fcels.c +++ b/epan/dissectors/packet-fcels.c @@ -632,14 +632,12 @@ static const true_false_string tfs_fc_fcels_cmn_payload = { static void dissect_cmnsvc (proto_tree *parent_tree, tvbuff_t *tvb, int offset, guint16 flags, guint8 opcode) { - proto_item *item=NULL; - proto_tree *tree=NULL; + proto_item *item; + proto_tree *tree; - if(parent_tree){ - item=proto_tree_add_uint(parent_tree, hf_fcels_cmnfeatures, - tvb, offset, 2, flags); - tree=proto_item_add_subtree(item, ett_fcels_cmnfeatures); - } + item=proto_tree_add_uint(parent_tree, hf_fcels_cmnfeatures, + tvb, offset, 2, flags); + tree=proto_item_add_subtree(item, ett_fcels_cmnfeatures); proto_tree_add_boolean(tree, hf_fcels_cmn_cios, tvb, offset, 2, flags); if (flags&0x8000){ @@ -746,14 +744,12 @@ static const true_false_string tfs_fc_fcels_cls_nzctl = { static void dissect_clssvc_flags (proto_tree *parent_tree, tvbuff_t *tvb, int offset, guint16 flags, guint8 opcode) { - proto_item *item=NULL; - proto_tree *tree=NULL; + proto_item *item; + proto_tree *tree; - if(parent_tree){ - item=proto_tree_add_uint(parent_tree, hf_fcels_clsflags, - tvb, offset, 2, flags); - tree=proto_item_add_subtree(item, ett_fcels_clsflags); - } + item=proto_tree_add_uint(parent_tree, hf_fcels_clsflags, + tvb, offset, 2, flags); + tree=proto_item_add_subtree(item, ett_fcels_clsflags); proto_tree_add_boolean(tree, hf_fcels_cls_cns, tvb, offset, 2, flags); if (!(flags&0x8000)){ @@ -821,14 +817,12 @@ static const true_false_string tfs_fc_fcels_fcpflags_wrxr = { static void dissect_fcp_flags (proto_tree *parent_tree, tvbuff_t *tvb, int offset, guint32 flags, guint8 isreq) { - proto_item *item=NULL; - proto_tree *tree=NULL; + proto_item *item; + proto_tree *tree; - if(parent_tree){ - item=proto_tree_add_uint(parent_tree, hf_fcels_fcpflags, - tvb, offset, 4, flags); - tree=proto_item_add_subtree(item, ett_fcels_fcpflags); - } + item=proto_tree_add_uint(parent_tree, hf_fcels_fcpflags, + tvb, offset, 4, flags); + tree=proto_item_add_subtree(item, ett_fcels_fcpflags); if (isreq) { proto_tree_add_boolean(tree, hf_fcels_fcpflags_trireq, tvb, offset, 4, flags); @@ -890,16 +884,14 @@ dissect_fcp_flags (proto_tree *parent_tree, tvbuff_t *tvb, int offset, guint32 f static void dissect_speed_flags (proto_tree *parent_tree, tvbuff_t *tvb, int offset, guint32 flags, int port) { - proto_item *item=NULL; - proto_tree *tree=NULL; + proto_item *item; + proto_tree *tree; - if(parent_tree){ - item=proto_tree_add_uint_format(parent_tree, hf_fcels_speedflags, - tvb, offset, 2, flags, - "Port Speed Capabilities (Port %u): 0x%04x", - port, flags); - tree=proto_item_add_subtree(item, ett_fcels_speedflags); - } + item=proto_tree_add_uint_format(parent_tree, hf_fcels_speedflags, + tvb, offset, 2, flags, + "Port Speed Capabilities (Port %u): 0x%04x", + port, flags); + tree=proto_item_add_subtree(item, ett_fcels_speedflags); proto_tree_add_boolean(tree, hf_fcels_speedflags_1gb, tvb, offset, 2, flags); if (flags&0x8000){ @@ -942,14 +934,12 @@ static const true_false_string tfs_fc_fcels_prliloflags_eip = { static void dissect_prlilo_flags (proto_tree *parent_tree, tvbuff_t *tvb, int offset, int flags, guint8 opcode) { - proto_item *item=NULL; - proto_tree *tree=NULL; + proto_item *item; + proto_tree *tree; - if(parent_tree){ - item=proto_tree_add_uint(parent_tree, hf_fcels_prliloflags, - tvb, offset, 1, flags); - tree=proto_item_add_subtree(item, ett_fcels_prliloflags); - } + item=proto_tree_add_uint(parent_tree, hf_fcels_prliloflags, + tvb, offset, 1, flags); + tree=proto_item_add_subtree(item, ett_fcels_prliloflags); if (opcode == FC_ELS_TPRLO) { proto_tree_add_boolean(tree, hf_fcels_tprloflags_opav, tvb, offset, 1, flags); @@ -1022,14 +1012,12 @@ static const true_false_string tfs_fc_fcels_initctl_ackgaa = { static void dissect_initctl_flags (proto_tree *parent_tree, tvbuff_t *tvb, int offset, guint16 flags, guint8 opcode) { - proto_item *item=NULL; - proto_tree *tree=NULL; + proto_item *item; + proto_tree *tree; - if(parent_tree){ - item=proto_tree_add_uint(parent_tree, hf_fcels_initctl, - tvb, offset, 2, flags); - tree=proto_item_add_subtree(item, ett_fcels_initctl); - } + item=proto_tree_add_uint(parent_tree, hf_fcels_initctl, + tvb, offset, 2, flags); + tree=proto_item_add_subtree(item, ett_fcels_initctl); if ((opcode == FC_ELS_PLOGI) || (opcode == FC_ELS_PDISC)) { proto_tree_add_uint(tree, hf_fcels_initctl_initial_pa, @@ -1080,14 +1068,12 @@ static const value_string rcptctl_category_vals[] = { static void dissect_rcptctl_flags (proto_tree *parent_tree, tvbuff_t *tvb, int offset, guint16 flags, guint8 opcode) { - proto_item *item=NULL; - proto_tree *tree=NULL; + proto_item *item; + proto_tree *tree; - if(parent_tree){ - item=proto_tree_add_uint(parent_tree, hf_fcels_rcptctl, - tvb, offset, 2, flags); - tree=proto_item_add_subtree(item, ett_fcels_rcptctl); - } + item=proto_tree_add_uint(parent_tree, hf_fcels_rcptctl, + tvb, offset, 2, flags); + tree=proto_item_add_subtree(item, ett_fcels_rcptctl); if ((opcode == FC_ELS_PLOGI) || (opcode == FC_ELS_PDISC)) { proto_tree_add_boolean(tree, hf_fcels_rcptctl_ack0, tvb, offset, 2, flags); @@ -1141,16 +1127,13 @@ dissect_fcels_logi (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, svcvld = 0, svcclass; proto_tree *logi_tree, *cmnsvc_tree; - proto_item *subti; guint16 flag; if (tree) { logi_tree = proto_item_add_subtree (ti, ett_fcels_logi); proto_tree_add_item (logi_tree, hf_fcels_opcode, tvb, offset, 1, ENC_BIG_ENDIAN); - subti = proto_tree_add_text (logi_tree, tvb, offset+4, 16, - "Common Svc Parameters"); - cmnsvc_tree = proto_item_add_subtree (subti, ett_fcels_logi_cmnsvc); + cmnsvc_tree = proto_tree_add_subtree(logi_tree, tvb, offset+4, 16, ett_fcels_logi_cmnsvc, NULL, "Common Svc Parameters"); proto_tree_add_item (cmnsvc_tree, hf_fcels_b2b, tvb, offset+6, 2, ENC_BIG_ENDIAN); flag = tvb_get_ntohs (tvb, offset+8); @@ -1173,9 +1156,8 @@ dissect_fcels_logi (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, /* Add subtree for class paramters */ offset = 36; for (svcclass = 1; svcclass < 5; svcclass++) { - subti = proto_tree_add_text (logi_tree, tvb, offset, 16, - "Class %d Svc Parameters", svcclass); - cmnsvc_tree = proto_item_add_subtree (subti, ett_fcels_logi_cmnsvc); + cmnsvc_tree = proto_tree_add_subtree_format(logi_tree, tvb, offset, 16, + ett_fcels_logi_cmnsvc, NULL, "Class %d Svc Parameters", svcclass); flag = tvb_get_ntohs (tvb, offset); dissect_clssvc_flags (cmnsvc_tree, tvb, offset, flag, opcode); @@ -1533,7 +1515,6 @@ dissect_fcels_rpl (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, /* Set up structures needed to add the protocol subtree and manage it */ int offset = 0; proto_tree *rpl_tree, *pb_tree; - proto_item *subti; int loop; if (tree) { @@ -1563,9 +1544,8 @@ dissect_fcels_rpl (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, offset = 12; /* The following loop is for dissecting the port blocks */ for (loop = tvb_get_ntoh24 (tvb, 5); loop > 0; loop--) { - subti = proto_tree_add_text (rpl_tree, tvb, offset+12, 16, - "Port Block %u", loop); - pb_tree = proto_item_add_subtree (subti, ett_fcels_rplpb); + pb_tree = proto_tree_add_subtree_format(rpl_tree, tvb, offset+12, 16, + ett_fcels_rplpb, NULL, "Port Block %u", loop); proto_tree_add_text (pb_tree, tvb, offset, 4, "Physical Port #: %u", @@ -1611,7 +1591,6 @@ dissect_fcels_rscn (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, /* Set up structures needed to add the protocol subtree and manage it */ int offset = 1; proto_tree *rscn_tree, *rectree; - proto_item *subti; int numrec, plen, i; if (tree) { @@ -1630,9 +1609,8 @@ dissect_fcels_rscn (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, offset = 4; for (i = 0; i < numrec; i++) { - subti = proto_tree_add_text (rscn_tree, tvb, offset, 4, - "Affected N_Port Page %u", i); - rectree = proto_item_add_subtree (subti, ett_fcels_rscn_rec); + rectree = proto_tree_add_subtree_format(rscn_tree, tvb, offset, 4, + ett_fcels_rscn_rec, NULL, "Affected N_Port Page %u", i); proto_tree_add_item (rectree, hf_fcels_rscn_evqual, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -1672,7 +1650,6 @@ dissect_fcels_rnft (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int offset = 0; guint16 numrec, i; proto_tree *rnft_tree, *fc4_tree; - proto_item *subti; if (tree) { rnft_tree = proto_item_add_subtree (ti, ett_fcels_rnft); @@ -1697,9 +1674,8 @@ dissect_fcels_rnft (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, tvb_get_guint8 (tvb, offset+7)); offset = 8; for (i = 0; i < numrec; i++) { - subti = proto_tree_add_text (rnft_tree, tvb, offset, 4, - "FC-4 Entry #%u", i); - fc4_tree = proto_item_add_subtree (subti, ett_fcels_rnft_fc4); + fc4_tree = proto_tree_add_subtree_format(rnft_tree, tvb, offset, 4, + ett_fcels_rnft_fc4, NULL, "FC-4 Entry #%u", i); proto_tree_add_item (fc4_tree, hf_fcels_rnft_fc4type, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -1753,7 +1729,6 @@ dissect_fcels_prlilo_payload (tvbuff_t *tvb, packet_info *pinfo _U_, guint8 type; proto_tree *prli_tree, *svcpg_tree; int num_svcpg, payload_len, i, flag; - proto_item *subti; /* We're assuming that we're invoked only if tree is not NULL i.e. * we don't do the usual "if (tree)" check here, the caller must. @@ -1772,9 +1747,8 @@ dissect_fcels_prlilo_payload (tvbuff_t *tvb, packet_info *pinfo _U_, offset = 4; for (i = 0; i < num_svcpg; i++) { - subti = proto_tree_add_text (prli_tree, tvb, offset, 16, - "Service Parameter Page %u", i); - svcpg_tree = proto_item_add_subtree (subti, ett_fcels_prli_svcpg); + svcpg_tree = proto_tree_add_subtree_format(prli_tree, tvb, offset, 16, + ett_fcels_prli_svcpg, NULL, "Service Parameter Page %u", i); type = tvb_get_guint8 (tvb, offset); proto_tree_add_text (svcpg_tree, tvb, offset, 1, diff --git a/epan/dissectors/packet-fcfcs.c b/epan/dissectors/packet-fcfcs.c index 5cf14ebc1e..1c268cbcf2 100644 --- a/epan/dissectors/packet-fcfcs.c +++ b/epan/dissectors/packet-fcfcs.c @@ -788,12 +788,10 @@ dissect_fcfcs (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) /* Make entries in Protocol column and Info column on summary display */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "FC-FCS"); - if (tree) { - ti = proto_tree_add_protocol_format (tree, proto_fcfcs, tvb, 0, - tvb_reported_length (tvb), - "FCS"); - fcfcs_tree = proto_item_add_subtree (ti, ett_fcfcs); - } + ti = proto_tree_add_protocol_format (tree, proto_fcfcs, tvb, 0, + tvb_reported_length (tvb), + "FCS"); + fcfcs_tree = proto_item_add_subtree (ti, ett_fcfcs); tvb_memcpy (tvb, (guint8 *)&cthdr, offset, FCCT_PRMBL_SIZE); cthdr.revision = tvb_get_guint8 (tvb, offset); diff --git a/epan/dissectors/packet-fcgi.c b/epan/dissectors/packet-fcgi.c index d652439cd8..fec38bafc8 100644 --- a/epan/dissectors/packet-fcgi.c +++ b/epan/dissectors/packet-fcgi.c @@ -143,11 +143,9 @@ dissect_nv_pairs(tvbuff_t *tvb, proto_tree *fcgi_tree, gint offset, guint16 len) static int dissect_begin_request(tvbuff_t *tvb, proto_tree *fcgi_tree, gint offset, guint16 len) { - proto_item *br; proto_tree *br_tree; - br = proto_tree_add_text(fcgi_tree, tvb, offset, len, "Begin Request:"); - br_tree = proto_item_add_subtree(br, ett_fcgi_begin_request); + br_tree = proto_tree_add_subtree(fcgi_tree, tvb, offset, len, ett_fcgi_begin_request, NULL, "Begin Request:"); proto_tree_add_item(br_tree, hf_fcgi_begin_request_role, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; @@ -172,11 +170,9 @@ dissect_abort_request(tvbuff_t *tvb, proto_tree *fcgi_tree, gint offset, guint16 static int dissect_end_request(tvbuff_t *tvb, proto_tree *fcgi_tree, gint offset, guint16 len) { - proto_item *er; proto_tree *er_tree; - er = proto_tree_add_text(fcgi_tree, tvb, offset, len, "End Request:"); - er_tree = proto_item_add_subtree(er, ett_fcgi_end_request); + er_tree = proto_tree_add_subtree(fcgi_tree, tvb, offset, len, ett_fcgi_end_request, NULL, "End Request:"); proto_tree_add_item(er_tree, hf_fcgi_end_request_app_status, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; @@ -192,11 +188,9 @@ dissect_end_request(tvbuff_t *tvb, proto_tree *fcgi_tree, gint offset, guint16 l static void dissect_params(tvbuff_t *tvb, proto_tree *fcgi_tree, gint offset, guint16 len) { - proto_item *p; proto_tree *p_tree; - p = proto_tree_add_text(fcgi_tree, tvb, offset, len, "Params:"); - p_tree = proto_item_add_subtree(p, ett_fcgi_params); + p_tree = proto_tree_add_subtree(fcgi_tree, tvb, offset, len, ett_fcgi_params, NULL, "Params:"); dissect_nv_pairs(tvb, p_tree, offset, len); @@ -206,11 +200,9 @@ dissect_params(tvbuff_t *tvb, proto_tree *fcgi_tree, gint offset, guint16 len) static void dissect_get_values(tvbuff_t *tvb, proto_tree *fcgi_tree, gint offset, guint16 len) { - proto_item *gv; proto_tree *gv_tree; - gv = proto_tree_add_text(fcgi_tree, tvb, offset, len, "Get Values:"); - gv_tree = proto_item_add_subtree(gv, ett_fcgi_params); + gv_tree = proto_tree_add_subtree(fcgi_tree, tvb, offset, len, ett_fcgi_params, NULL, "Get Values:"); dissect_nv_pairs(tvb, gv_tree, offset, len); @@ -220,11 +212,9 @@ dissect_get_values(tvbuff_t *tvb, proto_tree *fcgi_tree, gint offset, guint16 le static void dissect_get_values_result(tvbuff_t *tvb, proto_tree *fcgi_tree, gint offset, guint16 len) { - proto_item *gvr; proto_tree *gvr_tree; - gvr = proto_tree_add_text(fcgi_tree, tvb, offset, len, "Get Values:"); - gvr_tree = proto_item_add_subtree(gvr, ett_fcgi_params); + gvr_tree = proto_tree_add_subtree(fcgi_tree, tvb, offset, len, ett_fcgi_params, NULL, "Get Values:"); dissect_nv_pairs(tvb, gvr_tree, offset, len); diff --git a/epan/dissectors/packet-fcp.c b/epan/dissectors/packet-fcp.c index 2245ba07a2..35d3b4e963 100644 --- a/epan/dissectors/packet-fcp.c +++ b/epan/dissectors/packet-fcp.c @@ -180,15 +180,13 @@ static const true_false_string fcp_mgmt_flags_abort_task_set_tfs = { static void dissect_task_mgmt_flags(packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset) { - proto_item *item = NULL; - proto_tree *tree = NULL; + proto_item *item; + proto_tree *tree; guint8 flags; - if (parent_tree) { - item = proto_tree_add_item(parent_tree, hf_fcp_taskmgmt, tvb, offset, 1, ENC_LITTLE_ENDIAN); - tree = proto_item_add_subtree(item, ett_fcp_taskmgmt); - } + item = proto_tree_add_item(parent_tree, hf_fcp_taskmgmt, tvb, offset, 1, ENC_LITTLE_ENDIAN); + tree = proto_item_add_subtree(item, ett_fcp_taskmgmt); flags = tvb_get_guint8(tvb, offset); @@ -285,15 +283,13 @@ static const true_false_string fcp_rsp_flags_res_vld_tfs = { static void dissect_rsp_flags(proto_tree *parent_tree, tvbuff_t *tvb, int offset) { - proto_item *item = NULL; - proto_tree *tree = NULL; + proto_item *item; + proto_tree *tree; gboolean bidi_resid_present = FALSE; guint8 flags; - if (parent_tree) { - item = proto_tree_add_item(parent_tree, hf_fcp_rspflags, tvb, offset, 1, ENC_LITTLE_ENDIAN); - tree = proto_item_add_subtree(item, ett_fcp_rsp_flags); - } + item = proto_tree_add_item(parent_tree, hf_fcp_rspflags, tvb, offset, 1, ENC_LITTLE_ENDIAN); + tree = proto_item_add_subtree(item, ett_fcp_rsp_flags); flags = tvb_get_guint8(tvb, offset); diff --git a/epan/dissectors/packet-fcsb3.c b/epan/dissectors/packet-fcsb3.c index 1b4e5a019e..fe6e94fab8 100644 --- a/epan/dissectors/packet-fcsb3.c +++ b/epan/dissectors/packet-fcsb3.c @@ -251,14 +251,12 @@ static const value_string fc_sbccs_dib_lrj_errcode_val[] = { static void dissect_iui_flags (proto_tree *parent_tree, tvbuff_t *tvb, int offset, guint16 flags) { - proto_item *item = NULL; - proto_tree *tree = NULL; + proto_item *item; + proto_tree *tree; - if (parent_tree) { - item=proto_tree_add_uint(parent_tree, hf_sbccs_iui, - tvb, offset, 1, flags); - tree=proto_item_add_subtree(item, ett_sbccs_iui); - } + item=proto_tree_add_uint(parent_tree, hf_sbccs_iui, + tvb, offset, 1, flags); + tree=proto_item_add_subtree(item, ett_sbccs_iui); proto_tree_add_boolean(tree, hf_sbccs_iui_as, tvb, offset, 1, flags); if (flags & 0x10) { @@ -280,14 +278,12 @@ dissect_iui_flags (proto_tree *parent_tree, tvbuff_t *tvb, int offset, guint16 f static void dissect_linkctlinfo (proto_tree *parent_tree, tvbuff_t *tvb, int offset, guint16 flags) { - proto_item *item = NULL; - proto_tree *tree = NULL; + proto_item *item; + proto_tree *tree; - if (parent_tree) { - item=proto_tree_add_uint(parent_tree, hf_sbccs_dib_linkctlinfo, - tvb, offset, 2, flags); - tree=proto_item_add_subtree(item, ett_sbccs_dib_linkctlinfo); - } + item=proto_tree_add_uint(parent_tree, hf_sbccs_dib_linkctlinfo, + tvb, offset, 2, flags); + tree=proto_item_add_subtree(item, ett_sbccs_dib_linkctlinfo); proto_tree_add_boolean(tree, hf_sbccs_dib_linkctlinfo_ctcconn, tvb, offset, 2, flags); if (flags & 0x80) { @@ -306,14 +302,12 @@ dissect_linkctlinfo (proto_tree *parent_tree, tvbuff_t *tvb, int offset, guint16 static void dissect_dh_flags (proto_tree *parent_tree, tvbuff_t *tvb, int offset, guint16 flags) { - proto_item *item = NULL; - proto_tree *tree = NULL; + proto_item *item; + proto_tree *tree; - if (parent_tree) { - item=proto_tree_add_uint(parent_tree, hf_sbccs_dhflags, - tvb, offset, 1, flags); - tree=proto_item_add_subtree(item, ett_sbccs_dhflags); - } + item=proto_tree_add_uint(parent_tree, hf_sbccs_dhflags, + tvb, offset, 1, flags); + tree=proto_item_add_subtree(item, ett_sbccs_dhflags); proto_tree_add_boolean(tree, hf_sbccs_dhflags_end, tvb, offset, 1, flags); if (flags & 0x80) { @@ -344,14 +338,12 @@ dissect_dh_flags (proto_tree *parent_tree, tvbuff_t *tvb, int offset, guint16 fl static void dissect_ccw_flags (proto_tree *parent_tree, tvbuff_t *tvb, int offset, guint8 flags) { - proto_item *item = NULL; - proto_tree *tree = NULL; + proto_item *item; + proto_tree *tree; - if (parent_tree) { - item=proto_tree_add_uint(parent_tree, hf_sbccs_dib_ccw_flags, - tvb, offset, 1, flags); - tree=proto_item_add_subtree(item, ett_sbccs_dib_ccw_flags); - } + item=proto_tree_add_uint(parent_tree, hf_sbccs_dib_ccw_flags, + tvb, offset, 1, flags); + tree=proto_item_add_subtree(item, ett_sbccs_dib_ccw_flags); proto_tree_add_boolean(tree, hf_sbccs_dib_ccw_flags_cd, tvb, offset, 1, flags); if (flags & 0x80) { @@ -382,14 +374,12 @@ dissect_ccw_flags (proto_tree *parent_tree, tvbuff_t *tvb, int offset, guint8 fl static void dissect_cmd_flags (proto_tree *parent_tree, tvbuff_t *tvb, int offset, guint8 flags) { - proto_item *item = NULL; - proto_tree *tree = NULL; + proto_item *item; + proto_tree *tree; - if (parent_tree) { - item=proto_tree_add_uint(parent_tree, hf_sbccs_dib_cmdflags, - tvb, offset, 1, flags); - tree=proto_item_add_subtree(item, ett_sbccs_dib_cmdflags); - } + item=proto_tree_add_uint(parent_tree, hf_sbccs_dib_cmdflags, + tvb, offset, 1, flags); + tree=proto_item_add_subtree(item, ett_sbccs_dib_cmdflags); proto_tree_add_boolean(tree, hf_sbccs_dib_cmdflags_du, tvb, offset, 1, flags); if (flags & 0x10) { @@ -433,15 +423,12 @@ static const value_string status_ffc_val[] = { static void dissect_status_flags (proto_tree *parent_tree, tvbuff_t *tvb, int offset, guint8 flags) { - proto_item *item = NULL; - proto_tree *tree = NULL; - - if (parent_tree) { - item=proto_tree_add_uint(parent_tree, hf_sbccs_dib_statusflags, - tvb, offset, 1, flags); - tree=proto_item_add_subtree(item, ett_sbccs_dib_statusflags); - } + proto_item *item; + proto_tree *tree; + item=proto_tree_add_uint(parent_tree, hf_sbccs_dib_statusflags, + tvb, offset, 1, flags); + tree=proto_item_add_subtree(item, ett_sbccs_dib_statusflags); proto_tree_add_item (tree, hf_sbccs_dib_statusflags_ffc, tvb, offset, 1, ENC_BIG_ENDIAN); proto_item_append_text(item, "%s", val_to_str ((flags>>5) & 0x07, status_ffc_val, "Reserved:0x%x")); @@ -477,15 +464,12 @@ dissect_status_flags (proto_tree *parent_tree, tvbuff_t *tvb, int offset, guint8 static void dissect_status (packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, guint8 flags) { - proto_item *item = NULL; - proto_tree *tree = NULL; - - if (parent_tree) { - item=proto_tree_add_uint(parent_tree, hf_sbccs_dib_status, - tvb, offset, 1, flags); - tree=proto_item_add_subtree(item, ett_sbccs_dib_status); - } + proto_item *item; + proto_tree *tree; + item=proto_tree_add_uint(parent_tree, hf_sbccs_dib_status, + tvb, offset, 1, flags); + tree=proto_item_add_subtree(item, ett_sbccs_dib_status); proto_tree_add_boolean(tree, hf_sbccs_dib_status_attention, tvb, offset, 1, flags); if (flags & 0x80) { @@ -549,14 +533,12 @@ dissect_status (packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int static void dissect_sel_rst_param (proto_tree *parent_tree, tvbuff_t *tvb, int offset, guint32 flags) { - proto_item *item = NULL; - proto_tree *tree = NULL; + proto_item *item; + proto_tree *tree; - if (parent_tree) { - item=proto_tree_add_uint(parent_tree, hf_sbccs_dib_ctlparam, - tvb, offset, 3, flags); - tree=proto_item_add_subtree(item, ett_sbccs_dib_ctlparam); - } + item=proto_tree_add_uint(parent_tree, hf_sbccs_dib_ctlparam, + tvb, offset, 3, flags); + tree=proto_item_add_subtree(item, ett_sbccs_dib_ctlparam); proto_tree_add_boolean(tree, hf_sbccs_dib_ctlparam_rc, tvb, offset, 3, flags); if (flags & 0x80) { @@ -594,7 +576,6 @@ static void dissect_fc_sbccs_sb3_iu_hdr (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint offset) { - proto_item *subti; proto_tree *sb3hdr_tree; proto_tree *iuhdr_tree; guint8 iui, dhflags; @@ -608,18 +589,16 @@ dissect_fc_sbccs_sb3_iu_hdr (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree if (tree) { /* Dissect SB3 header first */ - subti = proto_tree_add_text (tree, tvb, offset, FC_SBCCS_SB3_HDR_SIZE, - "SB-3 Header"); - sb3hdr_tree = proto_item_add_subtree (subti, ett_fc_sbccs); + sb3hdr_tree = proto_tree_add_subtree(tree, tvb, offset, FC_SBCCS_SB3_HDR_SIZE, + ett_fc_sbccs, NULL, "SB-3 Header"); proto_tree_add_item (sb3hdr_tree, hf_sbccs_chid, tvb, offset+1, 1, ENC_BIG_ENDIAN); proto_tree_add_item (sb3hdr_tree, hf_sbccs_cuid, tvb, offset+3, 1, ENC_BIG_ENDIAN); proto_tree_add_item (sb3hdr_tree, hf_sbccs_devaddr, tvb, offset+4, 2, ENC_BIG_ENDIAN); /* Dissect IU Header */ - subti = proto_tree_add_text (tree, tvb, offset + FC_SBCCS_SB3_HDR_SIZE, - FC_SBCCS_IU_HDR_SIZE, "IU Header"); - iuhdr_tree = proto_item_add_subtree (subti, ett_fc_sbccs); + iuhdr_tree = proto_tree_add_subtree(tree, tvb, offset + FC_SBCCS_SB3_HDR_SIZE, + FC_SBCCS_IU_HDR_SIZE, ett_fc_sbccs, NULL, "IU Header"); offset += FC_SBCCS_SB3_HDR_SIZE; iui = tvb_get_guint8 (tvb, offset); @@ -888,9 +867,8 @@ static void dissect_fc_sbccs (tvbuff_t *tvb, packet_info *pinfo, dissect_fc_sbccs_sb3_iu_hdr (tvb, pinfo, sb3_tree, offset); offset += (FC_SBCCS_SB3_HDR_SIZE + FC_SBCCS_IU_HDR_SIZE); - ti = proto_tree_add_text (sb3_tree, tvb, offset, - FC_SBCCS_DIB_LRC_HDR_SIZE, "DIB Header"); - dib_tree = proto_item_add_subtree (ti, ett_fc_sbccs); + dib_tree = proto_tree_add_subtree(sb3_tree, tvb, offset, + FC_SBCCS_DIB_LRC_HDR_SIZE, ett_fc_sbccs, NULL, "DIB Header"); } else { offset += (FC_SBCCS_SB3_HDR_SIZE + FC_SBCCS_IU_HDR_SIZE); diff --git a/epan/dissectors/packet-fcswils.c b/epan/dissectors/packet-fcswils.c index de839afbab..168928c531 100644 --- a/epan/dissectors/packet-fcswils.c +++ b/epan/dissectors/packet-fcswils.c @@ -628,20 +628,17 @@ dissect_swils_ess_capability_obj(tvbuff_t *tvb, proto_tree *tree, int offset) if (type != FCCT_GSTYPE_VENDOR) { num_entries = tvb_get_guint8(tvb, offset+3); total_len = 4 + (num_entries*8); - ti = proto_tree_add_text(tree, tvb, offset, - total_len, "Capability Object (%s)", + capinfo_tree = proto_tree_add_subtree_format(tree, tvb, offset, + total_len, ett_fcswils_capinfo, NULL, "Capability Object (%s)", val_to_str(type, fc_ct_gstype_vals, "Unknown (0x%x)")); - capinfo_tree = proto_item_add_subtree(ti, ett_fcswils_capinfo); - } else { i = tvb_get_guint8(tvb, offset+3); i += 12; - ti = proto_tree_add_text(tree, tvb, offset, - i, "Capability Object (Vendor-specific 0x%x)", + capinfo_tree = proto_tree_add_subtree_format(tree, tvb, offset, + i, ett_fcswils_capinfo, NULL, "Capability Object (Vendor-specific 0x%x)", type); - capinfo_tree = proto_item_add_subtree(ti, ett_fcswils_capinfo); } proto_tree_add_item(capinfo_tree, hf_swils_ess_cap_type, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -856,7 +853,6 @@ dissect_swils_efp(tvbuff_t *tvb, proto_tree *efp_tree, guint8 isreq _U_) { /* Set up structures needed to add the protocol subtree and manage it */ - proto_item *subti; proto_tree *lrec_tree; int num_listrec = 0; int offset = 0; @@ -899,12 +895,11 @@ dissect_swils_efp(tvbuff_t *tvb, proto_tree *efp_tree, guint8 isreq _U_) num_listrec = (efp.payload_len - FC_SWILS_EFP_SIZE)/efp.reclen; while (num_listrec-- > 0) { rec_type = tvb_get_guint8(tvb, offset); - subti = proto_tree_add_text(efp_tree, tvb, offset, -1, - "%s", + lrec_tree = proto_tree_add_subtree(efp_tree, tvb, offset, -1, + ett_fcswils_efplist, NULL, val_to_str(rec_type, fcswils_rectype_val, "Unknown record type (0x%02x)")); - lrec_tree = proto_item_add_subtree(subti, ett_fcswils_efplist); proto_tree_add_uint(lrec_tree, hf_swils_efp_rec_type, tvb, offset, 1, rec_type); switch (rec_type) { @@ -974,13 +969,11 @@ dissect_swils_rdi(tvbuff_t *tvb, proto_tree *rdi_tree, guint8 isreq) static void dissect_swils_fspf_hdr(tvbuff_t *tvb, proto_tree *tree, int offset) { - proto_item *subti; proto_tree *fspfh_tree; if (tree) { /* 20 is the size of FSPF header */ - subti = proto_tree_add_text(tree, tvb, offset, 20, "FSPF Header"); - fspfh_tree = proto_item_add_subtree(subti, ett_fcswils_fspfhdr); + fspfh_tree = proto_tree_add_subtree(tree, tvb, offset, 20, ett_fcswils_fspfhdr, NULL, "FSPF Header"); proto_tree_add_item(fspfh_tree, hf_swils_fspfh_rev, tvb, offset+4, 1, ENC_BIG_ENDIAN); @@ -1028,21 +1021,17 @@ dissect_swils_fspf_lsrec(tvbuff_t *tvb, proto_tree *tree, int offset, int num_lsrec) { int i, j, num_ldrec; - proto_item *subti1, *subti; proto_tree *lsrec_tree, *ldrec_tree, *lsrechdr_tree; if (tree) { for (j = 0; j < num_lsrec; j++) { num_ldrec = tvb_get_ntohs(tvb, offset+26); - subti = proto_tree_add_text(tree, tvb, offset, (28+num_ldrec*16), - "Link State Record %d (Domain %d)", j, + lsrec_tree = proto_tree_add_subtree_format(tree, tvb, offset, (28+num_ldrec*16), + ett_fcswils_lsrec, NULL, "Link State Record %d (Domain %d)", j, tvb_get_guint8(tvb, offset+15)); - lsrec_tree = proto_item_add_subtree(subti, ett_fcswils_lsrec); - subti = proto_tree_add_text(lsrec_tree, tvb, offset, 24, - "Link State Record Header"); - lsrechdr_tree = proto_item_add_subtree(subti, - ett_fcswils_lsrechdr); + lsrechdr_tree = proto_tree_add_subtree(lsrec_tree, tvb, offset, 24, + ett_fcswils_lsrechdr, NULL, "Link State Record Header"); dissect_swils_fspf_lsrechdr(tvb, lsrechdr_tree, offset); proto_tree_add_text(tree, tvb, offset+26, 2, "Number of Links: %d", @@ -1050,11 +1039,10 @@ dissect_swils_fspf_lsrec(tvbuff_t *tvb, proto_tree *tree, int offset, offset += 28; for (i = 0; i < num_ldrec; i++) { - subti1 = proto_tree_add_text(lsrec_tree, tvb, offset, 16, - "Link Descriptor %d " + ldrec_tree = proto_tree_add_subtree_format(lsrec_tree, tvb, offset, 16, + ett_fcswils_ldrec, NULL, "Link Descriptor %d " "(Neighbor domain %d)", i, tvb_get_guint8(tvb, offset+3)); - ldrec_tree = proto_item_add_subtree(subti1, ett_fcswils_ldrec); dissect_swils_fspf_ldrec(tvb, ldrec_tree, offset); offset += 16; } @@ -1108,7 +1096,6 @@ dissect_swils_lsack(tvbuff_t *tvb, proto_tree *lsa_tree, guint8 isreq _U_) /* Set up structures needed to add the protocol subtree and manage it */ int offset = 0; int num_lsrechdr, i; - proto_item *subti; proto_tree *lsrechdr_tree; if (lsa_tree) { @@ -1125,11 +1112,9 @@ dissect_swils_lsack(tvbuff_t *tvb, proto_tree *lsa_tree, guint8 isreq _U_) offset = 28; for (i = 0; i < num_lsrechdr; i++) { - subti = proto_tree_add_text(lsa_tree, tvb, offset, 24, - "Link State Record Header (Domain %d)", + lsrechdr_tree = proto_tree_add_subtree_format(lsa_tree, tvb, offset, 24, + ett_fcswils_lsrechdr, NULL, "Link State Record Header (Domain %d)", tvb_get_guint8(tvb, offset+15)); - lsrechdr_tree = proto_item_add_subtree(subti, - ett_fcswils_lsrechdr); dissect_swils_fspf_lsrechdr(tvb, lsrechdr_tree, offset); offset += 24; } @@ -1143,7 +1128,6 @@ dissect_swils_rscn(tvbuff_t *tvb, proto_tree *rscn_tree, guint8 isreq) int offset = 0; proto_tree *dev_tree; int numrec, i; - proto_item *subti; if (rscn_tree) { if (!isreq) @@ -1169,9 +1153,8 @@ dissect_swils_rscn(tvbuff_t *tvb, proto_tree *rscn_tree, guint8 isreq) offset = 16; for (i = 0; i < numrec; i++) { - subti = proto_tree_add_text(rscn_tree, tvb, offset, 20, - "Device Entry %d", i); - dev_tree = proto_item_add_subtree(subti, ett_fcswils_rscn_dev); + dev_tree = proto_tree_add_subtree_format(rscn_tree, tvb, offset, 20, + ett_fcswils_rscn_dev, NULL, "Device Entry %d", i); proto_tree_add_item(dev_tree, hf_swils_rscn_portstate, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_string(dev_tree, hf_swils_rscn_portid, tvb, offset+1, 3, @@ -1271,7 +1254,6 @@ dissect_swils_zone_obj(tvbuff_t *tvb, proto_tree *zobj_tree, int offset) proto_tree *zmbr_tree; int mbrlen, numrec, i, objtype; char *str; - proto_item *subti; objtype = tvb_get_guint8(tvb, offset); @@ -1296,10 +1278,8 @@ dissect_swils_zone_obj(tvbuff_t *tvb, proto_tree *zobj_tree, int offset) } else { mbrlen = 4 + tvb_get_guint8(tvb, offset+3); - subti = proto_tree_add_text(zobj_tree, tvb, offset, mbrlen, - "Zone Member %d", i); - zmbr_tree = proto_item_add_subtree(subti, - ett_fcswils_zonembr); + zmbr_tree = proto_tree_add_subtree_format(zobj_tree, tvb, offset, mbrlen, + ett_fcswils_zonembr, NULL, "Zone Member %d", i); dissect_swils_zone_mbr(tvb, zmbr_tree, offset); offset += mbrlen; } @@ -1314,7 +1294,6 @@ dissect_swils_mergereq(tvbuff_t *tvb, proto_tree *mr_tree, guint8 isreq) proto_tree *zobjlist_tree, *zobj_tree; int numrec, i, zonesetlen, objlistlen, objlen; char *str; - proto_item *subti; if (mr_tree) { if (isreq) { @@ -1335,10 +1314,8 @@ dissect_swils_mergereq(tvbuff_t *tvb, proto_tree *mr_tree, guint8 isreq) offset = offset + (4 + ZONENAME_LEN(tvb, offset+4)); numrec = tvb_get_ntohl(tvb, offset); - subti = proto_tree_add_text(mr_tree, tvb, offset, objlistlen, - "Active Zone Set"); - zobjlist_tree = proto_item_add_subtree(subti, - ett_fcswils_zoneobjlist); + zobjlist_tree = proto_tree_add_subtree(mr_tree, tvb, offset, objlistlen, + ett_fcswils_zoneobjlist, NULL, "Active Zone Set"); proto_tree_add_text(zobjlist_tree, tvb, offset, 4, "Number of zoning objects: %d", numrec); @@ -1346,9 +1323,8 @@ dissect_swils_mergereq(tvbuff_t *tvb, proto_tree *mr_tree, guint8 isreq) offset += 4; for (i = 0; i < numrec; i++) { objlen = get_zoneobj_len(tvb, offset); - subti = proto_tree_add_text(zobjlist_tree, tvb, offset+4, - objlen, "Zone Object %d", i); - zobj_tree = proto_item_add_subtree(subti, ett_fcswils_zoneobj); + zobj_tree = proto_tree_add_subtree_format(zobjlist_tree, tvb, offset+4, objlen, + ett_fcswils_zoneobj, NULL, "Zone Object %d", i); dissect_swils_zone_obj(tvb, zobj_tree, offset); offset += objlen; } @@ -1367,19 +1343,16 @@ dissect_swils_mergereq(tvbuff_t *tvb, proto_tree *mr_tree, guint8 isreq) offset += 4; numrec = tvb_get_ntohl(tvb, offset); - subti = proto_tree_add_text(mr_tree, tvb, offset, objlistlen, - "Full Zone Set"); + zobjlist_tree = proto_tree_add_subtree(mr_tree, tvb, offset, objlistlen, + ett_fcswils_zoneobjlist, NULL, "Full Zone Set"); - zobjlist_tree = proto_item_add_subtree(subti, - ett_fcswils_zoneobjlist); proto_tree_add_text(zobjlist_tree, tvb, offset, 4, "Number of zoning objects: %d", numrec); offset += 4; for (i = 0; i < numrec; i++) { objlen = get_zoneobj_len(tvb, offset); - subti = proto_tree_add_text(zobjlist_tree, tvb, offset, - objlen, "Zone Object %d", i); - zobj_tree = proto_item_add_subtree(subti, ett_fcswils_zoneobj); + zobj_tree = proto_tree_add_subtree_format(zobjlist_tree, tvb, offset, + objlen, ett_fcswils_zoneobj, NULL, "Zone Object %d", i); dissect_swils_zone_obj(tvb, zobj_tree, offset); offset += objlen; } @@ -1460,7 +1433,6 @@ dissect_swils_sfc(tvbuff_t *tvb, proto_tree *sfc_tree, guint8 isreq) proto_tree *zobjlist_tree, *zobj_tree; int numrec, i, zonesetlen, objlistlen, objlen; char *str; - proto_item *subti; if (sfc_tree) { if (isreq) { @@ -1482,10 +1454,8 @@ dissect_swils_sfc(tvbuff_t *tvb, proto_tree *sfc_tree, guint8 isreq) offset = offset + (4 + ZONENAME_LEN(tvb, offset+4)); numrec = tvb_get_ntohl(tvb, offset); - subti = proto_tree_add_text(sfc_tree, tvb, offset, objlistlen, - "Zone Set"); - zobjlist_tree = proto_item_add_subtree(subti, - ett_fcswils_zoneobjlist); + zobjlist_tree = proto_tree_add_subtree(sfc_tree, tvb, offset, objlistlen, + ett_fcswils_zoneobjlist, NULL, "Zone Set"); proto_tree_add_text(zobjlist_tree, tvb, offset, 4, "Number of zoning objects: %d", numrec); @@ -1493,9 +1463,8 @@ dissect_swils_sfc(tvbuff_t *tvb, proto_tree *sfc_tree, guint8 isreq) offset += 4; for (i = 0; i < numrec; i++) { objlen = get_zoneobj_len(tvb, offset); - subti = proto_tree_add_text(zobjlist_tree, tvb, offset, - objlen, "Zone Object %d", i); - zobj_tree = proto_item_add_subtree(subti, ett_fcswils_zoneobj); + zobj_tree = proto_tree_add_subtree_format(zobjlist_tree, tvb, offset, objlen, + ett_fcswils_zoneobj, NULL, "Zone Object %d", i); dissect_swils_zone_obj(tvb, zobj_tree, offset); offset += objlen; } @@ -1514,19 +1483,16 @@ dissect_swils_sfc(tvbuff_t *tvb, proto_tree *sfc_tree, guint8 isreq) offset += 4; numrec = tvb_get_ntohl(tvb, offset); - subti = proto_tree_add_text(sfc_tree, tvb, offset, objlistlen, - "Full Zone Set"); + zobjlist_tree = proto_tree_add_subtree(sfc_tree, tvb, offset, objlistlen, + ett_fcswils_zoneobjlist, NULL, "Full Zone Set"); - zobjlist_tree = proto_item_add_subtree(subti, - ett_fcswils_zoneobjlist); proto_tree_add_text(zobjlist_tree, tvb, offset, 4, "Number of zoning objects: %d", numrec); offset += 4; for (i = 0; i < numrec; i++) { objlen = get_zoneobj_len(tvb, offset); - subti = proto_tree_add_text(zobjlist_tree, tvb, offset, - objlen, "Zone Object %d", i); - zobj_tree = proto_item_add_subtree(subti, ett_fcswils_zoneobj); + zobj_tree = proto_tree_add_subtree_format(zobjlist_tree, tvb, offset, objlen, + ett_fcswils_zoneobj, NULL, "Zone Object %d", i); dissect_swils_zone_obj(tvb, zobj_tree, offset); offset += objlen; } @@ -1570,7 +1536,6 @@ dissect_swils_esc(tvbuff_t *tvb, proto_tree *esc_tree, guint8 isreq) int offset = 0; int i, numrec, plen; proto_tree *pdesc_tree; - proto_item *subti; if (esc_tree) { if (isreq) { @@ -1583,10 +1548,8 @@ dissect_swils_esc(tvbuff_t *tvb, proto_tree *esc_tree, guint8 isreq) offset = 12; for (i = 0; i < numrec; i++) { - subti = proto_tree_add_text(esc_tree, tvb, offset, 12, - "Protocol Descriptor %d", i); - pdesc_tree = proto_item_add_subtree(subti, - ett_fcswils_esc_pdesc); + pdesc_tree = proto_tree_add_subtree_format(esc_tree, tvb, offset, 12, + ett_fcswils_esc_pdesc, NULL, "Protocol Descriptor %d", i); proto_tree_add_item(pdesc_tree, hf_swils_esc_pdesc_vendorid, tvb, offset, 8, ENC_ASCII|ENC_NA); proto_tree_add_item(pdesc_tree, hf_swils_esc_protocolid, @@ -1597,9 +1560,8 @@ dissect_swils_esc(tvbuff_t *tvb, proto_tree *esc_tree, guint8 isreq) else { proto_tree_add_item(esc_tree, hf_swils_esc_swvendorid, tvb, offset+4, 8, ENC_ASCII|ENC_NA); - subti = proto_tree_add_text(esc_tree, tvb, offset+12, 12, - "Accepted Protocol Descriptor"); - pdesc_tree = proto_item_add_subtree(subti, ett_fcswils_esc_pdesc); + pdesc_tree = proto_tree_add_subtree(esc_tree, tvb, offset+12, 12, + ett_fcswils_esc_pdesc, NULL, "Accepted Protocol Descriptor"); proto_tree_add_item(pdesc_tree, hf_swils_esc_pdesc_vendorid, tvb, offset+12, 8, ENC_ASCII|ENC_NA); @@ -1638,8 +1600,7 @@ dissect_swils_ess(tvbuff_t *tvb, proto_tree *ess_tree, guint8 isreq _U_) gint16 numcapobj = 0; gint len = 0; gint capobjlen = 0; - proto_item *ti = NULL; - proto_tree *ieinfo_tree = NULL; + proto_tree *ieinfo_tree; if (!ess_tree) { return; @@ -1649,10 +1610,9 @@ dissect_swils_ess(tvbuff_t *tvb, proto_tree *ess_tree, guint8 isreq _U_) proto_tree_add_item(ess_tree, hf_swils_ess_len, tvb, offset+8, 4, ENC_BIG_ENDIAN); len = tvb_get_ntohl(tvb, offset+8); - ti = proto_tree_add_text(ess_tree, tvb, offset+12, + ieinfo_tree = proto_tree_add_subtree(ess_tree, tvb, offset+12, MAX_INTERCONNECT_ELEMENT_INFO_LEN+4, - "Interconnect Element Info"); - ieinfo_tree = proto_item_add_subtree(ti, ett_fcswils_ieinfo); + ett_fcswils_ieinfo, NULL, "Interconnect Element Info"); dissect_swils_interconnect_element_info(tvb, ieinfo_tree, offset+12); len -= 256; /* the interconnect obj above is 256 bytes */ offset += 268; @@ -1784,11 +1744,8 @@ dissect_fcswils(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) /* decoding of this is done by each individual opcode handler */ opcode = tvb_get_guint8(tvb, 0); - if (tree) { - ti = proto_tree_add_protocol_format(tree, proto_fcswils, tvb, 0, - tvb_length(tvb), "SW_ILS"); - swils_tree = proto_item_add_subtree(ti, ett_fcswils); - } + ti = proto_tree_add_protocol_format(tree, proto_fcswils, tvb, 0, -1, "SW_ILS"); + swils_tree = proto_item_add_subtree(ti, ett_fcswils); /* Register conversation if this is not a response */ if ((opcode != FC_SWILS_SWACC) && (opcode != FC_SWILS_SWRJT)) { diff --git a/epan/dissectors/packet-fefd.c b/epan/dissectors/packet-fefd.c index e92b92107d..603a0c4199 100644 --- a/epan/dissectors/packet-fefd.c +++ b/epan/dissectors/packet-fefd.c @@ -152,10 +152,9 @@ dissect_fefd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) length - 4)); if (tree) { - tlvi = proto_tree_add_text(fefd_tree, tvb, offset, - length, "Device ID: %s", + tlv_tree = proto_tree_add_subtree_format(fefd_tree, tvb, offset, + length, ett_fefd_tlv, NULL, "Device ID: %s", tvb_format_stringzpad(tvb, offset + 4, length - 4)); - tlv_tree = proto_item_add_subtree(tlvi, ett_fefd_tlv); proto_tree_add_uint(tlv_tree, hf_fefd_tlvtype, tvb, offset + TLV_TYPE, 2, type); proto_tree_add_uint(tlv_tree, hf_fefd_tlvlength, tvb, @@ -184,10 +183,9 @@ dissect_fefd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb_format_stringzpad(tvb, offset + 4, real_length - 4)); if (tree) { - tlvi = proto_tree_add_text(fefd_tree, tvb, offset, - real_length, "Port ID: %s", + tlv_tree = proto_tree_add_subtree_format(fefd_tree, tvb, offset, + real_length, ett_fefd_tlv, NULL, "Port ID: %s", tvb_format_text(tvb, offset + 4, real_length - 4)); - tlv_tree = proto_item_add_subtree(tlvi, ett_fefd_tlv); proto_tree_add_uint(tlv_tree, hf_fefd_tlvtype, tvb, offset + TLV_TYPE, 2, type); proto_tree_add_uint(tlv_tree, hf_fefd_tlvlength, tvb, @@ -206,11 +204,10 @@ dissect_fefd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case TYPE_DEVICE_NAME: case TYPE_SEQUENCE_NUMBER: default: - tlvi = proto_tree_add_text(fefd_tree, tvb, offset, - length, "Type: %s, length: %u", + tlv_tree = proto_tree_add_subtree_format(fefd_tree, tvb, offset, + length, ett_fefd_tlv, NULL, "Type: %s, length: %u", val_to_str(type, type_vals, "Unknown (0x%04x)"), length); - tlv_tree = proto_item_add_subtree(tlvi, ett_fefd_tlv); proto_tree_add_uint(tlv_tree, hf_fefd_tlvtype, tvb, offset + TLV_TYPE, 2, type); proto_tree_add_uint(tlv_tree, hf_fefd_tlvlength, tvb, diff --git a/epan/dissectors/packet-ff.c b/epan/dissectors/packet-ff.c index d8d5675a03..113e20b165 100644 --- a/epan/dissectors/packet-ff.c +++ b/epan/dissectors/packet-ff.c @@ -1872,7 +1872,6 @@ dissect_ff_msg_fda_open_sess_req(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FDA Open Session Request"); @@ -1880,9 +1879,8 @@ dissect_ff_msg_fda_open_sess_req(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FDA Open Session Request"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fda_open_sess_req); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fda_open_sess_req, NULL, "FDA Open Session Request"); proto_tree_add_item(sub_tree, hf_ff_fda_open_sess_req_sess_idx, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -1942,7 +1940,6 @@ dissect_ff_msg_fda_open_sess_rsp(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FDA Open Session Response"); @@ -1950,9 +1947,8 @@ dissect_ff_msg_fda_open_sess_rsp(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FDA Open Session Response"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fda_open_sess_rsp); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fda_open_sess_rsp, NULL, "FDA Open Session Response"); proto_tree_add_item(sub_tree, hf_ff_fda_open_sess_rsp_sess_idx, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -2012,7 +2008,6 @@ dissect_ff_msg_fda_open_sess_err(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; guint8 ErrorClass; guint8 ErrorCode; const char *error_code; @@ -2023,9 +2018,8 @@ dissect_ff_msg_fda_open_sess_err(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FDA Open Session Error"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fda_open_sess_err); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fda_open_sess_err, NULL, "FDA Open Session Error"); ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, @@ -2070,7 +2064,6 @@ dissect_ff_msg_fda_idle_req(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FDA Idle Request"); @@ -2079,9 +2072,8 @@ dissect_ff_msg_fda_idle_req(tvbuff_t *tvb, gint offset, } if (length) { - ti = proto_tree_add_text(tree, tvb, offset, length, - "FDA Idle Request"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fda_idle_req); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fda_idle_req, NULL, "FDA Idle Request"); proto_tree_add_text(sub_tree, tvb, offset, length, "[Unknown] (%u bytes)", length); @@ -2100,7 +2092,6 @@ dissect_ff_msg_fda_idle_rsp(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FDA Idle Response"); @@ -2109,9 +2100,8 @@ dissect_ff_msg_fda_idle_rsp(tvbuff_t *tvb, gint offset, } if (length) { - ti = proto_tree_add_text(tree, tvb, offset, length, - "FDA Idle Response"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fda_idle_rsp); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fda_idle_rsp, NULL, "FDA Idle Response"); proto_tree_add_text(sub_tree, tvb, offset, length, "[Unknown] (%u bytes)", length); @@ -2130,7 +2120,6 @@ dissect_ff_msg_fda_idle_err(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; guint8 ErrorClass; guint8 ErrorCode; const char *error_code; @@ -2141,9 +2130,8 @@ dissect_ff_msg_fda_idle_err(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FDA Idle Error"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fda_idle_err); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fda_idle_err, NULL, "FDA Idle Error"); ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, @@ -2188,7 +2176,6 @@ dissect_ff_msg_sm_find_tag_query_req(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "SM Find Tag Query Request"); @@ -2196,9 +2183,8 @@ dissect_ff_msg_sm_find_tag_query_req(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "SM Find Tag Query Request"); - sub_tree = proto_item_add_subtree(ti, ett_ff_sm_find_tag_query_req); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_sm_find_tag_query_req, NULL, "SM Find Tag Query Request"); proto_tree_add_item(sub_tree, hf_ff_sm_find_tag_query_req_query_type, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -2273,17 +2259,15 @@ dissect_ff_msg_sm_find_tag_reply_req_list_of_fda_addr_selectors(tvbuff_t *tvb, gint offset, proto_tree *tree, guint16 value) { proto_tree *sub_tree; - proto_item *ti; guint d; if (!tree) { return; } - ti = proto_tree_add_text(tree, tvb, offset, 2 * value, + sub_tree = proto_tree_add_subtree_format(tree, tvb, offset, 2 * value, + ett_ff_sm_find_tag_reply_req_list_of_fda_addr_selectors, NULL, "List of FDA Address Selectors (%u bytes)", 2 * value); - sub_tree = proto_item_add_subtree(ti, - ett_ff_sm_find_tag_reply_req_list_of_fda_addr_selectors); for (d = 0; d < value; d++) { proto_tree_add_item(sub_tree, @@ -2303,7 +2287,6 @@ dissect_ff_msg_sm_find_tag_reply_req(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; guint8 DuplicateDetectionState; guint16 NumOfFDAAddrSelectors; @@ -2313,9 +2296,8 @@ dissect_ff_msg_sm_find_tag_reply_req(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "SM Find Tag Reply Request"); - sub_tree = proto_item_add_subtree(ti, ett_ff_sm_find_tag_reply_req); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_sm_find_tag_reply_req, NULL, "SM Find Tag Reply Request"); proto_tree_add_item(sub_tree, hf_ff_sm_find_tag_reply_req_query_type, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -2406,7 +2388,6 @@ dissect_ff_msg_sm_id_req(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "SM Identify Request"); @@ -2415,9 +2396,8 @@ dissect_ff_msg_sm_id_req(tvbuff_t *tvb, gint offset, } if (length) { - ti = proto_tree_add_text(tree, tvb, offset, length, - "SM Identify Request"); - sub_tree = proto_item_add_subtree(ti, ett_ff_sm_id_req); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_sm_id_req, NULL, "SM Identify Request"); proto_tree_add_text(sub_tree, tvb, offset, length, "[Unknown] (%u bytes)", length); @@ -2436,16 +2416,13 @@ dissect_ff_msg_sm_id_rsp_h1_node_addr(tvbuff_t *tvb, gint offset, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; if (!tree) { return; } - ti = proto_tree_add_text(tree, tvb, offset, 2, - "H1 Node Address Version Number (%u bytes)", 2); - sub_tree = proto_item_add_subtree(ti, - ett_ff_sm_id_rsp_h1_node_addr); + sub_tree = proto_tree_add_subtree_format(tree, tvb, offset, 2, + ett_ff_sm_id_rsp_h1_node_addr, NULL, "H1 Node Address Version Number (%u bytes)", 2); proto_tree_add_item(sub_tree, hf_ff_sm_id_rsp_h1_node_addr_ver_num_h1_node_addr, @@ -2466,17 +2443,14 @@ dissect_ff_msg_sm_id_rsp_entries_node_addr(tvbuff_t *tvb, gint offset, proto_tree *tree, guint32 value) { proto_tree *sub_tree; - proto_item *ti; guint d; if (!tree) { return; } - ti = proto_tree_add_text(tree, tvb, offset, 4 * value, - "Version Number List (%u bytes)", 4 * value); - sub_tree = proto_item_add_subtree(ti, - ett_ff_sm_id_rsp_entries_node_addr); + sub_tree = proto_tree_add_subtree_format(tree, tvb, offset, 4 * value, + ett_ff_sm_id_rsp_entries_node_addr, NULL, "Version Number List (%u bytes)", 4 * value); for (d = 0; d < value * 2; d++) { dissect_ff_msg_sm_id_rsp_h1_node_addr(tvb, offset, sub_tree); @@ -2493,16 +2467,13 @@ dissect_ff_msg_sm_id_rsp_h1_live_list(tvbuff_t *tvb, gint offset, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; if (!tree) { return; } - ti = proto_tree_add_text(tree, tvb, offset, 4, - "H1 Live-list Version Number (%u bytes)", 4); - sub_tree = proto_item_add_subtree(ti, - ett_ff_sm_id_rsp_h1_live_list); + sub_tree = proto_tree_add_subtree_format(tree, tvb, offset, 4, + ett_ff_sm_id_rsp_h1_live_list, NULL, "H1 Live-list Version Number (%u bytes)", 4); proto_tree_add_item(sub_tree, hf_ff_sm_id_rsp_h1_live_list_h1_link_id, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -2526,17 +2497,14 @@ dissect_ff_msg_sm_id_rsp_entries_link_id(tvbuff_t *tvb, gint offset, proto_tree *tree, guint32 value) { proto_tree *sub_tree; - proto_item *ti; guint d; if (!tree) { return; } - ti = proto_tree_add_text(tree, tvb, offset, 4 * value, - "Version Number List (%u bytes)", 4 * value); - sub_tree = proto_item_add_subtree(ti, - ett_ff_sm_id_rsp_entries_h1_live_list); + sub_tree = proto_tree_add_subtree_format(tree, tvb, offset, 4 * value, + ett_ff_sm_id_rsp_entries_h1_live_list, NULL, "Version Number List (%u bytes)", 4 * value); for (d = 0; d < value; d++) { dissect_ff_msg_sm_id_rsp_h1_live_list(tvb, offset, sub_tree); @@ -2693,7 +2661,6 @@ dissect_ff_msg_sm_id_rsp(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree, guint32 FDAAddress) { proto_tree *sub_tree; - proto_item *ti; guint8 SMKState; guint8 DeviceType; @@ -2707,9 +2674,7 @@ dissect_ff_msg_sm_id_rsp(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, "SM Identify Response"); - sub_tree = proto_item_add_subtree(ti, - ett_ff_sm_id_rsp); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, ett_ff_sm_id_rsp, NULL, "SM Identify Response"); SMKState = tvb_get_guint8(tvb, offset); dissect_ff_msg_sm_id_rsp_smk_state(tvb, offset, sub_tree, SMKState); @@ -2823,7 +2788,6 @@ dissect_ff_msg_sm_id_err(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; guint8 ErrorClass; guint8 ErrorCode; const char *error_code; @@ -2834,8 +2798,7 @@ dissect_ff_msg_sm_id_err(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, "SM Identify Error"); - sub_tree = proto_item_add_subtree(ti, ett_ff_sm_id_err); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, ett_ff_sm_id_err, NULL, "SM Identify Error"); ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, @@ -2880,7 +2843,6 @@ dissect_ff_msg_sm_clear_addr_req(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "SM Clear Address Request"); @@ -2888,9 +2850,8 @@ dissect_ff_msg_sm_clear_addr_req(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "SM Clear Address Request"); - sub_tree = proto_item_add_subtree(ti, ett_ff_sm_id_err); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_sm_id_err, NULL, "SM Clear Address Request"); proto_tree_add_item(sub_tree, hf_ff_sm_clear_addr_req_dev_id, tvb, offset, 32, ENC_ASCII|ENC_NA); @@ -2929,7 +2890,6 @@ dissect_ff_msg_sm_clear_addr_rsp(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "SM Clear Address Response"); @@ -2938,9 +2898,8 @@ dissect_ff_msg_sm_clear_addr_rsp(tvbuff_t *tvb, gint offset, } if (length) { - ti = proto_tree_add_text(tree, tvb, offset, length, - "SM Clear Address Response"); - sub_tree = proto_item_add_subtree(ti, ett_ff_sm_clear_addr_rsp); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_sm_clear_addr_rsp, NULL, "SM Clear Address Response"); proto_tree_add_text(sub_tree, tvb, offset, length, "[Unknown] (%u bytes)", length); @@ -2959,7 +2918,6 @@ dissect_ff_msg_sm_clear_addr_err(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; guint8 ErrorClass; guint8 ErrorCode; const char *error_code; @@ -2970,9 +2928,8 @@ dissect_ff_msg_sm_clear_addr_err(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "SM Clear Address Error"); - sub_tree = proto_item_add_subtree(ti, ett_ff_sm_clear_addr_err); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_sm_clear_addr_err, NULL, "SM Clear Address Error"); ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, @@ -3081,7 +3038,6 @@ dissect_ff_msg_sm_set_assign_info_req(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; guint8 DeviceRedundancyState; guint8 ClearDuplicateDetectionState; @@ -3091,10 +3047,8 @@ dissect_ff_msg_sm_set_assign_info_req(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "SM Set Assignment Info Request"); - sub_tree = proto_item_add_subtree(ti, - ett_ff_sm_set_assign_info_req); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_sm_set_assign_info_req, NULL, "SM Set Assignment Info Request"); proto_tree_add_item(sub_tree, hf_ff_sm_set_assign_info_req_dev_id, tvb, offset, 32, ENC_ASCII|ENC_NA); @@ -3171,7 +3125,6 @@ dissect_ff_msg_sm_set_assign_info_rsp(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "SM Set Assignment Info Response"); @@ -3179,10 +3132,8 @@ dissect_ff_msg_sm_set_assign_info_rsp(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "SM Set Assignment Info Response"); - sub_tree = proto_item_add_subtree(ti, - ett_ff_sm_set_assign_info_rsp); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_sm_set_assign_info_rsp, NULL, "SM Set Assignment Info Response"); proto_tree_add_item(sub_tree, hf_ff_sm_set_assign_info_rsp_reserved, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -3217,7 +3168,6 @@ dissect_ff_msg_sm_set_assign_info_err(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; guint8 ErrorClass; guint8 ErrorCode; const char *error_code; @@ -3228,9 +3178,8 @@ dissect_ff_msg_sm_set_assign_info_err(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "SM Set Assignment Info Error"); - sub_tree = proto_item_add_subtree(ti, ett_ff_sm_set_assign_info_err); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_sm_set_assign_info_err, NULL, "SM Set Assignment Info Error"); ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, @@ -3276,7 +3225,6 @@ dissect_ff_msg_sm_clear_assign_info_req(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "SM Clear Assignment Info Request"); @@ -3284,10 +3232,8 @@ dissect_ff_msg_sm_clear_assign_info_req(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "SM Clear Assignment Info Request"); - sub_tree = proto_item_add_subtree(ti, - ett_ff_sm_clear_assign_info_req); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_sm_clear_assign_info_req, NULL, "SM Clear Assignment Info Request"); proto_tree_add_item(sub_tree, hf_ff_sm_clear_assign_info_req_dev_id, tvb, offset, 32, ENC_ASCII|ENC_NA); @@ -3317,7 +3263,6 @@ dissect_ff_msg_sm_clear_assign_info_rsp(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "SM Clear Assignment Info Response"); @@ -3326,10 +3271,8 @@ dissect_ff_msg_sm_clear_assign_info_rsp(tvbuff_t *tvb, gint offset, } if (length) { - ti = proto_tree_add_text(tree, tvb, offset, length, - "SM Clear Assignment Info Response"); - sub_tree = proto_item_add_subtree(ti, - ett_ff_sm_clear_assign_info_rsp); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_sm_clear_assign_info_rsp, NULL, "SM Clear Assignment Info Response"); proto_tree_add_text(sub_tree, tvb, offset, length, "[Unknown] (%u bytes)", length); @@ -3348,7 +3291,6 @@ dissect_ff_msg_sm_clear_assign_info_err(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; guint8 ErrorClass; guint8 ErrorCode; const char *error_code; @@ -3359,10 +3301,8 @@ dissect_ff_msg_sm_clear_assign_info_err(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "SM Clear Assignment Info Error"); - sub_tree = proto_item_add_subtree(ti, - ett_ff_sm_clear_assign_info_err); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_sm_clear_assign_info_err, NULL, "SM Clear Assignment Info Error"); ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, @@ -3408,16 +3348,13 @@ dissect_ff_msg_sm_dev_annunc_req_h1_node_addr(tvbuff_t *tvb, gint offset, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; if (!tree) { return; } - ti = proto_tree_add_text(tree, tvb, offset, 2, - "H1 Node Address Version Number (%u bytes)", 2); - sub_tree = proto_item_add_subtree(ti, - ett_ff_sm_dev_annunc_req_h1_node_addr); + sub_tree = proto_tree_add_subtree_format(tree, tvb, offset, 2, + ett_ff_sm_dev_annunc_req_h1_node_addr, NULL, "H1 Node Address Version Number (%u bytes)", 2); proto_tree_add_item(sub_tree, hf_ff_sm_dev_annunc_req_h1_node_addr_ver_num_h1_node_addr, @@ -3439,17 +3376,14 @@ dissect_ff_msg_sm_dev_annunc_req_entries_node_addr(tvbuff_t *tvb, gint offset, proto_tree *tree, guint32 value) { proto_tree *sub_tree; - proto_item *ti; guint d; if (!tree) { return; } - ti = proto_tree_add_text(tree, tvb, offset, 4 * value, - "Version Number List (%u bytes)", 4 * value); - sub_tree = proto_item_add_subtree(ti, - ett_ff_sm_dev_annunc_req_entries_node_addr); + sub_tree = proto_tree_add_subtree_format(tree, tvb, offset, 4 * value, + ett_ff_sm_dev_annunc_req_entries_node_addr, NULL, "Version Number List (%u bytes)", 4 * value); for (d = 0; d < value * 2; d++) { dissect_ff_msg_sm_dev_annunc_req_h1_node_addr(tvb, offset, sub_tree); @@ -3466,16 +3400,13 @@ dissect_ff_msg_sm_dev_annunc_req_h1_live_list(tvbuff_t *tvb, gint offset, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; if (!tree) { return; } - ti = proto_tree_add_text(tree, tvb, offset, 4, - "H1 Live-list Version Number (%u bytes)", 4); - sub_tree = proto_item_add_subtree(ti, - ett_ff_sm_dev_annunc_req_h1_live_list); + sub_tree = proto_tree_add_subtree_format(tree, tvb, offset, 4, + ett_ff_sm_dev_annunc_req_h1_live_list, NULL, "H1 Live-list Version Number (%u bytes)", 4); proto_tree_add_item(sub_tree, hf_ff_sm_dev_annunc_req_h1_live_list_h1_link_id, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -3499,17 +3430,14 @@ dissect_ff_msg_sm_dev_annunc_req_entries_link_id(tvbuff_t *tvb, gint offset, proto_tree *tree, guint32 value) { proto_tree *sub_tree; - proto_item *ti; guint d; if (!tree) { return; } - ti = proto_tree_add_text(tree, tvb, offset, 4 * value, - "Version Number List (%u bytes)", 4 * value); - sub_tree = proto_item_add_subtree(ti, - ett_ff_sm_dev_annunc_req_entries_h1_live_list); + sub_tree = proto_tree_add_subtree_format(tree, tvb, offset, 4 * value, + ett_ff_sm_dev_annunc_req_entries_h1_live_list, NULL, "Version Number List (%u bytes)", 4 * value); for (d = 0; d < value; d++) { dissect_ff_msg_sm_dev_annunc_req_h1_live_list(tvb, offset, sub_tree); @@ -3664,7 +3592,6 @@ dissect_ff_msg_sm_dev_annunc_req(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree, guint32 FDAAddress) { proto_tree *sub_tree; - proto_item *ti; guint8 SMKState; guint8 DeviceType; @@ -3678,10 +3605,9 @@ dissect_ff_msg_sm_dev_annunc_req(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "SM Device Annunciation Request"); - sub_tree = proto_item_add_subtree(ti, - ett_ff_sm_dev_annunc_req); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_sm_dev_annunc_req, NULL, "SM Device Annunciation Request"); + SMKState = tvb_get_guint8(tvb, offset); dissect_ff_msg_sm_dev_annunc_req_smk_state(tvb, offset, sub_tree, SMKState); @@ -3797,7 +3723,6 @@ dissect_ff_msg_fms_init_req(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Initiate Request"); @@ -3805,8 +3730,7 @@ dissect_ff_msg_fms_init_req(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, "FMS Initiate Request"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_init_req); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, ett_ff_fms_init_req, NULL, "FMS Initiate Request"); proto_tree_add_item(sub_tree, hf_ff_fms_init_req_conn_opt, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -3858,7 +3782,6 @@ dissect_ff_msg_fms_init_rsp(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Initiate Response"); @@ -3866,9 +3789,8 @@ dissect_ff_msg_fms_init_rsp(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Initiate Response"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_init_rep); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_init_rep, NULL, "FMS Initiate Response"); proto_tree_add_item(sub_tree, hf_ff_fms_init_rsp_ver_od_called, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -3898,7 +3820,6 @@ dissect_ff_msg_fms_init_err(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; guint8 ErrorClass; guint8 ErrorCode; const char *error_code; @@ -3909,8 +3830,7 @@ dissect_ff_msg_fms_init_err(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, "FMS Initiate Error"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_init_err); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, ett_ff_fms_init_err, NULL, "FMS Initiate Error"); ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, @@ -3955,7 +3875,6 @@ dissect_ff_msg_fms_abort_req(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Abort Request"); @@ -3963,8 +3882,7 @@ dissect_ff_msg_fms_abort_req(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, "FMS Abort Request"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_abort_req); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, ett_ff_fms_abort_req, NULL, "FMS Abort Request"); proto_tree_add_text(sub_tree, tvb, offset, 16, "Abort Detail (%u bytes)", 16); @@ -4005,7 +3923,6 @@ dissect_ff_msg_fms_status_req(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Status Request"); @@ -4014,9 +3931,8 @@ dissect_ff_msg_fms_status_req(tvbuff_t *tvb, gint offset, } if (length) { - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Status Request"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_status_req); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_status_req, NULL, "FMS Status Request"); proto_tree_add_text(sub_tree, tvb, offset, length, "[Unknown] (%u bytes)", length); @@ -4035,7 +3951,6 @@ dissect_ff_msg_fms_status_rsp(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Status Response"); @@ -4043,8 +3958,7 @@ dissect_ff_msg_fms_status_rsp(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, "FMS Status Response"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_status_rsp); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, ett_ff_fms_status_rsp, NULL, "FMS Status Response"); proto_tree_add_item(sub_tree, hf_ff_fms_status_rsp_logical_status, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -4084,7 +3998,6 @@ dissect_ff_msg_fms_status_err(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; guint8 ErrorClass; guint8 ErrorCode; const char *error_code; @@ -4095,8 +4008,7 @@ dissect_ff_msg_fms_status_err(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, "FMS Status Error"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_status_err); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, ett_ff_fms_status_err, NULL, "FMS Status Error"); ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, @@ -4141,7 +4053,6 @@ dissect_ff_msg_fms_unsolicited_status_req(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Unsolicited Status Request"); @@ -4149,9 +4060,8 @@ dissect_ff_msg_fms_unsolicited_status_req(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Unsolicited Status Request"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_unsolicited_status_req); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_unsolicited_status_req, NULL, "FMS Unsolicited Status Request"); proto_tree_add_item(sub_tree, hf_ff_fms_unsolicited_status_req_logical_status, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -4193,7 +4103,6 @@ dissect_ff_msg_fms_id_req(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Identify Request"); @@ -4202,9 +4111,8 @@ dissect_ff_msg_fms_id_req(tvbuff_t *tvb, gint offset, } if (length) { - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Identify Request"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_id_req); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_id_req, NULL, "FMS Identify Request"); proto_tree_add_text(sub_tree, tvb, offset, length, "[Unknown] (%u bytes)", length); @@ -4223,7 +4131,6 @@ dissect_ff_msg_fms_id_rsp(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Identify Response"); @@ -4231,9 +4138,8 @@ dissect_ff_msg_fms_id_rsp(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Identify Response"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_id_rsp); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_id_rsp, NULL, "FMS Identify Response"); proto_tree_add_item(sub_tree, hf_ff_fms_id_rsp_vendor_name, tvb, offset, 32, ENC_ASCII|ENC_NA); @@ -4268,7 +4174,6 @@ dissect_ff_msg_fms_id_err(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; guint8 ErrorClass; guint8 ErrorCode; const char *error_code; @@ -4279,8 +4184,7 @@ dissect_ff_msg_fms_id_err(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, "FMS Identify Error"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_id_err); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, ett_ff_fms_id_err, NULL, "FMS Identify Error"); ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, @@ -4325,7 +4229,6 @@ dissect_ff_msg_fms_get_od_req(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Get OD Request"); @@ -4333,8 +4236,7 @@ dissect_ff_msg_fms_get_od_req(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, "FMS Get OD Request"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_get_od_req); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, ett_ff_fms_get_od_req, NULL, "FMS Get OD Request"); proto_tree_add_item(sub_tree, hf_ff_fms_get_od_req_all_attrs, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -4374,7 +4276,6 @@ dissect_ff_msg_fms_get_od_rsp(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Get OD Response"); @@ -4382,8 +4283,7 @@ dissect_ff_msg_fms_get_od_rsp(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, "FMS Get OD Response"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_get_od_rsp); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, ett_ff_fms_get_od_rsp, NULL, "FMS Get OD Response"); proto_tree_add_item(sub_tree, hf_ff_fms_get_od_rsp_more_follows, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -4418,7 +4318,6 @@ dissect_ff_msg_fms_get_od_err(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; guint8 ErrorClass; guint8 ErrorCode; const char *error_code; @@ -4429,8 +4328,7 @@ dissect_ff_msg_fms_get_od_err(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, "FMS Get OD Error"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_get_od_err); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, ett_ff_fms_get_od_err, NULL, "FMS Get OD Error"); ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, @@ -4475,17 +4373,14 @@ dissect_ff_msg_fms_init_put_od_req(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; - col_set_str(pinfo->cinfo, COL_INFO, "FMS Initiate Put OD Request"); if (!tree) { return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Initiate Put OD Request"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_init_put_od_req); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_init_put_od_req, NULL, "FMS Initiate Put OD Request"); proto_tree_add_item(sub_tree, hf_ff_fms_init_put_od_req_reserved, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -4515,7 +4410,6 @@ dissect_ff_msg_fms_init_put_od_rsp(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Initiate Put OD Response"); @@ -4524,9 +4418,8 @@ dissect_ff_msg_fms_init_put_od_rsp(tvbuff_t *tvb, gint offset, } if (length) { - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Initiate Put OD Response"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_init_put_od_rsp); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_init_put_od_rsp, NULL, "FMS Initiate Put OD Response"); proto_tree_add_text(sub_tree, tvb, offset, length, "[Unknown] (%u bytes)", length); @@ -4545,7 +4438,6 @@ dissect_ff_msg_fms_init_put_od_err(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; guint8 ErrorClass; guint8 ErrorCode; const char *error_code; @@ -4556,9 +4448,8 @@ dissect_ff_msg_fms_init_put_od_err(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Initiate Put OD Error"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_init_put_od_err); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_init_put_od_err, NULL, "FMS Initiate Put OD Error"); ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, @@ -4603,7 +4494,6 @@ dissect_ff_msg_fms_put_od_req(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Put OD Request"); @@ -4611,8 +4501,7 @@ dissect_ff_msg_fms_put_od_req(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, "FMS Put OD Request"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_put_od_req); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, ett_ff_fms_put_od_req, NULL, "FMS Put OD Request"); proto_tree_add_item(sub_tree, hf_ff_fms_put_od_req_num_of_obj_desc, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -4639,7 +4528,6 @@ dissect_ff_msg_fms_put_od_rsp(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Put OD Response"); @@ -4648,12 +4536,8 @@ dissect_ff_msg_fms_put_od_rsp(tvbuff_t *tvb, gint offset, } if (length) { - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Put OD Response"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_put_od_rsp); - - proto_tree_add_text(sub_tree, tvb, offset, length, - "[Unknown] (%u bytes)", length); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_put_od_rsp, NULL, "FMS Put OD Response"); } return; @@ -4669,7 +4553,6 @@ dissect_ff_msg_fms_put_od_err(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; guint8 ErrorClass; guint8 ErrorCode; const char *error_code; @@ -4680,9 +4563,8 @@ dissect_ff_msg_fms_put_od_err(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Put OD Error"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_put_od_err); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_put_od_err, NULL, "FMS Put OD Error"); ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, @@ -4727,7 +4609,6 @@ dissect_ff_msg_fms_terminate_put_od_req(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Terminate Put OD Request"); @@ -4736,9 +4617,8 @@ dissect_ff_msg_fms_terminate_put_od_req(tvbuff_t *tvb, gint offset, } if (length) { - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Terminate Put OD Request"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_terminate_put_od_req); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_terminate_put_od_req, NULL, "FMS Terminate Put OD Request"); proto_tree_add_text(sub_tree, tvb, offset, length, "[Unknown] (%u bytes)", length); @@ -4757,7 +4637,6 @@ dissect_ff_msg_fms_terminate_put_od_rsp(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Terminate Put OD Response"); @@ -4766,9 +4645,8 @@ dissect_ff_msg_fms_terminate_put_od_rsp(tvbuff_t *tvb, gint offset, } if (length) { - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Terminate Put OD Response"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_terminate_put_od_rsp); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_terminate_put_od_rsp, NULL, "FMS Terminate Put OD Response"); proto_tree_add_text(sub_tree, tvb, offset, length, "[Unknown] (%u bytes)", length); @@ -4787,7 +4665,6 @@ dissect_ff_msg_fms_terminate_put_od_err(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; guint8 ErrorClass; guint8 ErrorCode; const char *error_code; @@ -4798,9 +4675,8 @@ dissect_ff_msg_fms_terminate_put_od_err(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Terminate Put OD Error"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_terminate_put_od_err); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_terminate_put_od_err, NULL, "FMS Terminate Put OD Error"); proto_tree_add_item(sub_tree, hf_ff_fms_terminate_put_od_err_index, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -4854,7 +4730,6 @@ dissect_ff_msg_fms_generic_init_download_sequence_req( guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Generic Initiate Download Sequence Request"); @@ -4862,9 +4737,8 @@ dissect_ff_msg_fms_generic_init_download_sequence_req( return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Generic Initiate Download Sequence Request"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_gen_init_download_seq_req); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_gen_init_download_seq_req, NULL, "FMS Generic Initiate Download Sequence Request"); proto_tree_add_item(sub_tree, hf_ff_fms_gen_init_download_seq_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -4890,7 +4764,6 @@ dissect_ff_msg_fms_generic_init_download_sequence_rsp( guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Generic Initiate Download Sequence Response"); @@ -4899,10 +4772,8 @@ dissect_ff_msg_fms_generic_init_download_sequence_rsp( } if (length) { - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Generic Initiate Download Sequence Response"); - sub_tree = proto_item_add_subtree(ti, - ett_ff_fms_gen_init_download_seq_rep); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_gen_init_download_seq_rep, NULL, "FMS Generic Initiate Download Sequence Response"); proto_tree_add_text(sub_tree, tvb, offset, length, "[Unknown] (%u bytes)", length); @@ -4922,7 +4793,6 @@ dissect_ff_msg_fms_generic_init_download_sequence_err( guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; guint8 ErrorClass; guint8 ErrorCode; const char *error_code; @@ -4933,9 +4803,8 @@ dissect_ff_msg_fms_generic_init_download_sequence_err( return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Generic Initiate Download Sequence Error"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_gen_init_download_seq_err); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_gen_init_download_seq_err, NULL, "FMS Generic Initiate Download Sequence Error"); ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, @@ -4984,7 +4853,6 @@ dissect_ff_msg_fms_generic_download_segment_req( guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Generic Download Segment Request"); @@ -4992,9 +4860,8 @@ dissect_ff_msg_fms_generic_download_segment_req( return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Generic Download Segment Request"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_gen_download_seg_req); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_gen_download_seg_req, NULL, "FMS Generic Download Segment Request"); proto_tree_add_item(sub_tree, hf_ff_fms_gen_download_seg_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -5029,7 +4896,6 @@ dissect_ff_msg_fms_generic_download_segment_rsp( guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Generic Download Segment Response"); @@ -5038,10 +4904,8 @@ dissect_ff_msg_fms_generic_download_segment_rsp( } if (length) { - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Generic Download Segment Response"); - sub_tree = proto_item_add_subtree(ti, - ett_ff_fms_gen_download_seg_rsp); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_gen_download_seg_rsp, NULL, "FMS Generic Download Segment Response"); proto_tree_add_text(sub_tree, tvb, offset, length, "[Unknown] (%u bytes)", length); @@ -5061,7 +4925,6 @@ dissect_ff_msg_fms_generic_download_segment_err( guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; guint8 ErrorClass; guint8 ErrorCode; const char *error_code; @@ -5072,9 +4935,8 @@ dissect_ff_msg_fms_generic_download_segment_err( return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Generic Download Segment Error"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_gen_download_seg_err); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_gen_download_seg_err, NULL, "FMS Generic Download Segment Error"); ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, @@ -5123,7 +4985,6 @@ dissect_ff_msg_fms_generic_terminate_download_sequence_req( guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Generic Terminate Download Sequence Request"); @@ -5131,10 +4992,8 @@ dissect_ff_msg_fms_generic_terminate_download_sequence_req( return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Generic Terminate Download Sequence Request"); - sub_tree = proto_item_add_subtree(ti, - ett_ff_fms_gen_terminate_download_seq_req); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_gen_terminate_download_seq_req, NULL, "FMS Generic Terminate Download Sequence Request"); proto_tree_add_item(sub_tree, hf_ff_fms_gen_terminate_download_seq_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -5160,7 +5019,6 @@ dissect_ff_msg_fms_generic_terminate_download_sequence_rsp( guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Generic Terminate Download Sequence Response"); @@ -5168,10 +5026,8 @@ dissect_ff_msg_fms_generic_terminate_download_sequence_rsp( return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Generic Terminate Download Sequence Response"); - sub_tree = proto_item_add_subtree(ti, - ett_ff_fms_gen_terminate_download_seq_rsp); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_gen_terminate_download_seq_rsp, NULL, "FMS Generic Terminate Download Sequence Response"); proto_tree_add_item(sub_tree, hf_ff_fms_gen_terminate_download_seq_rsp_final_result, @@ -5202,7 +5058,6 @@ dissect_ff_msg_fms_generic_terminate_download_sequence_err( guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; guint8 ErrorClass; guint8 ErrorCode; const char *error_code; @@ -5213,10 +5068,8 @@ dissect_ff_msg_fms_generic_terminate_download_sequence_err( return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Generic Terminate Download Sequence Error"); - sub_tree = proto_item_add_subtree(ti, - ett_ff_fms_gen_terminate_download_seq_err); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_gen_terminate_download_seq_err, NULL, "FMS Generic Terminate Download Sequence Error"); ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, @@ -5266,7 +5119,6 @@ dissect_ff_msg_fms_init_download_sequence_req( guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Initiate Download Sequence Request"); @@ -5274,10 +5126,8 @@ dissect_ff_msg_fms_init_download_sequence_req( return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Initiate Download Sequence Request"); - sub_tree = proto_item_add_subtree(ti, - ett_ff_fms_init_download_seq_req); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_init_download_seq_req, NULL, "FMS Initiate Download Sequence Request"); proto_tree_add_item(sub_tree, hf_ff_fms_init_download_seq_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -5303,7 +5153,6 @@ dissect_ff_msg_fms_init_download_sequence_rsp( guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Initiate Download Sequence Response"); @@ -5312,10 +5161,8 @@ dissect_ff_msg_fms_init_download_sequence_rsp( } if (length) { - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Initiate Download Sequence Response"); - sub_tree = proto_item_add_subtree(ti, - ett_ff_fms_init_download_seq_rsp); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_init_download_seq_rsp, NULL, "FMS Initiate Download Sequence Response"); proto_tree_add_text(sub_tree, tvb, offset, length, "[Unknown] (%u bytes)", length); @@ -5335,7 +5182,6 @@ dissect_ff_msg_fms_init_download_sequence_err( guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; guint8 ErrorClass; guint8 ErrorCode; const char *error_code; @@ -5346,9 +5192,8 @@ dissect_ff_msg_fms_init_download_sequence_err( return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Initiate Download Sequence Error"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_init_download_seq_err); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_init_download_seq_err, NULL, "FMS Initiate Download Sequence Error"); ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, @@ -5395,7 +5240,6 @@ dissect_ff_msg_fms_download_segment_req(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Download Segment Request"); @@ -5403,9 +5247,8 @@ dissect_ff_msg_fms_download_segment_req(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Download Segment Request"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_download_seg_req); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_download_seg_req, NULL, "FMS Download Segment Request"); proto_tree_add_item(sub_tree, hf_ff_fms_download_seg_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -5430,7 +5273,6 @@ dissect_ff_msg_fms_download_segment_rsp(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Download Segment Response"); @@ -5438,9 +5280,8 @@ dissect_ff_msg_fms_download_segment_rsp(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Download Segment Response"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_download_seg_rsp); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_download_seg_rsp, NULL, "FMS Download Segment Response"); proto_tree_add_item(sub_tree, hf_ff_fms_download_seg_rsp_more_follows, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -5469,7 +5310,6 @@ dissect_ff_msg_fms_download_segment_err(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; guint8 ErrorClass; guint8 ErrorCode; const char *error_code; @@ -5480,9 +5320,8 @@ dissect_ff_msg_fms_download_segment_err(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Download Segment Error"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_download_seg_err); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_download_seg_err, NULL, "FMS Download Segment Error"); ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, @@ -5529,7 +5368,6 @@ dissect_ff_msg_fms_terminate_download_sequence_req( guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Terminate Download Sequence Request"); @@ -5537,10 +5375,8 @@ dissect_ff_msg_fms_terminate_download_sequence_req( return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Terminate Download Sequence Request"); - sub_tree = proto_item_add_subtree(ti, - ett_ff_fms_terminate_download_seq_req); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_terminate_download_seq_req, NULL, "FMS Terminate Download Sequence Request"); proto_tree_add_item(sub_tree, hf_ff_fms_terminate_download_seq_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -5576,7 +5412,6 @@ dissect_ff_msg_fms_terminate_download_sequence_rsp( guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Terminate Download Sequence Response"); @@ -5585,10 +5420,8 @@ dissect_ff_msg_fms_terminate_download_sequence_rsp( } if (length) { - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Terminate Download Sequence Response"); - sub_tree = proto_item_add_subtree(ti, - ett_ff_fms_terminate_download_seq_rsp); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_terminate_download_seq_rsp, NULL, "FMS Terminate Download Sequence Response"); proto_tree_add_text(sub_tree, tvb, offset, length, "[Unknown] (%u bytes)", length); @@ -5608,7 +5441,6 @@ dissect_ff_msg_fms_terminate_download_sequence_err( guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; guint8 ErrorClass; guint8 ErrorCode; const char *error_code; @@ -5619,10 +5451,8 @@ dissect_ff_msg_fms_terminate_download_sequence_err( return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Terminate Download Sequence Error"); - sub_tree = proto_item_add_subtree(ti, - ett_ff_fms_terminate_download_seq_err); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_terminate_download_seq_err, NULL, "FMS Terminate Download Sequence Error"); ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, @@ -5671,7 +5501,6 @@ dissect_ff_msg_fms_init_upload_seq_req( guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Initiate Upload Sequence Request"); @@ -5679,9 +5508,8 @@ dissect_ff_msg_fms_init_upload_seq_req( return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Initiate Upload Sequence Request"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_init_upload_seq_req); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_init_upload_seq_req, NULL, "FMS Initiate Upload Sequence Request"); proto_tree_add_item(sub_tree, hf_ff_fms_init_upload_seq_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -5707,7 +5535,6 @@ dissect_ff_msg_fms_init_upload_seq_rsp( guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Initiate Upload Sequence Response"); @@ -5716,9 +5543,8 @@ dissect_ff_msg_fms_init_upload_seq_rsp( } if (length) { - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Initiate Upload Sequence Response"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_init_upload_seq_rsp); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_init_upload_seq_rsp, NULL, "FMS Initiate Upload Sequence Response"); proto_tree_add_text(sub_tree, tvb, offset, length, "[Unknown] (%u bytes)", length); @@ -5738,7 +5564,6 @@ dissect_ff_msg_fms_init_upload_seq_err( guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; guint8 ErrorClass; guint8 ErrorCode; const char *error_code; @@ -5749,9 +5574,8 @@ dissect_ff_msg_fms_init_upload_seq_err( return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Initiate Upload Sequence Error"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_init_upload_seq_err); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_init_upload_seq_err, NULL, "FMS Initiate Upload Sequence Error"); ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, @@ -5796,7 +5620,6 @@ dissect_ff_msg_fms_upload_segment_req(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Upload Segment Request"); @@ -5804,9 +5627,8 @@ dissect_ff_msg_fms_upload_segment_req(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Upload Segment Request"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_upload_seg_req); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_upload_seg_req, NULL, "FMS Upload Segment Request"); proto_tree_add_item(sub_tree, hf_ff_fms_upload_seg_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -5831,7 +5653,6 @@ dissect_ff_msg_fms_upload_segment_rsp(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Upload Segment Response"); @@ -5839,9 +5660,8 @@ dissect_ff_msg_fms_upload_segment_rsp(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Upload Segment Response"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_upload_seg_rsp); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_upload_seg_rsp, NULL, "FMS Upload Segment Response"); proto_tree_add_item(sub_tree, hf_ff_fms_upload_seg_rsp_more_follows, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -5870,7 +5690,6 @@ dissect_ff_msg_fms_upload_segment_err(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; guint8 ErrorClass; guint8 ErrorCode; const char *error_code; @@ -5881,9 +5700,8 @@ dissect_ff_msg_fms_upload_segment_err(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Upload Segment Error"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_upload_seg_err); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_upload_seg_err, NULL, "FMS Upload Segment Error"); ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, @@ -5930,7 +5748,6 @@ dissect_ff_msg_fms_terminate_upload_seq_req( guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Terminate Upload Sequence Request"); @@ -5938,9 +5755,8 @@ dissect_ff_msg_fms_terminate_upload_seq_req( return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Terminate Upload Sequence Request"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_terminate_upload_seq_req); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_terminate_upload_seq_req, NULL, "FMS Terminate Upload Sequence Request"); proto_tree_add_item(sub_tree, hf_ff_fms_terminate_upload_seq_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -5966,7 +5782,6 @@ dissect_ff_msg_fms_terminate_upload_seq_rsp( guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Terminate Upload Sequence Response"); @@ -5975,10 +5790,8 @@ dissect_ff_msg_fms_terminate_upload_seq_rsp( } if (length) { - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Terminate Upload Sequence Response"); - sub_tree = proto_item_add_subtree(ti, - ett_ff_fms_terminate_upload_seq_rsp); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_terminate_upload_seq_rsp, NULL, "FMS Terminate Upload Sequence Response"); proto_tree_add_text(sub_tree, tvb, offset, length, "[Unknown] (%u bytes)", length); @@ -5998,7 +5811,6 @@ dissect_ff_msg_fms_terminate_upload_seq_err( guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; guint8 ErrorClass; guint8 ErrorCode; const char *error_code; @@ -6009,9 +5821,8 @@ dissect_ff_msg_fms_terminate_upload_seq_err( return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Terminate Upload Sequence Error"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_terminate_upload_seq_err); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_terminate_upload_seq_err, NULL, "FMS Terminate Upload Sequence Error"); ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, @@ -6060,7 +5871,6 @@ dissect_ff_msg_fms_req_dom_download_req( guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Request Domain Download Request"); @@ -6068,9 +5878,8 @@ dissect_ff_msg_fms_req_dom_download_req( return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Request Domain Download Request"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_req_dom_download_req); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_req_dom_download_req, NULL, "FMS Request Domain Download Request"); proto_tree_add_item(sub_tree, hf_ff_fms_req_dom_download_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -6097,7 +5906,6 @@ dissect_ff_msg_fms_req_dom_download_rsp( guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Request Domain Download Response"); @@ -6106,10 +5914,8 @@ dissect_ff_msg_fms_req_dom_download_rsp( } if (length) { - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Request Domain Download Response"); - sub_tree = proto_item_add_subtree(ti, - ett_ff_fms_req_dom_download_rsp); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_req_dom_download_rsp, NULL, "FMS Request Domain Download Response"); proto_tree_add_text(sub_tree, tvb, offset, length, "[Unknown] (%u bytes)", length); @@ -6129,7 +5935,6 @@ dissect_ff_msg_fms_req_dom_download_err( guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; guint8 ErrorClass; guint8 ErrorCode; const char *error_code; @@ -6140,9 +5945,8 @@ dissect_ff_msg_fms_req_dom_download_err( return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Request Domain Download Error"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_req_dom_download_err); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_req_dom_download_err, NULL, "FMS Request Domain Download Error"); ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, @@ -6190,7 +5994,6 @@ dissect_ff_msg_fms_req_dom_upload_req( guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Request Domain Upload Request"); @@ -6198,9 +6001,8 @@ dissect_ff_msg_fms_req_dom_upload_req( return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Request Domain Upload Request"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_req_dom_upload_req); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_req_dom_upload_req, NULL, "FMS Request Domain Upload Request"); proto_tree_add_item(sub_tree, hf_ff_fms_req_dom_upload_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -6227,7 +6029,6 @@ dissect_ff_msg_fms_req_dom_upload_rsp( guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Request Domain Upload Response"); @@ -6236,10 +6037,8 @@ dissect_ff_msg_fms_req_dom_upload_rsp( } if (length) { - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Request Domain Upload Response"); - sub_tree = proto_item_add_subtree(ti, - ett_ff_fms_req_dom_upload_rsp); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_req_dom_upload_rsp, NULL, "FMS Request Domain Upload Response"); proto_tree_add_text(sub_tree, tvb, offset, length, "[Unknown] (%u bytes)", length); @@ -6259,7 +6058,6 @@ dissect_ff_msg_fms_req_dom_upload_err( guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; guint8 ErrorClass; guint8 ErrorCode; const char *error_code; @@ -6270,9 +6068,8 @@ dissect_ff_msg_fms_req_dom_upload_err( return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Request Domain Upload Error"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_req_dom_upload_err); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_req_dom_upload_err, NULL, "FMS Request Domain Upload Error"); ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, @@ -6318,17 +6115,14 @@ dissect_ff_msg_fms_create_pi_req_dom_idxes(tvbuff_t *tvb, gint offset, proto_tree *tree, guint16 value) { proto_tree *sub_tree; - proto_item *ti; guint d; if (!tree) { return; } - ti = proto_tree_add_text(tree, tvb, offset, 4 * value, - "List Of Domain Indexes (%u bytes)", 4 * value); - sub_tree = proto_item_add_subtree(ti, - ett_ff_fms_create_pi_req_list_of_dom_idxes); + sub_tree = proto_tree_add_subtree_format(tree, tvb, offset, 4 * value, + ett_ff_fms_create_pi_req_list_of_dom_idxes, NULL, "List Of Domain Indexes (%u bytes)", 4 * value); for (d = 0; d < value; d++) { proto_tree_add_item(sub_tree, @@ -6347,7 +6141,6 @@ dissect_ff_msg_fms_create_pi_req(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; guint16 NumOfDomIdxes; col_set_str(pinfo->cinfo, COL_INFO, "FMS Create Program Invocation Request"); @@ -6356,10 +6149,8 @@ dissect_ff_msg_fms_create_pi_req(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Create Program Invocation Request"); - sub_tree = proto_item_add_subtree(ti, - ett_ff_fms_create_pi_req); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_create_pi_req, NULL, "FMS Create Program Invocation Request"); proto_tree_add_item(sub_tree, hf_ff_fms_create_pi_req_reusable, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -6403,7 +6194,6 @@ dissect_ff_msg_fms_create_pi_rsp(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Create Program Invocation Response"); @@ -6411,10 +6201,8 @@ dissect_ff_msg_fms_create_pi_rsp(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Create Program Invocation Response"); - sub_tree = proto_item_add_subtree(ti, - ett_ff_fms_create_pi_rsp); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_create_pi_rsp, NULL, "FMS Create Program Invocation Response"); proto_tree_add_item(sub_tree, hf_ff_fms_create_pi_rsp_idx, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -6439,7 +6227,6 @@ dissect_ff_msg_fms_create_pi_err(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; guint8 ErrorClass; guint8 ErrorCode; const char *error_code; @@ -6450,10 +6237,8 @@ dissect_ff_msg_fms_create_pi_err(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Create Program Invocation Error"); - sub_tree = proto_item_add_subtree(ti, - ett_ff_fms_create_pi_err); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_create_pi_err, NULL, "FMS Create Program Invocation Error"); ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, @@ -6499,7 +6284,6 @@ dissect_ff_msg_fms_del_pi_req(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Delete Program Invocation Request"); @@ -6507,10 +6291,8 @@ dissect_ff_msg_fms_del_pi_req(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Delete Program Invocation Request"); - sub_tree = proto_item_add_subtree(ti, - ett_ff_fms_del_pi_req); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_del_pi_req, NULL, "FMS Delete Program Invocation Request"); proto_tree_add_item(sub_tree, hf_ff_fms_del_pi_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -6535,7 +6317,6 @@ dissect_ff_msg_fms_del_pi_rsp(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Delete Program Invocation Response"); @@ -6544,10 +6325,8 @@ dissect_ff_msg_fms_del_pi_rsp(tvbuff_t *tvb, gint offset, } if (length) { - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Delete Program Invocation Response"); - sub_tree = proto_item_add_subtree(ti, - ett_ff_fms_del_pi_rsp); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_del_pi_rsp, NULL, "FMS Delete Program Invocation Response"); proto_tree_add_text(sub_tree, tvb, offset, length, "[Unknown] (%u bytes)", length); @@ -6566,7 +6345,6 @@ dissect_ff_msg_fms_del_pi_err(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; guint8 ErrorClass; guint8 ErrorCode; const char *error_code; @@ -6577,10 +6355,8 @@ dissect_ff_msg_fms_del_pi_err(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Delete Program Invocation Error"); - sub_tree = proto_item_add_subtree(ti, - ett_ff_fms_del_pi_err); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_del_pi_err, NULL, "FMS Delete Program Invocation Error"); ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, @@ -6626,7 +6402,6 @@ dissect_ff_msg_fms_start_pi_req(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Start Request"); @@ -6634,8 +6409,7 @@ dissect_ff_msg_fms_start_pi_req(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, "FMS Start Request"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_start_req); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, ett_ff_fms_start_req, NULL, "FMS Start Request"); proto_tree_add_item(sub_tree, hf_ff_fms_start_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -6660,7 +6434,6 @@ dissect_ff_msg_fms_start_pi_rsp(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Start Response"); @@ -6669,9 +6442,8 @@ dissect_ff_msg_fms_start_pi_rsp(tvbuff_t *tvb, gint offset, } if (length) { - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Start Response"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_start_rsp); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_start_rsp, NULL, "FMS Start Response"); proto_tree_add_text(sub_tree, tvb, offset, length, "[Unknown] (%u bytes)", length); @@ -6690,7 +6462,6 @@ dissect_ff_msg_fms_start_pi_err(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; guint8 ErrorClass; guint8 ErrorCode; const char *error_code; @@ -6701,8 +6472,7 @@ dissect_ff_msg_fms_start_pi_err(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, "FMS Start Error"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_start_err); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, ett_ff_fms_start_err, NULL, "FMS Start Error"); proto_tree_add_item(sub_tree, hf_ff_fms_start_err_pi_state, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -6756,7 +6526,6 @@ dissect_ff_msg_fms_stop_pi_req(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Stop Request"); @@ -6764,8 +6533,7 @@ dissect_ff_msg_fms_stop_pi_req(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, "FMS Stop Request"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_stop_req); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, ett_ff_fms_stop_req, NULL, "FMS Stop Request"); proto_tree_add_item(sub_tree, hf_ff_fms_stop_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -6790,7 +6558,6 @@ dissect_ff_msg_fms_stop_pi_rsp(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Stop Response"); @@ -6799,9 +6566,8 @@ dissect_ff_msg_fms_stop_pi_rsp(tvbuff_t *tvb, gint offset, } if (length) { - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Stop Response"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_stop_rsp); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_stop_rsp, NULL, "FMS Stop Response"); proto_tree_add_text(sub_tree, tvb, offset, length, "[Unknown] (%u bytes)", length); @@ -6820,7 +6586,6 @@ dissect_ff_msg_fms_stop_pi_err(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; guint8 ErrorClass; guint8 ErrorCode; const char *error_code; @@ -6831,8 +6596,7 @@ dissect_ff_msg_fms_stop_pi_err(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, "FMS Stop Error"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_stop_err); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, ett_ff_fms_stop_err, NULL, "FMS Stop Error"); proto_tree_add_item(sub_tree, hf_ff_fms_stop_err_pi_state, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -6886,7 +6650,6 @@ dissect_ff_msg_fms_resume_pi_req(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Resume Request"); @@ -6894,8 +6657,7 @@ dissect_ff_msg_fms_resume_pi_req(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, "FMS Resume Request"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_resume_req); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, ett_ff_fms_resume_req, NULL, "FMS Resume Request"); proto_tree_add_item(sub_tree, hf_ff_fms_resume_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -6920,7 +6682,6 @@ dissect_ff_msg_fms_resume_pi_rsp(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Resume Response"); @@ -6929,9 +6690,8 @@ dissect_ff_msg_fms_resume_pi_rsp(tvbuff_t *tvb, gint offset, } if (length) { - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Resume Response"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_resume_rsp); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_resume_rsp, NULL, "FMS Resume Response"); proto_tree_add_text(sub_tree, tvb, offset, length, "[Unknown] (%u bytes)", length); @@ -6950,7 +6710,6 @@ dissect_ff_msg_fms_resume_pi_err(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; guint8 ErrorClass; guint8 ErrorCode; const char *error_code; @@ -6961,8 +6720,7 @@ dissect_ff_msg_fms_resume_pi_err(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, "FMS Resume Error"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_resume_err); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, ett_ff_fms_resume_err, NULL, "FMS Resume Error"); proto_tree_add_item(sub_tree, hf_ff_fms_resume_err_pi_state, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -7016,7 +6774,6 @@ dissect_ff_msg_fms_reset_pi_req(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Reset Request"); @@ -7024,8 +6781,7 @@ dissect_ff_msg_fms_reset_pi_req(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, "FMS Reset Request"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_reset_req); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, ett_ff_fms_reset_req, NULL, "FMS Reset Request"); proto_tree_add_item(sub_tree, hf_ff_fms_reset_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -7050,7 +6806,6 @@ dissect_ff_msg_fms_reset_pi_rsp(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Reset Response"); @@ -7059,9 +6814,8 @@ dissect_ff_msg_fms_reset_pi_rsp(tvbuff_t *tvb, gint offset, } if (length) { - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Reset Response"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_reset_rsp); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_reset_rsp, NULL, "FMS Reset Response"); proto_tree_add_text(sub_tree, tvb, offset, length, "[Unknown] (%u bytes)", length); @@ -7080,7 +6834,6 @@ dissect_ff_msg_fms_reset_pi_err(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; guint8 ErrorClass; guint8 ErrorCode; const char *error_code; @@ -7091,8 +6844,7 @@ dissect_ff_msg_fms_reset_pi_err(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, "FMS Reset Error"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_reset_err); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, ett_ff_fms_reset_err, NULL, "FMS Reset Error"); proto_tree_add_item(sub_tree, hf_ff_fms_reset_err_pi_state, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -7146,7 +6898,6 @@ dissect_ff_msg_fms_kill_pi_req(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Kill Request"); @@ -7154,8 +6905,7 @@ dissect_ff_msg_fms_kill_pi_req(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, "FMS Kill Request"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_kill_req); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, ett_ff_fms_kill_req, NULL, "FMS Kill Request"); proto_tree_add_item(sub_tree, hf_ff_fms_kill_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -7180,7 +6930,6 @@ dissect_ff_msg_fms_kill_pi_rsp(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Kill Response"); @@ -7189,9 +6938,8 @@ dissect_ff_msg_fms_kill_pi_rsp(tvbuff_t *tvb, gint offset, } if (length) { - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Kill Response"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_kill_rsp); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_kill_rsp, NULL, "FMS Kill Response"); proto_tree_add_text(sub_tree, tvb, offset, length, "[Unknown] (%u bytes)", length); @@ -7210,7 +6958,6 @@ dissect_ff_msg_fms_kill_pi_err(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; guint8 ErrorClass; guint8 ErrorCode; const char *error_code; @@ -7221,8 +6968,7 @@ dissect_ff_msg_fms_kill_pi_err(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, "FMS Kill Error"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_kill_err); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, ett_ff_fms_kill_err, NULL, "FMS Kill Error"); ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, @@ -7267,7 +7013,6 @@ dissect_ff_msg_fms_read_req(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Read Request"); @@ -7275,8 +7020,7 @@ dissect_ff_msg_fms_read_req(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, "FMS Read Request"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_read_req); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, ett_ff_fms_read_req, NULL, "FMS Read Request"); proto_tree_add_item(sub_tree, hf_ff_fms_read_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -7301,7 +7045,6 @@ dissect_ff_msg_fms_read_rsp(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Read Response"); @@ -7309,8 +7052,7 @@ dissect_ff_msg_fms_read_rsp(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, "FMS Read Response"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_read_rsp); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, ett_ff_fms_read_rsp, NULL, "FMS Read Response"); proto_tree_add_text(sub_tree, tvb, offset, length, "Data (%u bytes)", length); @@ -7328,7 +7070,6 @@ dissect_ff_msg_fms_read_err(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; guint8 ErrorClass; guint8 ErrorCode; const char *error_code; @@ -7339,8 +7080,7 @@ dissect_ff_msg_fms_read_err(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, "FMS Read Error"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_read_err); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, ett_ff_fms_read_err, NULL, "FMS Read Error"); ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, @@ -7385,7 +7125,6 @@ dissect_ff_msg_fms_read_subindex_req(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Read with Subindex Request"); @@ -7393,9 +7132,8 @@ dissect_ff_msg_fms_read_subindex_req(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Read with Subindex Request"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_read_with_subidx_req); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_read_with_subidx_req, NULL, "FMS Read with Subindex Request"); proto_tree_add_item(sub_tree, hf_ff_fms_read_with_subidx_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -7425,7 +7163,6 @@ dissect_ff_msg_fms_read_subindex_rsp(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Read with Subindex Response"); @@ -7433,9 +7170,8 @@ dissect_ff_msg_fms_read_subindex_rsp(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Read with Subindex Response"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_read_with_subidx_rsp); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_read_with_subidx_rsp, NULL, "FMS Read with Subindex Response"); proto_tree_add_text(sub_tree, tvb, offset, length, "Data (%u bytes)", length); @@ -7453,7 +7189,6 @@ dissect_ff_msg_fms_read_subindex_err(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; guint8 ErrorClass; guint8 ErrorCode; const char *error_code; @@ -7464,9 +7199,8 @@ dissect_ff_msg_fms_read_subindex_err(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Read with Subindex Error"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_read_with_subidx_err); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_read_with_subidx_err, NULL, "FMS Read with Subindex Error"); ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, @@ -7513,7 +7247,6 @@ dissect_ff_msg_fms_write_req(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Write Request"); @@ -7521,8 +7254,7 @@ dissect_ff_msg_fms_write_req(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, "FMS Write Request"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_write_req); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, ett_ff_fms_write_req, NULL, "FMS Write Request"); proto_tree_add_item(sub_tree, hf_ff_fms_write_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -7547,7 +7279,6 @@ dissect_ff_msg_fms_write_rsp(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Write Response"); @@ -7556,9 +7287,8 @@ dissect_ff_msg_fms_write_rsp(tvbuff_t *tvb, gint offset, } if (length) { - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Write Response"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_write_rsp); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_write_rsp, NULL, "FMS Write Response"); proto_tree_add_text(sub_tree, tvb, offset, length, "[Unknown] (%u bytes)", length); @@ -7577,7 +7307,6 @@ dissect_ff_msg_fms_write_err(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; guint8 ErrorClass; guint8 ErrorCode; const char *error_code; @@ -7588,8 +7317,7 @@ dissect_ff_msg_fms_write_err(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, "FMS Write Error"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_write_err); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, ett_ff_fms_write_err, NULL, "FMS Write Error"); ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, @@ -7634,7 +7362,6 @@ dissect_ff_msg_fms_write_subindex_req(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Write with Subindex Request"); @@ -7642,9 +7369,8 @@ dissect_ff_msg_fms_write_subindex_req(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Write with Subindex Request"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_write_with_subidx_req); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_write_with_subidx_req, NULL, "FMS Write with Subindex Request"); proto_tree_add_item(sub_tree, hf_ff_fms_write_with_subidx_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -7674,7 +7400,6 @@ dissect_ff_msg_fms_write_subindex_rsp(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Write with Subindex Response"); @@ -7683,9 +7408,8 @@ dissect_ff_msg_fms_write_subindex_rsp(tvbuff_t *tvb, gint offset, } if (length) { - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Write with Subindex Response"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_write_with_subidx_rsp); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_write_with_subidx_rsp, NULL, "FMS Write with Subindex Response"); proto_tree_add_text(sub_tree, tvb, offset, length, "[Unknown] (%u bytes)", length); @@ -7704,7 +7428,6 @@ dissect_ff_msg_fms_write_subindex_err(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; guint8 ErrorClass; guint8 ErrorCode; const char *error_code; @@ -7715,9 +7438,8 @@ dissect_ff_msg_fms_write_subindex_err(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Write with Subindex Error"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_write_with_subidx_err); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_write_with_subidx_err, NULL, "FMS Write with Subindex Error"); ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, @@ -7764,17 +7486,14 @@ dissect_ff_msg_fms_def_variable_list_req_list_of_idxes(tvbuff_t *tvb, gint offset, proto_tree *tree, guint32 value) { proto_tree *sub_tree; - proto_item *ti; guint d; if (!tree) { return; } - ti = proto_tree_add_text(tree, tvb, offset, 4 * value, - "List Of Indexes (%u bytes)", 4 * value); - sub_tree = proto_item_add_subtree(ti, - ett_ff_fms_def_variable_list_req_list_of_idxes); + sub_tree = proto_tree_add_subtree_format(tree, tvb, offset, 4 * value, + ett_ff_fms_def_variable_list_req_list_of_idxes, NULL, "List Of Indexes (%u bytes)", 4 * value); for (d = 0; d < value; d++) { proto_tree_add_item(sub_tree, @@ -7792,7 +7511,6 @@ dissect_ff_msg_fms_def_variable_list_req(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; guint32 NumOfIndexes; col_set_str(pinfo->cinfo, COL_INFO, "FMS Define Variable List Request"); @@ -7801,9 +7519,8 @@ dissect_ff_msg_fms_def_variable_list_req(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Define Variable List Request"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_def_variable_list_req); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_def_variable_list_req, NULL, "FMS Define Variable List Request"); NumOfIndexes = tvb_get_ntohl(tvb, offset); proto_tree_add_item(sub_tree, @@ -7836,7 +7553,6 @@ dissect_ff_msg_fms_def_variable_list_rsp(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Define Variable List Response"); @@ -7844,9 +7560,8 @@ dissect_ff_msg_fms_def_variable_list_rsp(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Define Variable List Response"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_def_variable_list_rsp); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_def_variable_list_rsp, NULL, "FMS Define Variable List Response"); proto_tree_add_item(sub_tree, hf_ff_fms_def_variable_list_rsp_idx, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -7871,7 +7586,6 @@ dissect_ff_msg_fms_def_variable_list_err(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; guint8 ErrorClass; guint8 ErrorCode; const char *error_code; @@ -7882,9 +7596,8 @@ dissect_ff_msg_fms_def_variable_list_err(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Define Variable List Error"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_def_variable_list_err); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_def_variable_list_err, NULL, "FMS Define Variable List Error"); ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, @@ -7931,7 +7644,6 @@ dissect_ff_msg_fms_del_variable_list_req(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Delete Variable List Request"); @@ -7939,9 +7651,8 @@ dissect_ff_msg_fms_del_variable_list_req(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Delete Variable List Request"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_del_variable_list_req); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_del_variable_list_req, NULL, "FMS Delete Variable List Request"); proto_tree_add_item(sub_tree, hf_ff_fms_del_variable_list_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -7966,7 +7677,6 @@ dissect_ff_msg_fms_del_variable_list_rsp(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Delete Variable List Response"); @@ -7975,9 +7685,8 @@ dissect_ff_msg_fms_del_variable_list_rsp(tvbuff_t *tvb, gint offset, } if (length) { - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Delete Variable List Response"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_del_variable_list_rsp); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_del_variable_list_rsp, NULL, "FMS Delete Variable List Response"); proto_tree_add_text(sub_tree, tvb, offset, length, "[Unknown] (%u bytes)", length); @@ -7996,7 +7705,6 @@ dissect_ff_msg_fms_del_variable_list_err(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; guint8 ErrorClass; guint8 ErrorCode; const char *error_code; @@ -8007,9 +7715,8 @@ dissect_ff_msg_fms_del_variable_list_err(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Delete Variable List Error"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_del_variable_list_err); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_del_variable_list_err, NULL, "FMS Delete Variable List Error"); ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, @@ -8056,7 +7763,6 @@ dissect_ff_msg_fms_info_report_req(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Information Report Request"); @@ -8064,9 +7770,8 @@ dissect_ff_msg_fms_info_report_req(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Information Report Request"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_info_report_req); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_info_report_req, NULL, "FMS Information Report Request"); proto_tree_add_item(sub_tree, hf_ff_fms_info_report_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -8093,7 +7798,6 @@ dissect_ff_msg_fms_info_report_subindex_req(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Information Report with Subindex Request"); @@ -8101,10 +7805,8 @@ dissect_ff_msg_fms_info_report_subindex_req(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Information Report with Subindex Request"); - sub_tree = proto_item_add_subtree(ti, - ett_ff_fms_info_report_with_subidx_req); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_info_report_with_subidx_req, NULL, "FMS Information Report with Subindex Request"); proto_tree_add_item(sub_tree, hf_ff_fms_info_report_with_subidx_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -8135,7 +7837,6 @@ dissect_ff_msg_fms_info_report_change_req(tvbuff_t *tvb, gint offset, guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Information Report On Change Request"); @@ -8143,9 +7844,8 @@ dissect_ff_msg_fms_info_report_change_req(tvbuff_t *tvb, gint offset, return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Information Report On Change Request"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_info_report_on_change_req); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_info_report_on_change_req, NULL, "FMS Information Report On Change Request"); proto_tree_add_item(sub_tree, hf_ff_fms_info_report_on_change_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -8173,7 +7873,6 @@ dissect_ff_msg_fms_info_report_change_subindex_req( guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Information Report On Change with Subindex Request"); @@ -8181,10 +7880,8 @@ dissect_ff_msg_fms_info_report_change_subindex_req( return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Information Report On Change with Subindex Request"); - sub_tree = proto_item_add_subtree(ti, - ett_ff_fms_info_report_on_change_with_subidx_req); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_info_report_on_change_with_subidx_req, NULL, "FMS Information Report On Change with Subindex Request"); proto_tree_add_item(sub_tree, hf_ff_fms_info_report_on_change_with_subidx_req_idx, @@ -8218,7 +7915,6 @@ dissect_ff_msg_fms_ev_notification_req( guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Event Notification Request"); @@ -8226,9 +7922,8 @@ dissect_ff_msg_fms_ev_notification_req( return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Event Notification Request"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_ev_notification_req); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_ev_notification_req, NULL, "FMS Event Notification Request"); proto_tree_add_item(sub_tree, hf_ff_fms_ev_notification_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -8260,7 +7955,6 @@ dissect_ff_msg_fms_alter_alter_ev_condition_monitoring_req( guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Alter Event Condition Monitoring Request"); @@ -8268,10 +7962,8 @@ dissect_ff_msg_fms_alter_alter_ev_condition_monitoring_req( return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Alter Event Condition Monitoring Request"); - sub_tree = proto_item_add_subtree(ti, - ett_ff_fms_alter_ev_condition_monitoring_req); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_alter_ev_condition_monitoring_req, NULL, "FMS Alter Event Condition Monitoring Request"); proto_tree_add_item(sub_tree, hf_ff_fms_alter_ev_condition_monitoring_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -8307,7 +7999,6 @@ dissect_ff_msg_fms_alter_alter_ev_condition_monitoring_rsp( guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Alter Event Condition Monitoring Response"); @@ -8316,10 +8007,8 @@ dissect_ff_msg_fms_alter_alter_ev_condition_monitoring_rsp( } if (length) { - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Alter Event Condition Monitoring Response"); - sub_tree = proto_item_add_subtree(ti, - ett_ff_fms_alter_ev_condition_monitoring_rsp); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_alter_ev_condition_monitoring_rsp, NULL, "FMS Alter Event Condition Monitoring Response"); proto_tree_add_text(sub_tree, tvb, offset, length, "[Unknown] (%u bytes)", length); @@ -8339,7 +8028,6 @@ dissect_ff_msg_fms_alter_alter_ev_condition_monitoring_err( guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; guint8 ErrorClass; guint8 ErrorCode; const char *error_code; @@ -8350,10 +8038,8 @@ dissect_ff_msg_fms_alter_alter_ev_condition_monitoring_err( return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Alter Event Condition Monitoring Error"); - sub_tree = proto_item_add_subtree(ti, - ett_ff_fms_alter_ev_condition_monitoring_err); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_alter_ev_condition_monitoring_err, NULL, "FMS Alter Event Condition Monitoring Error"); ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, @@ -8403,7 +8089,6 @@ dissect_ff_msg_fms_ack_ev_notification_req( guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Acknowledge Event Notification Request"); @@ -8411,9 +8096,8 @@ dissect_ff_msg_fms_ack_ev_notification_req( return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Acknowledge Event Notification Request"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_ack_ev_notification_req); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_ack_ev_notification_req, NULL, "FMS Acknowledge Event Notification Request"); proto_tree_add_item(sub_tree, hf_ff_fms_ack_ev_notification_req_idx, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -8444,7 +8128,6 @@ dissect_ff_msg_fms_ack_ev_notification_rsp( guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "FMS Acknowledge Event Notification Response"); @@ -8453,10 +8136,8 @@ dissect_ff_msg_fms_ack_ev_notification_rsp( } if (length) { - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Acknowledge Event Notification Response"); - sub_tree = proto_item_add_subtree(ti, - ett_ff_fms_ack_ev_notification_rsp); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_ack_ev_notification_rsp, NULL, "FMS Acknowledge Event Notification Response"); proto_tree_add_text(sub_tree, tvb, offset, length, "[Unknown] (%u bytes)", length); @@ -8476,7 +8157,6 @@ dissect_ff_msg_fms_ack_ev_notification_err( guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; guint8 ErrorClass; guint8 ErrorCode; const char *error_code; @@ -8487,9 +8167,8 @@ dissect_ff_msg_fms_ack_ev_notification_err( return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "FMS Acknowledge Event Notification Error"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fms_ack_ev_notification_err); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_fms_ack_ev_notification_err, NULL, "FMS Acknowledge Event Notification Error"); ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, @@ -8538,7 +8217,6 @@ dissect_ff_msg_lr_get_info_req( guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "LAN Redundancy Get Information Request"); @@ -8547,10 +8225,8 @@ dissect_ff_msg_lr_get_info_req( } if (length) { - ti = proto_tree_add_text(tree, tvb, offset, length, - "LAN Redundancy Get Information Request"); - sub_tree = proto_item_add_subtree(ti, - ett_ff_lr_get_info_req); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_lr_get_info_req, NULL, "LAN Redundancy Get Information Request"); proto_tree_add_text(sub_tree, tvb, offset, length, "[Unknown] (%u bytes)", length); @@ -8617,7 +8293,6 @@ dissect_ff_msg_lr_get_info_rsp( guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; guint8 MaxMsgNumDiff; guint8 LRFlags; @@ -8627,9 +8302,8 @@ dissect_ff_msg_lr_get_info_rsp( return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "LAN Redundancy Get Information Response"); - sub_tree = proto_item_add_subtree(ti, ett_ff_lr_get_info_rsp); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_lr_get_info_rsp, NULL, "LAN Redundancy Get Information Response"); proto_tree_add_item(sub_tree, hf_ff_lr_get_info_rsp_lr_attrs_ver, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -8718,7 +8392,6 @@ dissect_ff_msg_lr_get_info_err( guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; guint8 ErrorClass; guint8 ErrorCode; const char *error_code; @@ -8729,9 +8402,8 @@ dissect_ff_msg_lr_get_info_err( return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "LAN Redundancy Get Information Error"); - sub_tree = proto_item_add_subtree(ti, ett_ff_lr_get_info_err); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_lr_get_info_err, NULL, "LAN Redundancy Get Information Error"); ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, @@ -8825,7 +8497,6 @@ dissect_ff_msg_lr_put_info_req( guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; guint8 MaxMsgNumDiff; guint8 LRFlags; @@ -8835,9 +8506,8 @@ dissect_ff_msg_lr_put_info_req( return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "LAN Redundancy Put Information Request"); - sub_tree = proto_item_add_subtree(ti, ett_ff_lr_put_info_req); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_lr_put_info_req, NULL, "LAN Redundancy Put Information Request"); proto_tree_add_item(sub_tree, hf_ff_lr_put_info_req_lr_attrs_ver, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -8973,7 +8643,6 @@ dissect_ff_msg_lr_put_info_rsp( guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; guint8 MaxMsgNumDiff; guint8 LRFlags; @@ -8983,9 +8652,8 @@ dissect_ff_msg_lr_put_info_rsp( return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "LAN Redundancy Put Information Response"); - sub_tree = proto_item_add_subtree(ti, ett_ff_lr_put_info_rsp); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_lr_put_info_rsp, NULL, "LAN Redundancy Put Information Response"); proto_tree_add_item(sub_tree, hf_ff_lr_put_info_rsp_lr_attrs_ver, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -9074,7 +8742,6 @@ dissect_ff_msg_lr_put_info_err( guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; guint8 ErrorClass; guint8 ErrorCode; const char *error_code; @@ -9085,9 +8752,8 @@ dissect_ff_msg_lr_put_info_err( return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "LAN Redundancy Put Information Error"); - sub_tree = proto_item_add_subtree(ti, ett_ff_lr_put_info_err); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_lr_put_info_err, NULL, "LAN Redundancy Put Information Error"); ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, @@ -9134,7 +8800,6 @@ dissect_ff_msg_lr_get_statistics_req( guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; col_set_str(pinfo->cinfo, COL_INFO, "LAN Redundancy Get Statistics Request"); @@ -9143,9 +8808,8 @@ dissect_ff_msg_lr_get_statistics_req( } if (length) { - ti = proto_tree_add_text(tree, tvb, offset, length, - "LAN Redundancy Get Statistics Request"); - sub_tree = proto_item_add_subtree(ti, ett_ff_lr_get_statistics_req); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_lr_get_statistics_req, NULL, "LAN Redundancy Get Statistics Request"); proto_tree_add_text(sub_tree, tvb, offset, length, "[Unknown] (%u bytes)", length); @@ -9164,17 +8828,15 @@ dissect_ff_msg_lr_get_statistics_rsp_x_cable_stat(tvbuff_t *tvb, gint offset, proto_tree *tree, guint32 value) { proto_tree *sub_tree; - proto_item *ti; guint d; if (!tree) { return; } - ti = proto_tree_add_text(tree, tvb, offset, 4 * value, + sub_tree = proto_tree_add_subtree_format(tree, tvb, offset, 4 * value, + ett_ff_lr_get_statistics_rsp_list_of_x_cable_stat, NULL, "List of Crossed Cable Status (%u bytes)", 4 * value); - sub_tree = proto_item_add_subtree(ti, - ett_ff_lr_get_statistics_rsp_list_of_x_cable_stat); for (d = 0; d < value; d++) { proto_tree_add_item(sub_tree, @@ -9194,7 +8856,6 @@ dissect_ff_msg_lr_get_statistics_rsp( guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; guint32 NumXcableStat; col_set_str(pinfo->cinfo, COL_INFO, "LAN Redundancy Get Statistics Response"); @@ -9203,9 +8864,8 @@ dissect_ff_msg_lr_get_statistics_rsp( return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "LAN Redundancy Get Statistics Response"); - sub_tree = proto_item_add_subtree(ti, ett_ff_lr_get_statistics_rsp); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_lr_get_statistics_rsp, NULL, "LAN Redundancy Get Statistics Response"); proto_tree_add_item(sub_tree, hf_ff_lr_get_statistics_rsp_num_diag_svr_ind_recv_a, @@ -9275,7 +8935,6 @@ dissect_ff_msg_lr_get_statistics_err( guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; guint8 ErrorClass; guint8 ErrorCode; const char *error_code; @@ -9286,10 +8945,8 @@ dissect_ff_msg_lr_get_statistics_err( return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "LAN Redundancy Get Statistics Error"); - sub_tree = proto_item_add_subtree(ti, - ett_ff_lr_get_statistics_err); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_lr_get_statistics_err, NULL, "LAN Redundancy Get Statistics Error"); ErrorClass = tvb_get_guint8(tvb, offset); proto_tree_add_item(sub_tree, @@ -9366,17 +9023,15 @@ dissect_ff_msg_diagnostic_msg_req_if_a_to_a_status(tvbuff_t *tvb, gint offset, proto_tree *tree, guint32 value) { proto_tree *sub_tree; - proto_item *ti; guint d; if (!tree) { return; } - ti = proto_tree_add_text(tree, tvb, offset, 4 * value, + sub_tree = proto_tree_add_subtree_format(tree, tvb, offset, 4 * value, + ett_ff_lr_diagnostic_msg_req_a_to_a_status, NULL, "List of Interface AtoA Statuses (%u bytes)", 4 * value); - sub_tree = proto_item_add_subtree(ti, - ett_ff_lr_diagnostic_msg_req_a_to_a_status); for (d = 0; d < value; d++) { proto_tree_add_item(sub_tree, @@ -9396,17 +9051,15 @@ dissect_ff_msg_diagnostic_msg_req_if_b_to_a_status(tvbuff_t *tvb, gint offset, proto_tree *tree, guint32 value) { proto_tree *sub_tree; - proto_item *ti; guint d; if (!tree) { return; } - ti = proto_tree_add_text(tree, tvb, offset, 4 * value, + sub_tree = proto_tree_add_subtree_format(tree, tvb, offset, 4 * value, + ett_ff_lr_diagnostic_msg_req_b_to_a_status, NULL, "List of Interface BtoA Statuses (%u bytes)", 4 * value); - sub_tree = proto_item_add_subtree(ti, - ett_ff_lr_diagnostic_msg_req_b_to_a_status); for (d = 0; d < value; d++) { proto_tree_add_item(sub_tree, @@ -9426,17 +9079,15 @@ dissect_ff_msg_diagnostic_msg_req_if_a_to_b_status(tvbuff_t *tvb, gint offset, proto_tree *tree, guint32 value) { proto_tree *sub_tree; - proto_item *ti; guint d; if (!tree) { return; } - ti = proto_tree_add_text(tree, tvb, offset, 4 * value, + sub_tree = proto_tree_add_subtree_format(tree, tvb, offset, 4 * value, + ett_ff_lr_diagnostic_msg_req_a_to_b_status, NULL, "List of Interface AtoB Statuses (%u bytes)", 4 * value); - sub_tree = proto_item_add_subtree(ti, - ett_ff_lr_diagnostic_msg_req_a_to_b_status); for (d = 0; d < value; d++) { proto_tree_add_item(sub_tree, @@ -9456,17 +9107,15 @@ dissect_ff_msg_diagnostic_msg_req_if_b_to_b_status(tvbuff_t *tvb, gint offset, proto_tree *tree, guint32 value) { proto_tree *sub_tree; - proto_item *ti; guint d; if (!tree) { return; } - ti = proto_tree_add_text(tree, tvb, offset, 4 * value, + sub_tree = proto_tree_add_subtree_format(tree, tvb, offset, 4 * value, + ett_ff_lr_diagnostic_msg_req_b_to_b_status, NULL, "List of Interface BtoB Statuses (%u bytes)", 4 * value); - sub_tree = proto_item_add_subtree(ti, - ett_ff_lr_diagnostic_msg_req_b_to_b_status); for (d = 0; d < value; d++) { proto_tree_add_item(sub_tree, @@ -9487,7 +9136,6 @@ dissect_ff_msg_diagnostic_msg_req( guint32 length, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; - proto_item *ti; guint16 DeviceIndex; guint8 DuplicateDetectionState; guint16 NumOfInterfaceStatuses; @@ -9498,9 +9146,8 @@ dissect_ff_msg_diagnostic_msg_req( return; } - ti = proto_tree_add_text(tree, tvb, offset, length, - "Diagnostic Message Request"); - sub_tree = proto_item_add_subtree(ti, ett_ff_lr_diagnostic_msg_req); + sub_tree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_ff_lr_diagnostic_msg_req, NULL, "Diagnostic Message Request"); DeviceIndex = tvb_get_ntohs(tvb, offset); if (DeviceIndex) { @@ -11685,7 +11332,6 @@ dissect_ff_msg_trailer(tvbuff_t *tvb, gint offset, guint32 length, proto_tree *tree, guint8 Options) { proto_tree *sub_tree; - proto_item *ti; proto_item *hidden_item; if (!tree) { @@ -11695,9 +11341,8 @@ dissect_ff_msg_trailer(tvbuff_t *tvb, hidden_item = proto_tree_add_boolean(tree, hf_ff_fda_msg_trailer, tvb, 0, 0, 1); PROTO_ITEM_SET_HIDDEN(hidden_item); - ti = proto_tree_add_text(tree, - tvb, offset, length, "FDA Message Trailer"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fda_msg_trailer); + sub_tree = proto_tree_add_subtree(tree, + tvb, offset, length, ett_ff_fda_msg_trailer, NULL, "FDA Message Trailer"); if (Options & OPTION_MESSAGE_NUMBER_MASK) { proto_tree_add_item(sub_tree, @@ -11863,7 +11508,6 @@ dissect_ff_msg_hdr(tvbuff_t *tvb, proto_tree *tree, guint8 Options, guint8 ProtocolAndType, guint8 Service) { proto_tree *sub_tree; - proto_item *ti; proto_item *hidden_item; gint offset = 0; @@ -11874,9 +11518,8 @@ dissect_ff_msg_hdr(tvbuff_t *tvb, hidden_item = proto_tree_add_boolean(tree, hf_ff_fda_msg_hdr, tvb, 0, 0, 1); PROTO_ITEM_SET_HIDDEN(hidden_item); - ti = proto_tree_add_text(tree, - tvb, offset, 12, "FDA Message Header"); - sub_tree = proto_item_add_subtree(ti, ett_ff_fda_msg_hdr); + sub_tree = proto_tree_add_subtree(tree, + tvb, offset, 12, ett_ff_fda_msg_hdr, NULL, "FDA Message Header"); /* FDA Message Version */ proto_tree_add_item(sub_tree, @@ -11915,8 +11558,8 @@ dissect_ff_msg_hdr(tvbuff_t *tvb, static int dissect_ff(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { - proto_tree *sub_tree = NULL; - proto_item *ti = NULL; + proto_tree *sub_tree; + proto_item *ti; gint offset = 0; guint8 Options = 0; /* Options */ @@ -11935,10 +11578,8 @@ dissect_ff(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) FDAAddress = tvb_get_ntohl(tvb, 4); length = tvb_get_ntohl(tvb, 8); - if (tree) { - ti = proto_tree_add_item(tree, proto_ff, tvb, offset, length, ENC_NA); - sub_tree = proto_item_add_subtree(ti, ett_ff); - } + ti = proto_tree_add_item(tree, proto_ff, tvb, offset, length, ENC_NA); + sub_tree = proto_item_add_subtree(ti, ett_ff); if (Options & OPTION_MESSAGE_NUMBER_MASK) { length -= 4; diff --git a/epan/dissectors/packet-fix.c b/epan/dissectors/packet-fix.c index 923b91c51e..82b30193cf 100644 --- a/epan/dissectors/packet-fix.c +++ b/epan/dissectors/packet-fix.c @@ -376,8 +376,8 @@ dissect_fix_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* da proto_tree *field_tree; /* XXX - it could be -1 if the tag isn't a number */ - ti = proto_tree_add_text(fix_tree, tvb, field_offset, tag->field_len, "%i: %s", tag_value, value); - field_tree = proto_item_add_subtree(ti, ett_unknow); + field_tree = proto_tree_add_subtree_format(fix_tree, tvb, field_offset, tag->field_len, ett_unknow, NULL, + "%i: %s", tag_value, value); proto_tree_add_uint(field_tree, hf_fix_field_tag, tvb, field_offset, tag->tag_len, tag_value); proto_tree_add_item(field_tree, hf_fix_field_value, tvb, tag->value_offset, tag->value_len, ENC_ASCII|ENC_NA); } diff --git a/epan/dissectors/packet-flip.c b/epan/dissectors/packet-flip.c index 074233addb..cca021ecd0 100644 --- a/epan/dissectors/packet-flip.c +++ b/epan/dissectors/packet-flip.c @@ -181,9 +181,8 @@ dissect_flip_chksum_hdr(tvbuff_t *tvb, } if (tree) { - item = proto_tree_add_text(tree, tvb, - offset + 0, 4, "Checksum Header"); - chksum_hdr_tree = proto_item_add_subtree(item, ett_flip_chksum); + chksum_hdr_tree = proto_tree_add_subtree(tree, tvb, offset + 0, 4, + ett_flip_chksum, NULL, "Checksum Header"); /* ETYPE: 8 bits */ proto_tree_add_uint_format_value(chksum_hdr_tree, hf_flip_chksum_etype, @@ -447,8 +446,7 @@ dissect_flip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ flip_tree = proto_item_add_subtree(ti, ett_flip); /* basic header */ - item = proto_tree_add_text(flip_tree, flip_tvb, 0, 8, "Basic Header"); - basic_hdr_tree = proto_item_add_subtree(item, ett_flip_basic); + basic_hdr_tree = proto_tree_add_subtree(flip_tree, flip_tvb, 0, 8, ett_flip_basic, NULL, "Basic Header"); /* Extension header follows? 1 bit. */ proto_tree_add_uint_format_value(basic_hdr_tree, diff --git a/epan/dissectors/packet-fmp.c b/epan/dissectors/packet-fmp.c index 127d20c8e1..b25bf07c12 100644 --- a/epan/dissectors/packet-fmp.c +++ b/epan/dissectors/packet-fmp.c @@ -189,16 +189,13 @@ dissect_fmp_fileHandleSrc(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, { nativeProtocol np; - proto_item *fileHandleItem; proto_tree *fileHandleTree; int length; length = get_fileHandleSrc_size(tvb, offset); - fileHandleItem = proto_tree_add_text(tree, tvb, offset, length, - "Source File Handle"); - fileHandleTree = proto_item_add_subtree(fileHandleItem, - ett_fmp_fileHandle); + fileHandleTree = proto_tree_add_subtree(tree, tvb, offset, length, + ett_fmp_fileHandle, NULL, "Source File Handle"); np = (nativeProtocol)tvb_get_ntohl(tvb, offset); proto_tree_add_item(fileHandleTree, hf_fmp_native_protocol, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -280,13 +277,10 @@ dissect_fmp_extentState(tvbuff_t *tvb, int offset, proto_tree *tree) static int dissect_fmp_extent(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, guint32 ext_num) { - proto_item *extItem; proto_tree *extTree; - extItem = proto_tree_add_text(tree, tvb, offset, 20 , - "Extent (%u)", (guint32) ext_num); - - extTree = proto_item_add_subtree(extItem, ett_fmp_ext); + extTree = proto_tree_add_subtree_format(tree, tvb, offset, 20 , + ett_fmp_ext, NULL, "Extent (%u)", (guint32) ext_num); offset = dissect_rpc_uint32(tvb, extTree, hf_fmp_firstLogBlk, offset); @@ -306,16 +300,14 @@ dissect_fmp_extentList(tvbuff_t *tvb, int offset, packet_info *pinfo, { guint32 numExtents; guint32 totalLength; - proto_item *extListItem; proto_tree *extListTree; guint32 i; numExtents = tvb_get_ntohl(tvb, offset); totalLength = 4 + (20 * numExtents); - extListItem = proto_tree_add_text(tree, tvb, offset, totalLength, - "Extent List"); - extListTree = proto_item_add_subtree(extListItem, ett_fmp_extList); + extListTree = proto_tree_add_subtree(tree, tvb, offset, totalLength, + ett_fmp_extList, NULL, "Extent List"); offset = dissect_rpc_uint32(tvb, extListTree, hf_fmp_extentList_len, offset); @@ -333,7 +325,6 @@ dissect_fmp_extentListEx(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { guint32 numExtents; - proto_item *extListItem; proto_tree *extListTree; guint32 i; @@ -342,10 +333,8 @@ dissect_fmp_extentListEx(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, offset += 4; for (i = 0; i < numExtents; i++) { - extListItem = proto_tree_add_text(tree, tvb, offset, 28, - "Extent List"); - extListTree = proto_item_add_subtree(extListItem, ett_fmp_extList); - + extListTree = proto_tree_add_subtree(tree, tvb, offset, 28, + ett_fmp_extList, NULL, "Extent List"); offset = dissect_rpc_uint64(tvb,extListTree , hf_fmp_firstLogBlk64, offset); @@ -839,13 +828,10 @@ dissect_fmp_cerrInfo(tvbuff_t *tvb, int offset, proto_tree *tree) static int dissect_fmp_attrs(tvbuff_t *tvb, int offset, proto_tree *tree) { - proto_tree *attrstree; proto_tree *attrsTree; - attrstree = proto_tree_add_text(tree, tvb, offset, 84, - "Attribute: "); - attrsTree = proto_item_add_subtree(attrstree, - ett_attrs ); + attrsTree = proto_tree_add_subtree(tree, tvb, offset, 84, + ett_attrs, NULL, "Attribute: "); offset = dissect_rpc_uint32(tvb, attrsTree, hf_fmp_nfsv3Attr_type, offset); offset = dissect_rpc_uint32(tvb, attrsTree, hf_fmp_nfsv3Attr_mode, offset); offset = dissect_rpc_uint32(tvb, attrsTree, hf_fmp_nfsv3Attr_nlink, offset); diff --git a/epan/dissectors/packet-fmp_notify.c b/epan/dissectors/packet-fmp_notify.c index 4291ad7e0b..28909fe52d 100644 --- a/epan/dissectors/packet-fmp_notify.c +++ b/epan/dissectors/packet-fmp_notify.c @@ -180,7 +180,6 @@ dissect_handleList(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, int numHandles; int listLength; int i; - proto_item *handleListItem; proto_tree *handleListTree; numHandles = tvb_get_ntohl(tvb, offset); @@ -190,10 +189,8 @@ dissect_handleList(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, listLength += (4 + tvb_get_ntohl(tvb, offset + listLength)); } - handleListItem = proto_tree_add_text(tree, tvb, offset, listLength, - "Handle List"); - handleListTree = proto_item_add_subtree(handleListItem, - ett_fmp_notify_hlist); + handleListTree = proto_tree_add_subtree(tree, tvb, offset, listLength, + ett_fmp_notify_hlist, NULL, "Handle List"); offset = dissect_rpc_uint32(tvb, handleListTree, hf_fmp_handleListLen, offset); @@ -468,14 +465,10 @@ static int dissect_fmp_notify_extent(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, guint32 ext_num) { - proto_item *extItem; proto_tree *extTree; - extItem = proto_tree_add_text(tree, tvb, offset, 20 , - "Extent (%u)", (guint32) ext_num); - - - extTree = proto_item_add_subtree(extItem, ett_fmp_ext); + extTree = proto_tree_add_subtree_format(tree, tvb, offset, 20 , + ett_fmp_ext, NULL, "Extent (%u)", (guint32) ext_num); offset = dissect_rpc_uint32(tvb, extTree, hf_fmp_firstLogBlk, offset); @@ -496,16 +489,14 @@ dissect_fmp_notify_extentList(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, { guint32 numExtents; guint32 totalLength; - proto_item *extListItem; proto_tree *extListTree; guint32 i; numExtents = tvb_get_ntohl(tvb, offset); totalLength = 4 + (20 * numExtents); - extListItem = proto_tree_add_text(tree, tvb, offset, totalLength, - "Extent List"); - extListTree = proto_item_add_subtree(extListItem, ett_fmp_extList); + extListTree = proto_tree_add_subtree(tree, tvb, offset, totalLength, + ett_fmp_extList, NULL, "Extent List"); offset = dissect_rpc_uint32(tvb, extListTree, hf_fmp_extentList_len, offset); diff --git a/epan/dissectors/packet-forces.c b/epan/dissectors/packet-forces.c index 53b5ae261f..66c5b3ca28 100644 --- a/epan/dissectors/packet-forces.c +++ b/epan/dissectors/packet-forces.c @@ -306,8 +306,7 @@ dissect_path_data_tlv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint while (tvb_reported_length_remaining(tvb, offset) >= TLV_TL_LENGTH) { - ti = proto_tree_add_text(tree, tvb, offset, TLV_TL_LENGTH, "TLV"); - tlv_tree = proto_item_add_subtree(ti, ett_forces_path_data_tlv); + tlv_tree = proto_tree_add_subtree(tree, tvb, offset, TLV_TL_LENGTH, ett_forces_path_data_tlv, &ti, "TLV"); type = tvb_get_ntohs(tvb, offset); proto_tree_add_item(tlv_tree, hf_forces_lfbselect_tlv_type_operation_path_type, @@ -324,8 +323,8 @@ dissect_path_data_tlv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint if (type == PATH_DATA_TLV) { - ti = proto_tree_add_text(tree, tvb, offset+TLV_TL_LENGTH, length_TLV-TLV_TL_LENGTH, "Path Data TLV"); - path_data_tree = proto_item_add_subtree(ti, ett_forces_path_data_tlv); + path_data_tree = proto_tree_add_subtree(tree, tvb, offset+TLV_TL_LENGTH, length_TLV-TLV_TL_LENGTH, + ett_forces_path_data_tlv, NULL, "Path Data TLV"); flag = tvb_get_ntohs(tvb, offset+TLV_TL_LENGTH); flag_item = proto_tree_add_item(path_data_tree, hf_forces_lfbselect_tlv_type_operation_path_flags, @@ -367,8 +366,8 @@ dissect_operation_tlv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint while (tvb_reported_length_remaining(tvb, offset) >= TLV_TL_LENGTH) { - ti = proto_tree_add_text(tree, tvb, offset, length_count, "Operation TLV"); - oper_tree = proto_item_add_subtree(ti, ett_forces_lfbselect_tlv_type_operation); + oper_tree = proto_tree_add_subtree(tree, tvb, offset, length_count, + ett_forces_lfbselect_tlv_type_operation, &ti, "Operation TLV"); type = tvb_get_ntohs(tvb,offset); ti = proto_tree_add_item(oper_tree, hf_forces_lfbselect_tlv_type_operation_type, @@ -419,8 +418,8 @@ dissect_redirecttlv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint of dst_addr = pinfo->dst, dst_net_addr = pinfo->net_dst; - ti = proto_tree_add_text(tree, tvb, offset, TLV_TL_LENGTH, "Meta Data TLV"); - meta_data_tree = proto_item_add_subtree(ti, ett_forces_redirect_tlv_meta_data_tlv); + meta_data_tree = proto_tree_add_subtree(tree, tvb, offset, TLV_TL_LENGTH, + ett_forces_redirect_tlv_meta_data_tlv, &ti, "Meta Data TLV"); proto_tree_add_item(meta_data_tree, hf_forces_redirect_tlv_meta_data_tlv_type, tvb, offset, 2, ENC_BIG_ENDIAN); length_meta = tvb_get_ntohs(tvb, offset+2); @@ -431,8 +430,8 @@ dissect_redirecttlv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint of start_offset = offset; while ((tvb_reported_length_remaining(tvb, offset) >= 8) && (start_offset+length_meta > offset)) { - ti = proto_tree_add_text(tree, tvb, offset, TLV_TL_LENGTH, "Meta Data ILV"); - meta_data_ilv_tree = proto_item_add_subtree(ti, ett_forces_redirect_tlv_meta_data_tlv_meta_data_ilv); + meta_data_ilv_tree = proto_tree_add_subtree(tree, tvb, offset, TLV_TL_LENGTH, + ett_forces_redirect_tlv_meta_data_tlv_meta_data_ilv, &ti, "Meta Data ILV"); proto_tree_add_item(meta_data_ilv_tree, hf_forces_redirect_tlv_meta_data_tlv_meta_data_ilv_id, tvb, offset+8, 4, ENC_BIG_ENDIAN); @@ -449,8 +448,8 @@ dissect_redirecttlv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint of if (tvb_reported_length_remaining(tvb, offset) > 0) { - ti = proto_tree_add_text(tree, tvb, offset, TLV_TL_LENGTH, "Redirect Data TLV"); - redirect_data_tree = proto_item_add_subtree(ti, ett_forces_redirect_tlv_redirect_data_tlv); + redirect_data_tree = proto_tree_add_subtree(tree, tvb, offset, TLV_TL_LENGTH, + ett_forces_redirect_tlv_redirect_data_tlv, &ti, "Redirect Data TLV"); proto_tree_add_item(redirect_data_tree, hf_forces_redirect_tlv_redirect_data_tlv_type, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -501,8 +500,8 @@ dissect_forces(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 offs ti = proto_tree_add_item(tree, proto_forces, tvb, 0, -1, ENC_NA); forces_tree = proto_item_add_subtree(ti, ett_forces); - ti = proto_tree_add_text(forces_tree, tvb, 0, ForCES_HEADER_LENGTH, "Common Header"); - forces_main_header_tree = proto_item_add_subtree(ti, ett_forces_main_header); + forces_main_header_tree = proto_tree_add_subtree(forces_tree, tvb, 0, ForCES_HEADER_LENGTH, + ett_forces_main_header, NULL, "Common Header"); proto_tree_add_item(forces_main_header_tree, hf_forces_version, tvb, 0, 1, ENC_BIG_ENDIAN); proto_tree_add_item(forces_main_header_tree, hf_forces_rsvd, tvb, 0, 1, ENC_BIG_ENDIAN); @@ -541,8 +540,7 @@ dissect_forces(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 offs offset += 24; while (tvb_reported_length_remaining(tvb, offset) >= TLV_TL_LENGTH) { - ti = proto_tree_add_text(forces_tree, tvb, offset, TLV_TL_LENGTH, "TLV"); - forces_tlv_tree = proto_item_add_subtree(ti, ett_forces_tlv); + forces_tlv_tree = proto_tree_add_subtree(forces_tree, tvb, offset, TLV_TL_LENGTH, ett_forces_tlv, &ti, "TLV"); tlv_type = tvb_get_ntohs(tvb, offset); tlv_item = proto_tree_add_item(forces_tlv_tree, hf_forces_tlv_type, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -565,33 +563,33 @@ dissect_forces(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 offs switch(tlv_type) { case LFBselect_TLV: - ti = proto_tree_add_text(forces_tlv_tree, tvb, offset, length_count, "LFB select TLV"); - tlv_tree = proto_item_add_subtree(ti, ett_forces_lfbselect_tlv_type); + tlv_tree = proto_tree_add_subtree(forces_tlv_tree, tvb, offset, length_count, + ett_forces_lfbselect_tlv_type, NULL, "LFB select TLV"); dissect_lfbselecttlv(tvb, pinfo, tlv_tree, offset, length_count); break; case REDIRECT_TLV: - ti = proto_tree_add_text(forces_tlv_tree, tvb, offset, length_count, "Redirect TLV"); - tlv_tree = proto_item_add_subtree(ti, ett_forces_redirect_tlv_type); + tlv_tree = proto_tree_add_subtree(forces_tlv_tree, tvb, offset, length_count, + ett_forces_redirect_tlv_type, NULL, "Redirect TLV"); dissect_redirecttlv(tvb, pinfo, tlv_tree, offset); break; case ASResult_TLV: - ti = proto_tree_add_text(forces_tlv_tree, tvb, offset, length_count, "ASResult TLV"); - tlv_tree = proto_item_add_subtree(ti, ett_forces_asresult_tlv); + tlv_tree = proto_tree_add_subtree(forces_tlv_tree, tvb, offset, length_count, + ett_forces_asresult_tlv, NULL, "ASResult TLV"); proto_tree_add_item(tlv_tree, hf_forces_asresult_association_setup_result, tvb, offset, 4, ENC_BIG_ENDIAN); break; case ASTreason_TLV: - ti = proto_tree_add_text(forces_tlv_tree, tvb, offset, length_count, "ASTreason TLV"); - tlv_tree = proto_item_add_subtree(ti, ett_forces_astreason_tlv); + tlv_tree = proto_tree_add_subtree(forces_tlv_tree, tvb, offset, length_count, + ett_forces_astreason_tlv, NULL, "ASTreason TLV"); proto_tree_add_item(tlv_tree, hf_forces_astreason_tlv_teardown_reason, tvb, offset, 4, ENC_BIG_ENDIAN); break; default: expert_add_info(pinfo, tlv_item, &ei_forces_tlv_type); - ti = proto_tree_add_text(forces_tlv_tree, tvb, offset, length_count, "Unknown TLV"); - tlv_tree = proto_item_add_subtree(ti, ett_forces_unknown_tlv); + tlv_tree = proto_tree_add_subtree(forces_tlv_tree, tvb, offset, length_count, + ett_forces_unknown_tlv, NULL, "Unknown TLV"); proto_tree_add_item(tlv_tree, hf_forces_unknown_tlv, tvb, offset, length_count, ENC_NA); break; } diff --git a/epan/dissectors/packet-foundry.c b/epan/dissectors/packet-foundry.c index c3fa37930e..624d2f90ed 100644 --- a/epan/dissectors/packet-foundry.c +++ b/epan/dissectors/packet-foundry.c @@ -111,7 +111,6 @@ static const value_string fdp_type_vals[] = { static int dissect_tlv_header(tvbuff_t *tvb, packet_info *pinfo _U_, int offset, int length _U_, proto_tree *tree) { - proto_item *tlv_item; proto_tree *tlv_tree; guint16 tlv_type; guint16 tlv_length; @@ -119,12 +118,11 @@ dissect_tlv_header(tvbuff_t *tvb, packet_info *pinfo _U_, int offset, int length tlv_type = tvb_get_ntohs(tvb, offset); tlv_length = tvb_get_ntohs(tvb, offset + 2); - tlv_item = proto_tree_add_text(tree, tvb, offset, 4, - "Length %d, type %d = %s", + tlv_tree = proto_tree_add_subtree_format(tree, tvb, offset, 4, + ett_fdp_tlv_header, NULL, "Length %d, type %d = %s", tlv_length, tlv_type, val_to_str(tlv_type, fdp_type_vals, "Unknown (%d)")); - tlv_tree = proto_item_add_subtree(tlv_item, ett_fdp_tlv_header); proto_tree_add_uint(tlv_tree, hf_fdp_tlv_type, tvb, offset, 2, tlv_type); offset += 2; diff --git a/epan/dissectors/packet-fr.c b/epan/dissectors/packet-fr.c index 9659b8836f..a44097f344 100644 --- a/epan/dissectors/packet-fr.c +++ b/epan/dissectors/packet-fr.c @@ -653,16 +653,15 @@ static void dissect_fr_uncompressed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - proto_item *ti = NULL; - proto_tree *fr_tree = NULL; + proto_item *ti; + proto_tree *fr_tree; col_set_str(pinfo->cinfo, COL_PROTOCOL, "FR"); col_clear(pinfo->cinfo, COL_INFO); - if (tree) { - ti = proto_tree_add_protocol_format(tree, proto_fr, tvb, 0, -1, "Frame Relay"); - fr_tree = proto_item_add_subtree(ti, ett_fr); - } + ti = proto_tree_add_protocol_format(tree, proto_fr, tvb, 0, -1, "Frame Relay"); + fr_tree = proto_item_add_subtree(ti, ett_fr); + dissect_fr_nlpid(tvb, 0, pinfo, tree, ti, fr_tree, XDLC_U); } diff --git a/epan/dissectors/packet-fractalgeneratorprotocol.c b/epan/dissectors/packet-fractalgeneratorprotocol.c index dc9ea620be..d93c497f6e 100644 --- a/epan/dissectors/packet-fractalgeneratorprotocol.c +++ b/epan/dissectors/packet-fractalgeneratorprotocol.c @@ -172,15 +172,10 @@ dissect_fractalgeneratorprotocol(tvbuff_t *message_tvb, packet_info *pinfo, prot col_set_str(pinfo->cinfo, COL_PROTOCOL, "FractalGeneratorProtocol"); - /* In the interest of speed, if "tree" is NULL, don't do any work not - necessary to generate protocol tree items. */ - if (tree) { - /* create the fractalgeneratorprotocol protocol tree */ - fractalgeneratorprotocol_item = proto_tree_add_item(tree, proto_fractalgeneratorprotocol, message_tvb, 0, -1, ENC_NA); - fractalgeneratorprotocol_tree = proto_item_add_subtree(fractalgeneratorprotocol_item, ett_fractalgeneratorprotocol); - } else { - fractalgeneratorprotocol_tree = NULL; - }; + /* create the fractalgeneratorprotocol protocol tree */ + fractalgeneratorprotocol_item = proto_tree_add_item(tree, proto_fractalgeneratorprotocol, message_tvb, 0, -1, ENC_NA); + fractalgeneratorprotocol_tree = proto_item_add_subtree(fractalgeneratorprotocol_item, ett_fractalgeneratorprotocol); + /* dissect the message */ dissect_fractalgeneratorprotocol_message(message_tvb, pinfo, fractalgeneratorprotocol_tree); return(TRUE); |