diff options
| -rw-r--r-- | etc/inc/system.inc | 14 | ||||
| -rwxr-xr-x | usr/local/www/diag_ping.php | 2 | ||||
| -rw-r--r-- | usr/local/www/diag_testport.php | 2 | ||||
| -rwxr-xr-x | usr/local/www/diag_traceroute.php | 2 |
4 files changed, 14 insertions, 6 deletions
diff --git a/etc/inc/system.inc b/etc/inc/system.inc index 58793eb..f1cb84c 100644 --- a/etc/inc/system.inc +++ b/etc/inc/system.inc @@ -1595,7 +1595,7 @@ function system_get_dmesg_boot() { return file_get_contents("{$g['varlog_path']}/dmesg.boot"); } -function get_possible_listen_ips() { +function get_possible_listen_ips($include_ipv6_link_local=false) { $interfaces = get_configured_interface_with_descr(); $carplist = get_configured_carp_interface_list(); $listenips = array(); @@ -1608,6 +1608,14 @@ function get_possible_listen_ips() { $tmp["name"] = $ifacename; $tmp["value"] = $iface; $listenips[] = $tmp; + if ($include_ipv6_link_local) { + $llip = find_interface_ipv6_ll(get_real_interface($iface)); + if (!empty($llip)) { + $tmp["name"] = "{$ifacename} IPv6 Link-Local"; + $tmp["value"] = $llip; + $listenips[] = $tmp; + } + } } $tmp["name"] = "Localhost"; $tmp["value"] = "lo0"; @@ -1615,9 +1623,9 @@ function get_possible_listen_ips() { return $listenips; } -function get_possible_traffic_source_addresses() { +function get_possible_traffic_source_addresses($include_ipv6_link_local=false) { global $config; - $sourceips = get_possible_listen_ips(); + $sourceips = get_possible_listen_ips($include_ipv6_link_local); foreach (array('server', 'client') as $mode) { if (is_array($config['openvpn']["openvpn-{$mode}"])) { foreach ($config['openvpn']["openvpn-{$mode}"] as $id => $setting) { diff --git a/usr/local/www/diag_ping.php b/usr/local/www/diag_ping.php index e2c3037..2270264 100755 --- a/usr/local/www/diag_ping.php +++ b/usr/local/www/diag_ping.php @@ -112,7 +112,7 @@ include("head.inc"); ?> <td width="78%" class="vtable"> <select name="sourceip" class="formselect"> <option value="">Default</option> - <?php $sourceips = get_possible_traffic_source_addresses(); + <?php $sourceips = get_possible_traffic_source_addresses(true); foreach ($sourceips as $sip): $selected = ""; if (!link_interface_to_bridge($sip['value']) && ($sip['value'] == $sourceip)) diff --git a/usr/local/www/diag_testport.php b/usr/local/www/diag_testport.php index b9abedf..799ed83 100644 --- a/usr/local/www/diag_testport.php +++ b/usr/local/www/diag_testport.php @@ -144,7 +144,7 @@ include("head.inc"); ?> <td width="78%" class="vtable"> <select name="sourceip" class="formselect"> <option value="">Any</option> - <?php $sourceips = get_possible_traffic_source_addresses(); + <?php $sourceips = get_possible_traffic_source_addresses(true); foreach ($sourceips as $sip): $selected = ""; if (!link_interface_to_bridge($sip['value']) && ($sip['value'] == $sourceip)) diff --git a/usr/local/www/diag_traceroute.php b/usr/local/www/diag_traceroute.php index 467138b..6399708 100755 --- a/usr/local/www/diag_traceroute.php +++ b/usr/local/www/diag_traceroute.php @@ -114,7 +114,7 @@ if (!isset($do_traceroute)) { <td width="78%" class="vtable"> <select name="sourceip" class="formselect"> <option value="">Any</option> - <?php $sourceips = get_possible_traffic_source_addresses(); + <?php $sourceips = get_possible_traffic_source_addresses(true); foreach ($sourceips as $sip): $selected = ""; if (!link_interface_to_bridge($sip['value']) && ($sip['value'] == $sourceip)) |
