(ipsec) remove ipsec_force_reload, replace with...

(ipsec) remove ipsec_force_reload, replace with ipsec_configured_on_interface() to check if a tunnel is configured before reloading ipsec

src/etc/inc/ipsec.inc

@@ -1288,35 +1288,15 @@ EOD;
     return count($filterdns_list);
 }
 
-/*
- * Forcefully restart IPsec
- * This is required for when dynamic interfaces reload
- * For all other occasions the normal ipsec_configure()
- * will gracefully reload the settings without restarting
- */
-function ipsec_force_reload($interface = '')
+function ipsec_configured_on_interface($interface)
 {
     global $config;
-
-    $ipseccfg = $config['ipsec'];
-
-    if (!empty($interface) && isset($ipseccfg['phase1']) && is_array($ipseccfg['phase1'])) {
-        $found = false;
-        foreach ($ipseccfg['phase1'] as $ipsec) {
-            if (!isset($ipsec['disabled']) && ($ipsec['interface'] == $interface)) {
-                $found = true;
-                break;
-            }
+    if (!empty($config['ipsec']['phase1'][0])) {
+        foreach ($config['ipsec']['phase1'] as $phase1) {
+            if (!isset($phase1['disabled']) && $phase1['interface'] == $interface) {
+                return true;
             }
-        if (!$found) {
-            log_error(sprintf('Ignoring IPsec reload since there are no tunnels on interface %s', $interface));
-            return;
         }
     }
-
-    /* if ipsec is enabled, start up again */
-    if (isset($ipseccfg['enable'])) {
-        log_error('Forcefully reloading IPsec');
-        ipsec_configure();
-    }
+    return false;
 }

src/etc/rc.newwanip

@@ -200,7 +200,9 @@ if (!is_ipaddr($oldip) || $curwanip != $oldip || !is_ipaddrv4($config['interface
     services_dyndns_configure($interface);
 
     /* reconfigure IPsec tunnels */
-    ipsec_force_reload($interface);
+    if (ipsec_configured_on_interface($interface)) {
+        ipsec_configure();
+    }
 
     /* start OpenVPN server & clients */
     if (substr($interface_real, 0, 4) != "ovpn") {

src/etc/rc.newwanipv6

@@ -125,7 +125,9 @@ if (is_ipaddrv6($oldipv6)) {
 		// Still need to sync VPNs on PPPoE and such, as even with the same IP the VPN software is unhappy with the IP disappearing.
 		if (in_array($config['interfaces'][$interface]['ipaddrv6'], array('pppoe', 'pptp', 'ppp'))) {
 			/* reconfigure IPsec tunnels */
-			ipsec_force_reload($interface);
+			if (ipsec_configured_on_interface($interface)) {
+				ipsec_configure();
+			}
 
 			/* start OpenVPN server & clients */
 			if (substr($interface_real, 0, 4) != "ovpn")
@@ -145,7 +147,9 @@ services_dnsupdate_process($interface);
 services_dyndns_configure($interface);
 
 /* reconfigure IPsec tunnels */
-ipsec_force_reload($interface);
+if (ipsec_configured_on_interface($interface)) {
+	ipsec_configure();
+}
 
 /* start OpenVPN server & clients */
 if (substr($interface_real, 0, 4) != "ovpn")