Only reload racoon when there is at least one tunnel enabled on the interface used to call rc.newwanip(v6). It fixes #2922

1 files changed, 16 insertions, 3 deletions

diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc
index 787abd4..d43c069 100644
--- a/etc/inc/vpn.inc
+++ b/etc/inc/vpn.inc
@@ -998,12 +998,25 @@ EOD;
  * For all other occasions the normal vpn_ipsec_configure()
  * will gracefully reload the settings without restarting
  */
-function vpn_ipsec_force_reload() {
-	global $config;
-	global $g;
+function vpn_ipsec_force_reload($interface = "") {
+	global $g, $config;
 
 	$ipseccfg = $config['ipsec'];
 
+	if (!empty($interface) && is_array($ipseccfg['phase1'])) {
+		$found = false;
+		foreach ($ipseccfg['phase1'] as $ipsec) {
+			if (!isset($ipsec['disabled']) && ($ipsec['interface'] == $interface)) {
+				$found = true;
+				break;
+			}
+		}
+		if (!$found) {
+			log_error(sprintf(gettext("Ignoring IPsec racoon daemon reload since there are no tunnels on interface %s"), $interface));
+			return;
+		}
+	}
+
 	/* send a SIGKILL to be sure */
 	killbypid("{$g['varrun_path']}/racoon.pid");