summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2013-07-19 09:37:52 -0400
committerjim-p <jimp@pfsense.org>2013-07-19 09:39:29 -0400
commitd30232e230ebc2ff89138d89915baa3a8881c42c (patch)
treec0b7c319743d870f99236f16a6eb16f30a15c880
parent04498edb46a80e258073c159a72bfd69a457ed6e (diff)
downloadpfsense-d30232e230ebc2ff89138d89915baa3a8881c42c.zip
pfsense-d30232e230ebc2ff89138d89915baa3a8881c42c.tar.gz
Handle IPv6 in ip_in_interface_alias_subnet()
-rw-r--r--etc/inc/interfaces.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index 4833c59..a414307 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -4752,7 +4752,8 @@ function ip_in_interface_alias_subnet($interface, $ipalias) {
case "ipalias":
if ($vip['interface'] <> $interface)
break;
- if (ip_in_subnet($ipalias, gen_subnet($vip['subnet'], $vip['subnet_bits']) . "/" . $vip['subnet_bits']))
+ $subnet = is_ipaddrv6($ipalias) ? gen_subnetv6($vip['subnet'], $vip['subnet_bits']) : gen_subnet($vip['subnet'], $vip['subnet_bits']);
+ if (ip_in_subnet($ipalias, $subnet . "/" . $vip['subnet_bits']))
return true;
break;
}
OpenPOWER on IntegriCloud