Changeset 12436

Timestamp:

07/03/09 18:54:03 (5 months ago)

Author:

BrainSlayer

Message:

cpe only mode

Files:

• src/router/httpd/httpd.c (modified) (1 diff)
• src/router/httpd/visuals/dd-wrt.c (modified) (9 diffs)
• src/router/httpd/visuals/ejs.c (modified) (2 diffs)
• src/router/libutils/utils.c (modified) (1 diff)
• src/router/services/networking/madwifi.c (modified) (1 diff)

src/router/httpd/httpd.c

@@ -966 +966 @@
-                             && nvram_match("http_passwd", DEFAULT_PASS))
-                            || nvram_match("http_username", "")
-About.htm
+register.asp
-                                changepassword = 1;
-                                if (endswith(file, ".asp"))

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

@@ -3869 +3869 @@
-                        // showOption (wp, "wl_basic.wifi_bonding", "wifi_bonding");
-#endif
+#ifdef HAVE_REGISTER
+        int cpeonly = iscpe();
+#else
+        int cpeonly = 0;
+#endif
-                        websWrite(wp,
-                                  "<div class=\"setting\"><div class=\"label\"><script type=\"text/javascript\">Capture(wl_basic.label)</script></div><select name=\"%s\" >\n",
@@ -3874 +3879 @@
-                        websWrite(wp,
-                                  "<script type=\"text/javascript\">\n//<![CDATA[\n");
+                        if (!cpeonly)
+                        {
-                        websWrite(wp,
-                                  "document.write(\"<option value=\\\"ap\\\" %s >\" + wl_basic.ap + \"</option>\");\n",
@@ -3879 +3886 @@
-                                              "ap") ?
-                                  "selected=\\\"selected\\\"" : "");
+                        }
-                        websWrite(wp,
-                                  "document.write(\"<option value=\\\"sta\\\" %s >\" + wl_basic.client + \"</option>\");\n",
@@ -3891 +3899 @@
-                                  "selected=\\\"selected\\\"" : "");
-#endif
+                        if (!cpeonly)
-                        websWrite(wp,
-                                  "document.write(\"<option value=\\\"infra\\\" %s >\" + wl_basic.adhoc + \"</option>\");\n",
@@ -3897 +3906 @@
-                                  "selected=\\\"selected\\\"" : "");
-#ifndef HAVE_MADWIFI
+                        if (!cpeonly)
+                        {
-                        websWrite(wp,
-                                  "document.write(\"<option value=\\\"apsta\\\" %s >\" + wl_basic.repeater + \"</option>\");\n",
@@ -3908 +3919 @@
-                                              "apstawet") ?
-                                  "selected=\\\"selected\\\"" : "");
+                        }
-//#endif
-#else
@@ -3915 +3927 @@
-                                              "wdssta") ?
-                                  "selected=\\\"selected\\\"" : "");
+                        if (!cpeonly)
+                        {
-                        websWrite(wp,
-                                  "document.write(\"<option value=\\\"wdsap\\\" %s >\" + wl_basic.wdsap + \"</option>\");\n",
@@ -3920 +3934 @@
-                                              "wdsap") ?
-                                  "selected=\\\"selected\\\"" : "");
+                        }
-#endif
-                        websWrite(wp, "//]]>\n</script>\n");
@@ -4408 +4423 @@
-        websWrite(wp, "</fieldset>\n");
-        websWrite(wp, "<br />\n");
-
+
+
-}
-

src/router/httpd/visuals/ejs.c

@@ -1432 +1432 @@
-        if (!isregistered_real())
-                registered = 0;
-
+
+
+
+
+
-#ifdef HAVE_MADWIFI
-#ifdef HAVE_NOWIFI
@@ -1657 +1661 @@
-                                    (menu[i][j], "Wireless_Advanced", 17))
-                                        j++;
-
-
+
-                                        j++;
-                                if (!wifi

src/router/libutils/utils.c

@@ -699 +699 @@
-        getBoardMAC(mac);
-        if (!strncmp(mac, "00:19:3B", 8) || !strncmp(mac, "00:02:6F", 8)
-
+ || !strncmp(mac, "00:C0:CA", 8)
-                fprintf(stderr, "unsupported board\n");
-                sys_reboot();

src/router/services/networking/madwifi.c

@@ -966 +966 @@
-        sprintf(wifivifs, "ath%d_vifs", count);
-        sprintf(wl, "ath%d_mode", count);
+#ifdef HAVE_REGISTER
+int cpeonly = iscpe();
+#else
+int cpeonly=0;
+#endif
+        if (cpeonly && nvram_match(wl,"ap"))
+            {
+            nvram_set(wl,"sta");
+            }
-        sprintf(channel, "ath%d_channel", count);
-        sprintf(power, "ath%d_txpwrdbm", count);