mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix validation of conflict between interface ip address and static routes. Fixes #2852

Browse Source
This commit is contained in:
Renato Botelho 2013-03-04 09:08:06 -03:00
parent b241b1442b
commit e480d64bc5
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
usr/local/www/interfaces.php
View File

@ -556,10 +556,12 @@ if ($_POST['apply']) {
$input_errors[] = gettext("This IPv4 address is being used by another interface or VIP.");
foreach ($staticroutes as $route_subnet) {
if (ip_in_subnet($_POST['ipaddr'], $route_subnet)) {
list($network, $subnet) = explode("/", $route_subnet);
if ($_POST['subnet'] == $subnet && $network == gen_subnet($_POST['ipaddr'], $_POST['subnet'])) {
$input_errors[] = gettext("This IPv4 address conflicts with a Static Route.");
break;
}
unset($network, $subnet);
}
}
}
@ -571,10 +573,12 @@ if ($_POST['apply']) {
$input_errors[] = gettext("This IPv6 address is being used by another interface or VIP.");
foreach ($staticroutes as $route_subnet) {
if (ip_in_subnet($_POST['ipaddrv6'], $route_subnet)) {
list($network, $subnet) = explode("/", $route_subnet);
if ($_POST['subnetv6'] == $subnet && $network == gen_subnetv6($_POST['ipaddrv6'], $_POST['subnetv6'])) {
$input_errors[] = gettext("This IPv6 address conflicts with a Static Route.");
break;
}
unset($network, $subnet);
}
}
}