Cleanup code and make sense of it. While here do not forget gre tunnels as well:

1 files changed, 15 insertions, 14 deletions

diff --git a/etc/rc.newwanip b/etc/rc.newwanip
index ff601d3..1e2d17e 100755
--- a/etc/rc.newwanip
+++ b/etc/rc.newwanip
@@ -161,20 +161,21 @@ switch($config['interfaces'][$interface]['ipaddrv6']) {
 }
 
 /* Check Gif tunnels */
-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);
-				}
-			}
+if (!empty($gif)) {
+	foreach($gif as $giftun) {
+		$confif = convert_real_interface_to_friendly_interface_name($gif['gifif']);
+		if (!empty($confif)) {
+			interface_configure($confif);
+			system_routing_configure($confif);
+		}
+	}
+}
+if (!empty($gre)) {
+	foreach($gre as $giftun) {
+		$confif = convert_real_interface_to_friendly_interface_name($gif['greif']);
+		if (!empty($confif)) {
+			interface_configure($confif);
+			system_routing_configure($confif);
 		}
 	}
 }