diff options
| author | Phil Davis <phil.davis@inf.org> | 2017-01-22 14:37:52 +0545 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2017-01-23 18:21:54 -0200 |
| commit | c528a112f9ca576b6d39ff03ca8e7e11b86c4c84 (patch) | |
| tree | 5666525b38c271311e94f792ce1f86569b6e3af2 /src/etc | |
| parent | 5050b79277d1f5944d786d63699feda013179c5b (diff) | |
| download | pfsense-c528a112f9ca576b6d39ff03ca8e7e11b86c4c84.zip pfsense-c528a112f9ca576b6d39ff03ca8e7e11b86c4c84.tar.gz | |
Force compress for where_is_ipaddr_configured
(cherry picked from commit cde28bfa0e11f268485ec1f6ccb73a3a2f66448f)
Diffstat (limited to 'src/etc')
| -rw-r--r-- | src/etc/inc/pfsense-utils.inc | 4 | ||||
| -rw-r--r-- | src/etc/inc/util.inc | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/etc/inc/pfsense-utils.inc b/src/etc/inc/pfsense-utils.inc index 4e002b2..b0a54e6 100644 --- a/src/etc/inc/pfsense-utils.inc +++ b/src/etc/inc/pfsense-utils.inc @@ -2980,6 +2980,10 @@ function where_is_ipaddr_configured($ipaddr, $ignore_if = "", $check_localip = f $isipv6 = is_ipaddrv6($ipaddr); + if ($isipv6) { + $ipaddr = text_to_compressed_ip6($ipaddr); + } + if ($check_subnets) { $cidrprefix = intval($cidrprefix); if ($isipv6) { diff --git a/src/etc/inc/util.inc b/src/etc/inc/util.inc index 3e8a948..62da39d 100644 --- a/src/etc/inc/util.inc +++ b/src/etc/inc/util.inc @@ -1484,14 +1484,14 @@ function get_configured_ipv6_addresses($linklocal_fallback = false) { $interfaces = get_configured_interface_list(); if (is_array($interfaces)) { foreach ($interfaces as $int) { - $ipaddrv6 = get_interface_ipv6($int, false, $linklocal_fallback); + $ipaddrv6 = text_to_compressed_ip6(get_interface_ipv6($int, false, $linklocal_fallback)); $ipv6_array[$int] = $ipaddrv6; } } $interfaces = get_configured_vip_list('inet6'); if (is_array($interfaces)) { foreach ($interfaces as $int => $ipaddrv6) { - $ipv6_array[$int] = $ipaddrv6; + $ipv6_array[$int] = text_to_compressed_ip6($ipaddrv6); } } return $ipv6_array; |
