Add 802.11 Tag Antenna (64)
svn path=/trunk/; revision=48061
This commit is contained in:
parent
95dff87ead
commit
ea4c5708b2
1 changed files with 30 additions and 0 deletions
|
@ -3257,6 +3257,8 @@ static int hf_ieee80211_tag_secondary_channel_offset = -1;
|
||||||
|
|
||||||
static int hf_ieee80211_tag_bss_ap_avg_access_delay = -1;
|
static int hf_ieee80211_tag_bss_ap_avg_access_delay = -1;
|
||||||
|
|
||||||
|
static int hf_ieee80211_tag_antenna_id = -1;
|
||||||
|
|
||||||
static int hf_ieee80211_tag_bss_avb_adm_cap_bitmask = -1;
|
static int hf_ieee80211_tag_bss_avb_adm_cap_bitmask = -1;
|
||||||
static int hf_ieee80211_tag_bss_avb_adm_cap_bitmask_up0 = -1;
|
static int hf_ieee80211_tag_bss_avb_adm_cap_bitmask_up0 = -1;
|
||||||
static int hf_ieee80211_tag_bss_avb_adm_cap_bitmask_up1 = -1;
|
static int hf_ieee80211_tag_bss_avb_adm_cap_bitmask_up1 = -1;
|
||||||
|
@ -8805,6 +8807,25 @@ dissect_bss_avg_access_delay_ie(tvbuff_t *tvb, packet_info *pinfo,
|
||||||
return offset;
|
return offset;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int
|
||||||
|
dissect_antenna_ie(tvbuff_t *tvb, packet_info *pinfo,
|
||||||
|
proto_tree *tree, int offset, guint32 tag_len, proto_item *ti_len)
|
||||||
|
{
|
||||||
|
|
||||||
|
if (tag_len != 1) {
|
||||||
|
expert_add_info_format(pinfo, ti_len, PI_MALFORMED, PI_ERROR,
|
||||||
|
"Antenna length %u wrong, must be = 1", tag_len);
|
||||||
|
return offset;
|
||||||
|
}
|
||||||
|
|
||||||
|
proto_tree_add_item(tree, hf_ieee80211_tag_antenna_id, tvb,
|
||||||
|
offset, 1, ENC_LITTLE_ENDIAN);
|
||||||
|
|
||||||
|
offset += 1;
|
||||||
|
|
||||||
|
return offset;
|
||||||
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
dissect_bss_available_admission_capacity_ie(tvbuff_t *tvb, packet_info *pinfo,
|
dissect_bss_available_admission_capacity_ie(tvbuff_t *tvb, packet_info *pinfo,
|
||||||
proto_tree *tree, int offset, guint32 tag_len, proto_item *ti_len)
|
proto_tree *tree, int offset, guint32 tag_len, proto_item *ti_len)
|
||||||
|
@ -10981,6 +11002,10 @@ add_tagged_field(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset
|
||||||
dissect_bss_avg_access_delay_ie(tvb, pinfo, tree, offset + 2, tag_len, ti_len);
|
dissect_bss_avg_access_delay_ie(tvb, pinfo, tree, offset + 2, tag_len, ti_len);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case TAG_ANTENNA: /* Antenna element (64) */
|
||||||
|
dissect_antenna_ie(tvb, pinfo, tree, offset + 2, tag_len, ti_len);
|
||||||
|
break;
|
||||||
|
|
||||||
case TAG_BSS_AVB_ADM_CAPACITY:
|
case TAG_BSS_AVB_ADM_CAPACITY:
|
||||||
dissect_bss_available_admission_capacity_ie(tvb, pinfo, tree, offset + 2, tag_len, ti_len);
|
dissect_bss_available_admission_capacity_ie(tvb, pinfo, tree, offset + 2, tag_len, ti_len);
|
||||||
break;
|
break;
|
||||||
|
@ -16496,6 +16521,11 @@ proto_register_ieee80211 (void)
|
||||||
FT_UINT8, BASE_DEC, NULL, 0x0,
|
FT_UINT8, BASE_DEC, NULL, 0x0,
|
||||||
NULL, HFILL }},
|
NULL, HFILL }},
|
||||||
|
|
||||||
|
{&hf_ieee80211_tag_antenna_id,
|
||||||
|
{"Antenna ID", "wlan_mgt.antenna.id",
|
||||||
|
FT_UINT8, BASE_DEC, NULL, 0x0,
|
||||||
|
NULL, HFILL }},
|
||||||
|
|
||||||
{&hf_ieee80211_tag_bss_avb_adm_cap_bitmask,
|
{&hf_ieee80211_tag_bss_avb_adm_cap_bitmask,
|
||||||
{"Available Admission Capacity Bitmask", "wlan_mgt.bss_avb_adm_cap.bitmask",
|
{"Available Admission Capacity Bitmask", "wlan_mgt.bss_avb_adm_cap.bitmask",
|
||||||
FT_UINT16, BASE_HEX, NULL, 0,
|
FT_UINT16, BASE_HEX, NULL, 0,
|
||||||
|
|
Loading…
Reference in a new issue