From 90c386ba159113db055cd69fdb6b4dc1f279df82 Mon Sep 17 00:00:00 2001 From: jim-p Date: Sun, 24 Jul 2011 12:28:58 -0400 Subject: [PATCH] Revert "Already doing this no need to duplicate" <- no, we aren't 100% duplicating this. This commit breaks fully reconfiguring assigned gif interfaces. This reverts commit 87f0f42c3230ad7ad15b14a8a9d63c58f8b2e379. --- etc/rc.newwanip | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/etc/rc.newwanip b/etc/rc.newwanip index 07ff33f86d..1ae72ed878 100755 --- a/etc/rc.newwanip +++ b/etc/rc.newwanip @@ -112,6 +112,23 @@ if (!empty($grouptmp)) /* reconfigure static routes (kernel may have deleted them) */ 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); + } + } + } +} + /* reconfigure our gateway monitor */ setup_gateways_monitor();