diff options
author | Ermal LUÇI <eri@pfsense.org> | 2014-11-26 11:31:20 +0100 |
---|---|---|
committer | Ermal LUÇI <eri@pfsense.org> | 2014-11-26 11:31:20 +0100 |
commit | eb8ad408e0845b4b28e701eba9a06f794b528afe (patch) | |
tree | f5976c4b85fb4c5a2b51160c913867517c18eb1c /etc/rc.newwanip | |
parent | 619cd0d60d5dd67339bfa12499434d609387b4c2 (diff) | |
download | pfsense-eb8ad408e0845b4b28e701eba9a06f794b528afe.zip pfsense-eb8ad408e0845b4b28e701eba9a06f794b528afe.tar.gz |
Cleanup code and make sense of it. While here do not forget gre tunnels as well:
Diffstat (limited to 'etc/rc.newwanip')
-rwxr-xr-x | etc/rc.newwanip | 29 |
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); } } } |