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.

1 files changed, 15 insertions, 23 deletions

diff --git a/etc/inc/util.inc b/etc/inc/util.inc
index 7417695..0d2eea9 100644
--- a/etc/inc/util.inc
+++ b/etc/inc/util.inc
@@ -255,34 +255,26 @@ function is_valid_shaperbw($val) {
  *           "media"  - use ifconfig to check physical connection
  *			status (much slower)
  */
-/*
- *   get_interface_list() - Return a list of all physical interfaces
- *   along with MAC and status.
- *
- *   $mode = "active" - use ifconfig -lu
- *           "media"  - use ifconfig to check physical connection
- *			status (much slower)
- */
 function get_interface_list($mode = "active", $keyby = "physical", $vfaces = "") {
         global $config;
 	$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":