Merge pull request #1039 from gokulkumar792/add_bar_and_ba_ctl_frames

IEEE 802.11: add support to filter Block Ack Req & Block Ack control frames

diff --git a/grammar.y.in b/grammar.y.in
index f8d336eab519ad475f13a9550e2f0d51bfd7c5c6..357dcbacb94393ef990ea357b5d8608fb9e55bdd 100644 (file)
--- a/grammar.y.in
+++ b/grammar.y.in
@@ -176,6 +176,8 @@ static const struct tok ieee80211_mgt_subtypes[] = {
        { 0, NULL }
 };
 static const struct tok ieee80211_ctl_subtypes[] = {
+       { IEEE80211_FC0_SUBTYPE_BAR, "bar" },
+       { IEEE80211_FC0_SUBTYPE_BA, "ba" },
        { IEEE80211_FC0_SUBTYPE_PS_POLL, "ps-poll" },
        { IEEE80211_FC0_SUBTYPE_RTS, "rts" },
        { IEEE80211_FC0_SUBTYPE_CTS, "cts" },

diff --git a/ieee80211.h b/ieee80211.h
index 473803d8a242760be6bba87c1090c7548db3b5ed..8b2641f3a8a727c8eed6873cfd865517db213b4e 100644 (file)
--- a/ieee80211.h
+++ b/ieee80211.h
@@ -62,6 +62,8 @@
 #define        IEEE80211_FC0_SUBTYPE_AUTH              0xb0
 #define        IEEE80211_FC0_SUBTYPE_DEAUTH            0xc0
 /* for TYPE_CTL */
+#define        IEEE80211_FC0_SUBTYPE_BAR               0x80
+#define        IEEE80211_FC0_SUBTYPE_BA                0x90
 #define        IEEE80211_FC0_SUBTYPE_PS_POLL           0xa0
 #define        IEEE80211_FC0_SUBTYPE_RTS               0xb0
 #define        IEEE80211_FC0_SUBTYPE_CTS               0xc0
@@ -124,7 +126,7 @@
        "reserved#2",           "reserved#3",           \
        "reserved#3",           "reserved#5",           \
        "reserved#6",           "reserved#7",           \
-       "reserved#8",           "reserved#9",           \
+       "bar",                  "ba",                   \
        "ps-poll",              "rts",                  \
        "cts",                  "ack",                  \
        "cf-end",               "cf-end-ack"            \

diff --git a/pcap-filter.manmisc.in b/pcap-filter.manmisc.in
index 65a37b91d187a30c5b9a86f7474e092c0ac451eb..23b77e29a4dd74948e5a8bc56cf8a65303812b13 100644 (file)
--- a/pcap-filter.manmisc.in
+++ b/pcap-filter.manmisc.in
@@ -630,6 +630,8 @@ then valid \fIwlan_subtype\fRs are:
 .IP
 If the specified \fIwlan_type\fR is \fBctl\fP,
 then valid \fIwlan_subtype\fRs are:
+\fBbar\fP,
+\fBba\fP,
 \fBps-poll\fP,
 \fBrts\fP,
 \fBcts\fP,