Changeset 7413

Timestamp:

07/09/07 19:01:34 (6 years ago)

Author:

BrainSlayer

Message:

some new experiments

Location:

src/router

Files:

• httpd/modules/broadcom.c (modified) (5 diffs)
• kromo/cisco_wrt54g_en/common.js (modified) (2 diffs)
• kromo/cisco_wrt54g_en/common_micro.js (modified) (2 diffs)
• kromo/cisco_wrt54g_en/lang_pack/english.js (modified) (1 diff)
• kromo/cisco_wrt54g_en/lang_pack/german.js (modified) (1 diff)
• rc/services.c (modified) (1 diff)
• services/networking/madwifi.c (modified) (1 diff)
• services/networking/network.c (modified) (2 diffs)
• services/services/vlantagging.c (modified) (4 diffs)
• services/tools/site_survey_broadcom.c (modified) (2 diffs)
• shared/utils.c (modified) (1 diff)
• shared/wl.c (modified) (4 diffs)

src/router/httpd/modules/broadcom.c

@@ -3510 +3510 @@
 
   /** Apply **/
-  if (!strcmp (value, "Apply"))
+  if (!strcmp (value, "Apply") || !strcmp (value, "ApplyTake"))
     {
       struct apply_action *act;
@@ -3527 +3527 @@
                    "submit_button=[%s] service=[%s] sleep_time=[%d] action=[%d]\n",
                    act->name, act->service, act->sleep_time, act->action);
+
           if ((act->action == SYS_RESTART)
               || (act->action == SERVICE_RESTART))
             nvram_set ("action_service", act->service);
+          char *actionstack;
+          int freeit=0;
+          if (nvram_get("action_service")!=NULL)
+          {
+          actionstack = malloc(strlen(nvram_safe_get("action_service")) + strlen(act->service) + 2);
+          sprintf(actionstack,"%s %s",nvram_safe_get("action_service"),act->service);
+          freeit=0;
+          }
           else
-            nvram_set ("action_service", "");
-
+          {
+          actionstack = nvram_get("action_service");
+          }
+          nvram_set("action_service",actionstack);
+          if (freeit)
+            free(actionstack);
           sleep_time = act->sleep_time;
           action = act->action;
@@ -3541 +3554 @@
       else
         {
-          nvram_set ("action_service", "");
+          //nvram_set ("action_service", "");
           sleep_time = 1;
           action = RESTART;
         }
 
-      if (need_commit)
+      if (need_commit && !strcmp (value, "ApplyTake"))
         {
           diag_led (DIAG, STOP_LED);
@@ -3602 +3615 @@
 
 footer:
+
   if (do_reboot)
     action = REBOOT;
@@ -3608 +3622 @@
   if (need_reboot)
     action = REBOOT;
+
+if (!strcmp (value, "ApplyTake"))
+    {
+    action=NOTHING;
+    }
 
   if (action != REBOOT)

src/router/kromo/cisco_wrt54g_en/common.js

@@ -835 +835 @@
 // Gray all form when submitting
 function apply(form, text, delay) {
+    form.submit();
+}
+function applytake(form, text, delay) {
+    form.action.value = "ApplyTake";
     if(!text)
         text=errmsg.err100;
@@ -1085 +1089 @@
         if(sub)
                 document.write("<input class=\"button\" type=\"button\" name=\"save_button\" value=\"" + sbutton.save + "\" onclick=\"to_submit(this.form);\" />");
+        if(sub)
+                document.write("<input class=\"button\" type=\"button\" name=\"apply_button\" value=\"" + sbutton.apply + "\" onclick=\"applytake(this.form);\" />");
         if(res)
                 document.write("<input class=\"button\" type=\"button\" name=\"reset_button\" value=\"" + sbutton.cancel + "\" onclick=\"window.location.reload();\" />");

src/router/kromo/cisco_wrt54g_en/common_micro.js

@@ -818 +818 @@
 function apply(form) {
         form.submit();
+}
+
+function applytake(form) {
+        form.action.value="ApplyTake";
+        form.submit();
         for (i = 0; i < form.elements.length; i++) {
                 if(defined(form.elements[i].disabled)) 
@@ -1005 +1010 @@
         if(sub)
                 document.write("<input class=\"button\" type=\"button\" name=\"save_button\" value=\"" + sbutton.save + "\" onclick=\"to_submit(this.form);\" />");
+        if(sub)
+                document.write("<input class=\"button\" type=\"button\" name=\"apply_button\" value=\"" + sbutton.apply + "\" onclick=\"applytake(this.form);\" />");
         if(res)
                 document.write("<input class=\"button\" type=\"button\" name=\"reset_button\" value=\"" + sbutton.cancel + "\" onclick=\"window.location.reload();\" />");

src/router/kromo/cisco_wrt54g_en/lang_pack/english.js

@@ -164 +164 @@
 
 var sbutton = new Object();
-sbutton.save="Save Settings";
+sbutton.save="Save";
+sbutton.apply="Apply Settings";
 sbutton.saving="Saved";
 sbutton.cmd="Executing";

src/router/kromo/cisco_wrt54g_en/lang_pack/german.js

@@ -137 +137 @@
 share.user="Nutzer";
 
-sbutton.save="Einstellungen speichern";
+sbutton.save="Speichern";
+sbutton.apply="Übernehmen";
 sbutton.saving="Gespeichert";
 sbutton.cmd="Ausführen";

src/router/rc/services.c

@@ -269 +269 @@
     kill (1, SIGHUP);
   fprintf (stderr, "Action %s\n", service);
-
+  sleep(3);
   cprintf ("Restart service=[%s]\n", service);
   start_service ("overclocking");

src/router/services/networking/madwifi.c

@@ -1439 +1439 @@
   int s;
 
-
-
   char *m;
   char *first = NULL;

src/router/services/networking/network.c

@@ -1836 +1836 @@
   br_shutdown ();
 #endif
+  eval("rm","/tmp/.ifcache");
 
 }
@@ -2834 +2835 @@
 #endif
 #endif
+  eval("rm","/tmp/.ifcache");
 
 }

src/router/services/services/vlantagging.c

@@ -23 +23 @@
     sprintf (vlan_name, "%s.%s", tag, port);
     eval ("ifconfig", vlan_name, "0.0.0.0", "up");
+    eval("rm","/tmp/.ifcache");
   }
 }
@@ -41 +42 @@
     sprintf (vlan_name, "%s.%s", tag, port);
     if (ifexists (vlan_name))
+      {
       eval ("vconfig", "rem", vlan_name);
+      eval("rm","/tmp/.ifcache");
+      }
   }
 }
@@ -92 +96 @@
 
     eval ("brctl", "addbr", tag);
+    eval("rm","/tmp/.ifcache");
     if (!strcmp (port, "On"))
       br_set_stp_state (tag, 1);
@@ -205 +210 @@
         eval ("ifconfig", tag, "down");
         eval ("brctl", "delbr", tag);
+        eval("rm","/tmp/.ifcache");
       }
   }

src/router/services/tools/site_survey_broadcom.c

@@ -299 +299 @@
 
   /* can only scan in STA mode */
-//#ifndef HAVE_MSSID
+#ifndef HAVE_MSSID
   wl_ioctl (dev, WLC_GET_AP, &oldap, sizeof (oldap));
   if (oldap > 0)
     eval ("wl", "ap", "0");
-//#endif
+#endif
   if (wl_ioctl (dev, WLC_SCAN, &params, 64) < 0)
     {
@@ -367 +367 @@
 
 endss:
-//#ifndef HAVE_MSSID
+#ifndef HAVE_MSSID
   if (oldap > 0)
     eval ("wl", "ap", "1");
-//#endif
+#endif
 
   C_led (0);

src/router/shared/utils.c

@@ -2715 +2715 @@
 getIfList (char *buffer, char *ifprefix)
 {
-  FILE *in = fopen ("/proc/net/dev", "rb");
+  FILE *in = fopen("/tmp/.ifcache","rb");
+  if (in==NULL)
+    {
+    in = fopen("/proc/net/dev","rb");
+    FILE *tmp = fopen("/tmp/.ifcache","wb");
+    int c=getc(in);
+    while(c!=EOF)
+        {
+        putc(c,tmp);
+        c=getc(in);
+        }
+    fclose(tmp);
+    fclose(in);
+    in=fopen("/tmp/.ifcache","rb");
+    }
   char ifname[32];
 //skip the first 2 lines

src/router/shared/wl.c

@@ -673 +673 @@
   char type[32];
   char netmode[32];
+  unsigned int *count = (unsigned int *) list;
   sprintf (type, "%s_mode",ifname);
   sprintf (netmode, "%s_net_mode",ifname);
@@ -686 +687 @@
       getAssocMAC (ifname,mac);
       memcpy (&list[4], mac, 6);
+      count[0]=1;
       mincount = 1;
     }
@@ -693 +695 @@
       fprintf (stderr, "socket(SOCK_DRAGM)\n");
       free (buf);
-      return -1;
+      mincount = 1;
+      return mincount;
     }
   (void) memset (&iwr, 0, sizeof (iwr));
@@ -715 +718 @@
   cp = buf;
   unsigned char *l = (unsigned char *) list;
-  unsigned int *count = (unsigned int *) list;
   count[0] = 0;
   l += 4;