Changeset 12202

Timestamp:

05/22/09 15:07:05 (4 years ago)

Author:

eko

Message:

some more dual radio stuff

Location:

src/router/httpd

Files:

• modules/broadcom.c (modified) (5 diffs)
• validate/validators.c (modified) (1 diff)
• validate/webs.c (modified) (2 diffs)
• visuals/dd-wrt.c (modified) (2 diffs)
• visuals/ejs.c (modified) (2 diffs)
• visuals/status.c (modified) (1 diff)
• visuals/wireless.c (modified) (8 diffs)

src/router/httpd/modules/broadcom.c

@@ -651 +651 @@
     fread( webfile, len, 1, web );
     webfile[len] = 0;
-    sprintf( temp, webfile, ifname, ifname, ifname, ifname );
+    sprintf( temp, webfile, ifname, ifname, ifname, ifname, ifname, ifname );
     free( webfile );
     fclose( web );
+    do_ej_buffer( temp, stream );
+}
+
+void do_activetable( struct mime_handler *handler, char *path, webs_t stream,
+             char *query )
+{
+    char *temp2 = &path[indexof( path, '-' ) + 1];
+    char ifname[16];
+
+    strcpy( ifname, temp2 );
+    ifname[indexof( ifname, '.' )] = 0;
+    FILE *web = getWebsFile( "WL_ActiveTable.asp" );
+    unsigned int len = getWebsFileLen( "WL_ActiveTable.asp" );
+    char *webfile = ( char * )malloc( len + 1 );
+
+    fread( webfile, len, 1, web );
+    webfile[len] = 0;
+    fclose( web );
+
+    char temp[32768];
+
+    memset( temp, 0, 32768 );
+    int ai = 0;
+    int i = 0;
+    int weblen = strlen( webfile );
+
+    for( i = 0; i < weblen; i++ )
+    {
+        if( webfile[i] == '%' )
+        {
+            i++;
+            switch ( webfile[i] )
+            {
+                case '%':
+                    temp[ai++] = '%';
+                    break;
+                case 's':
+                    strcpy( &temp[ai], ifname );
+                    ai += strlen( ifname );
+                    break;
+                default:
+                    temp[ai++] = webfile[i];
+                    break;
+            }
+        }
+        else
+            temp[ai++] = webfile[i];
+    }
+    free( webfile );
     do_ej_buffer( temp, stream );
 }
@@ -884 +933 @@
     {"WL_WPATable", "save", "wireless_2", 1, REFRESH, "security_save"},
     {"WL_WPATable", "keysize", "wireless_2", 1, REFRESH, "security_save"},
-    {"WL_ActiveTable", "add_mac", "", 1, REFRESH, "add_active_mac"},
+    {"WL_ActiveTable-wl0", "add_mac", "", 1, REFRESH, "add_active_mac"},
+    {"WL_ActiveTable-wl1", "add_mac", "", 1, REFRESH, "add_active_mac"},
     /*
      * Siafu addition 
@@ -1088 +1138 @@
         do_filtertable( NULL, path, wp, NULL ); // refresh
     // #ifdef HAVE_MADWIFI
+    else if( !strncmp( path, "WL_ActiveTable", 14 ) )
+        do_activetable( NULL, path, wp, NULL ); // refresh
     else if( !strncmp( path, "Wireless_WDS", 12 ) )
         do_wds( NULL, path, wp, NULL ); // refresh
@@ -1396 +1448 @@
         if( !strncmp( path, "WL_FilterTable", 14 ) )
             do_filtertable( NULL, path, wp, NULL );     // refresh
+        else if( !strncmp( path, "WL_ActiveTable", 14 ) )
+            do_activetable( NULL, path, wp, NULL );     // refresh      
         else if( !strncmp( path, "Wireless_WDS", 12 ) )
             do_wds( NULL, path, wp, NULL );     // refresh
@@ -2135 +2189 @@
     // #ifdef HAVE_MADWIFI
     {"Wireless_WDS*", "text/html", no_cache, NULL, do_wds, do_auth, 1},
+    {"WL_ActiveTable*", "text/html", no_cache, NULL, do_activetable, do_auth, 1},   
     {"Wireless_Advanced*", "text/html", no_cache, NULL, do_wireless_adv, do_auth, 1},
     // #endif

src/router/httpd/validate/validators.c

@@ -1419 +1419 @@
         sprintf( mlist, "%s_maclist", ifname );
         nvram_set( mlist, buf );
+        if( !strcmp( ifname, "wl0" ) )
+        {
         nvram_set( "wl_active_mac", "" );
         nvram_set( "wl0_active_mac", "" );
+        }
+        else
+        nvram_set( "wl1_active_mac", "" );
     }
     free(buf);

src/router/httpd/validate/webs.c

@@ -914 +914 @@
     char buf[1000] = "", *cur = buf;
     int i, count = 0;
+    
+    char *iface = websGetVar( wp, "iface", NULL );
 
     nvram_set( "wl_active_add_mac", "1" );
@@ -948 +950 @@
                          wl_client_macs[atoi( index )].hwaddr );
     }
-    nvram_set( "wl_active_mac", buf );
-    nvram_set( "wl0_active_mac", buf );
+    if( !strcmp( iface "wl0" ) )
+    {
+        nvram_set( "wl_active_mac", buf );
+        nvram_set( "wl0_active_mac", buf );
+        }
+    else
+        nvram_set( "wl1_active_mac", buf )
 }
 

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

@@ -1528 +1528 @@
     int i;
 
-    if( nvram_match( "wl0_mode", "wet" ) )      // dhcpd settings disabled in 
+    if( nvram_match( "wl0_mode", "wet" ) || nvram_match( "wl0_mode", "apstawet" ))      // dhcpd settings disabled in 
         // client bridge mode, so we
         // wont display it
         return;
-    if( nvram_match( "wl0_mode", "apstawet" ) ) // dhcpd settings disabled in 
+    if( nvram_match( "wl1_mode", "wet" ) || nvram_match( "wl1_mode", "apstawet" ) )     // dhcpd settings disabled in 
         // client bridge mode, so we
         // wont display it
@@ -7870 +7870 @@
     }
 
-    websWrite( wp, "<option value=\"%s\" %s >WLAN</option>\n",
-               nvram_safe_get( "wl0_ifname" ), nvram_match( "rflow_if",
+    int cnt = get_wl_instances(  );
+    int c;
+
+    for( c = 0; c < cnt; c++ )
+    {
+    sprintf( var, "wl%d_ifname", c );
+    websWrite( wp, "<option value=\"%s\" %s >WLAN%d</option>\n",
+               nvram_safe_get( var ), nvram_match( "rflow_if",
                                                             nvram_safe_get
-                                                            ( "wl0_ifname" ) )
-               ? "selected=\"selected\"" : "" );
+                                                            ( var ) )
+               ? "selected=\"selected\"" : "", c);
+        }
 
     char *wanif = nvram_safe_get( "wan_ifname" );

src/router/httpd/visuals/ejs.c

@@ -85 +85 @@
 struct onload onloads[] = {
     // { "Filters", filter_onload },
-    {"WL_ActiveTable", wl_active_onload},
+    {"WL_ActiveTable-wl0", wl_active_onload},
+    {"WL_ActiveTable-wl1", wl_active_onload},
     {"MACClone", macclone_onload},
     {"FilterSummary", filtersummary_onload},
@@ -2018 +2019 @@
     if( nvram_match( "wl0_mode", "wet" )
         || nvram_match( "wl0_mode", "apstawet" )
+        || nvram_match( "wl1_mode", "wet" )
+        || nvram_match( "wl1_mode", "apstawet" )
         || nvram_match( "wan_proto", "disabled" ) )
     {

src/router/httpd/visuals/status.c

@@ -209 +209 @@
     if( nvram_match( "wl0_mode", "wet" )
         || nvram_match( "wl0_mode", "apstawet" )
+        || nvram_match( "wl1_mode", "wet" )
+        || nvram_match( "wl1_mode", "apstawet" )
         || !strcmp( wan_proto, "disabled" ) )
     {

src/router/httpd/visuals/wireless.c

@@ -42 +42 @@
 
 #define ASSOCLIST_TMP   "/tmp/.wl_assoclist"
-#define ASSOCLIST_CMD   "wl assoclist"
+#define ASSOCLIST_CMD   "assoclist"
 
 #define LEASES_NAME_IP  "/tmp/.leases_name_ip"
@@ -398 +398 @@
     char line[80];
     int dhcp_table_count;
-
-    if( !strcmp( argv[0], "online" ) )
+    char *type, *ifname;
+    
+    ejArgs( argc, argv, "%s %s", &type, &ifname );
+
+    if( !strcmp( type, "online" ) )
     {
         for( i = 0; i < MAX_LEASES; i++ )
@@ -411 +414 @@
 
         nv_count = 0;           // init mac list
+        
+        char *iface;
+        if( !strcmp( ifname, "wl0" ) )
+                iface = get_wl_instance_name( 0 );
+        else if ( !strcmp( ifname, "wl1" ) )
+                iface = get_wl_instance_name( 1 );
+        else
+                iface = nvram_safe_get( "wl0_ifname" );
+                        
 #ifdef HAVE_MADWIFI
         char *maclist = nvram_safe_get( "ath0_maclist" );
 #else
-        char *maclist = nvram_safe_get( "wl0_maclist" );
+        char var[32];
+        sprintf( var, "%s_maclist", ifname );
+        char *maclist = nvram_safe_get( var );
 #endif
         foreach( word, maclist, next )
@@ -424 +438 @@
             nv_count++;
         }
-        sysprintf( "%s > %s", ASSOCLIST_CMD, ASSOCLIST_TMP );
+        sysprintf( "wl -i %s %s > %s", iface, ASSOCLIST_CMD, ASSOCLIST_TMP );
 
         if( ( fp = fopen( ASSOCLIST_TMP, "r" ) ) )
@@ -462 +476 @@
             fclose( fp );
         }
-        if( !strcmp( argv[0], "online" ) )
+        if( !strcmp( type, "online" ) )
         {
             dhcp_table_count = dhcp_lease_table_init(  );       // init dhcp
@@ -473 +487 @@
     }
 
-    if( !strcmp( argv[0], "offline" ) )
+    if( !strcmp( type, "offline" ) )
     {
         get_hostname_ip( "offline", OLD_NAME_IP );
     }
 
-    if( !strcmp( argv[0], "online" ) )
+    if( !strcmp( type, "online" ) )
     {
         for( i = 0; i < nv_count; i++ )
@@ -493 +507 @@
         }
     }
-    else if( !strcmp( argv[0], "offline" ) )
+    else if( !strcmp( type, "offline" ) )
     {
         for( i = 0; i < nv_count; i++ )
@@ -721 +735 @@
     int count = 0;
 
-    sysprintf( "%s > %s", ASSOCLIST_CMD, ASSOCLIST_TMP );
+    sysprintf( "wl %s > %s", ASSOCLIST_CMD, ASSOCLIST_TMP );
 
     if( ( fp = fopen( ASSOCLIST_TMP, "r" ) ) )