Improve fall through logic

2 files changed, 13 insertions, 11 deletions

diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc
index 5ecdf49..012a9b1 100644
--- a/etc/inc/pfsense-utils.inc
+++ b/etc/inc/pfsense-utils.inc
@@ -3387,8 +3387,10 @@ function get_interface_gateway($interface) {
 					$interfacegw = $gateway['interface'];
 				}
 			}
+			$gw = $gatewayip;
+		} else {
+			$gw = $config['interfaces'][$interface]['gateway'];
 		}
-		$gw = $gatewayip;
 	}
 	/* if wan is requested, return it */
 	if($interface == "wan")
diff --git a/etc/inc/system.inc b/etc/inc/system.inc
index d58f9e6..a66ee08 100644
--- a/etc/inc/system.inc
+++ b/etc/inc/system.inc
@@ -289,8 +289,8 @@ function system_routing_configure() {
 					$interfacegw = $gateway['interface'];
 				}
 			}
+			mwexec("/sbin/route add default " . escapeshellarg($gatewayip));
 		}
-		mwexec("/sbin/route add default " . escapeshellarg($gatewayip));
 	}
 
 	if (is_array($config['staticroutes']['route'])) {
@@ -309,16 +309,16 @@ function system_routing_configure() {
 						$interfacegw = $gateway['interface'];
 					}
 				}
+				if(isset($rtent['interfacegateway'])) {
+					mwexec("/sbin/route add " . escapeshellarg($rtent['network']) .
+						" -iface " . escapeshellarg(convert_friendly_interface_to_real_interface_name($interfacegw)));
+				} else {
+					mwexec("/sbin/route add " . escapeshellarg($rtent['network']) .
+						" " . escapeshellarg($gatewayip));
+				}
+				/* record route so it can be easily removed later (if necessary) */
+				fwrite($fd, $rtent['network'] . "\n");
 			}
-			if(isset($rtent['interfacegateway'])) {
-				mwexec("/sbin/route add " . escapeshellarg($rtent['network']) .
-					" -iface " . escapeshellarg(convert_friendly_interface_to_real_interface_name($interfacegw)));
-			} else {
-				mwexec("/sbin/route add " . escapeshellarg($rtent['network']) .
-					" " . escapeshellarg($gatewayip));
-			}
-			/* record route so it can be easily removed later (if necessary) */
-			fwrite($fd, $rtent['network'] . "\n");
 		}
 
 		fclose($fd);