aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-ieee80211.c
diff options
context:
space:
mode:
authorjake <jake@f5534014-38df-0310-8fa8-9805f1628bb7>2009-08-05 07:33:44 +0000
committerjake <jake@f5534014-38df-0310-8fa8-9805f1628bb7>2009-08-05 07:33:44 +0000
commite4ce838a05da21a467df4e4a6613da133af0cd9e (patch)
tree0825dbc7a574d0a16a0f8d0d89c979dd96862418 /epan/dissectors/packet-ieee80211.c
parent9b210b8b0c54873e50ae201b73b5961d2fd0bd8b (diff)
Fix for bug 3806:
Add presentation of Block Ack Bitmap. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29302 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-ieee80211.c')
-rw-r--r--epan/dissectors/packet-ieee80211.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c
index 29257c4112..1c1138f910 100644
--- a/epan/dissectors/packet-ieee80211.c
+++ b/epan/dissectors/packet-ieee80211.c
@@ -1170,6 +1170,7 @@ static int hf_block_ack_request_type = -1;
static int hf_block_ack_multi_tid_reserved = -1;
static int hf_block_ack_multi_tid_value = -1;
static int hf_block_ack_type = -1;
+static int hf_block_ack_bitmap = -1;
/*** End: Block Ack Request/Block Ack - Dustin Johnson***/
static int ht_cap = -1;
@@ -6469,7 +6470,7 @@ dissect_ieee80211_common (tvbuff_t * tvb, packet_info * pinfo,
offset += 2;
offset += add_fixed_field(hdr_tree, tvb, offset, FIELD_BLOCK_ACK_SSC);
- proto_tree_add_text(hdr_tree, tvb, offset, 128, "Block Ack Bitmap");
+ proto_tree_add_item(hdr_tree, hf_block_ack_bitmap, tvb, offset, 128, FALSE);
offset += 128;
break;
}
@@ -6479,7 +6480,7 @@ dissect_ieee80211_common (tvbuff_t * tvb, packet_info * pinfo,
offset += 2;
offset += add_fixed_field(hdr_tree, tvb, offset, FIELD_BLOCK_ACK_SSC);
- proto_tree_add_text(hdr_tree, tvb, offset, 8, "Block Ack Bitmap");
+ proto_tree_add_item(hdr_tree, hf_block_ack_bitmap, tvb, offset, 8, FALSE);
offset += 8;
break;
}
@@ -6507,7 +6508,7 @@ dissect_ieee80211_common (tvbuff_t * tvb, packet_info * pinfo,
offset += 2;
offset += add_fixed_field(ba_mtid_sub_tree, tvb, offset, FIELD_BLOCK_ACK_SSC);
- proto_tree_add_text(ba_mtid_sub_tree, tvb, offset, 8, "Block Ack Bitmap");
+ proto_tree_add_item(ba_mtid_sub_tree, hf_block_ack_bitmap, tvb, offset, 8, FALSE);
offset += 8;
}
break;
@@ -9383,8 +9384,12 @@ proto_register_ieee80211 (void)
FT_UINT8, BASE_HEX, VALS(&hf_block_ack_request_type_flags), 0, "Block Ack Request (BAR) Type", HFILL }},
{&hf_block_ack_type,
- {"Block Ack Request Type", "wlan.ba.type",
- FT_UINT8, BASE_HEX, VALS(&hf_block_ack_type_flags), 0, NULL, HFILL }}
+ {"Block Ack Type", "wlan.ba.type",
+ FT_UINT8, BASE_HEX, VALS(&hf_block_ack_type_flags), 0, NULL, HFILL }},
+
+ {&hf_block_ack_bitmap,
+ {"Block Ack Bitmap", "wlan.ba.bm",
+ FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}
/*** End: Block Ack Request/Block Ack - Dustin Johnson***/
};