| commit | f793da835db97ea7a5963539164de29a29456b49 | |
| author | Jean-Yves Avenard <jean-yves@avenard.org> | |
| Wed, 11 Apr 2012 10:59:01 +0000 (11 07:59 -0300) | ||
| committer | Augusto Bott <augusto@bott.com.br> | |
| Wed, 11 Apr 2012 10:59:01 +0000 (11 07:59 -0300) | ||
| tree | 7974bfa3dcd5844238542bfff66b05fcaafe1994 | tree |
| parent | b75092f5dea6f2ec496f4c8d55c39fe463375c76 | commitdiff |
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
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 | diffblobblamehistory |