Changeset 10677

Timestamp:

10/28/08 22:31:27 (5 years ago)

Author:

BrainSlayer

Message:

madwifi support for wiviz2

Location:

src/router/wiviz2

Files:

• Makefile (modified) (1 diff)
• channelhopper.c (modified) (3 diffs)
• wireless.h (added)
• wiviz.c (modified) (11 diffs)
• wl_access.c (modified) (2 diffs)
• wl_access.h (modified) (1 diff)

src/router/wiviz2/Makefile

@@ -21 +21 @@
 CCOPTS  += -I$(SRCBASE)/include.v23 -L../shared -L../nvram -L../libutils
 endif
-
-
+ifeq ($(CONFIG_MADWIFI),y)
+CCOPTS+=-DHAVE_MADWIFI -DNEED_PRINTF -I../shared  -include $(TOP)/madwifi.dev/madwifi.dev/include/compat.h -DHEADERS_KERNEL
+endif
 
 wiviz: ${OBJS}

src/router/wiviz2/channelhopper.c

@@ -3 +3 @@
 #include <signal.h>
 #include <sys/time.h>
+#ifdef HAVE_MADWIFI
+#include <sys/mman.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <signal.h>
+#include <fcntl.h>
+
+#include <sys/types.h>
+#include <sys/file.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdint.h>
+#include <ctype.h>
+#include <getopt.h>
+#include <err.h>
+
+#include <ctype.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <bcmnvram.h>
+#include <bcmutils.h>
+#include <shutils.h>
+#include <utils.h>
+#include <unistd.h>
+#include "wireless.h"
+#endif
 #include "wl_access.h"
 #include "channelhopper.h"
 #include "structs.h"
+
 
 void ch_sig_handler(int i) {
@@ -11 +43 @@
   }
 
+#define IEEE80211_CHAN_2GHZ 1
+#define IEEE80211_CHAN_5GHZ 2
+u_int ieee80211_ieee2mhz(u_int chan, u_int flags)
+{
+        if (flags & IEEE80211_CHAN_2GHZ) {      /* 2GHz band */
+                if (chan == 14)
+                        return 2484;
+                if (chan < 14)
+                        return ((2407) + chan * 5);
+                else {
+                        if (chan > 236 && chan < 256) {
+                                //recalculate offset
+                                int newchan = chan - 256;
+                                int newfreq = (2407) + (newchan * 5);
+                                return newfreq;
+                        } else
+                                return ((2512) + ((chan - 15) * 20));
+                }
+        } else if (flags & IEEE80211_CHAN_5GHZ) /* 5Ghz band */
+                return ((5000) + (chan * 5));
+        else {                  /* either, guess */
+                if (chan == 14)
+                        return 2484;
+                if (chan < 14)  /* 0-13 */
+                        return ((2407) + chan * 5);
+                if (chan < 27)  /* 15-26 */
+                        return ((2512) + ((chan - 15) * 20));
+                if (chan > 236 && chan < 256) {
+                        //recalculate offset
+                        int newchan = chan - 256;
+                        int newfreq = (2407) + (newchan * 5);
+                        return newfreq;
+                } else
+                        return ((5000) + (chan * 5));
+        }
+}
+
+
+void set_channel(char *dev,int channel)
+{
+    struct iwreq wrq;
+    memset( &wrq, 0, sizeof( struct iwreq ) );
+    strncpy( wrq.ifr_name, get_monitor(), IFNAMSIZ );
+    wrq.u.freq.m = (double) ieee80211_ieee2mhz(channel,1) * 100000;
+    wrq.u.freq.e = (double) 1;
+    
+    if( ioctl( getsocket(), SIOCSIWFREQ, &wrq ) < 0 )
+    {
+        usleep( 10000 ); /* madwifi needs a second chance */
+
+        if( ioctl( getsocket(), SIOCSIWFREQ, &wrq ) < 0 )
+        {
+            return;
+        }
+    }
+
+}
 void channelHopper(wiviz_cfg * cfg) {
   int hopPos;
@@ -25 +114 @@
     hopPos = (hopPos + 1) % cfg->channelHopSeqLen;
     //Set the channel
-    fprintf(stderr, "It sets the channel to %i\n", nc);
 #ifdef HAVE_MADWIFI
-            sysprintf("iwconfig %s channel %d\n",wl_dev,nc);
+    set_channel(get_wdev(),nc);
 #else        
     wl_ioctl(get_wdev(), WLC_SET_CHANNEL, &nc, 4);

src/router/wiviz2/wiviz.c

@@ -14 +14 @@
 #include <linux/if_packet.h>
 #include <linux/if_ether.h>
+#include <sys/mman.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <signal.h>
+#include <fcntl.h>
+
+#include <sys/types.h>
+#include <sys/file.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdint.h>
+#include <ctype.h>
+#include <getopt.h>
+#include <err.h>
+
+#include <ctype.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <bcmnvram.h>
+#include <bcmutils.h>
+#include <shutils.h>
+#include <utils.h>
+#include <unistd.h>
 
 #define HOST_TIMEOUT 300
@@ -81 +109 @@
         }
 
+#else
+          sysprintf("wlanconfig %s create wlandev %s wlanmode monitor",get_monitor(),getWifi(get_wdev()));
+          sysprintf("ifconfig %s up",get_monitor());
+          cfg.readFromWl = 1;
 #endif
   reloadConfig();
 
 #ifdef HAVE_MADWIFI
-  s = openMonitorSocket("mon0"); // for testing we use ath0
+  s = openMonitorSocket(get_monitor()); // for testing we use ath0
 #else
   s = openMonitorSocket("prism0");
@@ -126 +158 @@
 #ifndef HAVE_MADWIFI
   wl_ioctl(wl_dev, WLC_SET_MONITOR, &oldMonitor, 4);
-#endif
-
+#else
+  sysprintf("ifconfig %s down",get_monitor());
+  sysprintf("wlanconfig %s destroy",get_monitor());
+#endif
   close(s);
   return 0;
@@ -265 +299 @@
           if (cfg->readFromWl) {
 #ifdef HAVE_MADWIFI
-            sysprintf("iwconfig %s channel %d\n",wl_dev,cfg->curChannel);
+            set_channel(wl_dev,cfg->curChannel);
+//          sysprintf("iwconfig %s channel %d\n",wl_dev,cfg->curChannel);
 #else        
             if (wl_ioctl(wl_dev, WLC_SET_CHANNEL, &cfg->curChannel, 4) < 0) {
@@ -325 +360 @@
 void dealWithPacket(wiviz_cfg * cfg, int pktlen, const u_char * packet) {
   ieee802_11_hdr * hWifi;
-  prism_hdr * hPrism;
   wiviz_host * host;
   wiviz_host * emergebss;
@@ -332 +366 @@
   int rssi = 0;
   int to_ds, from_ds;
-  prism_did * i;
   ieee_802_11_tag * e;
   ieee_802_11_mgt_frame * m;
@@ -343 +376 @@
   u_char ssidlen = 0;
   ap_enc_type encType = aetUnknown;
-
   if (!packet) return;
+
+#ifdef HAVE_MADWIFI
+int noise;
+  if (packet[0]>0)
+    {
+    printf( "Wrong radiotap header version.\n" );
+    return;
+    }
+  int number = packet[2] | (unsigned int)((unsigned int)packet[3]<<8);
+    if (number<=0 || number>=pktlen)
+        {
+        printf("something wrong %d\n",number);
+        return;
+        }
+    noise = packet[number-3];
+    rssi = -(100-(packet[number-4]-noise));
+    hWifi = (ieee802_11_hdr *) (packet + (number));
+#else
+  prism_hdr * hPrism;
+  prism_did * i;
   if (pktlen < sizeof(prism_hdr) + sizeof(ieee802_11_hdr)) return;
+
   hPrism = (prism_hdr *) packet;
   hWifi = (ieee802_11_hdr *) (packet + (hPrism->msg_length));
@@ -355 +408 @@
     i = (prism_did *) ((int)(i+1) + i->length);
     }
+#endif
 
   //Establish the frame type
   wfType = ((hWifi->frame_control & 0xF0) >> 4) + ((hWifi->frame_control & 0xC) << 2);
+
   switch (wfType) {
     case mgt_assocRequest:
@@ -519 +574 @@
   if (!h->occupied) {
     printf( "New host, ");
-    //fprint_mac(stderr, mac, ", type=");
+    fprint_mac(stdout, mac, ", type=");
     printf( "%s\n", (type==typeAP) ? "AP" : ((type==typeSta) ? "Sta" : "Unk"));
     }
@@ -600 +655 @@
         get_mac(wl_dev, mac);
         printf( "AP mac: ");
-        //print_mac(mac, "\n");
+        print_mac(mac, "\n");
         if (!nonzeromac(mac)) return;
         if (nvram_nmatch("ap","%s_mode",wl_dev))
@@ -631 +686 @@
                 macs = (maclist_t *) malloc(4 + MAX_STA_COUNT * sizeof(ether_addr_t));
                 macs->count = MAX_STA_COUNT;
-                if (getassoclist(wl_dev,macs)>-1)
+                int code = getassoclist(wl_dev,macs);
+                printf("code :%d\n",code);
+                if (code>0)
                 {
                     for (i = 0; i < macs->count; i++) {

src/router/wiviz2/wl_access.c

@@ -5 +5 @@
 #include <sys/ioctl.h>
 #include <net/if.h>
+#include <sys/mman.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <signal.h>
+#include <fcntl.h>
+
+#include <sys/types.h>
+#include <sys/file.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdint.h>
+#include <ctype.h>
+#include <getopt.h>
+#include <err.h>
+
+#include <ctype.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <bcmnvram.h>
+#include <bcmutils.h>
+#include <shutils.h>
+#include <utils.h>
+#include <unistd.h>
 
 #include "wl_access.h"
@@ -33 +61 @@
         return ret;
 }
+#else
+
+
+char *get_monitor(void)
+{
+int devcount;
+char *ifname = get_wdev();
+sscanf( ifname, "ath%d", &devcount );
+static char mon[32];
+sprintf(mon,"mon%d",devcount);
+return mon;
+}
 #endif
 

src/router/wiviz2/wl_access.h

@@ -2 +2 @@
 
 
-typedef unsigned int uint32;
-typedef unsigned char uchar;
-typedef int bool;
 
 typedef struct ether_addr {