osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Replace the last of PROTO_ITEM_ macro calls with function calls

This commit is contained in:
Jaap Keuter 2022-09-29 05:59:12 +00:00
parent b982023107
commit b092fa05da
18 changed files with 90 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -356,7 +356,7 @@ static int dissect_block_asb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
if (tgt_ix < tgt_size) {
const guint64 *tgt_blknum = wmem_array_index(targets, tgt_ix);
proto_item *item_tgt_blknum = proto_tree_add_uint64(tree_result_tgt_list, hf_asb_result_tgt_ref, tvb, 0, 0, *tgt_blknum);
PROTO_ITEM_SET_GENERATED(item_tgt_blknum);
proto_item_set_generated(item_tgt_blknum);
}
// iterate all results for this target

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

@ -762,11 +762,11 @@ proto_item * proto_tree_add_cbor_eid(proto_tree *tree, int hfindex, int hfindex_
if (dtn_wkssp) {
proto_item *item = proto_tree_add_string(tree_eid, hf_eid_dtn_wkssp, tvb, eid_start, *offset - eid_start, dtn_wkssp);
PROTO_ITEM_SET_GENERATED(item);
proto_item_set_generated(item);
}
if (dtn_serv) {
proto_item *item = proto_tree_add_string(tree_eid, hf_eid_dtn_serv, tvb, eid_start, *offset - eid_start, dtn_serv);
PROTO_ITEM_SET_GENERATED(item);
proto_item_set_generated(item);
}
char *uri = NULL;
@ -774,7 +774,7 @@ proto_item * proto_tree_add_cbor_eid(proto_tree *tree, int hfindex, int hfindex_
uri = wmem_strbuf_finalize(uribuf);
proto_item *item_uri = proto_tree_add_string(tree_eid, hfindex_uri, tvb, eid_start, *offset - eid_start, uri);
PROTO_ITEM_SET_GENERATED(item_uri);
proto_item_set_generated(item_uri);
proto_item_append_text(item_eid, ": %s", uri);
}
@ -813,7 +813,7 @@ static void proto_tree_add_dtn_time(proto_tree *tree, int hfindex, packet_info *
if (*dtntime > 0) {
const nstime_t utctime = dtn_to_utctime(*dtntime);
proto_item *item_utctime = proto_tree_add_time(tree_time, hf_time_utctime, tvb, chunk->start, chunk->data_length, &utctime);
PROTO_ITEM_SET_GENERATED(item_utctime);
proto_item_set_generated(item_utctime);
gchar *time_text = abs_time_to_str(wmem_packet_scope(), &utctime, ABSOLUTE_TIME_UTC, TRUE);
proto_item_append_text(item_time, ": %s", time_text);
@ -938,7 +938,7 @@ static void proto_tree_add_ident(proto_tree *tree, int hfindex, tvbuff_t *tvb, c
}
proto_item *item_subj_ident = proto_tree_add_string(tree, hfindex, tvb, 0, 0, wmem_strbuf_get_str(ident_text));
PROTO_ITEM_SET_GENERATED(item_subj_ident);
proto_item_set_generated(item_subj_ident);
wmem_strbuf_finalize(ident_text);
}
@ -1003,13 +1003,13 @@ static gint dissect_block_primary(tvbuff_t *tvb, packet_info *pinfo, proto_tree
if (lifetime) {
nstime_t lifetime_exp = dtn_to_delta(*lifetime);
proto_item *item_lifetime_exp = proto_tree_add_time(tree_block, hf_primary_lifetime_exp, tvb, chunk->start, chunk->head_length, &lifetime_exp);
PROTO_ITEM_SET_GENERATED(item_lifetime_exp);
proto_item_set_generated(item_lifetime_exp);
if (block->ts.abstime.dtntime > 0) {
nstime_t expiretime;
nstime_sum(&expiretime, &(block->ts.abstime.utctime), &lifetime_exp);
proto_item *item_expiretime = proto_tree_add_time(tree_block, hf_primary_expire_ts, tvb, 0, 0, &expiretime);
PROTO_ITEM_SET_GENERATED(item_expiretime);
proto_item_set_generated(item_expiretime);
}
}
field_ix++;
@ -1294,7 +1294,7 @@ static void show_status_subj_ref(gpointer key, gpointer val _U_, gpointer data)
const bp_bundle_t *status_found = wmem_map_lookup(bp_history->bundles, status_ident);
if (status_found) {
proto_item *item_subj_ref = proto_tree_add_uint(tree_bundle, hf_bundle_status_ref, NULL, 0, 0, status_found->frame_num);
PROTO_ITEM_SET_GENERATED(item_subj_ref);
proto_item_set_generated(item_subj_ref);
}
}
@ -1389,12 +1389,12 @@ static int dissect_bp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
const bp_bundle_t *seen_found = wmem_map_lookup(bp_history->bundles, bundle->ident);
if (seen_found && (seen_found->frame_num != pinfo->num)) {
proto_item *item_seen = proto_tree_add_uint(tree_bundle, hf_bundle_seen, tvb, 0, 0, seen_found->frame_num);
PROTO_ITEM_SET_GENERATED(item_seen);
proto_item_set_generated(item_seen);
nstime_t td;
nstime_delta(&td, &(bundle->frame_time), &(seen_found->frame_time));
proto_item *item_td = proto_tree_add_time(tree_bundle, hf_bundle_seen_time_diff, tvb, 0, 0, &td);
PROTO_ITEM_SET_GENERATED(item_td);
proto_item_set_generated(item_td);
}
// Indicate related status (may be multiple)
@ -1656,12 +1656,12 @@ static int dissect_status_report(tvbuff_t *tvb, packet_info *pinfo, proto_tree *
const bp_bundle_t *subj_found = wmem_map_lookup(bp_history->bundles, subj);
if (subj_found) {
proto_item *item_subj_ref = proto_tree_add_uint(tree_status, hf_status_rep_subj_ref, tvb, 0, 0, subj_found->frame_num);
PROTO_ITEM_SET_GENERATED(item_subj_ref);
proto_item_set_generated(item_subj_ref);
nstime_t td;
nstime_delta(&td, &(context->bundle->frame_time), &(subj_found->frame_time));
proto_item *item_td = proto_tree_add_time(tree_status, hf_status_time_diff, tvb, 0, 0, &td);
PROTO_ITEM_SET_GENERATED(item_td);
proto_item_set_generated(item_td);
}
}
{

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

@ -387,7 +387,7 @@ decode_dataitem_status(tvbuff_t *tvb, int offset, proto_item *pi, proto_tree *pt
/* Add and hide the specific dataitem protocol item */
tmp_pi = proto_tree_add_item(pt, hf_dlep_dataitem_status, tvb, offset, len, ENC_NA);
PROTO_ITEM_SET_HIDDEN(tmp_pi);
proto_item_set_hidden(tmp_pi);
if (len < DLEP_DIT_STATUS_MINLEN) {
expert_add_info(pinfo, pi, &ei_dlep_dataitem_unexpected_length);
@ -414,7 +414,7 @@ decode_dataitem_v4conn(tvbuff_t *tvb, int offset, proto_item *pi, proto_tree *pt
guint32 v4conn_port;
tmp_pi = proto_tree_add_item(pt, hf_dlep_dataitem_v4conn, tvb, offset, len, ENC_NA);
PROTO_ITEM_SET_HIDDEN(tmp_pi);
proto_item_set_hidden(tmp_pi);
tmp_pi = proto_tree_add_item(pt, hf_dlep_dataitem_v4conn_flags, tvb, offset, DLEP_DIT_V4CONN_FLAGS_LEN, ENC_NA);
flags_pt = proto_item_add_subtree(tmp_pi, ett_dlep_flags);
@ -446,7 +446,7 @@ decode_dataitem_v6conn(tvbuff_t *tvb, int offset, proto_item *pi, proto_tree *pt
guint32 v6conn_port;
tmp_pi = proto_tree_add_item(pt, hf_dlep_dataitem_v6conn, tvb, offset, len, ENC_NA);
PROTO_ITEM_SET_HIDDEN(tmp_pi);
proto_item_set_hidden(tmp_pi);
tmp_pi = proto_tree_add_item(pt, hf_dlep_dataitem_v6conn_flags, tvb, offset, DLEP_DIT_V6CONN_FLAGS_LEN, ENC_NA);
flags_pt = proto_item_add_subtree(tmp_pi, ett_dlep_flags);
@ -477,7 +477,7 @@ decode_dataitem_peertype(tvbuff_t *tvb, int offset, proto_item *pi, proto_tree *
proto_tree * flags_pt = NULL;
tmp_pi = proto_tree_add_item(pt, hf_dlep_dataitem_peertype, tvb, offset, len, ENC_NA);
PROTO_ITEM_SET_HIDDEN(tmp_pi);
proto_item_set_hidden(tmp_pi);
if (len < DLEP_DIT_PEERTYPE_MINLEN) {
expert_add_info(pinfo, pi, &ei_dlep_dataitem_unexpected_length);
@ -521,7 +521,7 @@ decode_dataitem_extsupp(tvbuff_t *tvb, int offset, proto_item *pi, proto_tree *p
proto_item* tmp_pi = NULL;
tmp_pi = proto_tree_add_item(pt, hf_dlep_dataitem_extsupp, tvb, offset, len, ENC_NA);
PROTO_ITEM_SET_HIDDEN(tmp_pi);
proto_item_set_hidden(tmp_pi);
while(len > 0) {
proto_tree_add_item_ret_uint(pt, hf_dlep_dataitem_extsupp_code, tvb, offset, 2, ENC_BIG_ENDIAN, &extension_code);
@ -563,7 +563,7 @@ decode_dataitem_v4addr(tvbuff_t *tvb, int offset, proto_item *pi, proto_tree *pt
proto_tree* flags_pt = NULL;
tmp_pi = proto_tree_add_item(pt, hf_dlep_dataitem_v4addr, tvb, offset, DLEP_DIT_V4ADDR_LEN, ENC_NA);
PROTO_ITEM_SET_HIDDEN(tmp_pi);
proto_item_set_hidden(tmp_pi);
tmp_pi = proto_tree_add_item(pt, hf_dlep_dataitem_v4addr_flags, tvb, offset, DLEP_DIT_V4ADDR_FLAGS_LEN, ENC_NA);
flags_pt = proto_item_add_subtree(tmp_pi, ett_dlep_flags);
@ -589,7 +589,7 @@ decode_dataitem_v6addr(tvbuff_t *tvb, int offset, proto_item *pi, proto_tree *pt
proto_tree* flags_pt = NULL;
tmp_pi = proto_tree_add_item(pt, hf_dlep_dataitem_v6addr, tvb, offset, DLEP_DIT_V6ADDR_LEN, ENC_NA);
PROTO_ITEM_SET_HIDDEN(tmp_pi);
proto_item_set_hidden(tmp_pi);
tmp_pi = proto_tree_add_item(pt, hf_dlep_dataitem_v6addr_flags, tvb, offset, DLEP_DIT_V6ADDR_FLAGS_LEN, ENC_NA);
flags_pt = proto_item_add_subtree(tmp_pi, ett_dlep_flags);
@ -616,7 +616,7 @@ decode_dataitem_v4subnet(tvbuff_t *tvb, int offset, proto_item *pi, proto_tree *
guint32 prefixlen;
tmp_pi = proto_tree_add_item(pt, hf_dlep_dataitem_v4subnet, tvb, offset, DLEP_DIT_V4SUBNET_LEN, ENC_NA);
PROTO_ITEM_SET_HIDDEN(tmp_pi);
proto_item_set_hidden(tmp_pi);
tmp_pi = proto_tree_add_item(pt, hf_dlep_dataitem_v4subnet_flags, tvb, offset, DLEP_DIT_V4SUBNET_FLAGS_LEN, ENC_NA);
flags_pt = proto_item_add_subtree(tmp_pi, ett_dlep_flags);
@ -647,7 +647,7 @@ decode_dataitem_v6subnet(tvbuff_t *tvb, int offset, proto_item *pi, proto_tree *
guint32 prefixlen;
tmp_pi = proto_tree_add_item(pt, hf_dlep_dataitem_v6subnet, tvb, offset, DLEP_DIT_V6SUBNET_LEN, ENC_NA);
PROTO_ITEM_SET_HIDDEN(tmp_pi);
proto_item_set_hidden(tmp_pi);
tmp_pi = proto_tree_add_item(pt, hf_dlep_dataitem_v6subnet_flags, tvb, offset, DLEP_DIT_V6SUBNET_FLAGS_LEN, ENC_NA);
flags_pt = proto_item_add_subtree(tmp_pi, ett_dlep_flags);
@ -1035,7 +1035,7 @@ decode_signal_header(tvbuff_t *tvb, int offset, proto_item* pi, proto_tree *pt,
guint32 signal_length;
tmp_pi = proto_tree_add_item(pt, hf_dlep_signal, tvb, offset, 0, ENC_NA);
PROTO_ITEM_SET_HIDDEN(tmp_pi);
proto_item_set_hidden(tmp_pi);
proto_tree_add_item(pt, hf_dlep_signal_signature, tvb, offset, 4, ENC_ASCII);
offset+=4;
@ -1073,7 +1073,7 @@ decode_message_header(tvbuff_t *tvb, int offset, proto_item* pi, proto_tree *pt,
guint32 message_length;
tmp_pi = proto_tree_add_item(pt, hf_dlep_message, tvb, offset, 0, ENC_NA);
PROTO_ITEM_SET_HIDDEN(tmp_pi);
proto_item_set_hidden(tmp_pi);
proto_tree_add_item_ret_uint(pt, hf_dlep_message_type, tvb, offset, 2, ENC_BIG_ENDIAN, &message_type);
proto_item_append_text(pi, ", Message: %s (%u)", val_to_str(message_type, message_type_vals, "Unknown"), message_type);

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

@ -334,14 +334,14 @@ dissect_address_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboole
proto_item_set_hidden(addr_item);
addr_item = proto_tree_add_item(addr_tree, hf_eth_dst_oui, tvb, 0, 3, ENC_NA);
PROTO_ITEM_SET_GENERATED(addr_item);
PROTO_ITEM_SET_HIDDEN(addr_item);
proto_item_set_generated(addr_item);
proto_item_set_hidden(addr_item);
dst_oui_name = tvb_get_manuf_name_if_known(tvb, 0);
if (dst_oui_name != NULL) {
addr_item = proto_tree_add_string(addr_tree, hf_eth_dst_oui_resolved, tvb, 0, 6, dst_oui_name);
PROTO_ITEM_SET_GENERATED(addr_item);
PROTO_ITEM_SET_HIDDEN(addr_item);
proto_item_set_generated(addr_item);
proto_item_set_hidden(addr_item);
}
proto_tree_add_ether(addr_tree, hf_eth_addr, tvb, 0, 6, dst_addr);
@ -351,13 +351,13 @@ dissect_address_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboole
proto_item_set_hidden(addr_item);
addr_item = proto_tree_add_item(addr_tree, hf_eth_addr_oui, tvb, 0, 3, ENC_NA);
PROTO_ITEM_SET_GENERATED(addr_item);
PROTO_ITEM_SET_HIDDEN(addr_item);
proto_item_set_generated(addr_item);
proto_item_set_hidden(addr_item);
if (dst_oui_name != NULL) {
addr_item = proto_tree_add_string(addr_tree, hf_eth_addr_oui_resolved, tvb, 0, 6, dst_oui_name);
PROTO_ITEM_SET_GENERATED(addr_item);
PROTO_ITEM_SET_HIDDEN(addr_item);
proto_item_set_generated(addr_item);
proto_item_set_hidden(addr_item);
}
proto_tree_add_item(addr_tree, hf_eth_dst_lg, tvb, 0, 3, ENC_BIG_ENDIAN);
@ -380,14 +380,14 @@ dissect_address_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboole
proto_item_set_hidden(addr_item);
addr_item = proto_tree_add_item(addr_tree, hf_eth_src_oui, tvb, 6, 3, ENC_NA);
PROTO_ITEM_SET_GENERATED(addr_item);
PROTO_ITEM_SET_HIDDEN(addr_item);
proto_item_set_generated(addr_item);
proto_item_set_hidden(addr_item);
src_oui_name = tvb_get_manuf_name_if_known(tvb, 6);
if (src_oui_name != NULL) {
addr_item = proto_tree_add_string(addr_tree, hf_eth_src_oui_resolved, tvb, 6, 6, src_oui_name);
PROTO_ITEM_SET_GENERATED(addr_item);
PROTO_ITEM_SET_HIDDEN(addr_item);
proto_item_set_generated(addr_item);
proto_item_set_hidden(addr_item);
}
proto_tree_add_ether(addr_tree, hf_eth_addr, tvb, 6, 6, src_addr);
@ -397,13 +397,13 @@ dissect_address_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboole
proto_item_set_hidden(addr_item);
addr_item = proto_tree_add_item(addr_tree, hf_eth_addr_oui, tvb, 6, 3, ENC_NA);
PROTO_ITEM_SET_GENERATED(addr_item);
PROTO_ITEM_SET_HIDDEN(addr_item);
proto_item_set_generated(addr_item);
proto_item_set_hidden(addr_item);
if (src_oui_name != NULL) {
addr_item = proto_tree_add_string(addr_tree, hf_eth_addr_oui_resolved, tvb, 6, 6, src_oui_name);
PROTO_ITEM_SET_GENERATED(addr_item);
PROTO_ITEM_SET_HIDDEN(addr_item);
proto_item_set_generated(addr_item);
proto_item_set_hidden(addr_item);
}
proto_tree_add_item(addr_tree, hf_eth_src_lg, tvb, 6, 3, ENC_BIG_ENDIAN);

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

@ -2449,7 +2449,7 @@ dissect_dpt_trailer_noise_low(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre
* for backward compatability for users that are accustomed to using
* "f5ethtrailer.ingress" but mark it as generated to indicate that that
* field no longer really exists. */
PROTO_ITEM_SET_GENERATED(pi);
proto_item_set_generated(pi);
proto_tree_add_bitmask(
tree, tvb, offset, hf_flags, ett_f5ethtrailer_low_flags, hf_flags__fields,
ENC_BIG_ENDIAN);

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

@ -32217,13 +32217,13 @@ dissect_ieee80211_s1g_tack(tvbuff_t *tvb, packet_info *pinfo _U_,
proto_tree_add_item(tree, hf_ieee80211_addr_ta, tvb, offset, 6, ENC_NA);
hidden_item = proto_tree_add_string(tree, hf_ieee80211_addr_ta_resolved,
tvb, offset, 6, ether_name);
PROTO_ITEM_SET_HIDDEN(hidden_item);
proto_item_set_hidden(hidden_item);
hidden_item = proto_tree_add_item(tree, hf_ieee80211_addr, tvb, offset, 6,
ENC_NA);
PROTO_ITEM_SET_HIDDEN(hidden_item);
proto_item_set_hidden(hidden_item);
hidden_item = proto_tree_add_string(tree, hf_ieee80211_addr_resolved, tvb,
offset, 6, ether_name);
PROTO_ITEM_SET_HIDDEN(hidden_item);
proto_item_set_hidden(hidden_item);
offset += 6;
length += 6;
@ -33013,10 +33013,10 @@ dissect_ieee80211_pv1(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
set_dst_addr_cols(pinfo, tvb, offset, "RA");
proto_tree_add_item(hdr_tree, hf_ieee80211_addr_ra, tvb, offset, 6, ENC_NA);
hidden = proto_tree_add_item(hdr_tree, hf_ieee80211_addr, tvb, offset, 6, ENC_NA);
PROTO_ITEM_SET_HIDDEN(hidden);
proto_item_set_hidden(hidden);
hidden = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_ra_resolved, tvb,
offset, 6, ether_name);
PROTO_ITEM_SET_HIDDEN(hidden);
proto_item_set_hidden(hidden);
offset += 6;
}
@ -33039,10 +33039,10 @@ dissect_ieee80211_pv1(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
/* TODO: why adding as visible *and* hidden? */
proto_tree_add_item(hdr_tree, hf_ieee80211_addr_ta, tvb, offset, 6, ENC_NA);
hidden = proto_tree_add_item(hdr_tree, hf_ieee80211_addr_ta, tvb, offset, 6, ENC_NA);
PROTO_ITEM_SET_HIDDEN(hidden);
proto_item_set_hidden(hidden);
hidden = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_ta_resolved, tvb,
offset, 6, ether_name);
PROTO_ITEM_SET_HIDDEN(hidden);
proto_item_set_hidden(hidden);
offset += 6;
}
@ -33068,10 +33068,10 @@ dissect_ieee80211_pv1(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
set_dst_addr_cols(pinfo, tvb, offset, "DA");
proto_tree_add_item(hdr_tree, hf_ieee80211_addr_da, tvb, offset, 6, ENC_NA);
hidden = proto_tree_add_item(hdr_tree, hf_ieee80211_addr, tvb, offset, 6, ENC_NA);
PROTO_ITEM_SET_HIDDEN(hidden);
proto_item_set_hidden(hidden);
hidden = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_da_resolved, tvb,
offset, 6, ether_name);
PROTO_ITEM_SET_HIDDEN(hidden);
proto_item_set_hidden(hidden);
offset += 6;
}
@ -33084,10 +33084,10 @@ dissect_ieee80211_pv1(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
copy_address_shallow(&pinfo->src, &pinfo->dl_src);
proto_tree_add_item(hdr_tree, hf_ieee80211_addr_sa, tvb, offset, 6, ENC_NA);
hidden = proto_tree_add_item(hdr_tree, hf_ieee80211_addr, tvb, offset, 6, ENC_NA);
PROTO_ITEM_SET_HIDDEN(hidden);
proto_item_set_hidden(hidden);
hidden = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_sa_resolved, tvb,
offset, 6, ether_name);
PROTO_ITEM_SET_HIDDEN(hidden);
proto_item_set_hidden(hidden);
offset += 6;
}

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

@ -2972,13 +2972,13 @@ add_ipv6_address_embed_ipv4(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
// The prefix
ti = proto_tree_add_item(tree, hf_ipv6_embed_ipv4_prefix, tvb, offset, ipv4_prefix / 8, ENC_NA);
PROTO_ITEM_SET_GENERATED(ti);
proto_item_set_generated(ti);
// Majority of IPv4 address is after u-field
if (ipv4_prefix >= 56) {
if (ipv4_prefix < 96) {
ti = proto_tree_add_item(tree, hf_ipv6_embed_ipv4_u, tvb, offset + 8, 1, ENC_NA);
PROTO_ITEM_SET_GENERATED(ti);
proto_item_set_generated(ti);
}
if (tvb_get_guint8(tvb, offset + 8)) {
expert_add_info(pinfo, ti, &ei_ipv6_embed_ipv4_u_value);
@ -2990,17 +2990,17 @@ add_ipv6_address_embed_ipv4(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
ti = proto_tree_add_ipv4(tree, hf_embed, tvb,
offset + (ipv4_offset / 8),
(ipv4_offset > 32 && ipv4_offset < 64) ? 5 : 4, ipv4_addr);
PROTO_ITEM_SET_GENERATED(ti);
proto_item_set_generated(ti);
ti = proto_tree_add_ipv4(tree, hf_ipv6_embed_ipv4, tvb,
offset + (ipv4_offset / 8),
(ipv4_offset > 32 && ipv4_offset < 64) ? 5 : 4, ipv4_addr);
PROTO_ITEM_SET_GENERATED(ti);
proto_item_set_generated(ti);
// Majority of IPv4 address is before u-field
if (ipv4_prefix < 56) {
ti = proto_tree_add_item(tree, hf_ipv6_embed_ipv4_u, tvb, offset + 8, 1, ENC_NA);
PROTO_ITEM_SET_GENERATED(ti);
proto_item_set_generated(ti);
if (tvb_get_guint8(tvb, offset + 8)) {
expert_add_info(pinfo, ti, &ei_ipv6_embed_ipv4_u_value);
}
@ -3012,7 +3012,7 @@ add_ipv6_address_embed_ipv4(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
offset + ((72 + ipv4_prefix - 32) / 8),
(56 - (ipv4_prefix - 32)) / 8,
ENC_NA);
PROTO_ITEM_SET_GENERATED(ti);
proto_item_set_generated(ti);
}
}
}

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

@ -679,7 +679,7 @@ dissect_log3gpp(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, void* data
proto_item* ti_local = proto_tree_add_uint(prot3gpp_tree,
hf_log3gpp_dissected_length,
tvb, 0, 0, tvb_reported_length(tvb) - offset);
PROTO_ITEM_SET_GENERATED(ti_local);
proto_item_set_generated(ti_local);
}
return tvb_reported_length(tvb);
}

2
epan/dissectors/packet-mpeg-dsmcc.c
View File

@ -2312,7 +2312,7 @@ dissect_dsmcc_ts(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree_in, void *d
crc_len, 4, crc,
"CRC: 0x%08x [Failed Verification (Calculated: 0x%08x)]",
crc, calculated_crc );
PROTO_ITEM_SET_GENERATED(msg_error);
proto_item_set_generated(msg_error);
expert_add_info( pinfo, msg_error, &ei_dsmcc_crc_invalid);
}
} else {

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

@ -1191,7 +1191,7 @@ static int dissect_mqtt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi
}
ti = proto_tree_add_string(mqtt_tree, hf_mqtt_topic, tvb, offset, 0, topic_str);
PROTO_ITEM_SET_GENERATED(ti);
proto_item_set_generated(ti);
if (topic == NULL)
{

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

@ -1417,7 +1417,7 @@ process_rtp_payload(tvbuff_t *newtvb, packet_info *pinfo, proto_tree *tree,
* Just add it as data.
*/
if (len > 0)
PROTO_ITEM_SET_HIDDEN(rtp_data);
proto_item_set_hidden(rtp_data);
return;
}
}
@ -1425,7 +1425,7 @@ process_rtp_payload(tvbuff_t *newtvb, packet_info *pinfo, proto_tree *tree,
/* if we don't found, it is static OR could be set static from the preferences */
if (dissector_try_uint(rtp_pt_dissector_table, payload_type, newtvb, pinfo, tree))
PROTO_ITEM_SET_HIDDEN(rtp_data);
proto_item_set_hidden(rtp_data);
}
/* Rtp payload reassembly

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

@ -3286,7 +3286,7 @@ static gint dissect_mutable_member(proto_tree *tree , tvbuff_t * tvb, gint offse
proto_item_append_text(member, "(base found 0x%016" PRIx64 ")", key);
dissect_user_defined(tree, tvb, offset, encoding, encoding_version, NULL, mapping->member_type_id,
mapping->member_name, EXTENSIBILITY_INVALID, offset, 0, mapping->member_id, show);
PROTO_ITEM_SET_HIDDEN(member);
proto_item_set_hidden(member);
return offset + member_length;
} else
proto_item_append_text(member, "(base not found 0x%016" PRIx64 " from 0x%016" PRIx64 ")",
@ -3304,7 +3304,7 @@ static gint dissect_mutable_member(proto_tree *tree , tvbuff_t * tvb, gint offse
} else
proto_item_append_text(member, "(not found 0x%016" PRIx64 " from 0x%016" PRIx64 ")",
key, info->type_id);
PROTO_ITEM_SET_HIDDEN(member);
proto_item_set_hidden(member);
return offset + member_length;
}

4
epan/dissectors/packet-someip-sd.c
View File

@ -670,9 +670,7 @@ dissect_someip_sd_pdu_entry(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
}
}
if (ti != NULL) {
PROTO_ITEM_SET_HIDDEN(ti);
}
proto_item_set_hidden(ti);
/* TAP */
if (have_tap_listener(tap_someip_sd_entries)) {

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

@ -3479,7 +3479,7 @@ dissect_someip_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
/* Message ID = Service ID + Method ID*/
someip_messageid = tvb_get_ntohl(tvb, 0);
ti = proto_tree_add_uint_format_value(someip_tree, hf_someip_messageid, tvb, offset, 4, someip_messageid, "0x%08x", someip_messageid);
PROTO_ITEM_SET_HIDDEN(ti);
proto_item_set_hidden(ti);
/* Service ID */
ti = proto_tree_add_item_ret_uint(someip_tree, hf_someip_serviceid, tvb, offset, 2, ENC_BIG_ENDIAN, &someip_serviceid);

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

@ -1015,7 +1015,7 @@ static void transfer_add_segment(tcpcl_dissect_ctx_t *ctx, guint64 xfer_id, guin
seg_meta->seen_len = prev_seen_len + data_len;
proto_item *item_seen = proto_tree_add_uint64(tree_msg, hf_tcpclv4_xfer_segment_seen_len, tvb, 0, 0, seg_meta->seen_len);
PROTO_ITEM_SET_GENERATED(item_seen);
proto_item_set_generated(item_seen);
if (seg_meta->seen_len > ctx->rx_peer->transfer_mru) {
expert_add_info(pinfo, item_seen, &ei_tcpclv4_xferload_over_xfer_mru);
}
@ -1028,17 +1028,17 @@ static void transfer_add_segment(tcpcl_dissect_ctx_t *ctx, guint64 xfer_id, guin
expert_add_info(pinfo, item_seen, &ei_xfer_mismatch_total_len);
}
proto_item *item_total = proto_tree_add_uint64(tree_msg, hf_tcpclv4_xfer_total_len, tvb, 0, 0, *(xfer->total_length));
PROTO_ITEM_SET_GENERATED(item_total);
proto_item_set_generated(item_total);
}
if (seg_meta->related_ack) {
proto_item *item_rel = proto_tree_add_uint(tree_msg, hf_tcpclv4_xfer_segment_related_ack, tvb, 0, 0, seg_meta->related_ack->frame_loc.frame_num);
PROTO_ITEM_SET_GENERATED(item_rel);
proto_item_set_generated(item_rel);
nstime_t td;
nstime_delta(&td, &(seg_meta->related_ack->frame_time), &(seg_meta->frame_time));
proto_item *item_td = proto_tree_add_time(tree_msg, hf_tcpclv4_xfer_segment_time_diff, tvb, 0, 0, &td);
PROTO_ITEM_SET_GENERATED(item_td);
proto_item_set_generated(item_td);
}
else {
@ -1046,12 +1046,12 @@ static void transfer_add_segment(tcpcl_dissect_ctx_t *ctx, guint64 xfer_id, guin
}
if (seg_meta->related_start && (seg_meta->related_start != seg_meta)) {
proto_item *item_rel = proto_tree_add_uint(tree_msg, hf_tcpclv4_xfer_segment_related_start, tvb, 0, 0, seg_meta->related_start->frame_loc.frame_num);
PROTO_ITEM_SET_GENERATED(item_rel);
proto_item_set_generated(item_rel);
nstime_t td;
nstime_delta(&td, &(seg_meta->frame_time), &(seg_meta->related_start->frame_time));
proto_item *item_td = proto_tree_add_time(tree_msg, hf_tcpclv4_xfer_segment_time_start, tvb, 0, 0, &td);
PROTO_ITEM_SET_GENERATED(item_td);
proto_item_set_generated(item_td);
}
}
@ -1099,16 +1099,16 @@ static void transfer_add_ack(tcpcl_dissect_ctx_t *ctx, guint64 xfer_id, guint8 f
if (xfer->total_length) {
proto_item *item_total = proto_tree_add_uint64(tree_msg, hf_tcpclv4_xfer_total_len, tvb, 0, 0, *(xfer->total_length));
PROTO_ITEM_SET_GENERATED(item_total);
proto_item_set_generated(item_total);
}
if (ack_meta->related_seg) {
proto_item *item_rel = proto_tree_add_uint(tree_msg, hf_tcpclv4_xfer_ack_related_seg, tvb, 0, 0, ack_meta->related_seg->frame_loc.frame_num);
PROTO_ITEM_SET_GENERATED(item_rel);
proto_item_set_generated(item_rel);
nstime_t td;
nstime_delta(&td, &(ack_meta->frame_time), &(ack_meta->related_seg->frame_time));
proto_item *item_td = proto_tree_add_time(tree_msg, hf_tcpclv4_xfer_ack_time_diff, tvb, 0, 0, &td);
PROTO_ITEM_SET_GENERATED(item_td);
proto_item_set_generated(item_td);
if (item_flags && (ack_meta->flags != ack_meta->related_seg->flags)) {
expert_add_info(pinfo, item_flags, &ei_xfer_ack_mismatch_flags);
@ -1119,12 +1119,12 @@ static void transfer_add_ack(tcpcl_dissect_ctx_t *ctx, guint64 xfer_id, guint8 f
}
if (ack_meta->related_start) {
proto_item *item_rel = proto_tree_add_uint(tree_msg, hf_tcpclv4_xfer_ack_related_start, tvb, 0, 0, ack_meta->related_start->frame_loc.frame_num);
PROTO_ITEM_SET_GENERATED(item_rel);
proto_item_set_generated(item_rel);
nstime_t td;
nstime_delta(&td, &(ack_meta->frame_time), &(ack_meta->related_start->frame_time));
proto_item *item_td = proto_tree_add_time(tree_msg, hf_tcpclv4_xfer_ack_time_start, tvb, 0, 0, &td);
PROTO_ITEM_SET_GENERATED(item_td);
proto_item_set_generated(item_td);
}
}
@ -1141,7 +1141,7 @@ static void transfer_add_refuse(tcpcl_dissect_ctx_t *ctx, guint64 xfer_id,
if (seg_last) {
proto_item *item_rel = proto_tree_add_uint(tree_msg, hf_tcpclv4_xfer_refuse_related_seg, tvb, 0, 0, seg_last->frame_loc.frame_num);
PROTO_ITEM_SET_GENERATED(item_rel);
proto_item_set_generated(item_rel);
}
else {
expert_add_info(pinfo, item_msg, &ei_tcpclv4_xfer_refuse_no_transfer);
@ -1275,7 +1275,7 @@ dissect_v3_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
tcpcl_peer_associate_transfer(ctx->tx_peer, ctx->cur_loc, *xfer_id);
}
item_xfer_id = proto_tree_add_uint64(conv_tree, hf_tcpclv3_xfer_id, tvb, 0, 0, *xfer_id);
PROTO_ITEM_SET_GENERATED(item_xfer_id);
proto_item_set_generated(item_xfer_id);
proto_tree_add_item(conv_tree, hf_tcpclv3_data_segment_data, tvb, offset, segment_length, ENC_NA);
@ -1327,7 +1327,7 @@ dissect_v3_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
tcpcl_peer_associate_transfer(ctx->rx_peer, ctx->cur_loc, *xfer_id);
}
item_xfer_id = proto_tree_add_uint64(conv_tree, hf_tcpclv3_xfer_id, tvb, 0, 0, *xfer_id);
PROTO_ITEM_SET_GENERATED(item_xfer_id);
proto_item_set_generated(item_xfer_id);
if (tcpcl_analyze_sequence) {
transfer_add_ack(ctx, *xfer_id, 0, segment_length, pinfo, tvb, conv_tree, conv_item, NULL);
@ -1383,7 +1383,7 @@ dissect_v3_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
tcpcl_peer_associate_transfer(ctx->rx_peer, ctx->cur_loc, *xfer_id);
}
item_xfer_id = proto_tree_add_uint64(conv_tree, hf_tcpclv3_xfer_id, tvb, 0, 0, *xfer_id);
PROTO_ITEM_SET_GENERATED(item_xfer_id);
proto_item_set_generated(item_xfer_id);
if (tcpcl_analyze_sequence) {
transfer_add_refuse(ctx, *xfer_id, pinfo, tvb, conv_tree, conv_item);
@ -1618,7 +1618,7 @@ dissect_v4_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
if (tcpcl_analyze_sequence) {
if (ctx->rx_peer->sess_term_seen) {
proto_item *item_rel = proto_tree_add_uint(tree_msg, hf_tcpclv4_sess_term_related, tvb, 0, 0, ctx->rx_peer->sess_term_seen->frame_num);
PROTO_ITEM_SET_GENERATED(item_rel);
proto_item_set_generated(item_rel);
// Is this message after the other SESS_TERM?
if (tcpcl_frame_loc_compare(ctx->tx_peer->sess_term_seen, ctx->rx_peer->sess_term_seen, NULL) > 0) {
@ -1864,11 +1864,11 @@ dissect_v4_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
if (ctx->convo->sess_negotiated) {
if (ctx->rx_peer->sess_init_seen){
proto_item *item_nego = proto_tree_add_uint(tree_msg, hf_tcpclv4_sess_init_related, tvb, 0, 0, ctx->rx_peer->sess_init_seen->frame_num);
PROTO_ITEM_SET_GENERATED(item_nego);
proto_item_set_generated(item_nego);
}
{
proto_item *item_nego = proto_tree_add_uint(tree_msg, hf_tcpclv4_negotiate_keepalive, tvb, 0, 0, ctx->convo->sess_keepalive);
PROTO_ITEM_SET_GENERATED(item_nego);
proto_item_set_generated(item_nego);
}
}
}
@ -2038,11 +2038,11 @@ static gint dissect_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
if (ctx->convo->contact_negotiated) {
if (ctx->rx_peer->chdr_seen) {
proto_item *item_nego = proto_tree_add_uint(tree_chdr, hf_chdr_related, tvb, 0, 0, ctx->rx_peer->chdr_seen->frame_num);
PROTO_ITEM_SET_GENERATED(item_nego);
proto_item_set_generated(item_nego);
}
if (ctx->tx_peer->version == 4) {
proto_item *item_nego = proto_tree_add_boolean(tree_chdr, hf_tcpclv4_negotiate_use_tls, tvb, 0, 0, ctx->convo->session_use_tls);
PROTO_ITEM_SET_GENERATED(item_nego);
proto_item_set_generated(item_nego);
}
}
}

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

@ -1004,7 +1004,7 @@ dissect_tecmp_entry_header(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
proto_item_append_text(ti, " (synchronized or master)");
}
ti = proto_tree_add_uint64(tree, hf_tecmp_payload_timestamp_ns, tvb, offset + 4, 8, ns);
PROTO_ITEM_SET_HIDDEN(ti);
proto_item_set_hidden(ti);
proto_tree_add_item(tree, hf_tecmp_payload_length, tvb, offset+12, 2, ENC_BIG_ENDIAN);
offset += 14;

2
plugins/epan/profinet/packet-pn-rsi.c
View File

@ -371,7 +371,7 @@ dissect_pn_rta_remaining_user_data_bytes(tvbuff_t *tvb, int offset, packet_info
pn_rsi_tree_item = proto_tree_get_parent(tree);
pi = proto_tree_add_uint(pn_rsi_tree_item, hf_pn_rsi_reassembled_in,
tvb, 0, 0, fd_reass->reassembled_in);
PROTO_ITEM_SET_GENERATED(pi);
proto_item_set_generated(pi);
}
}

2
ui/qt/utils/proto_node.cpp
View File

@ -154,5 +154,5 @@ ProtoNode ProtoNode::ChildIterator::element()
bool ProtoNode::isHidden(proto_node * node)
{
return PROTO_ITEM_IS_HIDDEN(node) && !prefs.display_hidden_proto_items;
return proto_item_is_hidden(node) && !prefs.display_hidden_proto_items;
}