mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2764 from NewEraCracker/redmine-6011

Browse Source
This commit is contained in:
Chris Buechler 2016-06-30 01:42:48 -05:00
commit f5ba05cbee
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/etc/inc/auth.inc
View File

@ -205,8 +205,9 @@ if (function_exists("display_error_form") && !isset($config['system']['webgui'][
break;
}
}
$interface_list_ipv6s = get_configured_ipv6_addresses();
$interface_list_ipv6s = get_configured_ipv6_addresses(true);
foreach ($interface_list_ipv6s as $ilipv6s) {
$ilipv6s = explode('%', $ilipv6s)[0];
if (strcasecmp($referrer_host, $ilipv6s) == 0) {
$found_host = true;
break;

4
src/etc/inc/interfaces.inc
View File

@ -5383,7 +5383,7 @@ function get_interface_ip($interface = "wan") {
}
}
function get_interface_ipv6($interface = "wan", $flush = false) {
function get_interface_ipv6($interface = "wan", $flush = false, $linklocal_fallback = false) {
global $config;
if (substr($interface, 0, 4) == '_vip') {
@ -5432,7 +5432,7 @@ function get_interface_ipv6($interface = "wan", $flush = false) {
* NOTE: On the case when only the prefix is requested,
* the communication on WAN will be done over link-local.
*/
if (is_array($config['interfaces'][$interface]) && isset($config['interfaces'][$interface]['dhcp6prefixonly'])) {
if ($linklocal_fallback || (is_array($config['interfaces'][$interface]) && isset($config['interfaces'][$interface]['dhcp6prefixonly']))) {
$curip = find_interface_ipv6_ll($realif, $flush);
if ($curip && is_ipaddrv6($curip) && ($curip != "::")) {
return $curip;

4
src/etc/inc/util.inc
View File

@ -1459,13 +1459,13 @@ function get_configured_ip_addresses() {
* IPv6 addresses.
*
*/
function get_configured_ipv6_addresses() {
function get_configured_ipv6_addresses($linklocal_fallback = false) {
require_once("interfaces.inc");
$ipv6_array = array();
$interfaces = get_configured_interface_list();
if (is_array($interfaces)) {
foreach ($interfaces as $int) {
$ipaddrv6 = get_interface_ipv6($int);
$ipaddrv6 = get_interface_ipv6($int, false, $linklocal_fallback);
$ipv6_array[$int] = $ipaddrv6;
}
}