diff options
| author | Seth Mos <seth.mos@dds.nl> | 2012-07-04 23:34:31 -0700 |
|---|---|---|
| committer | Seth Mos <seth.mos@dds.nl> | 2012-07-04 23:34:31 -0700 |
| commit | b2b9892dbf3e0f856895fde14b10fe7ba864772e (patch) | |
| tree | 0f66cbd7a43c798e39ad7ff856934475c0489ebd | |
| parent | 45c197912c9798e7a4adf337776e1795b54bb34d (diff) | |
| parent | 6d26ccdbaac2781843448068c28ce3fef0919053 (diff) | |
| download | pfsense-b2b9892dbf3e0f856895fde14b10fe7ba864772e.zip pfsense-b2b9892dbf3e0f856895fde14b10fe7ba864772e.tar.gz | |
Merge pull request #165 from r-duran/master
Fix get_staticroutes() function to handle IPv6 subnets properly
| -rw-r--r-- | etc/inc/util.inc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/etc/inc/util.inc b/etc/inc/util.inc index cb1ac42..f95cdb0 100644 --- a/etc/inc/util.inc +++ b/etc/inc/util.inc @@ -1754,8 +1754,10 @@ function get_staticroutes($returnsubnetsonly = false) { if (is_alias($route['network'])) { $subnets = filter_expand_alias_array($route['network']); foreach ($subnets as $net) { - if (is_ipaddr($net)) + if (is_ipaddrv4($net)) $net .= "/32"; + if (is_ipaddrv6($net) && !is_subnetv6($net)) + $net .= "/128"; /* This must be a hostname, we can't use it. */ if (!is_subnet($net)) continue; |
