diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/etc/inc/interfaces.inc | 4 | ||||
-rw-r--r-- | src/etc/inc/pfsense-utils.inc | 2 | ||||
-rw-r--r-- | src/etc/inc/upgrade_config.inc | 4 | ||||
-rw-r--r-- | src/etc/inc/util.inc | 5 | ||||
-rw-r--r-- | src/usr/local/www/diag_backup.php | 2 | ||||
-rw-r--r-- | src/usr/local/www/firewall_aliases_edit.php | 2 | ||||
-rw-r--r-- | src/usr/local/www/firewall_aliases_import.php | 2 | ||||
-rw-r--r-- | src/usr/local/www/interfaces_bridge.php | 2 | ||||
-rw-r--r-- | src/usr/local/www/interfaces_gif.php | 2 | ||||
-rw-r--r-- | src/usr/local/www/interfaces_gre.php | 2 | ||||
-rw-r--r-- | src/usr/local/www/interfaces_lagg.php | 2 | ||||
-rw-r--r-- | src/usr/local/www/interfaces_lagg_edit.php | 2 | ||||
-rw-r--r-- | src/usr/local/www/interfaces_ppps.php | 2 | ||||
-rw-r--r-- | src/usr/local/www/interfaces_qinq.php | 2 | ||||
-rw-r--r-- | src/usr/local/www/interfaces_vlan.php | 2 | ||||
-rw-r--r-- | src/usr/local/www/interfaces_wireless.php | 2 | ||||
-rw-r--r-- | src/usr/local/www/interfaces_wireless_edit.php | 2 |
17 files changed, 19 insertions, 22 deletions
diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc index 4f309f5..414e51f 100644 --- a/src/etc/inc/interfaces.inc +++ b/src/etc/inc/interfaces.inc @@ -2519,7 +2519,7 @@ function interface_sync_wireless_clones(&$ifcfg, $sync_changes = false) { $baseif = interface_get_wireless_base($ifcfg['if']); // Sync shared settings for assigned clones - $iflist = get_configured_interface_list(false, true); + $iflist = get_configured_interface_list(true); foreach ($iflist as $if) { if ($baseif == interface_get_wireless_base($config['interfaces'][$if]['if']) && $ifcfg['if'] != $config['interfaces'][$if]['if']) { if (isset($config['interfaces'][$if]['wireless']['standard']) || $sync_changes) { @@ -4802,7 +4802,7 @@ function convert_real_interface_to_friendly_interface_name($interface = "wan", $ /* XXX: For speed reasons reference directly the interface array */ $ifdescrs = &$config['interfaces']; - //$ifdescrs = get_configured_interface_list(false, true); + //$ifdescrs = get_configured_interface_list(true); foreach ($ifdescrs as $if => $ifname) { if ($if == $interface || $ifname['if'] == $interface) { diff --git a/src/etc/inc/pfsense-utils.inc b/src/etc/inc/pfsense-utils.inc index 07b225b..991aaac 100644 --- a/src/etc/inc/pfsense-utils.inc +++ b/src/etc/inc/pfsense-utils.inc @@ -605,7 +605,7 @@ function is_schedule_inuse($schedule) { function setup_microcode() { /* if list */ - $iflist = get_configured_interface_list(false, true); + $iflist = get_configured_interface_list(true); foreach ($iflist as $if => $ifdescr) { enable_hardware_offloading($if); } diff --git a/src/etc/inc/upgrade_config.inc b/src/etc/inc/upgrade_config.inc index bbd6552..ab7574d 100644 --- a/src/etc/inc/upgrade_config.inc +++ b/src/etc/inc/upgrade_config.inc @@ -742,7 +742,7 @@ function upgrade_041_to_042() { function upgrade_042_to_043() { global $config; /* migrate old interface gateway to the new gateways config */ - $iflist = get_configured_interface_list(false, true); + $iflist = get_configured_interface_list(true); $gateways = array(); $i = 0; foreach ($iflist as $ifname => $interface) { @@ -837,7 +837,7 @@ function upgrade_043_to_044() { function upgrade_044_to_045() { global $config; - $iflist = get_configured_interface_list(false, true); + $iflist = get_configured_interface_list(true); if (is_array($config['vlans']['vlan']) && count($config['vlans']['vlan'])) { $i = 0; foreach ($config['vlans']['vlan'] as $id => $vlan) { diff --git a/src/etc/inc/util.inc b/src/etc/inc/util.inc index f9491a5..db8ec73 100644 --- a/src/etc/inc/util.inc +++ b/src/etc/inc/util.inc @@ -1367,16 +1367,13 @@ function compare_interface_friendly_names($a, $b) { } /* return the configured interfaces list. */ -function get_configured_interface_list($only_opt = false, $withdisabled = false) { +function get_configured_interface_list($withdisabled = false) { global $config; $iflist = array(); /* if list */ foreach ($config['interfaces'] as $if => $ifdetail) { - if ($only_opt && ($if == "wan" || $if == "lan")) { - continue; - } if (isset($ifdetail['enable']) || $withdisabled == true) { $iflist[$if] = $if; } diff --git a/src/usr/local/www/diag_backup.php b/src/usr/local/www/diag_backup.php index be44f68..9c17cf6 100644 --- a/src/usr/local/www/diag_backup.php +++ b/src/usr/local/www/diag_backup.php @@ -317,7 +317,7 @@ if ($_POST) { } unset($config['shaper']); /* optional if list */ - $ifdescrs = get_configured_interface_list(true, true); + $ifdescrs = get_configured_interface_list(true); /* remove special characters from interface descriptions */ if (is_array($ifdescrs)) { foreach ($ifdescrs as $iface) { diff --git a/src/usr/local/www/firewall_aliases_edit.php b/src/usr/local/www/firewall_aliases_edit.php index 7a38c57..b11a2e0 100644 --- a/src/usr/local/www/firewall_aliases_edit.php +++ b/src/usr/local/www/firewall_aliases_edit.php @@ -51,7 +51,7 @@ if (is_array($config['load_balancer']['lbpool'])) { } } -$reserved_ifs = get_configured_interface_list(false, true); +$reserved_ifs = get_configured_interface_list(true); $reserved_keywords = array_merge($reserved_keywords, $reserved_ifs, $reserved_table_names); $max_alias_addresses = 5000; diff --git a/src/usr/local/www/firewall_aliases_import.php b/src/usr/local/www/firewall_aliases_import.php index df7fd86..501288b 100644 --- a/src/usr/local/www/firewall_aliases_import.php +++ b/src/usr/local/www/firewall_aliases_import.php @@ -44,7 +44,7 @@ if (is_array($config['load_balancer']['lbpool'])) { } } -$reserved_ifs = get_configured_interface_list(false, true); +$reserved_ifs = get_configured_interface_list(true); $reserved_keywords = array_merge($reserved_keywords, $reserved_ifs, $reserved_table_names); $tab = $_REQUEST['tab']; diff --git a/src/usr/local/www/interfaces_bridge.php b/src/usr/local/www/interfaces_bridge.php index 1d5688e..d1fb733 100644 --- a/src/usr/local/www/interfaces_bridge.php +++ b/src/usr/local/www/interfaces_bridge.php @@ -37,7 +37,7 @@ $a_bridges = &$config['bridges']['bridged'] ; function bridge_inuse($num) { global $config, $a_bridges; - $iflist = get_configured_interface_list(false, true); + $iflist = get_configured_interface_list(true); foreach ($iflist as $if) { if ($config['interfaces'][$if]['if'] == $a_bridges[$num]['bridgeif']) { diff --git a/src/usr/local/www/interfaces_gif.php b/src/usr/local/www/interfaces_gif.php index 7fea9e7..db3a2ed 100644 --- a/src/usr/local/www/interfaces_gif.php +++ b/src/usr/local/www/interfaces_gif.php @@ -37,7 +37,7 @@ $a_gifs = &$config['gifs']['gif'] ; function gif_inuse($num) { global $config, $a_gifs; - $iflist = get_configured_interface_list(false, true); + $iflist = get_configured_interface_list(true); foreach ($iflist as $if) { if ($config['interfaces'][$if]['if'] == $a_gifs[$num]['gifif']) { return true; diff --git a/src/usr/local/www/interfaces_gre.php b/src/usr/local/www/interfaces_gre.php index 41c71a1..47abcf0 100644 --- a/src/usr/local/www/interfaces_gre.php +++ b/src/usr/local/www/interfaces_gre.php @@ -38,7 +38,7 @@ $a_gres = &$config['gres']['gre'] ; function gre_inuse($num) { global $config, $a_gres; - $iflist = get_configured_interface_list(false, true); + $iflist = get_configured_interface_list(true); foreach ($iflist as $if) { if ($config['interfaces'][$if]['if'] == $a_gres[$num]['greif']) { return true; diff --git a/src/usr/local/www/interfaces_lagg.php b/src/usr/local/www/interfaces_lagg.php index 574a5b8..e3d41bf 100644 --- a/src/usr/local/www/interfaces_lagg.php +++ b/src/usr/local/www/interfaces_lagg.php @@ -37,7 +37,7 @@ $a_laggs = &$config['laggs']['lagg'] ; function lagg_inuse($num) { global $config, $a_laggs; - $iflist = get_configured_interface_list(false, true); + $iflist = get_configured_interface_list(true); foreach ($iflist as $if) { if ($config['interfaces'][$if]['if'] == $a_laggs[$num]['laggif']) { return true; diff --git a/src/usr/local/www/interfaces_lagg_edit.php b/src/usr/local/www/interfaces_lagg_edit.php index 9ac16b8..b554f76 100644 --- a/src/usr/local/www/interfaces_lagg_edit.php +++ b/src/usr/local/www/interfaces_lagg_edit.php @@ -101,7 +101,7 @@ if (is_array($config['laggs']['lagg']) && count($config['laggs']['lagg'])) { } } -$checklist = get_configured_interface_list(false, true); +$checklist = get_configured_interface_list(true); foreach ($checklist as $tmpif) { $realifchecklist[get_real_interface($tmpif)] = $tmpif; diff --git a/src/usr/local/www/interfaces_ppps.php b/src/usr/local/www/interfaces_ppps.php index e1a5d9f..48ef1d6 100644 --- a/src/usr/local/www/interfaces_ppps.php +++ b/src/usr/local/www/interfaces_ppps.php @@ -36,7 +36,7 @@ require_once("functions.inc"); function ppp_inuse($num) { global $config, $g; - $iflist = get_configured_interface_list(false, true); + $iflist = get_configured_interface_list(true); if (!is_array($config['ppps']['ppp'])) { return false; } diff --git a/src/usr/local/www/interfaces_qinq.php b/src/usr/local/www/interfaces_qinq.php index 3ed3d17..3fff40b 100644 --- a/src/usr/local/www/interfaces_qinq.php +++ b/src/usr/local/www/interfaces_qinq.php @@ -38,7 +38,7 @@ $a_qinqs = &$config['qinqs']['qinqentry']; function qinq_inuse($num) { global $config, $a_qinqs; - $iflist = get_configured_interface_list(false, true); + $iflist = get_configured_interface_list(true); foreach ($iflist as $if) { if ($config['interfaces'][$if]['if'] == $a_qinqs[$num]['qinqif']) { return true; diff --git a/src/usr/local/www/interfaces_vlan.php b/src/usr/local/www/interfaces_vlan.php index c21297c..d944616 100644 --- a/src/usr/local/www/interfaces_vlan.php +++ b/src/usr/local/www/interfaces_vlan.php @@ -41,7 +41,7 @@ $a_vlans = &$config['vlans']['vlan'] ; function vlan_inuse($num) { global $config, $a_vlans; - $iflist = get_configured_interface_list(false, true); + $iflist = get_configured_interface_list(true); foreach ($iflist as $if) { if ($config['interfaces'][$if]['if'] == $a_vlans[$num]['vlanif']) { return true; diff --git a/src/usr/local/www/interfaces_wireless.php b/src/usr/local/www/interfaces_wireless.php index 2236ab4..5d45bec 100644 --- a/src/usr/local/www/interfaces_wireless.php +++ b/src/usr/local/www/interfaces_wireless.php @@ -41,7 +41,7 @@ $a_clones = &$config['wireless']['clone']; function clone_inuse($num) { global $config, $a_clones; - $iflist = get_configured_interface_list(false, true); + $iflist = get_configured_interface_list(true); foreach ($iflist as $if) { if ($config['interfaces'][$if]['if'] == $a_clones[$num]['cloneif']) { diff --git a/src/usr/local/www/interfaces_wireless_edit.php b/src/usr/local/www/interfaces_wireless_edit.php index 2f9a531..a272c00 100644 --- a/src/usr/local/www/interfaces_wireless_edit.php +++ b/src/usr/local/www/interfaces_wireless_edit.php @@ -42,7 +42,7 @@ $a_clones = &$config['wireless']['clone']; function clone_inuse($num) { global $config, $a_clones; - $iflist = get_configured_interface_list(false, true); + $iflist = get_configured_interface_list(true); foreach ($iflist as $if) { if ($config['interfaces'][$if]['if'] == $a_clones[$num]['cloneif']) { return true; |