diff options
author | Guy Harris <gharris@sonic.net> | 2021-09-13 14:38:46 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-13 14:38:46 -0700 |
commit | dcf871f62a6ce334c2546a5ba0e1fe95dc7be26c (patch) | |
tree | c4cbb72f45e8b364472ed4c07e5b8fb2f4c683dd | |
parent | f98637ad7f086a34c4027339c9639ae1ef842df3 (diff) | |
parent | db222b77441a6a828c2d69475027295f06d9a937 (diff) |
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
-rw-r--r-- | grammar.y.in | 2 | ||||
-rw-r--r-- | ieee80211.h | 4 | ||||
-rw-r--r-- | pcap-filter.manmisc.in | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/grammar.y.in b/grammar.y.in index f8d336ea..357dcbac 100644 --- 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 473803d8..8b2641f3 100644 --- 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 65a37b91..23b77e29 100644 --- 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, |