aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-ieee80211.c
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors/packet-ieee80211.c')
-rw-r--r--epan/dissectors/packet-ieee80211.c138
1 files changed, 69 insertions, 69 deletions
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c
index fbe1e3ba22..b6c38697d4 100644
--- a/epan/dissectors/packet-ieee80211.c
+++ b/epan/dissectors/packet-ieee80211.c
@@ -7658,7 +7658,7 @@ dissect_hs20_subscription_remediation(tvbuff_t *tvb, packet_info *pinfo _U_,
pi = proto_tree_add_item(tree, hf_hs20_subscription_remediation_server_url,
tvb, offset, url_len, ENC_ASCII|ENC_NA);
offset += url_len;
- PROTO_ITEM_SET_URL(pi);
+ proto_item_set_url(pi);
proto_tree_add_item(tree, hf_hs20_subscription_remediation_server_method,
tvb, offset, 1, ENC_NA);
offset++;
@@ -7691,7 +7691,7 @@ dissect_hs20_deauthentication_imminent(tvbuff_t *tvb, packet_info *pinfo _U_,
pi = proto_tree_add_item(tree, hf_hs20_deauth_imminent_reason_url,
tvb, offset, url_len, ENC_ASCII|ENC_NA);
offset += url_len;
- PROTO_ITEM_SET_URL(pi);
+ proto_item_set_url(pi);
}
return offset;
}
@@ -8003,7 +8003,7 @@ dissect_hs20_osu_provider(proto_tree *tree, tvbuff_t *tvb,
uri_pi = proto_tree_add_item(prov_tree, hf_hs20_osu_server_uri, tvb, offset,
osu_server_uri_len, ENC_ASCII|ENC_NA);
offset += osu_server_uri_len;
- PROTO_ITEM_SET_URL(uri_pi);
+ proto_item_set_url(uri_pi);
osu_method_list_len = tvb_get_guint8(tvb, offset);
proto_tree_add_item(prov_tree, hf_hs20_osu_method_list_len, tvb, offset, 1,
@@ -8264,7 +8264,7 @@ dissect_anqp_venue_url(proto_tree *tree, tvbuff_t *tvb, int offset, int end)
url_pi = proto_tree_add_item(venue_url, hf_hs20_anqp_venue_url, tvb, offset,
url_duple_len -1, ENC_ASCII|ENC_NA);
- PROTO_ITEM_SET_URL(url_pi);
+ proto_item_set_url(url_pi);
offset += (url_duple_len - 1);
@@ -17521,9 +17521,9 @@ dissect_frame_control(proto_tree *tree, tvbuff_t *tvb, guint32 option_flags,
if(IS_FRAME_EXTENSION(fcf) == 0) {
proto_tree_add_item(flag_tree, hf_ieee80211_fc_data_ds, tvb, offset, 1, ENC_NA);
hidden_item = proto_tree_add_item(flag_tree, hf_ieee80211_fc_to_ds, tvb, offset, 1, ENC_NA);
- PROTO_ITEM_SET_HIDDEN(hidden_item);
+ proto_item_set_hidden(hidden_item);
hidden_item = proto_tree_add_item(flag_tree, hf_ieee80211_fc_from_ds, tvb, offset, 1, ENC_NA);
- PROTO_ITEM_SET_HIDDEN(hidden_item);
+ proto_item_set_hidden(hidden_item);
proto_tree_add_item(flag_tree, hf_ieee80211_fc_more_frag, tvb, offset, 1, ENC_NA);
ti = proto_tree_add_item(flag_tree, hf_ieee80211_fc_retry, tvb, offset, 1, ENC_NA);
if( IS_RETRY(flags) )
@@ -22760,13 +22760,13 @@ dissect_ieee80211_block_ack(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;
dissect_ieee80211_block_ack_details(tvb, pinfo, tree, offset, isDMG, is_req, has_fcs);
@@ -23181,13 +23181,13 @@ dissect_ieee80211_he_trigger(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;
@@ -23349,13 +23349,13 @@ dissect_ieee80211_vht_he_ndp_annc(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;
dialog_token = tvb_get_guint8(tvb, offset);
@@ -23748,11 +23748,11 @@ dissect_ieee80211_common(tvbuff_t *tvb, packet_info *pinfo,
const gchar *ether_name = tvb_get_ether_name(tvb, 4);
proto_tree_add_item(hdr_tree, hf_ieee80211_addr_ra, tvb, 4, 6, ENC_NA);
hidden_item = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_ra_resolved, tvb, 4, 6, ether_name);
- PROTO_ITEM_SET_HIDDEN(hidden_item);
+ proto_item_set_hidden(hidden_item);
hidden_item = proto_tree_add_item(hdr_tree, hf_ieee80211_addr, tvb, 4, 6, ENC_NA);
- PROTO_ITEM_SET_HIDDEN(hidden_item);
+ proto_item_set_hidden(hidden_item);
hidden_item = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_resolved, tvb, 4, 6, ether_name);
- PROTO_ITEM_SET_HIDDEN(hidden_item);
+ proto_item_set_hidden(hidden_item);
}
switch (FCF_FRAME_TYPE (fcf))
@@ -23789,18 +23789,18 @@ dissect_ieee80211_common(tvbuff_t *tvb, packet_info *pinfo,
ra_da_name = tvb_get_ether_name(tvb, 4);
proto_tree_add_item(hdr_tree, hf_ieee80211_addr_da, tvb, 4, 6, ENC_NA);
hidden_item = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_da_resolved, tvb, 4, 6, ra_da_name);
- PROTO_ITEM_SET_HIDDEN(hidden_item);
+ proto_item_set_hidden(hidden_item);
proto_tree_add_item(hdr_tree, hf_ieee80211_addr_ta, tvb, 10, 6, ENC_NA);
ta_sa_name = tvb_get_ether_name(tvb, 10);
hidden_item = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_ta_resolved, tvb, 10, 6, ta_sa_name);
- PROTO_ITEM_SET_HIDDEN(hidden_item);
+ proto_item_set_hidden(hidden_item);
proto_tree_add_item(hdr_tree, hf_ieee80211_addr_sa, tvb, 10, 6, ENC_NA);
hidden_item = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_sa_resolved, tvb, 10, 6, ta_sa_name);
- PROTO_ITEM_SET_HIDDEN(hidden_item);
+ proto_item_set_hidden(hidden_item);
proto_tree_add_item(hdr_tree, hf_ieee80211_addr_bssid, tvb, 16, 6, ENC_NA);
bssid_name = tvb_get_ether_name(tvb, 16);
hidden_item = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_bssid_resolved, tvb, 16, 6, bssid_name);
- PROTO_ITEM_SET_HIDDEN(hidden_item);
+ proto_item_set_hidden(hidden_item);
/* FIXME: With mgmt frames FROM_TO_DS is always 0, perhaps compare address to bssid instead? */
if ((flags & FROM_TO_DS) == FLAG_FROM_DS) { /* Receiver address */
@@ -23812,17 +23812,17 @@ dissect_ieee80211_common(tvbuff_t *tvb, packet_info *pinfo,
proto_tree_add_item(hdr_tree, hf_ieee80211_addr_staa, tvb, sta_addr_offset, 6, ENC_NA);
station_name = tvb_get_ether_name(tvb, sta_addr_offset);
hidden_item = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_staa_resolved, tvb, sta_addr_offset, 6, station_name);
- PROTO_ITEM_SET_HIDDEN(hidden_item);
+ proto_item_set_hidden(hidden_item);
}
/* add items for wlan.addr filter */
hidden_item = proto_tree_add_item(hdr_tree, hf_ieee80211_addr, tvb, 10, 6, ENC_NA);
- PROTO_ITEM_SET_HIDDEN(hidden_item);
+ proto_item_set_hidden(hidden_item);
hidden_item = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_resolved, tvb, 10, 6, ta_sa_name);
- PROTO_ITEM_SET_HIDDEN(hidden_item);
+ proto_item_set_hidden(hidden_item);
hidden_item = proto_tree_add_item(hdr_tree, hf_ieee80211_addr, tvb, 16, 6, ENC_NA);
- PROTO_ITEM_SET_HIDDEN(hidden_item);
+ proto_item_set_hidden(hidden_item);
hidden_item = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_resolved, tvb, 16, 6, bssid_name);
- PROTO_ITEM_SET_HIDDEN(hidden_item);
+ proto_item_set_hidden(hidden_item);
proto_tree_add_item(hdr_tree, hf_ieee80211_frag_number, tvb, 22, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item(hdr_tree, hf_ieee80211_seq_number, tvb, 22, 2, ENC_LITTLE_ENDIAN);
}
@@ -23864,7 +23864,7 @@ dissect_ieee80211_common(tvbuff_t *tvb, packet_info *pinfo,
const gchar *ether_name = tvb_get_ether_name(tvb, 4);
proto_tree_add_item(hdr_tree, hf_ieee80211_addr_bssid, tvb, 4, 6, ENC_NA);
hidden_item = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_bssid_resolved, tvb, 4, 6, ether_name);
- PROTO_ITEM_SET_HIDDEN(hidden_item);
+ proto_item_set_hidden(hidden_item);
}
}
@@ -23902,11 +23902,11 @@ dissect_ieee80211_common(tvbuff_t *tvb, packet_info *pinfo,
const gchar *ether_name = tvb_get_ether_name(tvb, offset);
proto_tree_add_item(hdr_tree, hf_ieee80211_addr_ta, tvb, offset, 6, ENC_NA);
hidden_item = proto_tree_add_string(hdr_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(hdr_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(hdr_tree, hf_ieee80211_addr_resolved, tvb, offset, 6, ether_name);
- PROTO_ITEM_SET_HIDDEN(hidden_item);
+ proto_item_set_hidden(hidden_item);
offset += 6;
}
break;
@@ -23924,16 +23924,16 @@ dissect_ieee80211_common(tvbuff_t *tvb, packet_info *pinfo,
if (isDMG) {
proto_tree_add_item(hdr_tree, hf_ieee80211_addr_ta, tvb, offset, 6, ENC_NA);
hidden_item = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_ta_resolved, tvb, offset, 6, ether_name);
- PROTO_ITEM_SET_HIDDEN(hidden_item);
+ proto_item_set_hidden(hidden_item);
} else {
proto_tree_add_item(hdr_tree, hf_ieee80211_addr_bssid, tvb, offset, 6, ENC_NA);
hidden_item = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_bssid_resolved, tvb, offset, 6, ether_name);
- PROTO_ITEM_SET_HIDDEN(hidden_item);
+ proto_item_set_hidden(hidden_item);
}
hidden_item = proto_tree_add_item(hdr_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(hdr_tree, hf_ieee80211_addr_resolved, tvb, offset, 6, ether_name);
- PROTO_ITEM_SET_HIDDEN(hidden_item);
+ proto_item_set_hidden(hidden_item);
offset += 6;
}
break;
@@ -23958,11 +23958,11 @@ dissect_ieee80211_common(tvbuff_t *tvb, packet_info *pinfo,
proto_tree_add_item(hdr_tree, hf_ieee80211_addr_ta, tvb, offset, 6, ENC_NA);
hidden_item = proto_tree_add_string(hdr_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(hdr_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(hdr_tree, hf_ieee80211_addr_resolved, tvb, offset, 6, ether_name);
- PROTO_ITEM_SET_HIDDEN(hidden_item);
+ proto_item_set_hidden(hidden_item);
offset += 6;
proto_tree_add_item(hdr_tree, hf_ieee80211_beamform_feedback_seg_retrans_bitmap, tvb, offset, 1, ENC_NA);
@@ -23992,11 +23992,11 @@ dissect_ieee80211_common(tvbuff_t *tvb, packet_info *pinfo,
const gchar *ether_name = tvb_get_ether_name(tvb, offset);
proto_tree_add_item(hdr_tree, hf_ieee80211_addr_ta, tvb, offset, 6, ENC_NA);
hidden_item = proto_tree_add_string(hdr_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(hdr_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(hdr_tree, hf_ieee80211_addr_resolved, tvb, offset, 6, ether_name);
- PROTO_ITEM_SET_HIDDEN(hidden_item);
+ proto_item_set_hidden(hidden_item);
offset += 6;
}
break;
@@ -24180,39 +24180,39 @@ dissect_ieee80211_common(tvbuff_t *tvb, packet_info *pinfo,
proto_tree_add_item(hdr_tree, hf_ieee80211_addr_ta, tvb, ta_offset, 6, ENC_NA);
ta_name = tvb_get_ether_name(tvb, ta_offset);
hidden_item = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_ta_resolved, tvb, ta_offset, 6, ta_name);
- PROTO_ITEM_SET_HIDDEN(hidden_item);
+ proto_item_set_hidden(hidden_item);
/* TA is always in the wlan.addr filter */
hidden_item = proto_tree_add_item(hdr_tree, hf_ieee80211_addr, tvb, ta_offset, 6, ENC_NA);
- PROTO_ITEM_SET_HIDDEN(hidden_item);
+ proto_item_set_hidden(hidden_item);
hidden_item = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_resolved, tvb, ta_offset, 6, ta_name);
- PROTO_ITEM_SET_HIDDEN(hidden_item);
+ proto_item_set_hidden(hidden_item);
if (da_offset) {
proto_tree_add_item(hdr_tree, hf_ieee80211_addr_da, tvb, da_offset, 6, ENC_NA);
da_name = tvb_get_ether_name(tvb, da_offset);
hidden_item = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_da_resolved, tvb, da_offset, 6, da_name);
- PROTO_ITEM_SET_HIDDEN(hidden_item);
+ proto_item_set_hidden(hidden_item);
}
if (sa_offset) {
proto_tree_add_item(hdr_tree, hf_ieee80211_addr_sa, tvb, sa_offset, 6, ENC_NA);
sa_name = tvb_get_ether_name(tvb, sa_offset);
hidden_item = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_sa_resolved, tvb, sa_offset, 6, sa_name);
- PROTO_ITEM_SET_HIDDEN(hidden_item);
+ proto_item_set_hidden(hidden_item);
}
if (bssid_offset) {
proto_tree_add_item(hdr_tree, hf_ieee80211_addr_bssid, tvb, bssid_offset, 6, ENC_NA);
bssid_name = tvb_get_ether_name(tvb, bssid_offset);
hidden_item = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_bssid_resolved, tvb, bssid_offset, 6, bssid_name);
- PROTO_ITEM_SET_HIDDEN(hidden_item);
+ proto_item_set_hidden(hidden_item);
}
if (addr_type == DATA_ADDR_T4 && is_amsdu) {
proto_tree_add_item(hdr_tree, hf_ieee80211_addr_bssid, tvb, 24, 6, ENC_NA);
bssid2_name = tvb_get_ether_name(tvb, 24);
hidden_item = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_bssid_resolved, tvb, 24, 6, bssid2_name);
- PROTO_ITEM_SET_HIDDEN(hidden_item);
+ proto_item_set_hidden(hidden_item);
}
if ((flags & FROM_TO_DS) == FLAG_FROM_DS) { /* Receiver address */
@@ -24224,7 +24224,7 @@ dissect_ieee80211_common(tvbuff_t *tvb, packet_info *pinfo,
proto_tree_add_item(hdr_tree, hf_ieee80211_addr_staa, tvb, sta_addr_offset, 6, ENC_NA);
station_name = tvb_get_ether_name(tvb, sta_addr_offset);
hidden_item = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_staa_resolved, tvb, sta_addr_offset, 6, station_name);
- PROTO_ITEM_SET_HIDDEN(hidden_item);
+ proto_item_set_hidden(hidden_item);
}
proto_tree_add_item(hdr_tree, hf_ieee80211_frag_number, tvb, 22, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item(hdr_tree, hf_ieee80211_seq_number, tvb, 22, 2, ENC_LITTLE_ENDIAN);
@@ -24232,27 +24232,27 @@ dissect_ieee80211_common(tvbuff_t *tvb, packet_info *pinfo,
/* add 3rd and 4th address for wlan.addr filter */
if (sa_offset >= 16) {
hidden_item = proto_tree_add_item(hdr_tree, hf_ieee80211_addr, tvb, sa_offset, 6, ENC_NA);
- PROTO_ITEM_SET_HIDDEN(hidden_item);
+ proto_item_set_hidden(hidden_item);
hidden_item = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_resolved, tvb, sa_offset, 6, sa_name);
- PROTO_ITEM_SET_HIDDEN(hidden_item);
+ proto_item_set_hidden(hidden_item);
}
if (da_offset >= 16 && da_offset != sa_offset) {
hidden_item = proto_tree_add_item(hdr_tree, hf_ieee80211_addr, tvb, da_offset, 6, ENC_NA);
- PROTO_ITEM_SET_HIDDEN(hidden_item);
+ proto_item_set_hidden(hidden_item);
hidden_item = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_resolved, tvb, da_offset, 6, da_name);
- PROTO_ITEM_SET_HIDDEN(hidden_item);
+ proto_item_set_hidden(hidden_item);
}
if (bssid_offset >= 16 && bssid_offset != sa_offset && bssid_offset != da_offset) {
hidden_item = proto_tree_add_item(hdr_tree, hf_ieee80211_addr, tvb, bssid_offset, 6, ENC_NA);
- PROTO_ITEM_SET_HIDDEN(hidden_item);
+ proto_item_set_hidden(hidden_item);
hidden_item = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_resolved, tvb, bssid_offset, 6, bssid_name);
- PROTO_ITEM_SET_HIDDEN(hidden_item);
+ proto_item_set_hidden(hidden_item);
}
if (addr_type == DATA_ADDR_T4 && is_amsdu) {
hidden_item = proto_tree_add_item(hdr_tree, hf_ieee80211_addr, tvb, 24, 6, ENC_NA);
- PROTO_ITEM_SET_HIDDEN(hidden_item);
+ proto_item_set_hidden(hidden_item);
hidden_item = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_resolved, tvb, 24, 6, bssid2_name);
- PROTO_ITEM_SET_HIDDEN(hidden_item);
+ proto_item_set_hidden(hidden_item);
}
break;
}
@@ -24267,7 +24267,7 @@ dissect_ieee80211_common(tvbuff_t *tvb, packet_info *pinfo,
if (tree) {
proto_tree_add_item(hdr_tree, hf_ieee80211_addr_bssid, tvb, 4, 6, ENC_NA);
hidden_item = proto_tree_add_item(hdr_tree, hf_ieee80211_addr, tvb, 4, 6, ENC_NA);
- PROTO_ITEM_SET_HIDDEN(hidden_item);
+ proto_item_set_hidden(hidden_item);
}
break;
}
@@ -24375,7 +24375,7 @@ dissect_ieee80211_common(tvbuff_t *tvb, packet_info *pinfo,
proto_tree_add_item(qos_tree, hf_ieee80211_qos_tid, tvb, qosoff, 2, ENC_LITTLE_ENDIAN);
qos_ti = proto_tree_add_item(qos_tree, hf_ieee80211_qos_priority, tvb, qosoff, 2, ENC_LITTLE_ENDIAN);
- PROTO_ITEM_SET_GENERATED(qos_ti);
+ proto_item_set_generated(qos_ti);
if (FLAGS_DS_STATUS(flags) == (FLAG_FROM_DS|FLAG_TO_DS)) {
/* mesh frame */
@@ -24547,9 +24547,9 @@ dissect_ieee80211_common(tvbuff_t *tvb, packet_info *pinfo,
item=proto_tree_add_none_format(hdr_tree, hf_ieee80211_fc_analysis_retransmission, tvb, 0, 0,
"Retransmitted frame");
- PROTO_ITEM_SET_GENERATED(item);
+ proto_item_set_generated(item);
item=proto_tree_add_uint(hdr_tree, hf_ieee80211_fc_analysis_retransmission_frame, tvb, 0, 0, fnum);
- PROTO_ITEM_SET_GENERATED(item);
+ proto_item_set_generated(item);
}
next_tvb = tvb_new_subset_length_caplen(tvb, hdr_len, len, reported_len);
call_data_dissector(next_tvb, pinfo, tree);
@@ -24671,17 +24671,17 @@ dissect_ieee80211_common(tvbuff_t *tvb, packet_info *pinfo,
if (key == 0) { /* encrypted with pairwise key */
ti = proto_tree_add_string(wep_tree, hf_ieee80211_fc_analysis_tk, tvb, 0, 0, out_buff);
- PROTO_ITEM_SET_GENERATED(ti);
+ proto_item_set_generated(ti);
/* Also add the PMK used to to decrypt the packet. (PMK==PSK) */
bytes_to_hexstr(out_buff, used_key.KeyData.Wpa.Psk, DOT11DECRYPT_WPA_PSK_LEN); /* 32 bytes */
out_buff[2*DOT11DECRYPT_WPA_PSK_LEN] = '\0';
ti = proto_tree_add_string(wep_tree, hf_ieee80211_fc_analysis_pmk, tvb, 0, 0, out_buff);
- PROTO_ITEM_SET_GENERATED(ti);
+ proto_item_set_generated(ti);
} else { /* Encrypted with Group Key */
ti = proto_tree_add_string(wep_tree, hf_ieee80211_fc_analysis_gtk, tvb, 0, 0, out_buff); /* GTK is stored in PTK at offset 32 bytes and 16 bytes long */
- PROTO_ITEM_SET_GENERATED(ti);
+ proto_item_set_generated(ti);
}
}
}
@@ -24965,12 +24965,12 @@ dissect_ieee80211_common(tvbuff_t *tvb, packet_info *pinfo,
resolve_name = tvb_get_ether_name(next_tvb, msdu_offset);
hidden_item = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_da_resolved, next_tvb, msdu_offset, 6,
resolve_name);
- PROTO_ITEM_SET_HIDDEN(hidden_item);
+ proto_item_set_hidden(hidden_item);
proto_tree_add_item(subframe_tree, hf_ieee80211_addr_sa, next_tvb, msdu_offset+6, 6, ENC_NA);
resolve_name = tvb_get_ether_name(next_tvb, msdu_offset+6);
hidden_item = proto_tree_add_string(hdr_tree, hf_ieee80211_addr_sa_resolved, next_tvb, msdu_offset+6, 6,
resolve_name);
- PROTO_ITEM_SET_HIDDEN(hidden_item);
+ proto_item_set_hidden(hidden_item);
proto_tree_add_item(subframe_tree, hf_ieee80211_amsdu_length, next_tvb, msdu_offset+12, 2, ENC_BIG_ENDIAN);
msdu_offset += 14;
@@ -25514,7 +25514,7 @@ dissect_wlan_rsna_eapol_wpa_or_rsn_key(tvbuff_t *tvb, packet_info *pinfo, proto_
}
}
- PROTO_ITEM_SET_GENERATED(ti);
+ proto_item_set_generated(ti);
guint16 keydes_version = tvb_get_ntohs(tvb, offset) & KEY_INFO_KEYDES_VERSION_MASK;
proto_tree_add_bitmask_with_flags(tree, tvb, offset, hf_wlan_rsna_eapol_wpa_keydes_keyinfo,
@@ -25590,12 +25590,12 @@ dissect_wlan_rsna_eapol_wpa_or_rsn_key(tvbuff_t *tvb, packet_info *pinfo, proto_
bytes_to_hexstr(out_buff, eapol->used_key.KeyData.Wpa.Ptk, 16); /* KCK is stored in PTK at offset 0 */
out_buff[2*16] = '\0';
ti = proto_tree_add_string(keydes_tree, hf_ieee80211_fc_analysis_kck, tvb, 0, 0, out_buff);
- PROTO_ITEM_SET_GENERATED(ti);
+ proto_item_set_generated(ti);
bytes_to_hexstr(out_buff, eapol->used_key.KeyData.Wpa.Ptk+16, 16); /* KEK is stored in PTK at offset 16 */
out_buff[2*16] = '\0';
ti = proto_tree_add_string(keydes_tree, hf_ieee80211_fc_analysis_kek, tvb, 0, 0, out_buff);
- PROTO_ITEM_SET_GENERATED(ti);
+ proto_item_set_generated(ti);
}
} else {
keydes_tree = proto_item_add_subtree(ti, ett_wlan_rsna_eapol_keydes_data);
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 10:13:35 +0000