Changeset 13748

Timestamp:

01/27/10 22:45:43 (3 years ago)

Author:

BrainSlayer

Message:

we changed handling

File:

• src/router/wiviz2/wiviz.c (modified) (5 diffs)

src/router/wiviz2/wiviz.c

@@ -525 +525 @@
   memset(src,0,6);
   memset(dst,0,6);
+  int fc = (hWifi->frame_control & 0xC);
   type =typeUnknown;
-if (!(hWifi->frame_control & 0xC)) // only accept management frames (type 0)
+if (!fc) // only accept management frames (type 0)
 {
   switch (hWifi->frame_control & 0xF0) {
@@ -546 +547 @@
       break;
     }
-}
 #ifdef DEBUG
         fprintf(stderr,"fc: %X",hWifi->frame_control);
@@ -557 +557 @@
         fprintf(stderr,"%s\n",ntoa(src));
 #endif
+}
   to_ds = hWifi->flags & IEEE80211_TO_DS;
   from_ds = hWifi->flags & IEEE80211_FROM_DS;
@@ -588 +589 @@
 
   //Parse the 802.11 tags
-  if (wfType == mgt_probeResponse || wfType == mgt_beacon || wfType == mgt_probeRequest) {
+  if (fc == mgt_probeResponse || fc == mgt_beacon || fc == mgt_probeRequest) {
     m = (ieee_802_11_mgt_frame *) (hWifi + 1);
     if (swap16(m->caps) & MGT_CAPS_IBSS) {
@@ -660 +661 @@
         }
       }
-    if (wfType == mgt_probeRequest && host->staInfo->state == ssUnknown) 
+    if (fc == mgt_probeRequest && host->staInfo->state == ssUnknown) 
       host->staInfo->state = ssUnassociated;
-    if (wfType == mgt_probeRequest && ssidlen > 0 && ssidlen <= 32) {
+    if (fc == mgt_probeRequest && ssidlen > 0 && ssidlen <= 32) {
       memcpy(host->staInfo->lastssid, ssid, ssidlen);
       host->staInfo->lastssid[ssidlen] = 0;