diff options
author | Ermal <eri@pfsense.org> | 2013-11-28 18:36:03 +0000 |
---|---|---|
committer | Ermal <eri@pfsense.org> | 2013-11-28 18:36:18 +0000 |
commit | 7238e0cfc840d175e5b0dd650730fc21b6a9b368 (patch) | |
tree | 7a3b20dd35ddf6019eb61f612d10711de12c03e4 /usr/local/www/firewall_virtual_ip_edit.php | |
parent | d11134243489f7cea17cdc4c04a0624b0c16ed18 (diff) | |
download | pfsense-7238e0cfc840d175e5b0dd650730fc21b6a9b368.zip pfsense-7238e0cfc840d175e5b0dd650730fc21b6a9b368.tar.gz |
Remove references to _vip interface and provide proper configuration for carp on FreeBSD 10. Still some places to deal with this and certainly missing upgrade code
Diffstat (limited to 'usr/local/www/firewall_virtual_ip_edit.php')
-rwxr-xr-x | usr/local/www/firewall_virtual_ip_edit.php | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/usr/local/www/firewall_virtual_ip_edit.php b/usr/local/www/firewall_virtual_ip_edit.php index b9993d4..81e4bb3 100755 --- a/usr/local/www/firewall_virtual_ip_edit.php +++ b/usr/local/www/firewall_virtual_ip_edit.php @@ -180,31 +180,10 @@ if ($_POST) { if ($_POST['interface'] == "lo0") $input_errors[] = gettext("For this type of vip localhost is not allowed."); - if (strstr($_POST['interface'], "_vip")) - $input_errors[] = gettext("For this type of vip a carp parent is not allowed."); - break; - case "ipalias": - if (strstr($_POST['interface'], "_vip")) { - if (is_ipaddrv4($_POST['subnet'])) { - $parent_ip = get_interface_ip($_POST['interface']); - $parent_sn = get_interface_subnet($_POST['interface']); - $subnet = gen_subnet($parent_ip, $parent_sn); - } else if (is_ipaddrv6($_POST['subnet'])) { - $parent_ip = get_interface_ipv6($_POST['interface']); - $parent_sn = get_interface_subnetv6($_POST['interface']); - $subnet = gen_subnetv6($parent_ip, $parent_sn); - } - if (isset($parent_ip) && !ip_in_subnet($_POST['subnet'], "{$subnet}/{$parent_sn}") && !ip_in_interface_alias_subnet($_POST['interface'], $_POST['subnet'])) { - $cannot_find = $_POST['subnet'] . "/" . $_POST['subnet_bits'] ; - $input_errors[] = sprintf(gettext("Sorry, we could not locate an interface with a matching subnet for %s. Please add an IP alias in this subnet on this interface."),$cannot_find); - } - } break; default: if ($_POST['interface'] == "lo0") $input_errors[] = gettext("For this type of vip localhost is not allowed."); - if (strstr($_POST['interface'], "_vip")) - $input_errors[] = gettext("For this type of VIP, a CARP parent is not allowed."); break; } |