Changeset 10805

Timestamp:

11/07/08 10:16:21 (5 years ago)

Author:

BrainSlayer

Message:

some scan fixes

File:

• src/router/services/tools/site_survey_ralink.c (modified) (4 diffs)

src/router/services/tools/site_survey_ralink.c

@@ -112 +112 @@
 #define DOT11_CAP_ESS                           0x0001
 #define DOT11_CAP_IBSS                          0x0002
-
-    unsigned char b1[32],b2[32],b3[32],b4[32],b5[32],b6[32],b7[32],b8[32];
+#define DOT11_CAP_PRIVACY                       0x0010  /* d11 cap. privacy */
+
+    unsigned char b1[32],b2[64],b3[32],b4[32],b5[32],b6[32],b7[32],b8[32];
     int i = 0;
 
@@ -121 +122 @@
     
     memset( site_survey_lists, sizeof( site_survey_lists ), 0 );
-    
+    if (nvram_match("wl0_mode","ap") || nvram_match("wl0_mode","apsta"))
+    {
     eval( "iwpriv", "ra0","set","SiteSurvey=1" ); // only in ap mode
     sleep(4); //wait 4 seconds per spec
+    }
     
     FILE *scan = popen("iwpriv ra0 get_site_survey","rb");
@@ -133 +136 @@
         if (feof(scan))
             break;
-        int ret = fscanf(scan,"%s %s %s %s %s %s %s %s",b1,b2,b3,b4,b5,b6,b7,b8); //skip second line
-        if (ret<8)
+        fread(b1,4,1,scan);
+        b1[4]=0;
+        b1[strlen(b1)]=0;
+        fread(b2,33,1,scan);
+        b2[32]=0;
+        b2[strlen(b2)]=0;
+        int ret = fscanf(scan,"%s %s %s %s %s %s",b3,b4,b5,b6,b7,b8); //skip second line
+        if (ret<6)
             break;
         site_survey_lists[i].channel = atoi(b1); // channel
@@ -157 +166 @@
         if (!strcmp(b8,"Ad"))
             site_survey_lists[i].capability=DOT11_CAP_IBSS;     
+
+        if (strcmp(b5,"OPEN"))
+            site_survey_lists[i].capability|=DOT11_CAP_PRIVACY; 
+            
         i++;
     }