mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolves #175. Return description even for disabled interfaces. Teach the return_gateways_array() to return status for disabled interfaces if the caller requests it.

Browse Source
This commit is contained in:
Ermal Lui 2009-11-25 18:18:51 +00:00
parent 392cd413c1
commit c795339e57
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
etc/inc/gwlb.inc
View File

@ -225,13 +225,17 @@ function return_gateways_status() {
return($status);
}
function return_gateways_array() {
function return_gateways_array($disabled = false) {
global $config;
$gateways_arr = array();
/* Loop through all interfaces with a gateway and add it to a array */
$iflist = get_configured_interface_with_descr();
if ($disabled == false)
$iflist = get_configured_interface_with_descr();
else
$iflist = get_configured_interface_with_descr(false, true);
foreach($iflist as $ifname => $friendly ) {
if(interface_has_gateway($ifname)) {
$gateway = array();
@ -482,4 +486,4 @@ function get_interface_gateway($interface) {
return $gw;
}
?>
?>

2
etc/inc/interfaces.inc
View File

@ -2276,7 +2276,7 @@ function convert_real_interface_to_friendly_descr($interface) {
$ifdesc = convert_real_interface_to_friendly_interface_name("{$interface}");
if ($ifdesc) {
$iflist = get_configured_interface_with_descr();
$iflist = get_configured_interface_with_descr(false, true);
return $iflist[$ifdesc];
}

2
usr/local/www/system_gateways.php
View File

@ -44,7 +44,7 @@ require_once("functions.inc");
require_once("filter.inc");
require_once("shaper.inc");
$a_gateways = return_gateways_array();
$a_gateways = return_gateways_array(true);
$a_gateways_arr = array();
foreach($a_gateways as $gw) {
$a_gateways_arr[] = $gw;