Changeset 12386

Timestamp:

06/26/09 17:08:33 (5 months ago)

Author:

BrainSlayer

Message:

fixes pptp snat issue

Files:

• src/router/services/networking/firewall.c (modified) (1 diff)
• src/router/services/networking/udhcpc.c (modified) (1 diff)
• src/router/services/sysinit/defaults.c (modified) (1 diff)

src/router/services/networking/firewall.c

@@ -774 +774 @@
-                if (strlen(wanface) > 0)
-                        save2file("-A POSTROUTING -o %s -j SNAT --to-source %s\n",wanface,nvram_safe_get("wan_ipaddr"));
+                if (nvram_match("wan_proto", "pptp") && nvram_match("pptp_use_dhcp", "1"))
+                {
+                    save2file("-A POSTROUTING -o %s -j SNAT --to-source %s\n",nvram_safe_get("pptp_ifname"),nvram_safe_get("pptp_wan_ipaddr"));
+                }else
-                if (nvram_match("wan_proto", "pptp")) {
-
+
+
+
-                }
-                char *method = "MASQUERADE";

src/router/services/networking/udhcpc.c

@@ -234 +234 @@
-        if (nvram_match("wan_proto", "pptp")
-            && nvram_match("pptp_use_dhcp", "1"))
-
-
+
+
+
+
-        else
-                eval("ifconfig", wan_ifname, nvram_safe_get("wan_ipaddr"),

src/router/services/sysinit/defaults.c

@@ -253 +253 @@
-        {"wan_proto", "pptp", 0},       /* [static|dhcp|pppoe|disabled] */
-#elif defined(HAVE_GGEW) && defined(HAVE_EOC2610)
+        {"wan_proto", "pptp", 0},       /* [static|dhcp|pppoe|disabled] */
+#elif defined(HAVE_GGEW)
-        {"wan_proto", "pptp", 0},       /* [static|dhcp|pppoe|disabled] */
-#elif HAVE_X86