diff options
author | jim-p <jimp@pfsense.org> | 2011-08-02 15:57:54 -0400 |
---|---|---|
committer | jim-p <jimp@pfsense.org> | 2011-08-02 15:59:11 -0400 |
commit | 233e2af1f43c143342336169b28b0bfa1165f2d1 (patch) | |
tree | 99d46be1c06fb3fc6b013631d2497633699fc9f6 | |
parent | eea89a5c1b8eb3f1af2d4c9fc81c50ff764e7a59 (diff) | |
download | pfsense-233e2af1f43c143342336169b28b0bfa1165f2d1.zip pfsense-233e2af1f43c143342336169b28b0bfa1165f2d1.tar.gz |
If no pppoe service name is configured, send a null service name. Seems to help clients especially when reconnecting.
-rw-r--r-- | etc/inc/interfaces.inc | 6 | ||||
-rwxr-xr-x | usr/local/www/interfaces.php | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index 6b2eb7d..8eb4d36 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -1576,9 +1576,11 @@ EOD; EOD; } - if (isset($ppp['provider']) && $type == "pppoe") { + if ($type == "pppoe") { + // Send a null service name if none is set. + $provider = isset($ppp['provider']) ? $ppp['provider'] : ""; $mpdconf .= <<<EOD - set pppoe service "{$ppp['provider']}" + set pppoe service "{$provider}" EOD; } diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php index a62fee5..8d7222c 100755 --- a/usr/local/www/interfaces.php +++ b/usr/local/www/interfaces.php @@ -745,7 +745,7 @@ if ($_POST['apply']) { if (!empty($_POST['provider'])) $a_ppps[$pppid]['provider'] = $_POST['provider']; else - unset($a_ppps[$pppid]['provider']); + $a_ppps[$pppid]['provider'] = true; $a_ppps[$pppid]['ondemand'] = $_POST['pppoe_dialondemand'] ? true : false; if (!empty($_POST['idletimeout'])) $a_ppps[$pppid]['idletimeout'] = $_POST['pppoe_idletimeout']; |