Project

General

Profile

« Previous | Next » 

Revision e3cffd6c

Added by Ermal Luçi over 10 years ago

Properly remove IPv6 carp vips as reported from https://forum.pfsense.org/index.php?topic=84392.0

View differences:

etc/inc/interfaces.inc
1194 1194 
		break;
1195 1195 
	case "carp":
1196 1196 
		/* XXX: Is enough to delete ip address? */
1197 
		if (does_interface_exist($vipif))
1198 
			pfSense_interface_deladdress($vipif, $vip['subnet']);
1197 
		if (does_interface_exist($vipif)) {
1198 
			if (is_ipaddrv6($vip['subnet']))
1199 
				mwexec("/sbin/ifconfig {$vipif} inet6 " . escapeshellarg($vip['subnet']) . " delete");
1200 
			else
1201 
				pfSense_interface_deladdress($vipif, $vip['subnet']);
1202 
		}
1199 1203 
		break;
1200 1204 
	}
1201 1205 
}
usr/local/www/xmlrpc.php
271 271 
		/* Cleanup remaining old carps */
272 272 
		foreach ($oldvips as $oldvipif => $oldvippar) {
273 273 
			$oldvipif = get_real_interface($oldvippar['interface']);
274 
			if (!empty($oldvipif))
275 
				pfSense_interface_deladdress($oldvipif, $oldvipar['subnet']);
274 
			if (!empty($oldvipif)) {
275 
				if (is_ipaddrv6($oldvipif))
276 
					 mwexec("/sbin/ifconfig " . escapeshellarg($oldvipif) . " inet6 " . escapeshellarg($oldvipar['subnet']) . " delete");
277 
				else
278 
					pfSense_interface_deladdress($oldvipif, $oldvipar['subnet']);
279 
			}
276 280 
		}
277 281 
		if ($carp_setuped == true)
278 282 
			interfaces_sync_setup();

Also available in: Unified diff