Changeset 10208

Timestamp:

08/25/08 23:00:36 (5 years ago)

Author:

BrainSlayer

Message:

line by line review of these changes could be usefull

Location:

src/router

Files:

• httpd/modules/callvalidate.c (modified) (3 diffs)
• httpd/modules/nvramsr.c (modified) (1 diff)
• httpd/validate/webs.c (modified) (1 diff)
• rc/init.c (modified) (1 diff)
• rc/run_wiviz.c (modified) (1 diff)
• rc/wland.c (modified) (7 diffs)
• rc/wol.c (modified) (1 diff)
• services/networking/firewall.c (modified) (1 diff)
• services/networking/network.c (modified) (4 diffs)
• services/networking/wshaper.c (modified) (16 diffs)
• services/services/bridgetools.c (modified) (12 diffs)
• services/services/milkfish.c (modified) (3 diffs)
• services/services/mmc.c (modified) (2 diffs)
• services/services/pppoeserver.c (modified) (2 diffs)
• services/services/pptp.c (modified) (4 diffs)
• services/services/routing.c (modified) (1 diff)
• services/services/services.c (modified) (11 diffs)
• services/services/telnet.c (modified) (1 diff)
• services/sysinit/switchlib/admtek.c (modified) (1 diff)
• services/sysinit/switchlib/icplus.c (modified) (1 diff)

src/router/httpd/modules/callvalidate.c

@@ -61 +61 @@
 // #include <shutils.h>
 
+#ifdef HAVE_ADM5120
+#define SERVICE_MODULE "/lib/validate.so"
+#define VISSERVICE_MODULE "/lib/visuals.so"
+#else
 #define SERVICE_MODULE "/usr/lib/validate.so"
 #define VISSERVICE_MODULE "/usr/lib/visuals.so"
-
+#endif
 // #define SERVICE_MODULE "/tmp/validate.so"
 // #define VISSERVICE_MODULE "/tmp/visuals.so"
@@ -105 +109 @@
         char dl[64];
 
-        sprintf( dl, "/usr/lib/%s_visual.so", name );
+        sprintf( dl, "/lib/%s_visual.so", name );
         cprintf( "try to load %s\n", dl );
         handle = dlopen( dl, RTLD_LAZY );
@@ -129 +133 @@
         char dl[64];
 
-        sprintf( dl, "/usr/lib/%s_validate.so", name );
+        sprintf( dl, "/lib/%s_validate.so", name );
         cprintf( "try to load %s\n", dl );
         handle = dlopen( dl, RTLD_LAZY );

src/router/httpd/modules/nvramsr.c

@@ -21 +21 @@
 #define MIN_BUF_SIZE    4096
 
-#define SERVICE_MODULE "/usr/lib/services.so"
+#define SERVICE_MODULE "/lib/services.so"
 #define cprintf(fmt, args...)
 

src/router/httpd/validate/webs.c

@@ -1036 +1036 @@
 
     char wol_cmd[256] = { 0 };
-    snprintf( wol_cmd, sizeof( wol_cmd ), "/usr/sbin/wol -v -i %s -p %s %s",
+    snprintf( wol_cmd, sizeof( wol_cmd ), "wol -v -i %s -p %s %s",
               manual_wol_network, manual_wol_port, manual_wol_mac );
     nvram_set( "wol_cmd", wol_cmd );

src/router/rc/init.c

@@ -784 +784 @@
                     // fix for client mode
                     cprintf( "ifconfig wl up\n" );
-                    eval( "/sbin/ifconfig", get_wdev(  ), "up" );
+                    eval( "ifconfig", get_wdev(  ), "up" );
                 }
 

src/router/rc/run_wiviz.c

@@ -35 +35 @@
                          nvram_safe_get( "hopdwell" ), hopseq );
                 fclose( fp );
-                eval( "/usr/sbin/wiviz", ">/dev/null", "</dev/null", "2>&1",
+                eval( "wiviz", ">/dev/null", "</dev/null", "2>&1",
                       "&" );
             }

src/router/rc/wland.c

@@ -64 +64 @@
         WLAND_INTERVAL;
 
-    system2( "/usr/sbin/wl assoclist 2>&1 > /tmp/.assoclist" );
+    system2( "wl assoclist 2>&1 > /tmp/.assoclist" );
     stat( "/tmp/.assoclist", &s );
     unlink( "/tmp/.assoclist" );
@@ -75 +75 @@
         time( &last );
         cprintf( "resetting ap radio\n" );
-        eval( "/usr/sbin/wlconf", get_wdev(  ), "down" );
+        eval( "wlconf", get_wdev(  ), "down" );
 
         val = atoi( nvram_safe_get( "wl0_channel" ) ) + 1;
@@ -84 +84 @@
         wl_ioctl( get_wdev(  ), WLC_UP, NULL, 0 );
 
-        eval( "/usr/sbin/wlconf", get_wdev(  ), "down" );
+        eval( "wlconf", get_wdev(  ), "down" );
         eval( "startservice", "wlconf" );
         // wlconf_up (get_wdev ());
@@ -443 +443 @@
     int len;
 
-    system2( "/usr/sbin/wl assoc 2>&1 > /tmp/.xassocx" );
+    system2( "wl assoc 2>&1 > /tmp/.xassocx" );
     if( ( fp = fopen( "/tmp/.xassocx", "r" ) ) == NULL )
         return;
@@ -531 +531 @@
                 if( count < 1 )
                 {
-                    eval( "/sbin/ifconfig", wdsdev, "down" );
+                    eval( "ifconfig", wdsdev, "down" );
                     sleep( 1 );
-                    eval( "/sbin/ifconfig", wdsdev, "up" );
+                    eval( "ifconfig", wdsdev, "up" );
                     eval( "startservice", "set_routes" );
                 }
@@ -574 +574 @@
                             foreach( var, vifs, next )
                             {
-                                eval( "/sbin/ifconfig", var, "down" );
+                                eval( "ifconfig", var, "down" );
                             }
                         }
 
                         notstarted[i] = 0;
-                        eval( "/sbin/ifconfig", dev, "down" );
+                        eval( "ifconfig", dev, "down" );
                         sleep( 1 );
-                        eval( "/sbin/ifconfig", dev, "up" );
+                        eval( "ifconfig", dev, "up" );
                         eval( "startservice", "set_routes" );
                         lastchans[i] = -1;
@@ -601 +601 @@
                             foreach( var, vifs, next )
                             {
-                                eval( "/sbin/ifconfig", var, "up" );
+                                eval( "ifconfig", var, "up" );
                                 eval( "startservice", "set_routes" );
                             }

src/router/rc/wol.c

@@ -52 +52 @@
 
         ret =
-            eval( "/usr/sbin/wol", passwd_param, passwd, hostname_param,
+            eval( "wol", passwd_param, passwd, hostname_param,
                   hostname, macs );
 

src/router/services/networking/firewall.c

@@ -3183 +3183 @@
     foreach( var, wordlist, next )
     {
-        sysprintf( "/usr/sbin/iptables -D INPUT -s %s -j ACCEPT", var );
+        sysprintf( "iptables -D INPUT -s %s -j ACCEPT", var );
     }
 #endif

src/router/services/networking/network.c

@@ -2268 +2268 @@
      */
     if( strcmp( nvram_safe_get( "lan_gateway" ), "0.0.0.0" ) )
-        eval( "/usr/sbin/ip", "ro", "add", "default", "via",
+        eval( "ip", "ro", "add", "default", "via",
               nvram_safe_get( "lan_gateway" ), "dev", "br0" );
 
@@ -2287 +2287 @@
 #ifndef HAVE_MADWIFI
 #ifndef HAVE_MSSID
-    eval( "/usr/sbin/wl", "radio",
+    eval( "wl", "radio",
           nvram_invmatch( "wl_net_mode", "disabled" ) ? "on" : "off" );
 #else
-    eval( "/usr/sbin/wl", "radio",
+    eval( "wl", "radio",
           nvram_invmatch( "wl0_net_mode", "disabled" ) ? "on" : "off" );
 #endif
@@ -2744 +2744 @@
         fp = fopen( "/tmp/ppp/options.pppoe", "w" );
         // rp-pppoe kernelmode plugin
+#ifdef HAVE_ADM5120
+        fprintf( fp, "plugin /lib/rp-pppoe.so" );
+#else
         fprintf( fp, "plugin /usr/lib/rp-pppoe.so" );
-
+#endif
         if( nvram_invmatch( "pppoe_service", "" ) )
             fprintf( fp, " rp_pppoe_service %s",
@@ -2924 +2927 @@
 #endif
         // system("export LINUX_PLUGIN=/usr/lib/rp-pppoe.so"); 
-        eval( "/usr/sbin/pppd", "file", "/tmp/ppp/options.pppoe" );
+        eval( "pppd", "file", "/tmp/ppp/options.pppoe" );
 
         // This is horrible.

src/router/services/networking/wshaper.c

@@ -298 +298 @@
     char *dev = get_wshaper_dev(  );
 
-    system2( "/usr/sbin/iptables -t mangle -F SVQOS_OUT" );
-    system2( "/usr/sbin/iptables -t mangle -X SVQOS_OUT" );
-    system2( "/usr/sbin/iptables -t mangle -N SVQOS_OUT" );
-
-    system2( "/usr/sbin/iptables -t mangle -F SVQOS_IN" );
-    system2( "/usr/sbin/iptables -t mangle -X SVQOS_IN" );
-    system2( "/usr/sbin/iptables -t mangle -N SVQOS_IN" );
-
-    sysprintf( "/usr/sbin/iptables -t mangle -D PREROUTING -i %s -j SVQOS_IN",
+    system2( "iptables -t mangle -F SVQOS_OUT" );
+    system2( "iptables -t mangle -X SVQOS_OUT" );
+    system2( "iptables -t mangle -N SVQOS_OUT" );
+
+    system2( "iptables -t mangle -F SVQOS_IN" );
+    system2( "iptables -t mangle -X SVQOS_IN" );
+    system2( "iptables -t mangle -N SVQOS_IN" );
+
+    sysprintf( "iptables -t mangle -D PREROUTING -i %s -j SVQOS_IN",
                dev );
 
-    sysprintf( "/usr/sbin/iptables -t mangle -I PREROUTING -i %s -j SVQOS_IN",
+    sysprintf( "iptables -t mangle -I PREROUTING -i %s -j SVQOS_IN",
                dev );
 
@@ -318 +318 @@
     {
         sysprintf
-            ( "/usr/sbin/iptables -t mangle -D PREROUTING -i %s -j IMQ --todev 0",
+            ( "iptables -t mangle -D PREROUTING -i %s -j IMQ --todev 0",
               "br0" );
         sysprintf
-            ( "/usr/sbin/iptables -t mangle -I PREROUTING -i %s -j IMQ --todev 0",
+            ( "iptables -t mangle -I PREROUTING -i %s -j IMQ --todev 0",
               "br0" );
         sysprintf
-            ( "/usr/sbin/iptables -t mangle -D FORWARD -i %s -j IMQ --todev 0",
+            ( "iptables -t mangle -D FORWARD -i %s -j IMQ --todev 0",
               dev );
         sysprintf
-            ( "/usr/sbin/iptables -t mangle -I FORWARD -i %s -j IMQ --todev 0",
+            ( "iptables -t mangle -I FORWARD -i %s -j IMQ --todev 0",
               dev );
         char iflist[256];
@@ -340 +340 @@
             {
                 sysprintf
-                    ( "/usr/sbin/iptables -t mangle -D FORWARD -i %s -j IMQ --todev 0",
+                    ( "iptables -t mangle -D FORWARD -i %s -j IMQ --todev 0",
                       word );
                 sysprintf
-                    ( "/usr/sbin/iptables -t mangle -I FORWARD -i %s -j IMQ --todev 0",
+                    ( "iptables -t mangle -I FORWARD -i %s -j IMQ --todev 0",
                       word );
             }
@@ -351 +351 @@
     {
         sysprintf
-            ( "/usr/sbin/iptables -t mangle -D PREROUTING -i %s -j IMQ --todev 0",
+            ( "iptables -t mangle -D PREROUTING -i %s -j IMQ --todev 0",
               "br0" );
         sysprintf
-            ( "/usr/sbin/iptables -t mangle -I PREROUTING -i %s -j IMQ --todev 0",
+            ( "iptables -t mangle -I PREROUTING -i %s -j IMQ --todev 0",
               "br0" );
     }
     sysprintf
-        ( "/usr/sbin/iptables -t mangle -D POSTROUTING -o %s -j SVQOS_OUT",
+        ( "iptables -t mangle -D POSTROUTING -o %s -j SVQOS_OUT",
           dev );
     sysprintf
-        ( "/usr/sbin/iptables -t mangle -I POSTROUTING -o %s -j SVQOS_OUT",
+        ( "iptables -t mangle -I POSTROUTING -o %s -j SVQOS_OUT",
           dev );
     insmod( "ipt_mark" );
@@ -368 +368 @@
     insmod( "xt_CONNMARK" );
     system2
-        ( "/usr/sbin/iptables -t mangle -A SVQOS_OUT -j CONNMARK --restore-mark" );
+        ( "iptables -t mangle -A SVQOS_OUT -j CONNMARK --restore-mark" );
     system2
-        ( "/usr/sbin/iptables -t mangle -A SVQOS_OUT -m mark ! --mark 0 -j RETURN" );
+        ( "iptables -t mangle -A SVQOS_OUT -m mark ! --mark 0 -j RETURN" );
     system2
-        ( "/usr/sbin/iptables -t mangle -A SVQOS_IN -j CONNMARK --restore-mark" );
+        ( "iptables -t mangle -A SVQOS_IN -j CONNMARK --restore-mark" );
     system2
-        ( "/usr/sbin/iptables -t mangle -A SVQOS_IN -m mark ! --mark 0 -j RETURN" );
+        ( "iptables -t mangle -A SVQOS_IN -m mark ! --mark 0 -j RETURN" );
     // if OSPF is active put it into the Express bucket for outgoing QoS
     if( nvram_match( "wk_mode", "ospf" ) )
         system2
-            ( "/usr/sbin/iptables -t mangle -A SVQOS_OUT -p ospf -m mark --mark 0 -j MARK --set-mark 20" );
+            ( "iptables -t mangle -A SVQOS_OUT -p ospf -m mark --mark 0 -j MARK --set-mark 20" );
     // non-TCP and TCP ACK packets are all 1:10 for ingress policing
-    // system("/usr/sbin/iptables -t mangle -A SVQOS_IN -p ! tcp -m mark
+    // system("iptables -t mangle -A SVQOS_IN -p ! tcp -m mark
     // --mark 0 -j MARK --set-mark 10 2>&1 > /dev/null");
-    // system("/usr/sbin/iptables -t mangle -A SVQOS_IN -m length --length
+    // system("iptables -t mangle -A SVQOS_IN -m length --length
     // :64 -m mark --mark 0 -j CLASSIFY --set-class 1:10 2>&1 > /dev/null");
-    // system("/usr/sbin/iptables -t mangle -A POSTROUTING -m length --length 
+    // system("iptables -t mangle -A POSTROUTING -m length --length 
     // 0:64 -m mark --mark 0 -j CLASSIFY --set-class 1:10 2>&1 > /dev/null");
     /*
@@ -426 +426 @@
             insmod( "xt_mac" );
             sysprintf
-                ( "/usr/sbin/iptables -t mangle -D PREROUTING -m mac --mac-source %s -j MARK --set-mark %s",
-                  data, level );
-            sysprintf
-                ( "/usr/sbin/iptables -t mangle -A PREROUTING -m mac --mac-source %s -j MARK --set-mark %s",
-                  data, level );
-            sysprintf
-                ( "/usr/sbin/iptables -t mangle -D PREROUTING -j CONNMARK --save-mark" );
-            sysprintf
-                ( "/usr/sbin/iptables -t mangle -A PREROUTING -j CONNMARK --save-mark" );
+                ( "iptables -t mangle -D PREROUTING -m mac --mac-source %s -j MARK --set-mark %s",
+                  data, level );
+            sysprintf
+                ( "iptables -t mangle -A PREROUTING -m mac --mac-source %s -j MARK --set-mark %s",
+                  data, level );
+            sysprintf
+                ( "iptables -t mangle -D PREROUTING -j CONNMARK --save-mark" );
+            sysprintf
+                ( "iptables -t mangle -A PREROUTING -j CONNMARK --save-mark" );
         }
         else
@@ -440 +440 @@
 #ifndef HAVE_EBTABLES
             sysprintf
-                ( "/usr/sbin/iptables -t nat -D PREROUTING -s %s -j mark --set-mark %s",
-                  data, level );
-            sysprintf
-                ( "/usr/sbin/iptables -t nat -A PREROUTING -s %s -j mark --set-mark %s",
-                  data, level );
-            sysprintf
-                ( "/usr/sbin/iptables -t nat -D POSTROUTING -d %s -j mark --set-mark %s",
-                  data, level );
-            sysprintf
-                ( "/usr/sbin/iptables -t nat -A POSTROUTING -d %s -j mark --set-mark %s",
+                ( "iptables -t nat -D PREROUTING -s %s -j mark --set-mark %s",
+                  data, level );
+            sysprintf
+                ( "iptables -t nat -A PREROUTING -s %s -j mark --set-mark %s",
+                  data, level );
+            sysprintf
+                ( "iptables -t nat -D POSTROUTING -d %s -j mark --set-mark %s",
+                  data, level );
+            sysprintf
+                ( "iptables -t nat -A POSTROUTING -d %s -j mark --set-mark %s",
                   data, level );
 #else
 
             sysprintf
-                ( "/usr/sbin/ebtables -t nat -D PREROUTING -s %s -j mark --set-mark %s",
-                  data, level );
-            sysprintf
-                ( "/usr/sbin/ebtables -t nat -A PREROUTING -s %s -j mark --set-mark %s",
-                  data, level );
-            sysprintf
-                ( "/usr/sbin/ebtables -t nat -D POSTROUTING -d %s -j mark --set-mark %s",
-                  data, level );
-            sysprintf
-                ( "/usr/sbin/ebtables -t nat -A POSTROUTING -d %s -j mark --set-mark %s",
+                ( "ebtables -t nat -D PREROUTING -s %s -j mark --set-mark %s",
+                  data, level );
+            sysprintf
+                ( "ebtables -t nat -A PREROUTING -s %s -j mark --set-mark %s",
+                  data, level );
+            sysprintf
+                ( "ebtables -t nat -D POSTROUTING -d %s -j mark --set-mark %s",
+                  data, level );
+            sysprintf
+                ( "ebtables -t nat -A POSTROUTING -d %s -j mark --set-mark %s",
                   data, level );
 #endif
@@ -481 +481 @@
             break;
         sysprintf
-            ( "/usr/sbin/iptables -t mangle -A SVQOS_OUT -s %s -m mark --mark 0 -j MARK --set-mark %s",
+            ( "iptables -t mangle -A SVQOS_OUT -s %s -m mark --mark 0 -j MARK --set-mark %s",
               data, level );
         sysprintf
-            ( "/usr/sbin/iptables -t mangle -A SVQOS_OUT -d %s -m mark --mark 0 -j MARK --set-mark %s",
+            ( "iptables -t mangle -A SVQOS_OUT -d %s -m mark --mark 0 -j MARK --set-mark %s",
               data, level );
         sysprintf
-            ( "/usr/sbin/iptables -t mangle -A SVQOS_IN -s %s -m mark --mark 0 -j MARK --set-mark %s",
+            ( "iptables -t mangle -A SVQOS_IN -s %s -m mark --mark 0 -j MARK --set-mark %s",
               data, level );
         sysprintf
-            ( "/usr/sbin/iptables -t mangle -A SVQOS_IN -d %s -m mark --mark 0 -j MARK --set-mark %s",
+            ( "iptables -t mangle -A SVQOS_IN -d %s -m mark --mark 0 -j MARK --set-mark %s",
               data, level );
     }
@@ -510 +510 @@
         {
             sysprintf
-                ( "/usr/sbin/iptables -t mangle -A SVQOS_OUT -p udp -m udp --dport %s -m mark --mark 0 -j MARK --set-mark %s",
-                  data, level );
-            sysprintf
-                ( "/usr/sbin/iptables -t mangle -A SVQOS_OUT -p udp -m udp --sport %s -m mark --mark 0 -j MARK --set-mark %s",
+                ( "iptables -t mangle -A SVQOS_OUT -p udp -m udp --dport %s -m mark --mark 0 -j MARK --set-mark %s",
+                  data, level );
+            sysprintf
+                ( "iptables -t mangle -A SVQOS_OUT -p udp -m udp --sport %s -m mark --mark 0 -j MARK --set-mark %s",
                   data, level );
         }
@@ -521 +521 @@
         {
             sysprintf
-                ( "/usr/sbin/iptables -t mangle -A SVQOS_OUT -p tcp -m tcp --dport %s -m mark --mark 0 -j MARK --set-mark %s",
-                  data, level );
-            sysprintf
-                ( "/usr/sbin/iptables -t mangle -A SVQOS_OUT -p tcp -m tcp --sport %s -m mark --mark 0 -j MARK --set-mark %s",
-                  data, level );
-            sysprintf
-                ( "/usr/sbin/iptables -t mangle -A SVQOS_IN -p tcp -m tcp --dport %s -m mark --mark 0 -j MARK --set-mark %s",
-                  data, level );
-            sysprintf
-                ( "/usr/sbin/iptables -t mangle -A SVQOS_IN -p tcp -m tcp --sport %s -m mark --mark 0 -j MARK --set-mark %s",
+                ( "iptables -t mangle -A SVQOS_OUT -p tcp -m tcp --dport %s -m mark --mark 0 -j MARK --set-mark %s",
+                  data, level );
+            sysprintf
+                ( "iptables -t mangle -A SVQOS_OUT -p tcp -m tcp --sport %s -m mark --mark 0 -j MARK --set-mark %s",
+                  data, level );
+            sysprintf
+                ( "iptables -t mangle -A SVQOS_IN -p tcp -m tcp --dport %s -m mark --mark 0 -j MARK --set-mark %s",
+                  data, level );
+            sysprintf
+                ( "iptables -t mangle -A SVQOS_IN -p tcp -m tcp --sport %s -m mark --mark 0 -j MARK --set-mark %s",
                   data, level );
         }
@@ -538 +538 @@
             insmod( "ipt_layer7" );
             sysprintf
-                ( "/usr/sbin/iptables -t mangle -A SVQOS_OUT -m layer7 --l7proto %s -m mark --mark 0 -j MARK --set-mark %s",
+                ( "iptables -t mangle -A SVQOS_OUT -m layer7 --l7proto %s -m mark --mark 0 -j MARK --set-mark %s",
                   name, level );
             sysprintf
-                ( "/usr/sbin/iptables -t mangle -A SVQOS_IN -m layer7 --l7proto %s -m mark --mark 0 -j MARK --set-mark %s",
+                ( "iptables -t mangle -A SVQOS_IN -m layer7 --l7proto %s -m mark --mark 0 -j MARK --set-mark %s",
                   name, level );
         }
@@ -577 +577 @@
             insmod( "ipt_ipp2p" );
             sysprintf
-                ( "/usr/sbin/iptables -t mangle -A SVQOS_OUT -p tcp -m mark --mark 0 -m ipp2p --%s -j MARK --set-mark %s",
+                ( "iptables -t mangle -A SVQOS_OUT -p tcp -m mark --mark 0 -m ipp2p --%s -j MARK --set-mark %s",
                   proto, level );
             sysprintf
-                ( "/usr/sbin/iptables -t mangle -A SVQOS_IN -p tcp -m mark --mark 0 -m ipp2p --%s -j MARK --set-mark %s",
+                ( "iptables -t mangle -A SVQOS_IN -p tcp -m mark --mark 0 -m ipp2p --%s -j MARK --set-mark %s",
                   proto, level );
         }
@@ -589 +589 @@
     svqos_set_ports(  );
     system2
-        ( "/usr/sbin/iptables -t mangle -A SVQOS_OUT -j CONNMARK --save-mark" );
-    system2( "/usr/sbin/iptables -t mangle -A SVQOS_OUT -j RETURN" );
+        ( "iptables -t mangle -A SVQOS_OUT -j CONNMARK --save-mark" );
+    system2( "iptables -t mangle -A SVQOS_OUT -j RETURN" );
     system2
-        ( "/usr/sbin/iptables -t mangle -A SVQOS_IN -j CONNMARK --save-mark" );
-    system2( "/usr/sbin/iptables -t mangle -A SVQOS_IN -j RETURN" );
+        ( "iptables -t mangle -A SVQOS_IN -j CONNMARK --save-mark" );
+    system2( "iptables -t mangle -A SVQOS_IN -j RETURN" );
     return 0;
 }
@@ -637 +637 @@
 #ifdef HAVE_WSHAPER
     ret =
-        eval( "/usr/sbin/wshaper", dl_val, ul_val, dev_val, ulcalc1_val,
+        eval( "wshaper", dl_val, ul_val, dev_val, ulcalc1_val,
               ulcalc2_val, nopriohostsrc_val, nopriohostdst_val,
               noprioportsrc_val, noprioportdst_val );
@@ -644 +644 @@
     if( nvram_match( "qos_type", "0" ) )
         ret =
-            eval( "/usr/sbin/svqos", dl_val, ul_val, dev_val, mtu_val, "0" );
+            eval( "svqos", dl_val, ul_val, dev_val, mtu_val, "0" );
     else
         ret =
-            eval( "/usr/sbin/svqos2", ul_val, dl_val, dev_val, mtu_val, "0" );
+            eval( "svqos2", ul_val, dl_val, dev_val, mtu_val, "0" );
 #ifdef HAVE_AQOS
     aqos_tables(  );
@@ -662 +662 @@
     nvram_set( "qos_done", "0" );
 #ifdef HAVE_WSHAPER
-    char script_name[] = "/usr/sbin/wshaper";
+    char script_name[] = "wshaper";
 #elif defined(HAVE_SVQOS)
     char *script_name;
 
     if( nvram_match( "qos_type", "0" ) )
-        script_name = "/usr/sbin/svqos";
+        script_name = "svqos";
     else
-        script_name = "/usr/sbin/svqos2";
+        script_name = "svqos2";
 #endif
     ret = eval( script_name, "stop", "XX", "br0" );

src/router/services/services/bridgetools.c

@@ -77 +77 @@
     {
         // syslog (LOG_INFO, "stp is set to on\n");
-        return eval( "/sbin/rstpctl", "rstp", br, "on" );
+        return eval( "rstpctl", "rstp", br, "on" );
     }
     else
     {
         // syslog (LOG_INFO, "stp is set to off\n");
-        return eval( "/sbin/rstpctl", "rstp", br, "off" );
+        return eval( "rstpctl", "rstp", br, "off" );
     }
 }
@@ -89 +89 @@
     if( !ifexists( br ) )
         return -1;
-    return eval( "/sbin/rstpctl", "setportprio", br, port, prio );
+    return eval( "rstpctl", "setportprio", br, port, prio );
 }
 
@@ -96 +96 @@
     if( !ifexists( br ) )
         return -1;
-    return eval( "/sbin/rstpctl", "setbridgeprio", br, prio );
+    return eval( "rstpctl", "setbridgeprio", br, prio );
 }
 
@@ -104 +104 @@
 
     sprintf( delay, "%d", sec );
-    return eval( "/sbin/rstpctl", "setfdelay", br, delay );
+    return eval( "rstpctl", "setfdelay", br, delay );
 
 }
@@ -113 +113 @@
 
     sprintf( delay, "%d", sec );
-    return eval( "/usr/sbin/brctl", "setfd", br, delay );
+    return eval( "brctl", "setfd", br, delay );
 }
 
@@ -123 +123 @@
     {
         // syslog (LOG_INFO, "stp is set to on\n");
-        return eval( "/usr/sbin/brctl", "stp", br, "1" );
+        return eval( "brctl", "stp", br, "1" );
     }
     else
     {
         // syslog (LOG_INFO, "stp is set to off\n");
-        return eval( "/usr/sbin/brctl", "stp", br, "0" );
+        return eval( "brctl", "stp", br, "0" );
     }
 }
@@ -135 +135 @@
     if( !ifexists( br ) )
         return -1;
-    return eval( "/usr/sbin/brctl", "setportprio", br, port, prio );
+    return eval( "brctl", "setportprio", br, port, prio );
 }
 
@@ -142 +142 @@
     if( !ifexists( br ) )
         return -1;
-    return eval( "/usr/sbin/brctl", "setbridgeprio", br, prio );
+    return eval( "brctl", "setbridgeprio", br, prio );
 }
 
@@ -149 +149 @@
 {
     dd_syslog( LOG_INFO, "bridge added successfully\n" );
-    return eval( "/usr/sbin/brctl", "addbr", brname );
+    return eval( "brctl", "addbr", brname );
 }
 
@@ -157 +157 @@
         return -1;
     dd_syslog( LOG_INFO, "bridge deleted successfully\n" );
-    return eval( "/usr/sbin/brctl", "delbr", brname );
+    return eval( "brctl", "delbr", brname );
 }
 
@@ -165 +165 @@
         return -1;
     dd_syslog( LOG_INFO, "interface added successfully\n" );
-    return eval( "/usr/sbin/brctl", "addif", br, dev );
+    return eval( "brctl", "addif", br, dev );
 }
 
@@ -173 +173 @@
         return -1;
     dd_syslog( LOG_INFO, "interface deleted successfully\n" );
-    return eval( "/usr/sbin/brctl", "delif", br, dev );
+    return eval( "brctl", "delif", br, dev );
 }
 

src/router/services/services/milkfish.c

@@ -40 +40 @@
         killall( "openser", SIGTERM );
         // Stop the milkfish services
-        eval( "/usr/sbin/milkfish_services", "stop" );
+        eval( "milkfish_services", "stop" );
     }
 }
@@ -77 +77 @@
     }
     // Start the milkfish services
-    eval( "/usr/sbin/milkfish_services", "start" );
+    eval( "milkfish_services", "start" );
     // dbtext module setup
     eval( "mkdir", "-p", "/var/openser/dbtext/" );
@@ -88 +88 @@
 
     // restore dbtext parts which may have been saved into nvram
-    eval( "/usr/sbin/milkfish_services", "sipdb", "restorenvdd" );
+    eval( "milkfish_services", "sipdb", "restorenvdd" );
 
     // firewall configuration in networking/firewall.c

src/router/services/services/mmc.c

@@ -45 +45 @@
             {
                 // device not formated
-                eval( "/sbin/mke2fs", "-F", "-b", "1024", "/dev/mmc" );
+                eval( "mke2fs", "-F", "-b", "1024", "/dev/mmc" );
                 mount( "/dev/mmc", "/mmc", "ext2", MS_MGC_VAL, NULL );
             }
@@ -119 +119 @@
             {
                 // device not formated
-                eval( "/sbin/mke2fs", "-F", "-b", "1024",
+                eval( "mke2fs", "-F", "-b", "1024",
                       "/dev/mmc/disc0/part1" );
                 mount( "/dev/mmc/disc0/part1", "/mmc", "ext2", MS_MGC_VAL,

src/router/services/services/pppoeserver.c

@@ -72 +72 @@
     FILE *fp = fopen( "/tmp/pppoeserver/ip-up", "w" );
 
-    fprintf( fp, "#!/bin/sh\n" "/sbin/startservice set_routes\n"        // reinitialize 
+    fprintf( fp, "#!/bin/sh\n" "startservice set_routes\n"      // reinitialize 
                                                                         // routing, 
                                                                         // just 
@@ -82 +82 @@
                                                                         // route 
                                                                         // exists
-             "/usr/sbin/iptables -I FORWARD -i $1 -p tcp --tcp-flags SYN,RST SYN -m tcpmss --mss %d: -j TCPMSS --set-mss %d\n"
-             "/usr/sbin/iptables -I INPUT -i $1 -j ACCEPT\n"
-             "/usr/sbin/iptables -I FORWARD -i $1 -j ACCEPT\n", mss + 1,
+             "iptables -I FORWARD -i $1 -p tcp --tcp-flags SYN,RST SYN -m tcpmss --mss %d: -j TCPMSS --set-mss %d\n"
+             "iptables -I INPUT -i $1 -j ACCEPT\n"
+             "iptables -I FORWARD -i $1 -j ACCEPT\n", mss + 1,
              mss );
     fclose( fp );
     fp = fopen( "/tmp/pppoeserver/ip-down", "w" );
     fprintf( fp, "#!/bin/sh\n"
-             "/usr/sbin/iptables -D FORWARD -i $1 -p tcp --tcp-flags SYN,RST SYN -m tcpmss --mss %d: -j TCPMSS --set-mss %d\n"
-             "/usr/sbin/iptables -D INPUT -i $1 -j ACCEPT\n"
-             "/usr/sbin/iptables -D FORWARD -i $1 -j ACCEPT\n", mss + 1,
+             "iptables -D FORWARD -i $1 -p tcp --tcp-flags SYN,RST SYN -m tcpmss --mss %d: -j TCPMSS --set-mss %d\n"
+             "iptables -D INPUT -i $1 -j ACCEPT\n"
+             "iptables -D FORWARD -i $1 -j ACCEPT\n", mss + 1,
              mss );
     fclose( fp );

src/router/services/services/pptp.c

@@ -173 +173 @@
 
     fp = fopen( "/tmp/pptpd/ip-up", "w" );
-    fprintf( fp, "#!/bin/sh\n" "/sbin/startservice set_routes\n"        // reinitialize 
+    fprintf( fp, "#!/bin/sh\n" "startservice set_routes\n"      // reinitialize 
                                                                         // routing, 
                                                                         // just 
@@ -183 +183 @@
                                                                         // route 
                                                                         // exists
-             "/usr/sbin/iptables -I FORWARD -i $1 -p tcp --tcp-flags SYN,RST SYN -m tcpmss --mss %d: -j TCPMSS --set-mss %d\n"
-             "/usr/sbin/iptables -I INPUT -i $1 -j ACCEPT\n"
-             "/usr/sbin/iptables -I FORWARD -i $1 -j ACCEPT\n"
+             "iptables -I FORWARD -i $1 -p tcp --tcp-flags SYN,RST SYN -m tcpmss --mss %d: -j TCPMSS --set-mss %d\n"
+             "iptables -I INPUT -i $1 -j ACCEPT\n"
+             "iptables -I FORWARD -i $1 -j ACCEPT\n"
              "%s\n", mss + 1, mss,
              nvram_get( "pptpd_ipup_script" ) ?
@@ -192 +192 @@
     fp = fopen( "/tmp/pptpd/ip-down", "w" );
     fprintf( fp, "#!/bin/sh\n"
-             "/usr/sbin/iptables -D FORWARD -i $1 -p tcp --tcp-flags SYN,RST SYN -m tcpmss --mss %d: -j TCPMSS --set-mss %d\n"
-             "/usr/sbin/iptables -D INPUT -i $1 -j ACCEPT\n"
-             "/usr/sbin/iptables -D FORWARD -i $1 -j ACCEPT\n"
+             "iptables -D FORWARD -i $1 -p tcp --tcp-flags SYN,RST SYN -m tcpmss --mss %d: -j TCPMSS --set-mss %d\n"
+             "iptables -D INPUT -i $1 -j ACCEPT\n"
+             "iptables -D FORWARD -i $1 -j ACCEPT\n"
              "%s\n", mss + 1, mss,
              nvram_get( "pptpd_ipdown_script" ) ?
@@ -215 +215 @@
     // Execute pptpd daemon
     ret =
-        eval( "/usr/sbin/pptpd", "-c", "/tmp/pptpd/pptpd.conf", "-o",
+        eval( "pptpd", "-c", "/tmp/pptpd/pptpd.conf", "-o",
               "/tmp/pptpd/options.pptpd" );
 

src/router/services/services/routing.c

@@ -204 +204 @@
 
     if( nvram_match( "dyn_default", "1" ) )
-        while( !eval( "/usr/sbin/ip", "route", "del", "default" ) )
+        while( !eval( "ip", "route", "del", "default" ) )
             ;
 
-    ret1 = eval( "/usr/sbin/zebra", "-d", "-f", "/tmp/zebra.conf" );
-    ret2 = eval( "/usr/sbin/ospfd", "-d", "-f", "/tmp/ospfd.conf" );
+    ret1 = eval( "zebra", "-d", "-f", "/tmp/zebra.conf" );
+    ret2 = eval( "ospfd", "-d", "-f", "/tmp/ospfd.conf" );
 
     return ret1 + ret2;

src/router/services/services/services.c

@@ -125 +125 @@
           || nvram_match( "ipsec_pass", "1" ) ) )
     {
-        eval( "/sbin/insmod", "nf_conntrack_proto_gre" );
+        insmod( "nf_conntrack_proto_gre" );
         dd_syslog( LOG_INFO,
                 "vpn modules : nf_conntrack_proto_gre successfully loaded\n" );
-        eval( "/sbin/insmod", "nf_nat_proto_gre" );
+        insmod( "nf_nat_proto_gre" );
         dd_syslog( LOG_INFO,
                 "vpn modules : nf_nat_proto_gre successfully loaded\n" );
@@ -134 +134 @@
     if( nvram_match( "pptp_pass", "1" ) )
     {
-        eval( "/sbin/insmod", "nf_conntrack_pptp" );
+        insmod( "nf_conntrack_pptp" );
         dd_syslog( LOG_INFO,
                 "vpn modules : nf_conntrack_pptp successfully loaded\n" );
-        eval( "/sbin/insmod", "nf_nat_pptp" );
+        insmod( "nf_nat_pptp" );
         dd_syslog( LOG_INFO, "vpn modules : nf_nat_pptp successfully loaded\n" );
     }
@@ -145 +145 @@
           || nvram_match( "ipsec_pass", "1" ) ) )
     {
-        eval( "/sbin/insmod", "ip_conntrack_proto_gre" );
+        insmod( "ip_conntrack_proto_gre" );
         dd_syslog( LOG_INFO,
                 "vpn modules : ip_conntrack_proto_gre successfully loaded\n" );
-        eval( "/sbin/insmod", "ip_nat_proto_gre" );
+        insmod( "ip_nat_proto_gre" );
         dd_syslog( LOG_INFO,
                 "vpn modules : ip_nat_proto_gre successfully loaded\n" );
@@ -154 +154 @@
     if( nvram_match( "pptp_pass", "1" ) )
     {
-        eval( "/sbin/insmod", "ip_conntrack_pptp" );
+        insmod( "ip_conntrack_pptp" );
         dd_syslog( LOG_INFO,
                 "vpn modules : ip_conntrack_pptp successfully loaded\n" );
-        eval( "/sbin/insmod", "ip_nat_pptp" );
+        insmod( "ip_nat_pptp" );
         dd_syslog( LOG_INFO, "vpn modules : ip_nat_pptp successfully loaded\n" );
     }
@@ -166 +166 @@
 {
 #if defined(HAVE_XSCALE) || defined(HAVE_FONERA) || defined(HAVE_WHRAG108) || defined(HAVE_X86) || defined(HAVE_LS2) || defined(HAVE_CA8) || defined(HAVE_TW6600)  || defined(HAVE_LS5)
-    eval( "/sbin/rmmod", "nf_nat_pptp" );
-    eval( "/sbin/rmmod", "nf_conntrack_pptp" );
-    eval( "/sbin/rmmod", "nf_nat_proto_gre" );
-    eval( "/sbin/rmmod", "nf_conntrack_proto_gre" );
+    rmmod( "nf_nat_pptp" );
+    rmmod( "nf_conntrack_pptp" );
+    rmmod( "nf_nat_proto_gre" );
+    rmmod( "nf_conntrack_proto_gre" );
     dd_syslog( LOG_INFO, "vpn modules : vpn modules successfully unloaded\n" );
 #else
-    eval( "/sbin/rmmod", "ip_nat_pptp" );
-    eval( "/sbin/rmmod", "ip_nat_proto_gre" );
-    eval( "/sbin/rmmod", "ip_conntrack_pptp" );
-    eval( "/sbin/rmmod", "ip_conntrack_proto_gre" );
+    rmmod( "ip_nat_pptp" );
+    rmmod( "ip_nat_proto_gre" );
+    rmmod( "ip_conntrack_pptp" );
+    rmmod( "ip_conntrack_proto_gre" );
     dd_syslog( LOG_INFO, "vpn modules : vpn modules successfully unloaded\n" );
 
@@ -335 +335 @@
 
         fp = fopen( "/tmp/cron.d/pppoe_reconnect", "w" );
-        fprintf( fp, "%s %s * * * root /usr/bin/killall pppd\n",
+        fprintf( fp, "%s %s * * * root /bin/killall pppd\n",
                  nvram_safe_get( "reconnect_minutes" ),
                  nvram_safe_get( "reconnect_hours" ) );
@@ -421 +421 @@
     if( strlen( nvram_safe_get( "syslogd_rem_ip" ) ) > 0 )
         ret1 =
-            eval( "/sbin/syslogd", "-R", nvram_safe_get( "syslogd_rem_ip" ) );
+            eval( "syslogd", "-R", nvram_safe_get( "syslogd_rem_ip" ) );
     else
-        ret1 = eval( "/sbin/syslogd", "-L" );
+        ret1 = eval( "syslogd", "-L" );
 
     dd_syslog( LOG_INFO, "syslogd : syslog daemon successfully started\n" );
-    ret2 = eval( "/sbin/klogd" );
+    ret2 = eval( "klogd" );
     dd_syslog( LOG_INFO, "klogd : klog daemon successfully started\n" );
 
@@ -518 +518 @@
     system2( "sync" );
 
-    ret = eval( "/sbin/radvd" );
+    ret = eval( "radvd" );
     dd_syslog( LOG_INFO, "radvd : RADV daemon successfully started\n" );
 
@@ -1357 +1357 @@
     }
     else
-        sysprintf( "/usr/sbin/l2tp-control \"start-session %s\"",
+        sysprintf( "l2tp-control \"start-session %s\"",
                    nvram_safe_get( "l2tp_server_ip" ) );
 
@@ -1406 +1406 @@
     int ret;
     pid_t pid;
-    char *wland_argv[] = { "/sbin/wland",
+    char *wland_argv[] = { "wland",
         NULL
     };
@@ -1554 +1554 @@
     {
 
-        sysprintf( "/usr/sbin/l2tp-control \"start-session %s\"",
+        sysprintf( "l2tp-control \"start-session %s\"",
                    nvram_safe_get( "l2tp_server_ip" ) );
         return ret;

src/router/services/services/telnet.c

@@ -33 +33 @@
     pid_t pid;
 
-    char *telnetd_argv[] = { "/usr/sbin/telnetd", NULL };
+    char *telnetd_argv[] = { "telnetd", NULL };
 #ifdef HAVE_REGISTER
     char *telnetd_argv_reg[] =
-        { "/usr/sbin/telnetd", "-l", "/sbin/regshell", NULL };
+        { "telnetd", "-l", "/sbin/regshell", NULL };
 #endif
     stop_telnetd(  );

src/router/services/sysinit/switchlib/admtek.c

@@ -605 +605 @@
 
     config_vlan(  );
-    eval( "/sbin/vconfig", "set_name_type", "VLAN_PLUS_VID_NO_PAD" );
-    eval( "/sbin/vconfig", "add", "eth0", "1" );
-    eval( "/sbin/vconfig", "add", "eth0", "2" );
+    eval( "vconfig", "set_name_type", "VLAN_PLUS_VID_NO_PAD" );
+    eval( "vconfig", "add", "eth0", "1" );
+    eval( "vconfig", "add", "eth0", "2" );
     struct ifreq ifr;
     int s;

src/router/services/sysinit/switchlib/icplus.c

@@ -564 +564 @@
     setPhy( IP_GLOBAL_PHY30_ADDR, IP_GLOBAL_PHY30_9_REG, phyReg );
 
-    eval( "/sbin/vconfig", "set_name_type", "VLAN_PLUS_VID_NO_PAD" );
-    eval( "/sbin/vconfig", "add", "eth0", "0" );
-    eval( "/sbin/vconfig", "add", "eth0", "2" );
+    eval( "vconfig", "set_name_type", "VLAN_PLUS_VID_NO_PAD" );
+    eval( "vconfig", "add", "eth0", "0" );
+    eval( "vconfig", "add", "eth0", "2" );
     struct ifreq ifr;
     int s;