Changeset 10033

Timestamp:

07/29/08 16:30:15 (5 years ago)

Author:

BrainSlayer

Message:

danube port

Location:

src/router

Files:

• kromo/dd-wrt/Makefile (modified) (1 diff)
• services/Makefile (modified) (2 diffs)
• services/networking/firewall.c (modified) (3 diffs)
• services/networking/interface.c (modified) (2 diffs)
• services/networking/network.c (modified) (6 diffs)
• services/networking/wshaper.c (modified) (5 diffs)

src/router/kromo/dd-wrt/Makefile

@@ -223 +223 @@
         cp -f sputnik/logo.png $(INSTALLDIR)/www/style
 endif
+
+ifeq ($(CONFIG_TELCOM),y)
+        cp -f telcom/logo.png $(INSTALLDIR)/www/style
+endif
+
 ifeq ($(CONFIG_GLAUCO),y)
         cp -f glauco/logo.png $(INSTALLDIR)/www/style

src/router/services/Makefile

@@ -351 +351 @@
 CFLAGS += -DHAVE_LSX
 endif
+ifeq ($(CONFIG_DANUBE),y)
+CFLAGS += -DHAVE_DANUBE
+endif
 ifeq ($(CONFIG_TW6600),y)
 CFLAGS += -DHAVE_TW6600
@@ -400 +403 @@
 CFLAGS += -DHAVE_IPROUTE2
 endif
+ifeq ($(CONFIG_TELCOM),y)
+CFLAGS += -DHAVE_TELCOM
+endif
+
 ifeq ($(CONFIG_GGEW),y)
 CFLAGS += -DHAVE_GGEW

src/router/services/networking/firewall.c

@@ -770 +770 @@
 #ifndef HAVE_PB42
 #ifndef HAVE_LSX
+#ifndef HAVE_DANUBE
 #ifndef HAVE_WHRAG108
 #ifndef HAVE_XSCALE
@@ -777 +778 @@
 #ifndef HAVE_TW6600
           system2 ("echo 1 > /proc/sys/net/ipv4/conf/br0/loop");
+#endif
 #endif
 #endif
@@ -2864 +2866 @@
   else
     perror ("/proc/sys/net/ipv4/netfilter/ip_conntrack_udp_timeout");
+#elif HAVE_DANUBE
+  if ((fp =
+       fopen ("/proc/sys/net/ipv4/netfilter/ip_conntrack_udp_timeout", "r+")))
+    {
+      fprintf (fp, "%d", 65);
+      fclose (fp);
+    }
+  else
+    perror ("/proc/sys/net/ipv4/netfilter/ip_conntrack_udp_timeout");
 #elif HAVE_PB42
   if ((fp =

src/router/services/networking/interface.c

@@ -248 +248 @@
 start_setup_vlans (void)
 {
-#if defined(HAVE_RB500) || defined(HAVE_XSCALE) || defined(HAVE_MAGICBOX) || defined(HAVE_FONERA) || defined(HAVE_WHRAG108) || defined(HAVE_LS2) || defined(HAVE_CA8) || defined(HAVE_TW6600) || defined(HAVE_PB42) || defined(HAVE_LS5) || defined(HAVE_LSX)
+#if defined(HAVE_RB500) || defined(HAVE_XSCALE) || defined(HAVE_MAGICBOX) || defined(HAVE_FONERA) || defined(HAVE_WHRAG108) || defined(HAVE_LS2) || defined(HAVE_CA8) || defined(HAVE_TW6600) || defined(HAVE_PB42) || defined(HAVE_LS5) || defined(HAVE_LSX) || defined(HAVE_DANUBE)
   return 0;
 #else
@@ -512 +512 @@
   snprintf (all_ifnames, 255, "%s %s %s", "eth0",
             nvram_safe_get ("lan_ifnames"), nvram_safe_get ("wan_ifnames"));
+#elif HAVE_DANUBE
+  snprintf (all_ifnames, 255, "%s %s %s", "eth0",
+            nvram_safe_get ("lan_ifnames"), nvram_safe_get ("wan_ifnames"));
 #elif HAVE_TW6600
   snprintf (all_ifnames, 255, "%s %s %s", "eth0",

src/router/services/networking/network.c

@@ -900 +900 @@
   strcpy (mac, nvram_safe_get ("et0macaddr"));
 #endif
+#ifdef HAVE_DANUBE
+  if (getSTA () || getWET () || nvram_match ("ath0_mode", "wdssta")
+      || nvram_match ("wan_proto", "disabled"))
+    {
+      nvram_set ("lan_ifname", "br0");
+      nvram_set ("lan_ifnames", "eth0 ath0");
+      PORTSETUPWAN ("");
+    }
+  else
+    {
+      nvram_set ("lan_ifname", "br0");
+      nvram_set ("lan_ifnames", "ath0");
+      PORTSETUPWAN ("eth0");
+    }
+  strncpy (ifr.ifr_name, "eth0", IFNAMSIZ);
+  ioctl (s, SIOCGIFHWADDR, &ifr);
+  nvram_set ("et0macaddr", ether_etoa (ifr.ifr_hwaddr.sa_data, eabuf));
+  strcpy (mac, nvram_safe_get ("et0macaddr"));
+#endif
 #ifdef HAVE_MR3202A
   if (getSTA () || getWET () || nvram_match ("ath0_mode", "wdssta")
@@ -1351 +1370 @@
         if (!ifexists (name))
           continue;
-#if defined(HAVE_MADWIFI) && !defined(HAVE_RB500) && !defined(HAVE_XSCALE) && !defined(HAVE_MAGICBOX) && !defined(HAVE_FONERA) && !defined(HAVE_WHRAG108) && !defined(HAVE_X86) && !defined(HAVE_LS2) && !defined(HAVE_LS5) && !defined(HAVE_CA8) && !defined(HAVE_TW6600) && !defined(HAVE_PB42) && !defined(HAVE_LSX)
+#if defined(HAVE_MADWIFI) && !defined(HAVE_RB500) && !defined(HAVE_XSCALE) && !defined(HAVE_MAGICBOX) && !defined(HAVE_FONERA) && !defined(HAVE_WHRAG108) && !defined(HAVE_X86) && !defined(HAVE_LS2) && !defined(HAVE_LS5) && !defined(HAVE_CA8) && !defined(HAVE_TW6600) && !defined(HAVE_PB42) && !defined(HAVE_LSX) && !defined(HAVE_DANUBE)
         if (!strcmp (name, "eth2"))
           {
@@ -1758 +1777 @@
       nvram_set ("et0macaddr", nvram_safe_get ("lan_hwaddr"));
 #endif
+#ifdef HAVE_DANUBE
+      nvram_set ("et0macaddr", nvram_safe_get ("lan_hwaddr"));
+#endif
 #ifdef HAVE_TW6600
       nvram_set ("et0macaddr", nvram_safe_get ("lan_hwaddr"));
@@ -1838 +1860 @@
 #endif
 #ifdef HAVE_LSX
+  strncpy (ifr.ifr_name, "ath0", IFNAMSIZ);
+  if (ioctl (s, SIOCGIFHWADDR, &ifr) == 0)
+    {
+      char eabuf[32];
+      nvram_set ("wl0_hwaddr", ether_etoa (ifr.ifr_hwaddr.sa_data, eabuf));
+    }
+#endif
+#ifdef HAVE_DANUBE
   strncpy (ifr.ifr_name, "ath0", IFNAMSIZ);
   if (ioctl (s, SIOCGIFHWADDR, &ifr) == 0)
@@ -2005 +2035 @@
 #endif
 #ifdef HAVE_LSX
+#define HAVE_RB500
+#endif
+#ifdef HAVE_DANUBE
 #define HAVE_RB500
 #endif
@@ -2267 +2300 @@
                                            "") ?
     nvram_safe_get ("pppoe_wan_ifname") : "eth0";
+#elif HAVE_DANUBE
+  char *pppoe_wan_ifname = nvram_invmatch ("pppoe_wan_ifname",
+                                           "") ?
+    nvram_safe_get ("pppoe_wan_ifname") : "eth0";
 #elif HAVE_LS5
   char *pppoe_wan_ifname = nvram_invmatch ("pppoe_wan_ifname",

src/router/services/networking/wshaper.c

@@ -113 +113 @@
 #ifndef HAVE_PB42
 #ifndef HAVE_LSX
+#ifndef HAVE_DANUBE
 #ifndef HAVE_TW6600
   if (nvram_match ("portprio_support", "1"))
@@ -145 +146 @@
         ("echo FULL > /proc/switch/eth0/port/4/bandwidth 2>&1 > /dev/null");
     }
+#endif
 #endif
 #endif
@@ -172 +174 @@
 #ifndef HAVE_PB42
 #ifndef HAVE_LSX
+#ifndef HAVE_DANUBE
   if (nvram_match ("portprio_support", "1"))
     {
@@ -201 +204 @@
         }
     }
+#endif
 #endif
 #endif
@@ -695 +699 @@
   ret = eval (script_name, "stop", "XX", "eth1");
   ret = eval (script_name, "stop", "XX", "ath0");
+#elif HAVE_DANUBE
+  ret = eval (script_name, "stop", "XX", "eth0");
+  ret = eval (script_name, "stop", "XX", "ath0");
 #elif HAVE_TW6600
   ret = eval (script_name, "stop", "XX", "eth0");