Merge pull request #64 from phil-davis/master

Bug #2284: rc.newwanip handle case when gifs config is null

1 files changed, 13 insertions, 11 deletions

diff --git a/etc/rc.newwanip b/etc/rc.newwanip
index 86dac23..c50b5d3 100755
--- a/etc/rc.newwanip
+++ b/etc/rc.newwanip
@@ -118,17 +118,19 @@ if (!empty($bridgetmp))
 system_routing_configure($interface);
 
 /* Check Gif tunnels */
-foreach($config['gifs']['gif'] as $gif) {
-	if($gif['if'] == $interface) {
-		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";
-				$gif['gifif'] = interface_gif_configure($gif);
-				$confif = convert_real_interface_to_friendly_interface_name($gif['gifif']);
-				if ($confif <> "")
-					interface_configure($confif);
-				system_routing_configure($ifname);
+if(is_array($config['gifs']['gif'])){
+	foreach($config['gifs']['gif'] as $gif) {
+		if($gif['if'] == $interface) {
+			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";
+					$gif['gifif'] = interface_gif_configure($gif);
+					$confif = convert_real_interface_to_friendly_interface_name($gif['gifif']);
+					if ($confif <> "")
+						interface_configure($confif);
+					system_routing_configure($ifname);
+				}
 			}
 		}
 	}