From c0481e1cb5ce9943a2c381f34d766440b71054aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ermal=20Lu=E7i?= <eri@pfsense.org>
Date: Mon, 1 Feb 2010 15:13:04 +0000
Subject: [PATCH] Fix several handling of gif/gre addresses and automatically
 added routes.

---
 etc/inc/interfaces.inc | 6 +++---
 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 0a13fdfbfb..a2276229b2 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 9d60d26069..2c8291d374 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
+?>