Fix check for MCS field being present.

Fix test file while we're at it.

diff --git a/print-802_11.c b/print-802_11.c
index 5ef69cb0f324f64db396f011a72077819fd5e97d..4ca13334f3d639955bdc734586ad5d32a3a55420 100644 (file)
--- a/print-802_11.c
+++ b/print-802_11.c
@@ -2481,7 +2481,7 @@ print_chaninfo(netdissect_options *ndo,
                int freq, int flags, int presentflags)
 {
        ND_PRINT((ndo, "%u MHz", freq));
-       if (presentflags & IEEE80211_RADIOTAP_MCS) {
+       if (presentflags & (1 << IEEE80211_RADIOTAP_MCS)) {
                /*
                 * We have the MCS field, so this is 11n, regardless
                 * of what the channel flags say.

diff --git a/tests/ieee802.11_exthdr.out b/tests/ieee802.11_exthdr.out
index 922b0a302151b11dbbd17effcd3c1c8588e4c72c..26cf7d8e5267bb7fcfcae0fabe8c0a82ce10dde6 100644 (file)
--- a/tests/ieee802.11_exthdr.out
+++ b/tests/ieee802.11_exthdr.out
@@ -1,26 +1,26 @@
-10016360us tsft 1.0 Mb/s 2412 MHz 11n -22dBm signal -86dBm noise antenna 1 [bit 31] Probe Request (omus) [1.0 2.0 5.5 11.0 6.0 9.0 12.0 18.0 Mbit]
-10018922us tsft 1.0 Mb/s 2412 MHz 11n -19dBm signal -86dBm noise antenna 0 [bit 31] Acknowledgment RA:90:a4:de:c0:46:0a 
+10016360us tsft 1.0 Mb/s 2412 MHz 11b -22dBm signal -86dBm noise antenna 1 [bit 31] Probe Request (omus) [1.0 2.0 5.5 11.0 6.0 9.0 12.0 18.0 Mbit]
+10018922us tsft 1.0 Mb/s 2412 MHz 11b -19dBm signal -86dBm noise antenna 0 [bit 31] Acknowledgment RA:90:a4:de:c0:46:0a 
 10017245us tsft 1.0 Mb/s -86dBm noise 27dBm tx power [bit 15] Probe Response (omus) [1.0* 2.0* 5.5* 11.0* 6.0 9.0 12.0 18.0 Mbit] CH: 1
-10085301us tsft 1.0 Mb/s 2412 MHz 11n -19dBm signal -86dBm noise antenna 1 [bit 31] Probe Request (omus) [1.0 2.0 5.5 11.0 6.0 9.0 12.0 18.0 Mbit]
-10087718us tsft 1.0 Mb/s 2412 MHz 11n -18dBm signal -86dBm noise antenna 0 [bit 31] Acknowledgment RA:90:a4:de:c0:46:0a 
+10085301us tsft 1.0 Mb/s 2412 MHz 11b -19dBm signal -86dBm noise antenna 1 [bit 31] Probe Request (omus) [1.0 2.0 5.5 11.0 6.0 9.0 12.0 18.0 Mbit]
+10087718us tsft 1.0 Mb/s 2412 MHz 11b -18dBm signal -86dBm noise antenna 0 [bit 31] Acknowledgment RA:90:a4:de:c0:46:0a 
 10086042us tsft 1.0 Mb/s -86dBm noise 27dBm tx power [bit 15] Probe Response (omus) [1.0* 2.0* 5.5* 11.0* 6.0 9.0 12.0 18.0 Mbit] CH: 1
-10284358us tsft 1.0 Mb/s 2412 MHz 11n -61dBm signal -86dBm noise antenna 1 [bit 31] Probe Request (omus) [1.0 2.0 5.5 11.0 6.0 9.0 12.0 18.0 Mbit]
-10288217us tsft 1.0 Mb/s 2412 MHz 11n -46dBm signal -86dBm noise antenna 0 [bit 31] Acknowledgment RA:90:a4:de:c0:46:0a 
+10284358us tsft 1.0 Mb/s 2412 MHz 11b -61dBm signal -86dBm noise antenna 1 [bit 31] Probe Request (omus) [1.0 2.0 5.5 11.0 6.0 9.0 12.0 18.0 Mbit]
+10288217us tsft 1.0 Mb/s 2412 MHz 11b -46dBm signal -86dBm noise antenna 0 [bit 31] Acknowledgment RA:90:a4:de:c0:46:0a 
 10286542us tsft 1.0 Mb/s -86dBm noise 27dBm tx power [bit 15] Probe Response (omus) [1.0* 2.0* 5.5* 11.0* 6.0 9.0 12.0 18.0 Mbit] CH: 1
-10351366us tsft 1.0 Mb/s 2412 MHz 11n -70dBm signal -86dBm noise antenna 1 [bit 31] Probe Request (omus) [1.0 2.0 5.5 11.0 6.0 9.0 12.0 18.0 Mbit]
-10353769us tsft 1.0 Mb/s 2412 MHz 11n -57dBm signal -86dBm noise antenna 0 [bit 31] Acknowledgment RA:90:a4:de:c0:46:0a 
+10351366us tsft 1.0 Mb/s 2412 MHz 11b -70dBm signal -86dBm noise antenna 1 [bit 31] Probe Request (omus) [1.0 2.0 5.5 11.0 6.0 9.0 12.0 18.0 Mbit]
+10353769us tsft 1.0 Mb/s 2412 MHz 11b -57dBm signal -86dBm noise antenna 0 [bit 31] Acknowledgment RA:90:a4:de:c0:46:0a 
 10352092us tsft 1.0 Mb/s -86dBm noise 27dBm tx power [bit 15] Probe Response (omus) [1.0* 2.0* 5.5* 11.0* 6.0 9.0 12.0 18.0 Mbit] CH: 1
-10418368us tsft 1.0 Mb/s 2412 MHz 11n -67dBm signal -86dBm noise antenna 1 [bit 31] Probe Request (omus) [1.0 2.0 5.5 11.0 6.0 9.0 12.0 18.0 Mbit]
-10420929us tsft 1.0 Mb/s 2412 MHz 11n -73dBm signal -86dBm noise antenna 0 [bit 31] Acknowledgment RA:90:a4:de:c0:46:0a 
+10418368us tsft 1.0 Mb/s 2412 MHz 11b -67dBm signal -86dBm noise antenna 1 [bit 31] Probe Request (omus) [1.0 2.0 5.5 11.0 6.0 9.0 12.0 18.0 Mbit]
+10420929us tsft 1.0 Mb/s 2412 MHz 11b -73dBm signal -86dBm noise antenna 0 [bit 31] Acknowledgment RA:90:a4:de:c0:46:0a 
 10419253us tsft 1.0 Mb/s -86dBm noise 27dBm tx power [bit 15] Probe Response (omus) [1.0* 2.0* 5.5* 11.0* 6.0 9.0 12.0 18.0 Mbit] CH: 1
-10485371us tsft 1.0 Mb/s 2412 MHz 11n -72dBm signal -86dBm noise antenna 1 [bit 31] Probe Request (omus) [1.0 2.0 5.5 11.0 6.0 9.0 12.0 18.0 Mbit]
-10489278us tsft 1.0 Mb/s 2412 MHz 11n -74dBm signal -86dBm noise antenna 0 [bit 31] Acknowledgment RA:90:a4:de:c0:46:0a 
+10485371us tsft 1.0 Mb/s 2412 MHz 11b -72dBm signal -86dBm noise antenna 1 [bit 31] Probe Request (omus) [1.0 2.0 5.5 11.0 6.0 9.0 12.0 18.0 Mbit]
+10489278us tsft 1.0 Mb/s 2412 MHz 11b -74dBm signal -86dBm noise antenna 0 [bit 31] Acknowledgment RA:90:a4:de:c0:46:0a 
 10487602us tsft 1.0 Mb/s -86dBm noise 27dBm tx power [bit 15] Probe Response (omus) [1.0* 2.0* 5.5* 11.0* 6.0 9.0 12.0 18.0 Mbit] CH: 1
-13338508us tsft 1.0 Mb/s 2412 MHz 11n -14dBm signal -86dBm noise antenna 1 [bit 31] Authentication (Open System)-1: Successful
-13340215us tsft 1.0 Mb/s 2412 MHz 11n -17dBm signal -86dBm noise antenna 0 [bit 31] Acknowledgment RA:90:a4:de:c0:46:0a 
+13338508us tsft 1.0 Mb/s 2412 MHz 11b -14dBm signal -86dBm noise antenna 1 [bit 31] Authentication (Open System)-1: Successful
+13340215us tsft 1.0 Mb/s 2412 MHz 11b -17dBm signal -86dBm noise antenna 0 [bit 31] Acknowledgment RA:90:a4:de:c0:46:0a 
 13339435us tsft 1.0 Mb/s -86dBm noise 27dBm tx power [bit 15] Authentication (Open System)-2: 
-13341999us tsft 1.0 Mb/s 2412 MHz 11n -18dBm signal -86dBm noise antenna 1 [bit 31] Assoc Request (omus) [1.0 2.0 5.5 11.0 6.0 9.0 12.0 18.0 Mbit]
-13346458us tsft 1.0 Mb/s 2412 MHz 11n -18dBm signal -86dBm noise antenna 0 [bit 31] Acknowledgment RA:90:a4:de:c0:46:0a 
+13341999us tsft 1.0 Mb/s 2412 MHz 11b -18dBm signal -86dBm noise antenna 1 [bit 31] Assoc Request (omus) [1.0 2.0 5.5 11.0 6.0 9.0 12.0 18.0 Mbit]
+13346458us tsft 1.0 Mb/s 2412 MHz 11b -18dBm signal -86dBm noise antenna 0 [bit 31] Acknowledgment RA:90:a4:de:c0:46:0a 
 13344925us tsft 1.0 Mb/s -86dBm noise 27dBm tx power [bit 15] Assoc Response AID(1) :: Successful
 13355433us tsft 2412 MHz 11n -22dBm signal -86dBm noise antenna 1 19.5 Mb/s MCS 2 20 MHz long GI [bit 31] 
 13454791us tsft 2412 MHz 11n -21dBm signal -86dBm noise antenna 1 52.0 Mb/s MCS 11 20 MHz long GI [bit 31]