diff options
| author | Seth Mos <seth.mos@dds.nl> | 2011-02-03 23:07:52 +0100 |
|---|---|---|
| committer | Seth Mos <seth.mos@dds.nl> | 2011-02-03 23:07:52 +0100 |
| commit | cf6bc278670a76710a364ccc42ab77a2b061ba14 (patch) | |
| tree | bb488e45089d698816cf6e9e294e7f5480f7b24b /etc/inc/util.inc | |
| parent | a23a99cb13af898ec662872dcd2ba544ea4ccbad (diff) | |
| download | pfsense-cf6bc278670a76710a364ccc42ab77a2b061ba14.zip pfsense-cf6bc278670a76710a364ccc42ab77a2b061ba14.tar.gz | |
Fix the subnet check for gif tunnels by dropping the bits to 126.
Always compress the subnet address for easier reading
Diffstat (limited to 'etc/inc/util.inc')
| -rw-r--r-- | etc/inc/util.inc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/etc/inc/util.inc b/etc/inc/util.inc index f3cb60b..4d939dd 100644 --- a/etc/inc/util.inc +++ b/etc/inc/util.inc @@ -226,7 +226,10 @@ function gen_subnet($ipaddr, $bits) { function gen_subnetv6($ipaddr, $bits) { if (!is_ipaddrv6($ipaddr) || !is_numeric($bits)) return ""; - return Net_IPv6::getNetmask($ipaddr, $bits); + + $address = Net_IPv6::getNetmask($ipaddr, $bits); + $address = Net_IPv6::Compress($address); + return $address; } /* return the highest (broadcast) address in the subnet given a host address and a subnet bit count */ |
