The earlier fix from today that fixed get_interfaces_with_gateways() created new problem where all interfaces would show up in assign_interfaces screen and other places. Instead of showing them all by default teach get_interfaces_with_gateways() how to extract the complete list.

2 files changed, 32 insertions, 16 deletions

diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc
index f2803f9..587c247 100644
--- a/etc/inc/pfsense-utils.inc
+++ b/etc/inc/pfsense-utils.inc
@@ -3307,7 +3307,23 @@ function is_dhcp_server_enabled() {
 function get_interfaces_with_gateway() {
 	global $config;
 	$ints = array();
-	$ifdescrs = get_interface_list();
+	$vfaces = array(
+			'bridge.?*',
+			'ppp.?*',
+			'sl.?*',
+			'gif.?*',
+			'faith.?*',
+			'lo.?*',
+			'ng.?*',
+			'vlan.?*',
+			'pflog.?*',
+			'pfsync.?*',
+			'enc.?*',
+			'tun.?*',
+			'carp.?*'
+		);	
+	$ifdescrs = get_interface_list("active","physical",$vfaces);
+
 
 	/* loop interfaces, check config for outbound */
 	foreach ($ifdescrs as $ifdescr => $ifname) {
diff --git a/etc/inc/util.inc b/etc/inc/util.inc
index 0ff8bf5..8af4444 100644
--- a/etc/inc/util.inc
+++ b/etc/inc/util.inc
@@ -268,21 +268,21 @@ function get_interface_list($mode = "active", $keyby = "physical", $vfaces = "")
 	$upints = array();
 	/* get a list of virtual interface types */
 	if(!$vfaces) {
-		$vfaces = array(
-				'bridge.?*',
-				'ppp.?*',
-				'sl.?*',
-				'gif.?*',
-				'faith.?*',
-				'lo.?*',
-				'ng.?*',
-				'vlan.?*',
-				'pflog.?*',
-				'pfsync.?*',
-				'enc.?*',
-				'tun.?*',
-				'carp.?*'
-			);
+		$vfaces = array (
+				'bridge',
+				'ppp',
+				'sl',
+				'gif',
+				'faith',
+				'lo',
+				'ng',
+				'vlan',
+				'pflog',
+				'pfsync',
+				'enc',
+				'tun',
+				'carp'
+		);
 	}
 	switch($mode) {
 	case "active":