Changeset 12038

Timestamp:

05/05/09 08:35:59 (4 years ago)

Author:

BrainSlayer

Message:

use now ccq instead of rssi for link quality (atheros chipsets only, broadcom and ralink uses still rssi

Location:

src/router

Files:

• httpd/visuals/dd-wrt.c (modified) (8 diffs)
• kromo/common/Info.htm (modified) (2 diffs)
• kromo/dd-wrt/Status_Wireless.asp (modified) (3 diffs)

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

@@ -5936 +5936 @@
                  0 ) )
         {
-            websWrite( wp, "'%s','%s','%s','%3dM','%3dM','%d','%d','%d'",
+            websWrite( wp, "'%s','%s','%s','%3dM','%3dM','%d','%d','%d','%d'",
                        mac,ifname, UPTIME(si->isi_uptime),
                        ( ( si->
@@ -5944 +5944 @@
                            isi_rates[si->isi_rxrate] & IEEE80211_RATE_VAL ) /
                          2 ) * turbo, si->isi_noise + si->isi_rssi,
-                       si->isi_noise, si->isi_rssi );
+                       si->isi_noise, si->isi_rssi,si->isi_ccq );
         }
         else
         {
-            websWrite( wp, "'%s','%s','%s','N/A','N/A','%d','%d','%d'", mac,
+            websWrite( wp, "'%s','%s','%s','N/A','N/A','%d','%d','%d','%d'", mac,
                        ifname, UPTIME(si->isi_uptime),si->isi_noise + si->isi_rssi, si->isi_noise,
-                       si->isi_rssi );
+                       si->isi_rssi,si->isi_ccq );
         }
         cp += si->isi_len;
@@ -6185 +6185 @@
             }
             else
+//* 1.24 + 116
 #endif
             {
-                websWrite( wp, "'%s','%s','N/A','N/A','N/A','%d','%d','%d'", mac,
+                int qual = table.Entry[i].AvgRssi0 * 124 + 11600;
+                qual/=10;
+
+                websWrite( wp, "'%s','%s','N/A','N/A','N/A','%d','%d','%d','%d'", mac,
                            ifname, table.Entry[i].AvgRssi0, -95,
-                           ( table.Entry[i].AvgRssi0 - ( -95 ) ) );
+                           ( table.Entry[i].AvgRssi0 - ( -95 ) ),qual );
             }
         }
@@ -6198 +6202 @@
         char mac[32];
 
+                int qual = sta->rssi * 124 + 11600;
+                qual/=10;
         strcpy( mac, ieee80211_ntoa( sta->mac ) );
-        websWrite( wp, "'%s','%s','N/A','N/A','N/A','%d','%d','%d'", mac,
+        websWrite( wp, "'%s','%s','N/A','N/A','N/A','%d','%d','%d','%d'", mac,
                    sta->ifname, sta->rssi, sta->noise,
-                   ( sta->rssi - ( sta->noise ) ) );
+                   ( sta->rssi - ( sta->noise ) ),qual );
         free( sta );
 
@@ -6242 +6248 @@
 #define NOISE_CMD       "wl noise"
 
-#ifndef HAVE_MSSID
-void ej_active_wireless( webs_t wp, int argc, char_t ** argv )
-{
-    int rssi = 0, noise = 0;
-    FILE *fp2;
-    char *mode;
-    char mac[30];
-    char list[2][30];
-    char line[80];
-    char cmd[80];
-    int macmask;
-
-#ifdef FASTWEB
-    ejArgs( argc, argv, "%d", &macmask );
-#else
-    if( ejArgs( argc, argv, "%d", &macmask ) < 1 )
-    {
-        websError( wp, 400, "Insufficient args\n" );
-        return;
-    }
-#endif
-
-    unlink( RSSI_TMP );
-    int cnt = 0;
-
-    mode = nvram_safe_get( "wl_mode" );
-    unsigned char buf[WLC_IOCTL_MAXLEN];
-
-    memset( buf, 0, WLC_IOCTL_MAXLEN );
-    char *iface = get_wdev(  );
-
-    if( !ifexists( iface ) )
-        return;
-    int r = getassoclist( iface, buf );
-
-    if( r < 0 )
-        return;
-    struct maclist *maclist = ( struct maclist * )buf;
-    int i;
-
-    for( i = 0; i < maclist->count; i++ )
-    {
-        ether_etoa( ( uint8 * ) & maclist->ea[i], mac );
-
-        rssi = 0;
-        noise = 0;
-        // get rssi value
-        if( strcmp( mode, "ap" ) && strcmp( mode, "apsta" )
-            && strcmp( mode, "apstawet" ) )
-            sysprintf( "%s > %s", RSSI_CMD, RSSI_TMP );
-        else
-            sysprintf( "%s \"%s\" > %s", RSSI_CMD, mac, RSSI_TMP );
-
-        // get noise value if not ap mode
-        if( strcmp( mode, "ap" ) )
-            sysprintf( "%s >> %s", NOISE_CMD, RSSI_TMP );
-
-        fp2 = fopen( RSSI_TMP, "r" );
-        if( fgets( line, sizeof( line ), fp2 ) != NULL )
-        {
-
-            // get rssi
-            // #ifdef HAVE_MSSID
-            if( sscanf( line, "%d", &rssi ) != 1 )
-                continue;
-
-            // noise=getNoise(iface);
-
-            if( strcmp( mode, "ap" ) &&
-                fgets( line, sizeof( line ), fp2 ) != NULL &&
-                sscanf( line, "%d", &noise ) != 1 )
-                continue;
-            /*
-             * #else if (sscanf (line, "%s %s %d", list[0], list[1], &rssi)
-             * != 3) continue; // noise=getNoise(iface); if (strcmp (mode,
-             * "ap") && fgets (line, sizeof (line), fp2) != NULL && sscanf
-             * (line, "%s %s %d", list[0], list[1], &noise) != 3) continue;
-             * #endif
-             */
-            // get noise for client/wet mode
-
-            fclose( fp2 );
-        }
-        if( nvram_match( "maskmac", "1" ) && macmask )
-        {
-            mac[0] = 'x';
-            mac[1] = 'x';
-            mac[3] = 'x';
-            mac[4] = 'x';
-            mac[6] = 'x';
-            mac[7] = 'x';
-            mac[9] = 'x';
-            mac[10] = 'x';
-        }
-        if( cnt )
-            websWrite( wp, "," );
-        cnt++;
-        if( !strcmp( mode, "ap" ) )
-        {
-            // char *ref = nvram_get ("noise_reference");
-            noise = -98;
-            // if (ref)
-            // noise = atoi (ref);
-        }
-        websWrite( wp, "'%s','%d','%d','%d'", mac, rssi, noise,
-                   rssi - noise );
-    }
-    unlink( RSSI_TMP );
-
-    return;
-}
-#else
 int
 ej_active_wireless_if( webs_t wp, int argc, char_t ** argv,
@@ -6364 +6258 @@
     char line[80];
     int macmask;
-
-#ifdef FASTWEB
-    ejArgs( argc, argv, "%d", &macmask );
-#else
-    if( ejArgs( argc, argv, "%d", &macmask ) < 1 )
-    {
-        websError( wp, 400, "Insufficient args\n" );
-        return 0;
-    }
-#endif
+    macmask=atoi(argv[0]);
     if( !ifexists( iface ) )
         return cnt;
@@ -6444 +6329 @@
          * only for broadcom }
          */
-        websWrite( wp, "'%s','%s','N/A','N/A','N/A','%d','%d','%d'", mac, iface,
-                   rssi, noise, rssi - noise );
+        int qual = rssi * 124 + 11600;
+        qual/=10;
+        websWrite( wp, "'%s','%s','N/A','N/A','N/A','%d','%d','%d','%d'", mac, iface,
+                   rssi, noise, rssi - noise,qual );
     }
     unlink( RSSI_TMP );
@@ -6480 +6367 @@
 }
 
-#endif
 
 #endif

src/router/kromo/common/Info.htm

@@ -14 +14 @@
                 return;
         }
-        for(var i = 0; i < val.length; i = i + 8) {
+        for(var i = 0; i < val.length; i = i + 9) {
                 var row = table.insertRow(-1);
                 
@@ -36 +36 @@
                 row.insertCell(-1).innerHTML = val[i + 6];              
                 row.insertCell(-1).innerHTML = val[i + 7];              
-                setMeterBar(row.insertCell(-1), (val[i + 5] == "0" ? 0 : parseInt(val[i + 5]) * 1.24 + 116), "");
+                setMeterBar(row.insertCell(-1), (val[i + 8] == "0" ? 0 : parseInt(val[i + 8]) * 0.1), "");
         }
 }

src/router/kromo/dd-wrt/Status_Wireless.asp

@@ -14 +14 @@
                 return;
         }
-        for(var i = 0; i < val.length; i = i + 8) {
+        for(var i = 0; i < val.length; i = i + 9) {
                 var row = table.insertRow(-1);
                 
@@ -32 +32 @@
                 row.insertCell(-1).innerHTML = val[i + 6];
                 row.insertCell(-1).innerHTML = val[i + 7];
-                setMeterBar(row.insertCell(-1), (val[i + 5] == "0" ? 0 : parseInt(val[i + 5]) * 1.24 + 116), "");
+                setMeterBar(row.insertCell(-1), (val[i + 8] == "0" ? 0 : parseInt(val[i + 8]) * 0.1), "");
         }
 }
@@ -216 +216 @@
                                                                                 <th width="8%"><% tran("share.intrface"); %></th>
                                                                                 <th width="10%"><% tran("status_router.sys_up"); %></th>
-                                                                                <th width="10%"><% tran("share.txrate"); %></th>
+                                                                                <th width="11%"><% tran("share.txrate"); %></th>
                                                                                 <th width="11%"><% tran("share.rxrate"); %></th>
                                                                                 <th width="8%"><% tran("share.signal"); %></th>