diff options
| author | Ermal Luçi <eri@pfsense.org> | 2008-07-14 21:01:53 +0000 |
|---|---|---|
| committer | Ermal Luçi <eri@pfsense.org> | 2008-07-14 21:01:53 +0000 |
| commit | f1f60c926a4167268e68e4ad000d412c50a63635 (patch) | |
| tree | 971abccab7e81f3bbff3a8164a6d1ada67f09b60 /usr/local/www/status_interfaces.php | |
| parent | 67ee1ec5ec2fe7722d0039aa98da72c4f58107f9 (diff) | |
| download | pfsense-f1f60c926a4167268e68e4ad000d412c50a63635.zip pfsense-f1f60c926a4167268e68e4ad000d412c50a63635.tar.gz | |
* Merge multiple PPPoE/PPTP interfaces from RELENG_1_MULTI_ANYTHING
* Much improved rule generation speed
* Many bug fixing in general of the interface handling
NOTE: this is the other half of changes
Diffstat (limited to 'usr/local/www/status_interfaces.php')
| -rwxr-xr-x | usr/local/www/status_interfaces.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/usr/local/www/status_interfaces.php b/usr/local/www/status_interfaces.php index c813347..fde298e 100755 --- a/usr/local/www/status_interfaces.php +++ b/usr/local/www/status_interfaces.php @@ -43,16 +43,16 @@ if ($_POST) { if ($ifcfg['ipaddr'] == "dhcp") interfaces_dhcp_down($interface); else if ($ifcfg['ipaddr'] == "pppoe") - interfaces_wan_pppoe_down(); // FIXME: when we support multi-pppoe + interfaces_wan_pppoe_down($interface); else if ($ifcfg['ipaddr'] == "pptp") - interfaces_wan_pptp_down(); // FIXME: when we support multi-pptp + interfaces_wan_pptp_down($interface); } else if ($_POST['submit'] == "Connect" || $_POST['submit'] == "Renew") { if ($ifcfg['ipaddr'] == "dhcp") interfaces_dhcp_up($interface); else if ($ifcfg['ipaddr'] == "pppoe") - interfaces_wan_pppoe_up(); // FIXME: when we support multi-pppoe + interfaces_wan_pppoe_up($interface); else if ($ifcfg['ipaddr'] == "pptp") - interfaces_wan_pptp_up(); // FIXME: when we support multi-pptp + interfaces_wan_pptp_up($interface); } else { header("Location: index.php"); exit; @@ -82,7 +82,7 @@ include("head.inc"); <td colspan="2" class="listtopic"> <?=htmlspecialchars($ifname);?> interface - (<?=convert_friendly_interface_to_real_interface_name($ifname);?>) + (<?=($ifinfo['hwif']);?>) </td> </tr> <tr> @@ -217,7 +217,7 @@ include("head.inc"); $real_interface = ""; $interrupt_total = ""; $interrupt_sec = ""; - $real_interface = convert_friendly_interface_to_real_interface_name($ifname); + $real_interface = $ifinfo['hwif']; $interrupt_total = `vmstat -i | grep $real_interface | awk '{ print $3 }'`; $interrupt_sec = `vmstat -i | grep $real_interface | awk '{ print $4 }'`; if(strstr($interrupt_total, "hci")) { |
