|
Added
Link Here
|
| 1 |
--- pcapsource.cc.orig 2007-10-06 17:09:03.000000000 -0400 |
| 2 |
+++ pcapsource.cc 2007-11-05 13:10:18.825873000 -0500 |
| 3 |
@@ -837,15 +837,15 @@ |
| 4 |
#define IEEE80211_CHAN_T \ |
| 5 |
(IEEE80211_CHAN_5GHZ | IEEE80211_CHAN_OFDM | IEEE80211_CHAN_TURBO) |
| 6 |
|
| 7 |
-#define IEEE80211_IS_CHAN_FHSS(_flags) \ |
| 8 |
+#define KISMET_IEEE80211_IS_CHAN_FHSS(_flags) \ |
| 9 |
((_flags & IEEE80211_CHAN_FHSS) == IEEE80211_CHAN_FHSS) |
| 10 |
-#define IEEE80211_IS_CHAN_A(_flags) \ |
| 11 |
+#define KISMET_IEEE80211_IS_CHAN_A(_flags) \ |
| 12 |
((_flags & IEEE80211_CHAN_A) == IEEE80211_CHAN_A) |
| 13 |
-#define IEEE80211_IS_CHAN_B(_flags) \ |
| 14 |
+#define KISMET_IEEE80211_IS_CHAN_B(_flags) \ |
| 15 |
((_flags & IEEE80211_CHAN_B) == IEEE80211_CHAN_B) |
| 16 |
-#define IEEE80211_IS_CHAN_PUREG(_flags) \ |
| 17 |
+#define KISMET_IEEE80211_IS_CHAN_PUREG(_flags) \ |
| 18 |
((_flags & IEEE80211_CHAN_PUREG) == IEEE80211_CHAN_PUREG) |
| 19 |
-#define IEEE80211_IS_CHAN_G(_flags) \ |
| 20 |
+#define KISMET_IEEE80211_IS_CHAN_G(_flags) \ |
| 21 |
((_flags & IEEE80211_CHAN_G) == IEEE80211_CHAN_G) |
| 22 |
#define IEEE80211_IS_CHAN_T(_flags) \ |
| 23 |
((_flags & IEEE80211_CHAN_T) == IEEE80211_CHAN_T) |
| 24 |
@@ -972,15 +972,15 @@ |
| 25 |
switch (bit) { |
| 26 |
case IEEE80211_RADIOTAP_CHANNEL: |
| 27 |
packet->channel = ieee80211_mhz2ieee(u.u16, u2.u16); |
| 28 |
- if (IEEE80211_IS_CHAN_FHSS(u2.u16)) |
| 29 |
+ if (KISMET_IEEE80211_IS_CHAN_FHSS(u2.u16)) |
| 30 |
packet->carrier = carrier_80211dsss; |
| 31 |
- else if (IEEE80211_IS_CHAN_A(u2.u16)) |
| 32 |
+ else if (KISMET_IEEE80211_IS_CHAN_A(u2.u16)) |
| 33 |
packet->carrier = carrier_80211a; |
| 34 |
- else if (IEEE80211_IS_CHAN_B(u2.u16)) |
| 35 |
+ else if (KISMET_IEEE80211_IS_CHAN_B(u2.u16)) |
| 36 |
packet->carrier = carrier_80211b; |
| 37 |
- else if (IEEE80211_IS_CHAN_PUREG(u2.u16)) |
| 38 |
+ else if (KISMET_IEEE80211_IS_CHAN_PUREG(u2.u16)) |
| 39 |
packet->carrier = carrier_80211g; |
| 40 |
- else if (IEEE80211_IS_CHAN_G(u2.u16)) |
| 41 |
+ else if (KISMET_IEEE80211_IS_CHAN_G(u2.u16)) |
| 42 |
packet->carrier = carrier_80211g; |
| 43 |
else if (IEEE80211_IS_CHAN_T(u2.u16)) |
| 44 |
packet->carrier = carrier_80211a;/*XXX*/ |