Changeset 11641

Timestamp:

02/18/09 11:07:31 (4 years ago)

Author:

BrainSlayer

Message:

fix single delete

File:

• src/router/httpd/validate/webs.c (modified) (20 diffs)

src/router/httpd/validate/webs.c

@@ -44 +44 @@
 {
     char *enable;
+
     enable = websGetVar( wp, "wan_proto", NULL );
     nvram_set( "wan_proto", enable );
@@ -296 +297 @@
     f_name = websGetVar( wp, "f_name", NULL );
     f_status = websGetVar( wp, "f_status", NULL );      // 0=>Disable /
-                                                        // 1,2=>Enable
+    // 1,2=>Enable
     f_status2 = websGetVar( wp, "f_status2", NULL );    // deny=>Deny /
-                                                        // allow=>Allow
+    // allow=>Allow
     if( !f_id || !f_name || !f_status || !f_status2 )
     {
@@ -537 +538 @@
 void delete_static_route( webs_t wp )
 {
-    addAction("routing");
+    addAction( "routing" );
     char *buf = malloc( 1000 );
     char *buf_name = malloc( 1000 );
+
     memset( buf, 0, 1000 );
     memset( buf_name, 0, 1000 );
@@ -1068 +1070 @@
     // use Wol.asp as a debugging console
 #ifdef HAVE_REGISTER
-if (!isregistered_real())
-    return;
+    if( !isregistered_real(  ) )
+        return;
 #endif
     sysprintf( "%s > %s 2>&1 &", wol_cmd, PING_TMP );
@@ -1087 +1089 @@
     setenv( "PATH", "/sbin:/bin:/usr/sbin:/usr/bin", 1 );
 #ifdef HAVE_REGISTER
-if (!isregistered_real())
-    return;
+    if( !isregistered_real(  ) )
+        return;
 #endif
     sysprintf( "alias ping=\'ping -c 3\'; eval \"%s\" > %s 2>&1 &", ip,
@@ -2058 +2060 @@
     for( i = 0; i < bridgescount; i++ )
     {
-        char *ifname, *tag, *prio,*mtu;
+        char *ifname, *tag, *prio, *mtu;
         char var[32];
         char ipaddr[32];
@@ -2087 +2089 @@
         if( strlen( prio ) == 0 )
             mtu = "1500";
-
 
         sprintf( n, "%s_ipaddr", ifname );
@@ -2483 +2484 @@
 {
     char n[80];
+
 #ifdef HAVE_MADWIFI
     char sifs[80];
@@ -2497 +2499 @@
 
         cprintf( "copy value %s which is [%s] to nvram\n", n, wl );
-        if ( wl )
-        {
-        if( !strcmp( prefix, "wl0" ) )
-            nvram_set( "wl_ssid", wl );
-        else
-            nvram_set( "wl1_ssid", wl );
-    }
+        if( wl )
+        {
+            if( !strcmp( prefix, "wl0" ) )
+                nvram_set( "wl_ssid", wl );
+            else
+                nvram_set( "wl1_ssid", wl );
+        }
     }
     copytonv( wp, "%s_distance", prefix );
@@ -2554 +2556 @@
         sprintf( turbo, "%s_rtsvalue", prefix );
         char *tw = websGetVar( wp, turbo, NULL );
+
         if( tw )
         {
@@ -2568 +2571 @@
     copytonv( wp, "%s_xr", prefix );
     copytonv( wp, "%s_outdoor", prefix );
-//    copytonv( wp, "%s_compression", prefix ); // Atheros SuperG header
-                                                // compression
+//    copytonv( wp, "%s_compression", prefix ); // Atheros SuperG header
+    // compression
     copytonv( wp, "%s_ff", prefix );    // ff = 0, Atheros SuperG fast
-                                        // framing disabled, 1 fast framing
-                                        // enabled
+    // framing disabled, 1 fast framing
+    // enabled
     copytonv( wp, "%s_diversity", prefix );
     copytonv( wp, "%s_preamble", prefix );
@@ -2585 +2588 @@
     copytonv( wp, "%s_chanshift", prefix );
     copytonv( wp, "%s_doth", prefix );
-    copytonv( wp, "%s_maxassoc", prefix);
+    copytonv( wp, "%s_maxassoc", prefix );
 
     sprintf( chanbw, "%s_channelbw", prefix );
@@ -2617 +2620 @@
         ifname = prefix;
 #else
-    ifname = getRADev(prefix);
+    ifname = getRADev( prefix );
 #endif
     copytonv( wp, "%s_multicast", ifname );
@@ -2654 +2657 @@
     copytonv( wp, "%s_ap_isolate", prefix );
     sprintf( n, "%s_mode", prefix );
-    if (nvram_match(n,"sta"))
-        {
+    if( nvram_match( n, "sta" ) )
+    {
         char *wl = websGetVar( wp, n, NULL );
-        if (wl)
-        if (!strcmp(wl,"ap") || !strcmp(wl,"wdsap") || !strcmp(wl,"infra") || !strcmp(wl,"wdssta"))
+
+        if( wl )
+            if( !strcmp( wl, "ap" ) || !strcmp( wl, "wdsap" )
+                || !strcmp( wl, "infra" ) || !strcmp( wl, "wdssta" ) )
             {
-            nvram_set("wan_proto","disabled");
+                nvram_set( "wan_proto", "disabled" );
             }
-        }
+    }
     copytonv( wp, n );
     if( !strcmp( prefix, "wl0" ) || !strcmp( prefix, "wl1" ) )
@@ -2680 +2685 @@
     }
     int chanchanged = 0;
+
 #ifdef HAVE_RT2880
     copytonv( wp, "%s_greenfield", prefix );
@@ -2701 +2707 @@
     }
 #ifdef HAVE_MADWIFI
-    if( cbwchanged || chanchanged)
+    if( cbwchanged || chanchanged )
     {
         if( nvram_match( chanbw, "40" ) )
@@ -2737 +2743 @@
         if( wl && !strcmp( prefix, "wl0" ) )
             nvram_set( "wl_channel", wl );
-        else if (wl)
+        else if( wl )
             nvram_set( "wl1_channel", wl );
     }
@@ -2750 +2756 @@
         if( wl && !strcmp( prefix, "wl0" ) )
             nvram_set( "wl_wchannel", wl );
-        else if (wl)
+        else if( wl )
             nvram_set( "wl1_wchannel", wl );
 
@@ -2833 +2839 @@
 void ttraff_erase( webs_t wp )
 {
-        char line[2048];
-        char *name = NULL;
-        system2( "nvram show | grep traff- > /tmp/.ttraff" );   
-        FILE *fp = fopen( "/tmp/.ttraff", "r" );
-        if( fp == NULL )
-        {
-          return;
-        }
-        while( fgets( line, sizeof( line ), fp ) != NULL )
-        {
-                if (startswith (line, "traff-"))
+    char line[2048];
+    char *name = NULL;
+
+    system2( "nvram show | grep traff- > /tmp/.ttraff" );
+    FILE *fp = fopen( "/tmp/.ttraff", "r" );
+
+    if( fp == NULL )
+    {
+        return;
+    }
+    while( fgets( line, sizeof( line ), fp ) != NULL )
+    {
+        if( startswith( line, "traff-" ) )
+        {
+            name = strtok( line, "=" );
+            if( strlen( name ) == 13 )  //only unset ttraf-XX-XXXX
             {
-                 name = strtok (line, "=");
-                 if (strlen (name) == 13)  //only unset ttraf-XX-XXXX
-                 {
-                   nvram_unset (name);
-             } 
+                nvram_unset( name );
             }
         }
-        nvram_commit ( );
-        unlink( "/tmp/.ttraff" );
+    }
+    nvram_commit(  );
+    unlink( "/tmp/.ttraff" );
 }
 
@@ -3668 +3676 @@
         else
         {
+            int which = atoi( nvram_default_get( "forward_cur", "0" ) );
+            int i = atoi( v );
+            char val[32];
+
+            sprintf( val, "forward_port%d", i );
+            int a;
+
+            nvram_unset( val );
+            for( a = i + 1; a < which; a++ )
+            {
+                nvram_nset( nvram_nget( "forward_port%d", a ),
+                            "forward_port%d", a - 1 );
+            }
+            which--;
+            sprintf( val, "forward_port%d", which );
+            nvram_unset( val );
+            if( which < 0 )
+                which = 0;
+            sprintf( val, "%d", which );
+            nvram_set( "forward_cur", val );
+
             sprintf( s, "forward_port%s", v );
             nvram_unset( s );