Avoid conflicting interface IP address with static routes. Fixes #2039

1 files changed, 23 insertions, 4 deletions

diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php
index 3552f33..dde7956 100755
--- a/usr/local/www/interfaces.php
+++ b/usr/local/www/interfaces.php
@@ -543,18 +543,37 @@ if ($_POST['apply']) {
 
 	
 	/* normalize MAC addresses - lowercase and convert Windows-ized hyphenated MACs to colon delimited */
+	$staticroutes = get_staticroutes(true);
 	$_POST['spoofmac'] = strtolower(str_replace("-", ":", $_POST['spoofmac']));
 	if ($_POST['ipaddr']) {
 		if (!is_ipaddrv4($_POST['ipaddr']))
 			$input_errors[] = gettext("A valid IPv4 address must be specified.");
-		else if (is_ipaddr_configured($_POST['ipaddr'], $if, true))
-			$input_errors[] = gettext("This IPv4 address is being used by another interface or VIP.");
+		else {
+			if (is_ipaddr_configured($_POST['ipaddr'], $if, true))
+				$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)) {
+					$input_errors[] = gettext("This IPv4 address conflicts with a Static Route.");
+					break;
+				}
+			}
+		}
 	}
 	if ($_POST['ipaddrv6']) {
 		if (!is_ipaddrv6($_POST['ipaddrv6']))
 			$input_errors[] = gettext("A valid IPv6 address must be specified.");
-		else if (is_ipaddr_configured($_POST['ipaddrv6'], $if, true))
-			$input_errors[] = gettext("This IPv6 address is being used by another interface or VIP.");
+		else {
+			if (is_ipaddr_configured($_POST['ipaddrv6'], $if, true))
+				$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)) {
+					$input_errors[] = gettext("This IPv6 address conflicts with a Static Route.");
+					break;
+				}
+			}
+		}
 	}
 	if (($_POST['subnet'] && !is_numeric($_POST['subnet'])))
 		$input_errors[] = gettext("A valid subnet bit count must be specified.");