diff options
Diffstat (limited to 'usr/local')
| -rw-r--r-- | usr/local/www/diag_ipsec.php | 15 | ||||
| -rw-r--r-- | usr/local/www/widgets/include/ipsec.inc | 15 |
2 files changed, 2 insertions, 28 deletions
diff --git a/usr/local/www/diag_ipsec.php b/usr/local/www/diag_ipsec.php index 14e48ba..96b1c28 100644 --- a/usr/local/www/diag_ipsec.php +++ b/usr/local/www/diag_ipsec.php @@ -163,20 +163,7 @@ function get_ipsec_tunnel_src($tunnel) { global $g, $config, $sad; $if = "WAN"; if ($tunnel['interface']) { - $iflabels = array('lan' => 'LAN', 'wan' => 'WAN'); - $carpips = find_number_of_needed_carp_interfaces(); - for($j=0; $j<$carpips; $j++) { - $interfaceip = find_interface_ip("carp" . $j); - $iflabels['carp' . $j] = $interfaceip; - } - for ($j = 1; isset($config['interfaces']['opt' . $j]); $j++) { - $realinterface = convert_friendly_interface_to_real_interface_name('opt' . $j); - $iflabels['opt' . $j] = find_interface_ip($realinterface); - } - $realinterface = convert_friendly_interface_to_real_interface_name($if); - $interfaceip = find_interface_ip($realinterface); - $interfaceip = $iflabels[$tunnel['interface']]; - } else { + $if = $tunnel['interface']; $realinterface = convert_friendly_interface_to_real_interface_name($if); $interfaceip = find_interface_ip($realinterface); } diff --git a/usr/local/www/widgets/include/ipsec.inc b/usr/local/www/widgets/include/ipsec.inc index f25c20b..f850e28 100644 --- a/usr/local/www/widgets/include/ipsec.inc +++ b/usr/local/www/widgets/include/ipsec.inc @@ -43,20 +43,7 @@ function get_ipsec_tunnel_src($tunnel) { global $g, $config, $sad; $if = "WAN"; if ($tunnel['interface']) { - $iflabels = array('lan' => 'LAN', 'wan' => 'WAN'); - $carpips = find_number_of_needed_carp_interfaces(); - for($j=0; $j<$carpips; $j++) { - $interfaceip = find_interface_ip("carp" . $j); - $iflabels['carp' . $j] = $interfaceip; - } - for ($j = 1; isset($config['interfaces']['opt' . $j]); $j++) { - $realinterface = convert_friendly_interface_to_real_interface_name('opt' . $j); - $iflabels['opt' . $j] = find_interface_ip($realinterface); - } - $realinterface = convert_friendly_interface_to_real_interface_name($if); - $interfaceip = find_interface_ip($realinterface); - $interfaceip = $iflabels[$tunnel['interface']]; - } else { + $if = $tunnel['interface']; $realinterface = convert_friendly_interface_to_real_interface_name($if); $interfaceip = find_interface_ip($realinterface); } |
