summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2010-11-10 18:25:38 +0000
committerErmal <eri@pfsense.org>2010-11-10 18:25:38 +0000
commitf6b30142f7f6cdc3d20ffd187be3dc528fd88cdc (patch)
tree477d58cbe4b4d89ecd7201217479130410d4bcbd
parentc422a1699881a79dd96efbb40c19c930da0b7448 (diff)
downloadpfsense-f6b30142f7f6cdc3d20ffd187be3dc528fd88cdc.zip
pfsense-f6b30142f7f6cdc3d20ffd187be3dc528fd88cdc.tar.gz
Ticket #904. Actually correctly handle the assigned openvpn client as a dynamic gateway rather than breaking the behaviour of the system. Strange nobody has noticed broken gateway behaviour with openvpn assigned!
-rw-r--r--etc/inc/interfaces.inc8
1 files changed, 3 insertions, 5 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index f5848d6..aa1a3a0 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -3208,9 +3208,6 @@ function get_interfaces_with_gateway() {
/* loop interfaces, check config for outbound */
foreach($config['interfaces'] as $ifdescr => $ifname) {
- if (substr($ifdescr, 0, 5) == "ovpnc")
- return true;
-
switch ($ifname['ipaddr']) {
case "dhcp":
case "carpdev-dhcp":
@@ -3222,7 +3219,8 @@ function get_interfaces_with_gateway() {
$ints[$ifdescr] = $ifdescr;
break;
default:
- if (!empty($ifname['gateway']))
+ if (substr($ifname['if'], 0, 5) == "ovpnc" ||
+ !empty($ifname['gateway']))
$ints[$ifdescr] = $ifdescr;
break;
}
@@ -3452,4 +3450,4 @@ EOD;
unlink_if_exists($cron_file);
}
-?> \ No newline at end of file
+?>
OpenPOWER on IntegriCloud