summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErmal LUÇI <eri@pfsense.org>2014-11-21 11:20:46 +0100
committerErmal LUÇI <eri@pfsense.org>2014-11-21 12:10:00 +0100
commite5e16cfc962bcc98a06b89574309bc2ef0ed3542 (patch)
tree77d8ec7777feb4ef2fd3109a37f4df0efb0af6fb
parentc1a50dd741cb5dbf570bd87528f3ec08b2ead4ab (diff)
downloadpfsense-e5e16cfc962bcc98a06b89574309bc2ef0ed3542.zip
pfsense-e5e16cfc962bcc98a06b89574309bc2ef0ed3542.tar.gz
Merge e3cffd6cefc - Properly remove IPv6 carp vips as reported from https://forum.pfsense.org/index.php?topic=84392.0
-rw-r--r--etc/inc/interfaces.inc9
1 files changed, 7 insertions, 2 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index 6ece099..0d51000 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -1167,8 +1167,13 @@ function interface_vip_bring_down($vip) {
break;
case "carp":
$vipif = "{$vip['interface']}_vip{$vip['vhid']}";
- if (does_interface_exist($vipif))
- pfSense_interface_destroy($vipif);
+ /* XXX: Is enough to delete ip address? */
+ if (does_interface_exist($vipif)) {
+ if (is_ipaddrv6($vip['subnet']))
+ mwexec("/sbin/ifconfig {$vipif} inet6 " . escapeshellarg($vip['subnet']) . " delete");
+ else
+ pfSense_interface_deladdress($vipif, $vip['subnet']);
+ }
break;
}
}
OpenPOWER on IntegriCloud