diff options
Diffstat (limited to 'src/etc/inc/openvpn.inc')
| -rw-r--r-- | src/etc/inc/openvpn.inc | 37 |
1 files changed, 13 insertions, 24 deletions
diff --git a/src/etc/inc/openvpn.inc b/src/etc/inc/openvpn.inc index c225727..06f44c6 100644 --- a/src/etc/inc/openvpn.inc +++ b/src/etc/inc/openvpn.inc @@ -160,25 +160,18 @@ function openvpn_build_if_list() { $list = array(); $interfaces = get_configured_interface_with_descr(); - $carplist = get_configured_carp_interface_list(); - - foreach ($carplist as $cif => $carpip) { - $interfaces[$cif.'|'.$carpip] = $carpip." (".get_vip_descr($carpip).")"; - } - - $aliaslist = get_configured_ip_aliases_list(); - - foreach ($aliaslist as $aliasip => $aliasif) { - $interfaces[$aliasif.'|'.$aliasip] = $aliasip." (".get_vip_descr($aliasip).")"; + $viplist = get_configured_vip_list(); + foreach ($viplist as $vip => $address) { + $interfaces[$vip.'|'.$address] = $address; + if (get_vip_descr($address)) { + $interfaces[$vip.'|'.$address] .= " ("; + $interfaces[$vip.'|'.$address] .= get_vip_descr($address); + $interfaces[$vip.'|'.$address] .= ")"; + } } $grouplist = return_gateway_groups_array(); - foreach ($grouplist as $name => $group) { - if ($group['ipprotocol'] != inet) { - continue; - } - if ($group[0]['vip'] != "") { $vipif = $group[0]['vip']; } else { @@ -277,16 +270,12 @@ function openvpn_build_bridge_list() { $serverbridge_interface['none'] = "none"; $serverbridge_interface = array_merge($serverbridge_interface, get_configured_interface_with_descr()); - $carplist = get_configured_carp_interface_list(); - - foreach ($carplist as $cif => $carpip) { - $serverbridge_interface[$cif.'|'.$carpip] = $carpip." (".get_vip_descr($carpip).")"; - } - - $aliaslist = get_configured_ip_aliases_list(); + $viplist = get_configured_vip_list(); - foreach ($aliaslist as $aliasip => $aliasif) { - $serverbridge_interface[$aliasif.'|'.$aliasip] = $aliasip." (".get_vip_descr($aliasip).")"; + foreach ($viplist as $vip => $address) { + $serverbridge_interface[$vip.'|'.$address] = $address; + if (get_vip_descr($address)) + $serverbridge_interface[$vip.'|'.$address] .= " (". get_vip_descr($address) .")"; } foreach ($serverbridge_interface as $iface => $ifacename) { |
