Changeset 10808 for src/router/wiviz2/wiviz.c

Timestamp:

11/07/08 16:02:50 (5 years ago)

Author:

BrainSlayer

Message:

how todo wiviz on ralink

File:

• src/router/wiviz2/wiviz.c (modified) (6 diffs)

src/router/wiviz2/wiviz.c

@@ -66 +66 @@
 void readWL(wiviz_cfg * cfg);
 void reloadConfig();
-
+int stop = 0;
+ 
 wiviz_cfg * global_cfg;
 char *wl_dev;
@@ -72 +73 @@
 int main(int argc, char * * argv) {
   char *dev;                          
-  int stop = 0;
   int oldMonitor, newMonitor;        
   u_char packet[4096];                 
@@ -85 +85 @@
   wl_dev=get_wdev();
 #endif
+if (argc>1)
+if (!strcmp(argv[1],"terminate"))
+    {
+#ifdef HAVE_MADWIFI
+  // return to original channel
+  sysprintf("iwconfig %s channel %sM",get_monitor(),nvram_nget("%s_channel",get_wdev()));
+  sleep(1);
+  sysprintf("ifconfig %s down",get_monitor());
+  sysprintf("wlanconfig %s destroy",get_monitor());
+#elif HAVE_RT2880
+  nvram_set("wl0_mode",nvram_safe_get("wl0_oldmode"));
+  sysprintf("startservice configurewifi");
+#else
+  wl_ioctl(wl_dev, WLC_SET_MONITOR, &oldMonitor, 4);
+#endif    
+    }
+
   global_cfg = &cfg;
   signal(SIGUSR1, &signal_handler);
@@ -116 +133 @@
           nvram_set("wl0_oldmode",nvram_safe_get("wl0_mode"));
           nvram_set("wl0_mode","sta");
+          if (!nvram_match("wl0_oldmode","sta"))
           sysprintf("startservice configurewifi");
           sysprintf("iwconfig ra0 mode monitor");
@@ -165 +183 @@
     if (cfg.hosts[i].staInfo) free(cfg.hosts[i].staInfo);
     }
-#endif
-#ifdef HAVE_MADWIFI
-  // return to original channel
-  sysprintf("iwconfig %s channel %sM",get_monitor(),nvram_nget("%s_channel",get_wdev()));
-  sleep(1);
-  sysprintf("ifconfig %s down",get_monitor());
-  sysprintf("wlanconfig %s destroy",get_monitor());
-#elif HAVE_RT2880
-  nvram_set("wl0_mode",nvram_safe_get("wl0_oldmode"));
-  sysprintf("startservice configurewifi");
-#else
-  wl_ioctl(wl_dev, WLC_SET_MONITOR, &oldMonitor, 4);
 #endif
   close(s);
@@ -373 +379 @@
   if (signum == SIGUSR1) writeJavascript();
   if (signum == SIGUSR2) reloadConfig();
+  if (signum == SIGTERM) stop=1;
   }