summaryrefslogtreecommitdiffstats
path: root/src/etc/inc/pfsense-utils.inc
diff options
context:
space:
mode:
authorPhil Davis <phil.davis@inf.org>2017-01-22 14:13:50 +0545
committerPhil Davis <phil.davis@inf.org>2017-01-22 14:13:50 +0545
commit587995fb57f91894d1f8eb6b296a9fe2fa111fac (patch)
tree0a81b86bd2f2f48358b735eeb6dab3f3d644c574 /src/etc/inc/pfsense-utils.inc
parentb2bb49709d6d1cb845f2c7caf40bebe375ecb2d7 (diff)
downloadpfsense-587995fb57f91894d1f8eb6b296a9fe2fa111fac.zip
pfsense-587995fb57f91894d1f8eb6b296a9fe2fa111fac.tar.gz
Always force compress when calling Net_IPv6
Diffstat (limited to 'src/etc/inc/pfsense-utils.inc')
-rw-r--r--src/etc/inc/pfsense-utils.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/etc/inc/pfsense-utils.inc b/src/etc/inc/pfsense-utils.inc
index de0b998..32ada39 100644
--- a/src/etc/inc/pfsense-utils.inc
+++ b/src/etc/inc/pfsense-utils.inc
@@ -2883,7 +2883,7 @@ function convert_128bit_to_ipv6($ip6bin) {
foreach ($ip6binarr as $binpart) {
$ip6arr[] = dechex(bindec($binpart));
}
- $ip6addr = Net_IPv6::compress(implode(":", $ip6arr));
+ $ip6addr = text_to_compressed_ip6(implode(":", $ip6arr));
return($ip6addr);
}
@@ -2965,7 +2965,7 @@ function merge_ipv6_delegated_prefix($prefix, $suffix, $len = 64) {
break;
}
- return Net_IPv6::compress(substr($prefix, 0, $prefix_len) .
+ return text_to_compressed_ip6(substr($prefix, 0, $prefix_len) .
substr($suffix, $prefix_len));
}
OpenPOWER on IntegriCloud