diff options
author | Seth Mos <seth.mos@xs4all.nl> | 2007-10-19 19:40:28 +0000 |
---|---|---|
committer | Seth Mos <seth.mos@xs4all.nl> | 2007-10-19 19:40:28 +0000 |
commit | a94e9f6629514434cde459ad4dfdc316a1b4f12a (patch) | |
tree | c1acd58fd2c57eca7a9de1bc336444057427cf6a /etc/inc | |
parent | 3b9758deb430321322bfac0d931d8dc093cf23e2 (diff) | |
download | pfsense-a94e9f6629514434cde459ad4dfdc316a1b4f12a.zip pfsense-a94e9f6629514434cde459ad4dfdc316a1b4f12a.tar.gz |
Improve fall through logic
Diffstat (limited to 'etc/inc')
-rw-r--r-- | etc/inc/pfsense-utils.inc | 4 | ||||
-rw-r--r-- | etc/inc/system.inc | 20 |
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); |