Changeset 10094

Timestamp:

08/05/08 16:02:16 (5 years ago)

Author:

BrainSlayer

Message:

fix some other bad persistence vars

Location:

src/router/httpd

Files:

• httpd.c (modified) (1 diff)
• httpd.h (modified) (1 diff)
• modules/broadcom.c (modified) (4 diffs)
• modules/callvalidate.c (modified) (3 diffs)
• visuals/ejs.c (modified) (4 diffs)
• visuals/status.c (modified) (2 diffs)

src/router/httpd/httpd.c

@@ -105 +105 @@
 
 #define DEFAULT_HTTP_PORT 80
-#ifdef HAVE_HTTPS
-int do_ssl;
-#endif
 int server_port;
 char pid_file[80];
 char *server_dir = NULL;
-
+#ifdef HAVE_HTTPS
+int do_ssl=0;
+#endif
 #ifdef SAMBA_SUPPORT
 extern int smb_getlock;

src/router/httpd/httpd.h

@@ -133 +133 @@
   int Pdo_ssl;
 #endif
-  int Pgozila_action;
-  int Pbrowser_method;
 };
 

src/router/httpd/modules/broadcom.c

@@ -53 +53 @@
 
 
-int gozila_action = 0;
 int debug_value = 0;
-int browser_method = 0;
 
 //static char * rfctime(const time_t *timep);
@@ -942 +940 @@
   struct gozila_action *act;
 
-  gozila_action = 1;
+  nvram_set("gozila_action","1");
   my_next_page[0] = '\0';
   submit_button = websGetVar (wp, "submit_button", NULL);       /* every html must have the name */
@@ -1017 +1015 @@
   websDone (wp, 200);
 
-  gozila_action = 0;            //reset gozila_action
+  nvram_set("gozila_action","0");
   nvram_set("generate_key","0");
   nvram_set("clone_wan_mac","0");
@@ -1158 +1156 @@
       ("lan_ipaddr", "lan_netmask",
        nvram_safe_get ("http_client_ip")) == TRUE)
-    browser_method = USE_LAN;
+    nvram_set("browser_method","USE_LAN");
   else
-    browser_method = USE_WAN;
+    nvram_set("browser_method","USE_WAN");
 
   /**********   get all webs var **********/

src/router/httpd/modules/callvalidate.c

@@ -88 +88 @@
 char *GOZILA_GET(webs_t wp,char *name)
 {
-return gozila_action ? websGetVar(wp, name, NULL) : nvram_safe_get(name);
+return nvram_match("gozila_action","1") ? websGetVar(wp, name, NULL) : nvram_safe_get(name);
 }
 
@@ -142 +142 @@
 //extern struct wl_client_mac *wl_client_macs;
 
-extern int gozila_action;
-extern int browser_method;
 extern char *live_translate (char *tran);
 
@@ -178 +176 @@
   env->Pwfflush = wfflush;
   env->PwebsRomPageIndex = websRomPageIndex;
-  env->Pgozila_action = gozila_action;
-  env->Pbrowser_method = browser_method;
   env->Plive_translate = live_translate;
   env->PGOZILA_GET = GOZILA_GET;

src/router/httpd/visuals/ejs.c

@@ -48 +48 @@
 int do_ssl;
 #endif
-int gozila_action;
-int browser_method;
 
 void
@@ -83 +81 @@
   cprintf ("set websrompageindex\n");
   websRomPageIndex = env->PwebsRomPageIndex;
-  cprintf ("set gozila_action\n");
-  gozila_action = env->Pgozila_action;
-  cprintf ("set browser_method\n");
-  browser_method = env->Pbrowser_method;
   cprintf ("set live_translate\n");
   live_translate = env->Plive_translate;
@@ -277 +271 @@
 #endif
   name = argv[0];
-  if (gozila_action)
+  if (nvram_match("gozila_action","1"))
     {
       char *buf = websGetVar (wp, name, NULL);
@@ -984 +978 @@
     strcpy (http, "http");
 
-  if (browser_method == USE_LAN)
+  if (nvram_match("browser_method","USE_LAN"))
     {                           // Use LAN to browser
       if (nvram_match ("restore_defaults", "1")

src/router/httpd/visuals/status.c

@@ -259 +259 @@
           /* press [ Connect | Disconnect ] button */
           /* set retry count */
-          if (gozila_action)
+          if (nvram_match("gozila_action","1"))
             retry_count = STATUS_RETRY_COUNT;   // retry 3 times
 
@@ -279 +279 @@
         {
           if (retry_count == 0
-              || (!submit_type && !wan_link && gozila_action))
+              || (!submit_type && !wan_link && nvram_match("gozila_action","1")))
             {                   //After refresh 2 times, if the status is disconnect, show Alert message.
               websWrite (wp, "ShowAlert(\"TIMEOUT\");");