Changeset 9114

Timestamp:

02/25/08 19:36:07 (5 years ago)

Author:

BrainSlayer

Message:

vdsl support for broadcom vlan switch supported routers too

Location:

src/router

Files:

• kromo/dd-wrt/index_pppoe.asp (modified) (2 diffs)
• services/networking/network.c (modified) (7 diffs)
• services/sysinit/sysinit-broadcom.c (modified) (5 diffs)
• services/sysinit/sysinit-ca8.c (modified) (1 diff)
• services/sysinit/sysinit-dir300.c (modified) (1 diff)
• services/sysinit/sysinit-fonera.c (modified) (1 diff)
• services/sysinit/sysinit-gateworx.c (modified) (1 diff)
• services/sysinit/sysinit-ls5.c (modified) (1 diff)
• services/sysinit/sysinit-magicbox.c (modified) (1 diff)
• services/sysinit/sysinit-mr3202a.c (modified) (1 diff)
• services/sysinit/sysinit-newmedia-dual.c (modified) (1 diff)
• services/sysinit/sysinit-pb42.c (modified) (1 diff)
• services/sysinit/sysinit-rb532.c (modified) (1 diff)
• services/sysinit/sysinit-supergerry.c (modified) (1 diff)
• services/sysinit/sysinit-whrag108.c (modified) (1 diff)
• services/sysinit/sysinit-wrt300nv2.c (modified) (1 diff)
• services/sysinit/sysinit-x86.c (modified) (1 diff)

src/router/kromo/dd-wrt/index_pppoe.asp

@@ -17 +17 @@
         <input class="spaceradio" type="radio" name="ppp_compression" value="0" <% nvram_checked("ppp_compression","0"); %> /><% tran("share.disable"); %> 
 </div>
-<% startswith("wan_ifname","vlan","<!--"); %>
 <div class="setting">
         <div class="label"><% tran("share.vdsl"); %></div>
@@ -23 +22 @@
         <input class="spaceradio" type="radio" name="wan_vdsl" value="0" <% nvram_checked("wan_vdsl","0"); %> /><% tran("share.disable"); %> 
 </div>
-<% startswith("wan_ifname","vlan","-->"); %>
 <div class="setting">
         <div class="label"><% tran("service.pptpd_encry"); %></div>

src/router/services/networking/network.c

@@ -1262 +1262 @@
     cprintf ("Write wireless mac successfully\n");
   eval ("wl", "-i", wl_face, "up");
-  start_config_macs(wl_face);
+  start_config_macs (wl_face);
 #ifdef HAVE_MSSID
   set_vifsmac (mac);
@@ -1388 +1388 @@
 #ifndef HAVE_MADWIFI
                     eval ("wl", "-i", name, "up");
-                    start_config_macs(name);
+                    start_config_macs (name);
 #endif
                   }
@@ -1405 +1405 @@
                 else
                   cprintf ("Write wireless mac successfully\n");
-                  start_config_macs(wl_face);
+                start_config_macs (wl_face);
               }
 #endif
@@ -1579 +1579 @@
       else
         cprintf ("Write wireless mac successfully\n");
-        start_config_macs(wl_face);
+      start_config_macs (wl_face);
     }
 
@@ -2136 +2136 @@
   int s;
   struct ifreq ifr;
-eval("ifconfig",nvram_safe_get("wan_ifname"),"allmulti","promisc");
+  eval ("ifconfig", nvram_safe_get ("wan_ifname"), "allmulti", "promisc");
 
 #ifdef HAVE_PPPOE
@@ -2316 +2316 @@
 #ifndef HAVE_MADWIFI
       if (wlifname && !strcmp (wan_ifname, wlifname))
-        {
-        eval ("wl", "-i", wan_ifname, "up");
-        start_config_macs(wan_ifname);
+        {
+          eval ("wl", "-i", wan_ifname, "up");
+          start_config_macs (wan_ifname);
         }
 #endif
@@ -2429 +2429 @@
       fprintf (fp, "\n");
       char vlannic[32];
-      sprintf (vlannic, "%s.0007", pppoe_wan_ifname);
-      if (nvram_match ("wan_vdsl", "1"))        // Deutsche Telekom VDSL2 Vlan 7 Tag
-        {
-          if (!ifexists (vlannic))
+      if (!strncmp (pppoe_wan_ifname, "vlan", 4))
+        {
+          sprintf (vlannic, "eth0.0007", pppoe_wan_ifname);
+          if (nvram_match ("wan_vdsl", "1"))
             {
-              eval ("vconfig", "set_name_type", "DEV_PLUS_VID");
-              eval ("vconfig", "add", pppoe_wan_ifname, "7");
-              eval ("ifconfig", vlannic, "up");
+              enable_dtag_vlan (1);
+              if (!ifexists (vlannic))
+                {
+                  eval ("vconfig", "set_name_type", "DEV_PLUS_VID");
+                  eval ("vconfig", "add", "eth0", "7");
+                  eval ("ifconfig", vlannic, "up");
+                }
+              fprintf (fp, "nic-%s\n", vlannic);
             }
-          fprintf (fp, "nic-%s\n", vlannic);
+          else
+            {
+              enable_dtag_vlan (0);
+              if (ifexists (vlannic))
+                eval ("vconfig", "rem", vlannic);
+              fprintf (fp, "nic-%s\n", pppoe_wan_ifname);
+            }
+
+
         }
       else
         {
-          if (ifexists (vlannic))
-            eval ("vconfig", "rem", vlannic);
-          fprintf (fp, "nic-%s\n", pppoe_wan_ifname);
+          sprintf (vlannic, "%s.0007", pppoe_wan_ifname);
+          if (nvram_match ("wan_vdsl", "1"))    // Deutsche Telekom VDSL2 Vlan 7 Tag
+            {
+              if (!ifexists (vlannic))
+                {
+                  eval ("vconfig", "set_name_type", "DEV_PLUS_VID");
+                  eval ("vconfig", "add", pppoe_wan_ifname, "7");
+                  eval ("ifconfig", vlannic, "up");
+                }
+              fprintf (fp, "nic-%s\n", vlannic);
+            }
+          else
+            {
+              if (ifexists (vlannic))
+                eval ("vconfig", "rem", vlannic);
+              fprintf (fp, "nic-%s\n", pppoe_wan_ifname);
+            }
         }
 

src/router/services/sysinit/sysinit-broadcom.c

@@ -136 +136 @@
     case ROUTER_LINKSYS_WRH54G:
       nvram_set ("wl0gpio0", "135");
-      break; 
+      break;
     case ROUTER_BUFFALO_WZRRSG54:
       nvram_unset ("wl0_abenable");
@@ -143 +143 @@
       nvram_set ("wl0gpio1", "0");
       nvram_set ("wl0gpio2", "0");
-      break;          
+      break;
     case ROUTER_ASUS_WL500W:
     case ROUTER_WRT54G:
@@ -419 +419 @@
       nvram_set ("wan_ifname", "eth1");
       nvram_set ("wl0_ifname", "eth2");
-      eval ("gpio", "init", "0"); //AOSS button
-      eval ("gpio", "init", "4"); //reset button
+      eval ("gpio", "init", "0");       //AOSS button
+      eval ("gpio", "init", "4");       //reset button
       break;
 
@@ -702 +702 @@
             {
             case ROUTER_WRT300NV11:
-            case ROUTER_WRT310N:    
+            case ROUTER_WRT310N:
             case ROUTER_WRT350N:
             case ROUTER_WRT600N:
@@ -1154 +1154 @@
 #endif
 }
+
+
+void
+enable_dtag_vlan (int enable)
+{
+  char *vlan1ports = NULL;
+  char *vlan2ports = NULL;
+  char *vlan7ports = NULL;
+  switch (getRouterBrand ())
+    {
+    case ROUTER_MOTOROLA:
+    case ROUTER_ASUS_WL520G:
+    case ROUTER_WRT54G_V8:
+      vlan1ports = "4 5";
+      vlan7ports = "4t 5";
+      break;
+    case ROUTER_LINKSYS_WTR54GS:
+      vlan1ports = "1 5";
+      vlan7ports = "1t 5";
+      break;
+    case ROUTER_ASUS_WL550GE:
+    case ROUTER_LINKSYS_WRH54G:
+      vlan1ports = "0 5";
+      vlan7ports = "0t 5";
+      break;
+    case ROUTER_WRT600N:
+      vlan2ports = "0 8";
+      vlan7ports = "0t 8";
+      break;
+    case ROUTER_WRT350N:
+    case ROUTER_BUFFALO_WZRG144NH:
+      vlan1ports = "4 8";
+      vlan7ports = "4t 8";
+      break;
+    default:
+      vlan1ports = "0 5";
+      vlan7ports = "0t 5";
+      break;
+    }
+  system2 ("echo 1 > /proc/switch/eth0/reset");
+  system2 ("echo 1 > /proc/switch/eth1/reset");
+  char tmp[200];
+  if (enable)
+    {
+      sprintf (tmp, "echo %s > /proc/switch/eth0/vlan/7/ports", vlan7ports);
+      system2 (tmp);
+      sprintf (tmp, "echo %s > /proc/switch/eth1/vlan/7/ports", vlan7ports);
+      system2 (tmp);
+      if (vlan1ports)
+        {
+          sprintf (tmp, "echo %s > /proc/switch/eth0/vlan/1/ports",
+                   vlan1ports);
+          system2 (tmp);
+          sprintf (tmp, "echo %s > /proc/switch/eth1/vlan/1/ports",
+                   vlan1ports);
+          system2 (tmp);
+        }
+      if (vlan2ports)
+        {
+          sprintf (tmp, "echo %s > /proc/switch/eth0/vlan/2/ports",
+                   vlan2ports);
+          system2 (tmp);
+          sprintf (tmp, "echo %s > /proc/switch/eth1/vlan/2/ports",
+                   vlan2ports);
+          system2 (tmp);
+        }
+      sprintf (tmp, "echo %s > /proc/switch/eth0/vlan/0/ports",
+               nvram_safe_get ("vlan0ports"));
+      system2 (tmp);
+      sprintf (tmp, "echo %s > /proc/switch/eth1/vlan/0/ports",
+               nvram_safe_get ("vlan0ports"));
+      system2 (tmp);
+    }
+  else
+    {
+      int i;
+      for (i = 0; i < 16; i++)
+        {
+          char vlanb[16];
+          sprintf (vlanb, "vlan%dports", i);
+          if (nvram_get (vlanb) == NULL || nvram_match (vlanb, ""))
+            continue;
+          sprintf (tmp, "echo %s > /proc/switch/eth0/vlan/%d/ports",
+                   nvram_safe_get (vlanb), i);
+          system2 (tmp);
+          sprintf (tmp, "echo %s > /proc/switch/eth1/vlan/%d/ports",
+                   nvram_safe_get (vlanb), i);
+          system2 (tmp);
+        }
+    }
+
+}

src/router/services/sysinit/sysinit-ca8.c

@@ -142 +142 @@
 {
 }
+
+void enable_dtag_vlan(int enable)
+{
+
+}

src/router/services/sysinit/sysinit-dir300.c

@@ -166 +166 @@
 {
 }
+void enable_dtag_vlan(int enable)
+{
+
+}

src/router/services/sysinit/sysinit-fonera.c

@@ -147 +147 @@
 {
 }
+void enable_dtag_vlan(int enable)
+{
+
+}

src/router/services/sysinit/sysinit-gateworx.c

@@ -357 +357 @@
 {
 }
+void enable_dtag_vlan(int enable)
+{
+
+}

src/router/services/sysinit/sysinit-ls5.c

@@ -143 +143 @@
 {
 }
+void enable_dtag_vlan(int enable)
+{
+
+}

src/router/services/sysinit/sysinit-magicbox.c

@@ -176 +176 @@
 {
 }
+void enable_dtag_vlan(int enable)
+{
+
+}

src/router/services/sysinit/sysinit-mr3202a.c

@@ -139 +139 @@
 {
 }
+void enable_dtag_vlan(int enable)
+{
+
+}

src/router/services/sysinit/sysinit-newmedia-dual.c

@@ -160 +160 @@
 {
 }
+void enable_dtag_vlan(int enable)
+{
+
+}

src/router/services/sysinit/sysinit-pb42.c

@@ -137 +137 @@
 {
 }
+void enable_dtag_vlan(int enable)
+{
+
+}

src/router/services/sysinit/sysinit-rb532.c

@@ -173 +173 @@
 {
 }
+void enable_dtag_vlan(int enable)
+{
+
+}

src/router/services/sysinit/sysinit-supergerry.c

@@ -150 +150 @@
 {
 }
+void enable_dtag_vlan(int enable)
+{
+
+}

src/router/services/sysinit/sysinit-whrag108.c

@@ -244 +244 @@
 {
 }
+void enable_dtag_vlan(int enable)
+{
+
+}

src/router/services/sysinit/sysinit-wrt300nv2.c

@@ -223 +223 @@
 {
 }
+void enable_dtag_vlan(int enable)
+{
+
+}

src/router/services/sysinit/sysinit-x86.c

@@ -401 +401 @@
 {
 }
+void enable_dtag_vlan(int enable)
+{
+
+}