diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2005-10-12 23:33:27 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2005-10-12 23:33:27 +0000 |
| commit | 4f9a78d93e996f5b9a6d6e9dd74d1034e364beff (patch) | |
| tree | 9ed0d2f4626f8208053b3b92b835362dfc4d4f7b /etc/inc | |
| parent | 0d429e435ef2d699f941b018413fe928f2a58a02 (diff) | |
| download | pfsense-4f9a78d93e996f5b9a6d6e9dd74d1034e364beff.zip pfsense-4f9a78d93e996f5b9a6d6e9dd74d1034e364beff.tar.gz | |
Do not call ifconfig on non-existant interfaces when testing
Diffstat (limited to 'etc/inc')
| -rw-r--r-- | etc/inc/interfaces.inc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index 5a6e99e..c8b5222 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -1311,9 +1311,12 @@ function destroy_bridge($bridge_num) { function discover_bridge($interface1, $interface2) { $total_bridges = get_number_of_bridged_interfaces(); + $interfaces = `/sbin/ifconfig -l`; $x=0; for($x=0; $x<$total_bridges; $x++) { - $bridge_text = `/sbin/ifconfig bridge{$x} | grep member`; + $bridge_text = "NA"; + if(!stristr($interfaces, "bridge{$x}")) { + $bridge_text = `/sbin/ifconfig bridge{$x} | grep member`; if(stristr($bridge_text, $interface1) == true and stristr($bridge_text, $interface2) == true) { return "{$x}"; |
