When deleting or disabling a non-dynamic gateway, if that gateway was set as default then remove the corresponding default route to respect the user's decision. Fixes #6659

1 files changed, 9 insertions, 0 deletions

diff --git a/src/usr/local/www/system_gateways_edit.php b/src/usr/local/www/system_gateways_edit.php
index bf5211b..0903aea 100644
--- a/src/usr/local/www/system_gateways_edit.php
+++ b/src/usr/local/www/system_gateways_edit.php
@@ -494,6 +494,15 @@ if ($_POST) {
 
 		if (isset($_POST['disabled'])) {
 			$gateway['disabled'] = true;
+			/* Check if the gateway was enabled but changed to disabled. */
+			if ((isset($realid) && $a_gateway_item[$realid]) && ($pconfig['disabled'] == false)) {
+				/*  If the disabled gateway was the default route, remove the default route */
+				if (is_ipaddr($gateway['gateway']) &&
+				    isset($gateway['defaultgw'])) {
+					$inet = (!is_ipaddrv4($gateway['gateway']) ? '-inet6' : '-inet');
+					mwexec("/sbin/route delete {$inet} default");
+				}
+			}
 		} else {
 			unset($gateway['disabled']);
 		}