diff options
| author | Ermal <eri@pfsense.org> | 2010-03-27 00:05:37 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2010-03-27 00:05:37 +0000 |
| commit | 611ae8521469576569a8d9c0d306668fe1b20dfe (patch) | |
| tree | f16b941d545194ba2db9a794dc66080cc5b4895f /usr/local/www/interfaces_assign.php | |
| parent | 3ad5fd63f0b5a7fa7b1f291b44ba37c0ccf88cd1 (diff) | |
| download | pfsense-611ae8521469576569a8d9c0d306668fe1b20dfe.zip pfsense-611ae8521469576569a8d9c0d306668fe1b20dfe.tar.gz | |
Redo most of the ppp interface handling to be consistent with the other mpd5 configurations. This way there is no more special handling for ppp around.
Diffstat (limited to 'usr/local/www/interfaces_assign.php')
| -rwxr-xr-x | usr/local/www/interfaces_assign.php | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/usr/local/www/interfaces_assign.php b/usr/local/www/interfaces_assign.php index 71b4a70..6d485a4 100755 --- a/usr/local/www/interfaces_assign.php +++ b/usr/local/www/interfaces_assign.php @@ -127,11 +127,11 @@ if (is_array($config['qinqs']['qinqentry']) && count($config['qinqs']['qinqentry /* add PPP interfaces */ if (is_array($config['ppps']['ppp']) && count($config['ppps']['ppp'])) { - foreach ($config['ppps']['ppp'] as $ppp) { - $portname = "ppp{$ppp['pppid']}"; - log_error("portname = " . $portname); + foreach ($config['ppps']['ppp'] as $pppid => $ppp) { + $portname = "ppp{$pppid}"; $portlist[$portname] = $ppp; $portlist[$portname]['isppp'] = true; + $portlist[$portname]['descr'] = "PPP {$ppp['port']}"; } } @@ -202,12 +202,8 @@ if ($_POST['apply']) { } $config['interfaces'][$ifname]['if'] = $ifport; if (preg_match('/^ppp[0-9]+/',$ifport)){ - $config['interfaces'][$ifname]['serialport'] = basename($portlist[$ifport]['port']); - $config['interfaces'][$ifname]['pointtopoint'] = true; + $config['interfaces'][$ifname]['if'] = basename($portlist[$ifport]['port']); $config['interfaces'][$ifname]['ipaddr'] = "ppp"; - } else { - unset($config['interfaces'][$ifname]['pointtopoint']); - unset($config['interfaces'][$ifname]['serialport']); } /* check for wireless interfaces, set or clear ['wireless'] */ |
