Changeset 19308

Timestamp:

05/28/12 02:20:53 (12 months ago)

Author:

BrainSlayer

Message:

better handling

Location:

src/router

Files:

• httpd/visuals/dd-wrt.c (modified) (1 diff)
• httpd/visuals/ejs.c (modified) (1 diff)
• httpd/visuals/status.c (modified) (3 diffs)
• libutils/utils.c (modified) (1 diff)
• services/networking/network.c (modified) (1 diff)

src/router/httpd/visuals/dd-wrt.c

@@ -258 +258 @@
 #ifdef HAVE_IPETH
         websWrite(wp,
-                  "<option value=\"iphone\" %s >IPhone/IPad Tethering</option>\n",
+                  "<option value=\"iphone\" %s >IPhone Tethering</option>\n",
                   nvram_selmatch(wp, "wan_proto",
                                  "iphone") ? "selected=\"selected\"" : "");

src/router/httpd/visuals/ejs.c

@@ -2192 +2192 @@
 #ifdef HAVE_3G
                    || !strcmp(wan_proto, "3g")
+#endif
+#ifdef HAVE_IPETH
+                   || !strcmp(wan_proto, "iphone")
 #endif
             ) {

src/router/httpd/visuals/status.c

@@ -122 +122 @@
                    || !strcmp(wan_proto, "3g")
 #endif
+#ifdef HAVE_IPETH
+                   || !strcmp(wan_proto, "iphone")
+#endif
             ) {
                 wan_ipaddr =
@@ -155 +158 @@
 #ifdef HAVE_3G
             || !strcmp(wan_proto, "3g")
+#endif
+#ifdef HAVE_IPETH
+            || !strcmp(wan_proto, "iphone")
 #endif
 #ifdef HAVE_PPPOATM
@@ -264 +270 @@
             || !strcmp(wan_proto, "3g")
 #endif
+#ifdef HAVE_IPETH
+            || !strcmp(wan_proto, "iphone")
+#endif
 #ifdef HAVE_PPPOATM
             || !strcmp(wan_proto, "pppoa")

src/router/libutils/utils.c

@@ -3026 +3026 @@
                         }
                         fclose(fp);
+                        if (nvram_match("wan_ipaddr","0.0.0.0") || nvram_match("wan_ipaddr",""))
+                                wan_link = 0;
 
                 }

src/router/services/networking/network.c

@@ -3864 +3864 @@
                 insmod("ipheth");
                 stop_process("ipheth-loop","IPhone Pairing daemon");
+                stop_process("usbmuxd","IPhone Mux daemon");
+                stop_process("udhcpc","DHCP Client");
                 eval("usbmuxd");
                 eval("ipheth-loop");