diff options
| -rwxr-xr-x | etc/rc.bootup | 1 | ||||
| -rwxr-xr-x | etc/rc.newipsecdns | 7 | ||||
| -rwxr-xr-x | usr/local/www/vpn_ipsec.php | 5 |
3 files changed, 0 insertions, 13 deletions
diff --git a/etc/rc.bootup b/etc/rc.bootup index 0f25668..612ff22 100755 --- a/etc/rc.bootup +++ b/etc/rc.bootup @@ -441,7 +441,6 @@ unset($g['booting']); /* If there are ipsec dynamic hosts try again to reload the tunnels as rc.newipsecdns does */ if ($ipsec_dynamic_hosts) { - vpn_ipsec_refresh_policies(); vpn_ipsec_configure(); filter_configure(); } diff --git a/etc/rc.newipsecdns b/etc/rc.newipsecdns index de3d7ac..854c8d7 100755 --- a/etc/rc.newipsecdns +++ b/etc/rc.newipsecdns @@ -52,13 +52,6 @@ if (isset($config['ipsec']['enable'])) { $ipseclck = lock('ipsecdns', LOCK_EX); -/* We will walk the list of hostnames found in the ipsec tunnel - * configuration. Since we are already triggered by filterdns - * that a hostname has changed we can proceed to compare the - * new IP address with the old address from the DNS cache. - */ -vpn_ipsec_refresh_policies(); - vpn_ipsec_configure(); if (isset($config['ipsec']['failoverforcereload'])) diff --git a/usr/local/www/vpn_ipsec.php b/usr/local/www/vpn_ipsec.php index cd5ee06..7d5fdfb 100755 --- a/usr/local/www/vpn_ipsec.php +++ b/usr/local/www/vpn_ipsec.php @@ -92,12 +92,8 @@ if ($_GET['act'] == "delph1") unset($a_phase2[$p2index]); } - /* needs to guarantee that SPDs will be removed before phase 1 */ - vpn_ipsec_refresh_policies(); - /* remove the phase1 entry */ unset($a_phase1[$_GET['p1index']]); - vpn_ipsec_refresh_policies(); vpn_ipsec_configure(); write_config(); filter_configure(); @@ -112,7 +108,6 @@ if ($_GET['act'] == "delph2") remove_tunnel_spd_policy($a_phase1[$_GET['p1index']],$a_phase2[$_GET['p2index']]); /* remove the phase2 entry */ unset($a_phase2[$_GET['p2index']]); - vpn_ipsec_refresh_policies(); vpn_ipsec_configure(); filter_configure(); write_config(); |
