diff options
| author | Ermal Luçi <eri@pfsense.org> | 2010-02-01 15:13:04 +0000 |
|---|---|---|
| committer | Ermal Luçi <eri@pfsense.org> | 2010-02-01 15:13:04 +0000 |
| commit | c0481e1cb5ce9943a2c381f34d766440b71054aa (patch) | |
| tree | e593680ab0b3de5984b04db8c597f3eb935d46ab | |
| parent | 1dd1e41fc2503fc9e77df4a91ec4e1dda5bea0be (diff) | |
| download | pfsense-c0481e1cb5ce9943a2c381f34d766440b71054aa.zip pfsense-c0481e1cb5ce9943a2c381f34d766440b71054aa.tar.gz | |
Fix several handling of gif/gre addresses and automatically added routes.
| -rw-r--r-- | etc/inc/interfaces.inc | 6 | ||||
| -rw-r--r-- | etc/inc/system.inc | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index 0a13fdf..a227622 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -574,7 +574,7 @@ function interface_gre_configure(&$gre) { else log_error("Could not bring greif up -- variable not defined."); - mwexec("/sbin/route add {$gre['remote-addr']}/{$gre['tunnel-remote-net']} {$realifip}"); + mwexec("/sbin/route add {$gre['remote-addr']}/{$gre['tunnel-remote-net']} -iface {$greif}"); file_put_contents("{$g['tmp_path']}/{$greif}_router", $gre['tunnel-remote-addr']); return $greif; @@ -628,7 +628,7 @@ function interface_gif_configure(&$gif) { else log_error("could not bring gifif up -- variable not defined"); - mwexec("/sbin/route add {$gif['remote-addr']}/{$gif['tunnel-remote-net']} {$realifip}"); + mwexec("/sbin/route add {$gif['remote-addr']}/{$gif['tunnel-remote-net']} -iface {$gifif}"); file_put_contents("{$g['tmp_path']}/{$gifif}_router", $gif['tunnel-remote-addr']); return $gifif; @@ -1738,7 +1738,7 @@ function interface_configure($interface = "wan", $reloadall = false) { if (link_interface_to_gif($interface)) { foreach ($config['gifs']['gif'] as $gif) if ($gif['if'] == $interface) - interface_gre_configure($gif); + interface_gif_configure($gif); } if (link_interface_to_bridge($interface)) { foreach ($config['bridges']['bridged'] as $bridge) diff --git a/etc/inc/system.inc b/etc/inc/system.inc index 9d60d26..2c8291d 100644 --- a/etc/inc/system.inc +++ b/etc/inc/system.inc @@ -360,7 +360,7 @@ function system_routing_configure() { $gatewayip = $rtent['gateway']; $interfacegw = $rtent['interface']; } - if((isset($rtent['interfacegateway'])) && (! is_ipaddr($gatewayip))){ + if((isset($rtent['interfacegateway'])) && (! is_ipaddr($gatewayip))) { mwexec("/sbin/route add " . escapeshellarg($rtent['network']) . " -iface " . escapeshellarg(convert_friendly_interface_to_real_interface_name($interfacegw))); } else { @@ -1356,4 +1356,4 @@ function enable_watchdog() { } } -?>
\ No newline at end of file +?> |
