diff options
author | Scott Ullrich <sullrich@pfsense.org> | 2005-03-11 22:50:31 +0000 |
---|---|---|
committer | Scott Ullrich <sullrich@pfsense.org> | 2005-03-11 22:50:31 +0000 |
commit | 401e59a9449ecb55be3c383036a381383ac0ede8 (patch) | |
tree | 2e169a19bf3918e0066a056793254416bf8cb14f /etc | |
parent | bc5d2a265f0b15a87d50788f14fcfa9dc27dce72 (diff) | |
download | pfsense-401e59a9449ecb55be3c383036a381383ac0ede8.zip pfsense-401e59a9449ecb55be3c383036a381383ac0ede8.tar.gz |
Return optional interfaces correctly in convert_friendly_interface_to_real_interface_name
Diffstat (limited to 'etc')
-rw-r--r-- | etc/inc/pfsense-utils.inc | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc index 868a0c2..7807933 100644 --- a/etc/inc/pfsense-utils.inc +++ b/etc/inc/pfsense-utils.inc @@ -515,7 +515,17 @@ function execute_command_return_output($command) { */ function convert_friendly_interface_to_real_interface_name($interface) { global $config; - return $config['interfaces'][$interface]['if']; + if($config['interfaces'][$interface]['if'] <> "") + return $config['interfaces'][$interface]['if']; + $i = 0; + for ($j = 1; isset($config['interfaces']['opt' . $j]); $j++) { + $ifdescrs['opt' . $j] = "opt" . $j; + } + foreach ($ifdescrs as $ifdescr => $ifname) { + if($config['interfaces'][$ifname]['descr'] == $interface) + return $config['interfaces'][$ifname]['if']; + } + return $interface; } /* @@ -530,7 +540,6 @@ function convert_real_interface_to_friendly_interface_name($interface) { } foreach ($ifdescrs as $ifdescr => $ifname) { $int = filter_translate_type_to_real_interface($ifname); - echo $ifname . " - " . $interface ."\n"; if($ifname == $interface) return $ifname; } return $interface; |