diff --git a/src/etc/inc/system.inc b/src/etc/inc/system.inc index 8d03abbbc..1686f06fc 100644 --- a/src/etc/inc/system.inc +++ b/src/etc/inc/system.inc @@ -969,18 +969,24 @@ function system_arp_wrong_if() )); } -function get_possible_listen_ips($include_ipv6_link_local = false, $include_loopback = true) { +function get_possible_listen_ips($include_ipv6_link_local = false) +{ global $config; + $interfaces = get_configured_interface_with_descr(); $carplist = get_configured_carp_interface_list(); $listenips = array(); + foreach ($carplist as $cif => $carpip) { $interfaces[$cif] = $carpip." (".get_vip_descr($carpip).")"; } + $aliaslist = get_configured_ip_aliases_list(); + foreach ($aliaslist as $aliasip => $aliasif) { $interfaces[$aliasip] = $aliasip." (".get_vip_descr($aliasip).")"; } + foreach ($interfaces as $iface => $ifacename) { $tmp["name"] = $ifacename; $tmp["value"] = $iface; @@ -994,11 +1000,11 @@ function get_possible_listen_ips($include_ipv6_link_local = false, $include_loop } } } - if ($include_loopback) { - $tmp["name"] = "Localhost"; - $tmp["value"] = "lo0"; - $listenips[] = $tmp; - } + + $tmp['name'] = 'Localhost'; + $tmp['value'] = 'lo0'; + $listenips[] = $tmp; + foreach (array('server', 'client') as $mode) { if (isset($config['openvpn']["openvpn-{$mode}"]) && is_array($config['openvpn']["openvpn-{$mode}"])) { foreach ($config['openvpn']["openvpn-{$mode}"] as $id => $setting) { @@ -1011,6 +1017,7 @@ function get_possible_listen_ips($include_ipv6_link_local = false, $include_loop } } } + return $listenips; } diff --git a/src/www/diag_logs_settings.php b/src/www/diag_logs_settings.php index 0e5f8d2d6..db0b57f3c 100644 --- a/src/www/diag_logs_settings.php +++ b/src/www/diag_logs_settings.php @@ -450,7 +450,7 @@ $(document).ready(function() { + foreach (get_possible_listen_ips() as $laddr):?>