From 839ee78fc2c31b2140bed0cdc56e0d284ce809a2 Mon Sep 17 00:00:00 2001
From: Seth Mos <seth.mos@dds.nl>
Date: Sat, 21 May 2011 23:16:01 +0200
Subject: [PATCH] Further fine tune the gif tunnel default route commands.

---
 etc/rc.newwanip | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/etc/rc.newwanip b/etc/rc.newwanip
index aa39ab44df..d9d5317aa2 100755
--- a/etc/rc.newwanip
+++ b/etc/rc.newwanip
@@ -102,20 +102,22 @@ file_put_contents("{$g['vardb_path']}/{$interface}_ip", $curwanip);
 /* reconfigure static routes (kernel may have deleted them) */
 system_routing_configure($interface);
 
+/* reconfigure our gateway monitor */
+setup_gateways_monitor();
+
 /* Check Gif tunnels */
-foreach($config['gifs'] as $gif) {
+foreach($config['gifs']['gif'] as $gif) {
 	if($gif['if'] == $interface) {
-		foreach($config['interfaces'] as $ifparent => $ifname) {
+		foreach($config['interfaces'] as $ifname => $ifparent) {
+			// echo "interface $ifparent, ifname $ifname, gif {$gif['gifif']}\n";
 			if(($ifparent['if'] == $gif['gifif']) && (isset($ifparent['enable']))) {
+				// echo "Running routing configure for $ifname\n";
 				system_routing_configure($ifname);
 			}
 		}
 	}
 }
 
-/* reconfigure our gateway monitor */
-setup_gateways_monitor();
-
 /* signal filter reload */
 filter_configure();