Changeset 10808

Timestamp:

11/07/08 16:02:50 (5 years ago)

Author:

BrainSlayer

Message:

how todo wiviz on ralink

Location:

src/router

Files:

• httpd/visuals/dd-wrt.c (modified) (6 diffs)
• libutils/wl.c (modified) (16 diffs)
• wiviz2/channelhopper.c (modified) (1 diff)
• wiviz2/wiviz.c (modified) (6 diffs)

src/router/httpd/visuals/dd-wrt.c

@@ -5653 +5653 @@
 #define RTPRIV_IOCTL_GET_MAC_TABLE              (SIOCIWFIRSTPRIV + 0x0F)
 
+typedef struct STAINFO {
+        char mac[6];
+        char rssi;
+        char noise;
+        char ifname[32];
+} STAINFO;
+
+
 int
 ej_active_wireless_if( webs_t wp, int argc, char_t ** argv,
@@ -5663 +5671 @@
     int s, len,i;
     struct iwreq iwr;
+    int ignore=0;
 
     if( !ifexists( ifname ) )
@@ -5673 +5682 @@
     if( state == 0 || state == -1 )
     {
-        printf( "IOCTL_STA_INFO radio %s not enabled!\n", ifname );
         return cnt;
     }
@@ -5679 +5687 @@
     if( s < 0 )
     {
-        fprintf( stderr, "socket(SOCK_DRAGM)\n" );
         return cnt;
     }
@@ -5689 +5696 @@
     if( ioctl( s, RTPRIV_IOCTL_GET_MAC_TABLE, &iwr ) < 0 )
     {
-        fprintf( stderr, "IOCTL_STA_INFO for %s failed!\n", ifname );
-        close( s );
-        return cnt;
-    }
-
-
+        ignore=1;
+    }
+if (!ignore)
 for (i = 0; i < table.Num; i++) {
         if( cnt )
@@ -5736 +5740 @@
         }
     }
-    close( s );
-
+STAINFO *sta = getRaStaInfo("wl0");
+    if (sta)
+        {
+        char mac[32];
+        strcpy( mac, ieee80211_ntoa( sta->mac ) );
+            websWrite( wp, "'%s','%s','N/A','N/A','%d','%d','%d'", mac,sta->ifname, sta->rssi, sta->noise,(sta->rssi - (sta->noise)) );
+        free(sta);
+        
+        }
+    
+close(s);
     return cnt;
 }

src/router/libutils/wl.c

@@ -33 +33 @@
 
 #ifdef HAVE_RT2880
-char *getRADev(char *prefix)
-{
-char *ifname=NULL;
-        if (!strcmp(prefix,"wl0"))ifname="ra0";
-        if (!strcmp(prefix,"wl0.1"))ifname="ra1";
-        if (!strcmp(prefix,"wl0.2"))ifname="ra2";
-        if (!strcmp(prefix,"wl0.3"))ifname="ra3";
-        if (!strcmp(prefix,"wl0.4"))ifname="ra4";
-        if (!strcmp(prefix,"wl0.5"))ifname="ra5";
-        if (!strcmp(prefix,"wl0.6"))ifname="ra6";
-        if (!strcmp(prefix,"wl0.7"))ifname="ra7";
-if (ifname)
-    return ifname;
-else 
-    return prefix;
+char *getRADev( char *prefix )
+{
+    char *ifname = NULL;
+
+    if( !strcmp( prefix, "wl0" ) )
+        ifname = "ra0";
+    if( !strcmp( prefix, "wl0.1" ) )
+        ifname = "ra1";
+    if( !strcmp( prefix, "wl0.2" ) )
+        ifname = "ra2";
+    if( !strcmp( prefix, "wl0.3" ) )
+        ifname = "ra3";
+    if( !strcmp( prefix, "wl0.4" ) )
+        ifname = "ra4";
+    if( !strcmp( prefix, "wl0.5" ) )
+        ifname = "ra5";
+    if( !strcmp( prefix, "wl0.6" ) )
+        ifname = "ra6";
+    if( !strcmp( prefix, "wl0.7" ) )
+        ifname = "ra7";
+    if( ifname )
+        return ifname;
+    else
+        return prefix;
 }
 
 int getchannels( unsigned int *list, char *ifname )
 {
-list[0]=1;
-list[1]=2;
-list[2]=3;
-list[3]=4;
-list[4]=5;
-list[5]=6;
-list[6]=7;
-list[7]=8;
-list[8]=9;
-list[9]=10;
-list[10]=11;
-list[11]=12;
-list[12]=13;
+    list[0] = 1;
+    list[1] = 2;
+    list[2] = 3;
+    list[3] = 4;
+    list[4] = 5;
+    list[5] = 6;
+    list[6] = 7;
+    list[7] = 8;
+    list[8] = 9;
+    list[9] = 10;
+    list[10] = 11;
+    list[11] = 12;
+    list[12] = 13;
 #ifdef BUFFALO_JP
-list[13]=14;
-return 14;
+    list[13] = 14;
+    return 14;
 #else
-return 13;
+    return 13;
 #endif
 }
@@ -102 +111 @@
 }
 
-
 u_int ieee80211_mhz2ieee( u_int freq )
 {
-    if( freq == 2484)
+    if( freq == 2484 )
         return 14;
-    if( freq < 2484)
-        return ( freq - ( 2407) ) / 5;
+    if( freq < 2484 )
+        return ( freq - ( 2407 ) ) / 5;
     if( freq < 4990 && freq > 4940 )
         return ( ( freq * 10 ) + ( ( ( freq % 5 ) == 2 ) ? 5 : 0 ) -
                  49400 ) / 5;
     if( freq < 5000 )
-        return 15 + ( ( freq - ( 2512) ) / 20 );
+        return 15 + ( ( freq - ( 2512 ) ) / 20 );
 
     return ( freq - ( 5000 ) ) / 5;
 }
 
-
-unsigned int ieee80211_ieee2mhz(unsigned int chan)
-{
-                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));
-                }
+unsigned int ieee80211_ieee2mhz( unsigned int chan )
+{
+    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 ) );
+    }
 }
 
@@ -148 +159 @@
 
     freq = ( float )wrq.u.freq.m;
-    if (freq<1000.0f)
-        {
-        return (int)freq;
-        }
+    if( freq < 1000.0f )
+    {
+        return ( int )freq;
+    }
     for( i = 0; i < wrq.u.freq.e; i++ )
         freq *= 10;
@@ -172 +183 @@
 
     freq = ( float )wrq.u.freq.m;
-    if (freq<1000.0f)
-        {
-        return ieee80211_ieee2mhz((unsigned int)freq);
-        }
+    if( freq < 1000.0f )
+    {
+        return ieee80211_ieee2mhz( ( unsigned int )freq );
+    }
     for( i = 0; i < wrq.u.freq.e; i++ )
         freq *= 10;
@@ -223 +234 @@
     return ( i < 17 ? NULL : a );
 }
-typedef union _MACHTTRANSMIT_SETTING {
-        struct  {
-                unsigned short  MCS:7;  // MCS
-                unsigned short  BW:1;   //channel bandwidth 20MHz or 40 MHz
-                unsigned short  ShortGI:1;
-                unsigned short  STBC:2; //SPACE
-                unsigned short  rsv:3;
-                unsigned short  MODE:2; // Use definition MODE_xxx.
-        } field;
-        unsigned short      word;
+typedef union _MACHTTRANSMIT_SETTING
+{
+    struct
+    {
+        unsigned short MCS:7;   // MCS
+        unsigned short BW:1;    //channel bandwidth 20MHz or 40 MHz
+        unsigned short ShortGI:1;
+        unsigned short STBC:2;  //SPACE
+        unsigned short rsv:3;
+        unsigned short MODE:2;  // Use definition MODE_xxx.
+    } field;
+    unsigned short word;
 } MACHTTRANSMIT_SETTING;
 
-typedef struct _RT_802_11_MAC_ENTRY {
-        unsigned char            Addr[6];
-        unsigned char            Aid;
-        unsigned char            Psm;     // 0:PWR_ACTIVE, 1:PWR_SAVE
-        unsigned char            MimoPs;  // 0:MMPS_STATIC, 1:MMPS_DYNAMIC, 3:MMPS_Enabled
-        char                     AvgRssi0;
-        char                     AvgRssi1;
-        char                     AvgRssi2;
-        unsigned int             ConnectedTime;
-        MACHTTRANSMIT_SETTING    TxRate;
+typedef struct _RT_802_11_MAC_ENTRY
+{
+    unsigned char Addr[6];
+    unsigned char Aid;
+    unsigned char Psm;          // 0:PWR_ACTIVE, 1:PWR_SAVE
+    unsigned char MimoPs;       // 0:MMPS_STATIC, 1:MMPS_DYNAMIC, 3:MMPS_Enabled
+    char AvgRssi0;
+    char AvgRssi1;
+    char AvgRssi2;
+    unsigned int ConnectedTime;
+    MACHTTRANSMIT_SETTING TxRate;
 } RT_802_11_MAC_ENTRY;
 
-typedef struct _RT_802_11_MAC_TABLE {
-        unsigned long            Num;
-        RT_802_11_MAC_ENTRY      Entry[32]; //MAX_LEN_OF_MAC_TABLE = 32
+typedef struct _RT_802_11_MAC_TABLE
+{
+    unsigned long Num;
+    RT_802_11_MAC_ENTRY Entry[32];      //MAX_LEN_OF_MAC_TABLE = 32
 } RT_802_11_MAC_TABLE;
+
+typedef struct STAINFO
+{
+    char mac[6];
+    char rssi;
+    char noise;
+    char ifname[32];
+} STAINFO;
+
+int OidQueryInformation( unsigned long OidQueryCode, int socket_id,
+                         char *DeviceName, void *ptr,
+                         unsigned long PtrLength )
+{
+    struct iwreq wrq;
+
+    strcpy( wrq.ifr_name, DeviceName );
+    wrq.u.data.length = PtrLength;
+    wrq.u.data.pointer = ( caddr_t ) ptr;
+    wrq.u.data.flags = OidQueryCode;
+
+    return ( ioctl( socket_id, ( SIOCIWFIRSTPRIV + 0x0E ), &wrq ) );
+}
+
+#include "stapriv.h"
+#include "oid.h"
+
+STAINFO *getRaStaInfo( char *ifname )
+{
+    char G_bRadio = 1;          //TRUE
+
+    int ConnectStatus = 0;
+    unsigned char BssidQuery[6];
+
+    if( !nvram_nmatch( "sta", "%s_mode", ifname )
+        && !nvram_nmatch( "apsta", "%s_mode", ifname )
+        && !nvram_nmatch( "apstawet", "%s_mode", ifname ) )
+    {
+        return NULL;
+    }
+    char *ifn = "ra0";
+
+    if( nvram_nmatch( "apsta", "%s_mode", ifname )
+        || nvram_nmatch( "apstawet", "%s_mode", ifname ) )
+        ifn = "apcli0";
+
+    int s;
+
+    s = getsocket(  );
+    if( OidQueryInformation
+        ( OID_GEN_MEDIA_CONNECT_STATUS, s, ifn, &ConnectStatus,
+          sizeof( ConnectStatus ) ) < 0 )
+    {
+        return NULL;
+    }
+    if( OidQueryInformation
+        ( RT_OID_802_11_RADIO, s, ifn, &G_bRadio, sizeof( G_bRadio ) ) < 0 )
+    {
+        return NULL;
+    }
+    if( G_bRadio && ConnectStatus == 1 )
+    {
+        memset( &BssidQuery, 0x00, sizeof( BssidQuery ) );
+        OidQueryInformation( OID_802_11_BSSID, s, ifn, &BssidQuery,
+                             sizeof( BssidQuery ) );
+        long RSSI;
+        int nNoiseDbm;
+        unsigned char lNoise; // this value is (ULONG) in Ndis driver (NOTICE!!!)
+
+        OidQueryInformation( RT_OID_802_11_RSSI, s, ifn, &RSSI,
+                             sizeof( RSSI ) );
+        OidQueryInformation(RT_OID_802_11_QUERY_NOISE_LEVEL, s, "ra0", &lNoise, sizeof(lNoise));
+        nNoiseDbm = lNoise;
+        nNoiseDbm -= 143;
+
+
+
+        STAINFO *ret = malloc( sizeof( STAINFO ) );
+
+        memcpy( ret->mac, BssidQuery, 6 );
+        strcpy( ret->ifname, ifn );
+        ret->rssi = RSSI;
+        ret->noise = nNoiseDbm;
+        return ret;
+    }
+    return NULL;
+
+}
 
 #define RTPRIV_IOCTL_GET_MAC_TABLE              (SIOCIWFIRSTPRIV + 0x0F)
@@ -261 +363 @@
     unsigned int *count = ( unsigned int * )list;
 
-    RT_802_11_MAC_TABLE table = {0};
+    RT_802_11_MAC_TABLE table = { 0 };
     int s, i;
 
@@ -271 +373 @@
     }
 
-    if( !ifexists( ifname ) )
-    {
-        printf( "IOCTL_STA_INFO ifresolv %s failed!\n", ifname );
-        return 0;
-    }
     int state = get_radiostate( ifname );
+    int ignore = 0;
 
     if( state == 0 || state == -1 )
     {
-        printf( "IOCTL_STA_INFO radio %s not enabled!\n", ifname );
-        return 0;
-    }
-    s = socket( AF_INET, SOCK_DGRAM, 0 );
-    if( s < 0 )
-    {
-        fprintf( stderr, "socket(SOCK_DRAGM)\n" );
-        return 0;
-    }
-    ( void )memset( &iwr, 0, sizeof( struct iwreq ) );
-    ( void )strncpy( iwr.ifr_name, ifname, sizeof( iwr.ifr_name ) );
-
-    iwr.u.data.pointer = (caddr_t) &table;
-    if( ioctl( s, RTPRIV_IOCTL_GET_MAC_TABLE, &iwr ) < 0 )
-    {
-        fprintf( stderr, "IOCTL_STA_INFO for %s failed!\n", ifname );
-        close( s );
-        return 0;
-    }
-
+        ignore = 1;
+    }
+    if( !ignore )
+    {
+        s = getsocket(  );
+        if( s < 0 )
+        {
+            ignore = 1;
+        }
+        ( void )memset( &iwr, 0, sizeof( struct iwreq ) );
+        ( void )strncpy( iwr.ifr_name, ifname, sizeof( iwr.ifr_name ) );
+
+        iwr.u.data.pointer = ( caddr_t ) & table;
+        if( ioctl( s, RTPRIV_IOCTL_GET_MAC_TABLE, &iwr ) < 0 )
+        {
+            ignore = 1;
+        }
+    }
 
     unsigned char *l = ( unsigned char * )list;
@@ -305 +401 @@
     count[0] = 0;
     l += 4;
-    for (i=0;i<table.Num;i++)
-    {
-        memcpy( l, &table.Entry[i].Addr, 6 );
-        if( l[0] == 0 && l[1] == 0 && l[2] == 0 && l[3] == 0 && l[4] == 0
-            && l[5] == 0 )
-            break;
+    STAINFO *sta = getRaStaInfo( ifname );
+
+    if( sta != NULL )
+    {
+        memcpy( l, sta->mac, 6 );
         l += 6;
         count[0]++;
-    }
-    close( s );
+        free( sta );
+    }
+    if( !ignore )
+        for( i = 0; i < table.Num; i++ )
+        {
+            memcpy( l, &table.Entry[i].Addr, 6 );
+            if( l[0] == 0 && l[1] == 0 && l[2] == 0 && l[3] == 0 && l[4] == 0
+                && l[5] == 0 )
+                break;
+            l += 6;
+            count[0]++;
+        }
 
     return count[0];
 }
-
-
-
-
+int getRssi( char *ifname, unsigned char *mac )
+{
+    struct iwreq iwr;
+    char type[32];
+    char netmode[32];
+
+    RT_802_11_MAC_TABLE table = { 0 };
+    int s, i;
+
+    sprintf( type, "%s_mode", ifname );
+    sprintf( netmode, "%s_net_mode", ifname );
+    if( nvram_match( netmode, "disabled" ) )
+    {
+        return 0;
+    }
+
+    int state = get_radiostate( ifname );
+    int ignore = 0;
+
+    if( state == 0 || state == -1 )
+    {
+        ignore = 1;
+    }
+    if( !ignore )
+    {
+        s = getsocket(  );
+        if( s < 0 )
+        {
+            ignore = 1;
+        }
+        ( void )memset( &iwr, 0, sizeof( struct iwreq ) );
+        ( void )strncpy( iwr.ifr_name, ifname, sizeof( iwr.ifr_name ) );
+
+        iwr.u.data.pointer = ( caddr_t ) & table;
+        if( ioctl( s, RTPRIV_IOCTL_GET_MAC_TABLE, &iwr ) < 0 )
+        {
+            ignore = 1;
+        }
+    }
+
+    STAINFO *sta = getRaStaInfo( ifname );
+
+    if( sta != NULL )
+    {
+        if( !memcmp( mac, sta->mac, 6 ) )
+        {
+            int retu = sta->rssi;
+
+            free( sta );
+            return -95 + retu;
+        }
+        free( sta );
+    }
+    if( !ignore )
+        for( i = 0; i < table.Num; i++ )
+        {
+            if( !memcmp( mac, &table.Entry[i].Addr, 6 ) )
+            {
+                return -95 + table.Entry[i].AvgRssi0;
+            }
+        }
+    return 0;
+}
+
+int getNoise( char *ifname, unsigned char *mac )
+{
+
+    return -95;
+
+}
 
 #else
@@ -416 +587 @@
 }
 
+#ifndef HAVE_RT2880
 int getNoise( char *ifname, unsigned char *macname )
 {
@@ -436 +608 @@
     return noise;
 }
-
+#endif
 /*
  * struct iw_statistics *wlcompat_get_wireless_stats(struct net_device *dev)
@@ -481 +653 @@
 #include "net80211/ieee80211_ioctl.h"
 
-
-
 int getsocket( void )
 {
@@ -496 +666 @@
 }
 
-
 /*
  * Atheros 
  */
-
 
 #define IOCTL_ERR(x) [x - SIOCIWFIRSTPRIV] "ioctl[" #x "]"
@@ -891 +1059 @@
 }
 
-
 struct wifi_channels
 {
@@ -1136 +1303 @@
 }
 
-
 int getRssi( char *ifname, unsigned char *mac )
 {
@@ -1350 +1516 @@
 #endif
 
-
-
 #ifdef HAVE_RT2880
 char *get_wl_instance_name( int instance )
@@ -1366 +1530 @@
     return 1;
 }
-
-
 
 #else

src/router/wiviz2/channelhopper.c

@@ -126 +126 @@
     hopPos = (hopPos + 1) % cfg->channelHopSeqLen;
     }
+#ifdef HAVE_MADWIFI
     if (nc>255)nc=1;
+#elif HAVE_RT2880
+    if (nc>14)nc=1;
+#else
+    if (nc>255)nc=1;
+#endif
     //Set the channel
 #ifdef HAVE_MADWIFI

src/router/wiviz2/wiviz.c

@@ -66 +66 @@
 void readWL(wiviz_cfg * cfg);
 void reloadConfig();
-
+int stop = 0;
+ 
 wiviz_cfg * global_cfg;
 char *wl_dev;
@@ -72 +73 @@
 int main(int argc, char * * argv) {
   char *dev;                          
-  int stop = 0;
   int oldMonitor, newMonitor;        
   u_char packet[4096];                 
@@ -85 +85 @@
   wl_dev=get_wdev();
 #endif
+if (argc>1)
+if (!strcmp(argv[1],"terminate"))
+    {
+#ifdef HAVE_MADWIFI
+  // return to original channel
+  sysprintf("iwconfig %s channel %sM",get_monitor(),nvram_nget("%s_channel",get_wdev()));
+  sleep(1);
+  sysprintf("ifconfig %s down",get_monitor());
+  sysprintf("wlanconfig %s destroy",get_monitor());
+#elif HAVE_RT2880
+  nvram_set("wl0_mode",nvram_safe_get("wl0_oldmode"));
+  sysprintf("startservice configurewifi");
+#else
+  wl_ioctl(wl_dev, WLC_SET_MONITOR, &oldMonitor, 4);
+#endif    
+    }
+
   global_cfg = &cfg;
   signal(SIGUSR1, &signal_handler);
@@ -116 +133 @@
           nvram_set("wl0_oldmode",nvram_safe_get("wl0_mode"));
           nvram_set("wl0_mode","sta");
+          if (!nvram_match("wl0_oldmode","sta"))
           sysprintf("startservice configurewifi");
           sysprintf("iwconfig ra0 mode monitor");
@@ -165 +183 @@
     if (cfg.hosts[i].staInfo) free(cfg.hosts[i].staInfo);
     }
-#endif
-#ifdef HAVE_MADWIFI
-  // return to original channel
-  sysprintf("iwconfig %s channel %sM",get_monitor(),nvram_nget("%s_channel",get_wdev()));
-  sleep(1);
-  sysprintf("ifconfig %s down",get_monitor());
-  sysprintf("wlanconfig %s destroy",get_monitor());
-#elif HAVE_RT2880
-  nvram_set("wl0_mode",nvram_safe_get("wl0_oldmode"));
-  sysprintf("startservice configurewifi");
-#else
-  wl_ioctl(wl_dev, WLC_SET_MONITOR, &oldMonitor, 4);
 #endif
   close(s);
@@ -373 +379 @@
   if (signum == SIGUSR1) writeJavascript();
   if (signum == SIGUSR2) reloadConfig();
+  if (signum == SIGTERM) stop=1;
   }