summaryrefslogtreecommitdiffstats
path: root/etc/inc/util.inc
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2013-02-07 09:43:57 +0000
committerErmal <eri@pfsense.org>2013-02-07 09:46:44 +0000
commit88cc00dbf56c7b900a6258a47f7f07329c2c19c8 (patch)
tree5e5867aed7f32d77ba3b48054a9cd8cfd80273dd /etc/inc/util.inc
parentd7a1532bbf016674514daa01a8bbec20848f8870 (diff)
downloadpfsense-88cc00dbf56c7b900a6258a47f7f07329c2c19c8.zip
pfsense-88cc00dbf56c7b900a6258a47f7f07329c2c19c8.tar.gz
Make gen_subnetv6 return a compressed form IPv6 address/net representation. This removes some issues reported during Ticket #2746 and solve the issue on some cases
Diffstat (limited to 'etc/inc/util.inc')
-rw-r--r--etc/inc/util.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/etc/inc/util.inc b/etc/inc/util.inc
index 74b11ce..e137c68 100644
--- a/etc/inc/util.inc
+++ b/etc/inc/util.inc
@@ -284,6 +284,7 @@ function gen_subnetv6($ipaddr, $bits) {
return "";
$address = Net_IPv6::getNetmask($ipaddr, $bits);
+ $address = Net_IPv6::compress($address);
return $address;
}
@@ -307,7 +308,7 @@ function gen_subnetv6_max($ipaddr, $bits) {
$inet_end = $inet_ip | ~$inet_mask;
- return(Net_IPv6::uncompress(inet_ntop($inet_end)));
+ return (inet_ntop($inet_end));
}
/* returns a subnet mask (long given a bit count) */
OpenPOWER on IntegriCloud