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

Fix discover_bridge()

Browse Source
This commit is contained in:
Scott Ullrich 2006-05-31 23:29:35 +00:00
parent c8000491f7
commit 51e4bb3731
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
etc/inc/interfaces.inc
View File

@ -1502,6 +1502,7 @@ function discover_bridge($interface1, $interface2) {
if(!$interface1) return;
if(!$interface2) return;
$total_bridges = get_number_of_bridged_interfaces();
$total_bridges++;
$interfaces = `/sbin/ifconfig -l`;
$x=0;
for($x=0; $x<$total_bridges; $x++) {
@ -1509,10 +1510,9 @@ function discover_bridge($interface1, $interface2) {
if(!stristr($interfaces, "bridge{$x}"))
continue;
$bridge_text = `/sbin/ifconfig bridge{$x} | grep member`;
if(stristr($bridge_text, $interface1) == true and
stristr($bridge_text, $interface2) == true) {
return "{$x}";
}
if(stristr($bridge_text, $interface1))
if(stristr($bridge_text, $interface2))
return $x;
}
return "-1";
}