From f793da835db97ea7a5963539164de29a29456b49 Mon Sep 17 00:00:00 2001 From: Jean-Yves Avenard Date: Wed, 11 Apr 2012 07:59:01 -0300 Subject: [PATCH] Fix PPTP when used over WAN setup using PPPoE WAN options were set using the system-wide pppd options file. the pppd process read the system-wide options file (in /tmp/ppp/options) before reading any other configuration. This meant that really, only one pppd process could run at a time. We now store the pppd options into /tmp/ppp/wanoptions and start the main pppd with: pppd file /tmp/ppp/wanoptions That way, we can start subsequent pppd process without conflicting options. (cherry picked from commit 82d98a546c763224b4b2b3da72ea4d29a2af9479) Conflicts: release/src/router/rc/pptp_client.c --- release/src/router/rc/wan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/src/router/rc/wan.c b/release/src/router/rc/wan.c index bd5d102b03..55c4a36f41 100644 --- a/release/src/router/rc/wan.c +++ b/release/src/router/rc/wan.c @@ -43,7 +43,7 @@ #include static const char ppp_linkfile[] = "/tmp/ppp/link"; -static const char ppp_optfile[] = "/tmp/ppp/options"; +static const char ppp_optfile[] = "/tmp/ppp/wanoptions"; static void make_secrets(void) { @@ -212,7 +212,7 @@ static void stop_ppp(void) static void run_pppd(void) { - eval("pppd"); + eval("pppd", "file", ppp_optfile); if (nvram_get_int("ppp_demand")) { // demand mode -- 2.11.4.GIT