Merge pull request #627 from phil-davis/master

Optimize which OpenVPN instances are restarted 

2 files changed, 26 insertions, 2 deletions

diff --git a/etc/inc/openvpn.inc b/etc/inc/openvpn.inc
index a5244fd..bd92642 100644
--- a/etc/inc/openvpn.inc
+++ b/etc/inc/openvpn.inc
@@ -744,9 +744,12 @@ function openvpn_reconfigure($mode, $settings) {
 	$fpath = "{$g['varetc_path']}/openvpn/{$mode_id}.conf";
 	file_put_contents($fpath, $conf);
 	unset($conf);
+	$fpath = "{$g['varetc_path']}/openvpn/{$mode_id}.interface";
+	file_put_contents($fpath, $interface);
 	//chown($fpath, 'nobody');
 	//chgrp($fpath, 'nobody');
 	@chmod("{$g['varetc_path']}/openvpn/{$mode_id}.conf", 0600);
+	@chmod("{$g['varetc_path']}/openvpn/{$mode_id}.interface", 0600);
 	@chmod("{$g['varetc_path']}/openvpn/{$mode_id}.key", 0600);
 	@chmod("{$g['varetc_path']}/openvpn/{$mode_id}.tls-auth", 0600);
 	@chmod("{$g['varetc_path']}/openvpn/{$mode_id}.conf", 0600);
diff --git a/etc/rc.openvpn b/etc/rc.openvpn
index d57594a..531fa40 100755
--- a/etc/rc.openvpn
+++ b/etc/rc.openvpn
@@ -38,6 +38,27 @@ require_once("filter.inc");
 require_once("gwlb.inc");
 require_once("openvpn.inc");
 
+function openvpn_resync_if_needed ($mode, $ovpn_settings, $interface) {
+	global $g, $config;
+
+	$resync_needed = false;
+	if (empty($interface)) {
+		$resync_needed = true;
+	} else {
+		$mode_id = $mode . $ovpn_settings['vpnid'];
+		$fpath = "{$g['varetc_path']}/openvpn/{$mode_id}.interface";
+		$current_device = file_get_contents($fpath);
+		$new_device = get_failover_interface($ovpn_settings['interface']);
+		$this_device = $config['interfaces'][$interface]['if'];
+		if (($current_device != $new_device) || ($current_device == $this_device) || ($new_device == $this_device))
+			$resync_needed = true;
+	}
+	if ($resync_needed) {
+		log_error("OpenVPN: Resync " . $mode_id . " " . $ovpn_settings['description']);
+		openvpn_resync($mode, $ovpn_settings);
+	}
+}
+
 /* make sure to wait until the boot scripts have finished */
 if (file_exists("{$g['varrun_path']}/booting"))
 	return;
@@ -70,14 +91,14 @@ else {
 if(is_array($config['openvpn']['openvpn-server'])) {
 	foreach($config['openvpn']['openvpn-server'] as &$server) {
 		if ($server['interface'] == $interface || empty($interface) || (!empty($gwgroups) && in_array($server['interface'], $gwgroups)))
-			openvpn_resync('server', $server);
+			openvpn_resync_if_needed('server', $server, $interface);
 	}
 }
 
 if (is_array($config['openvpn']['openvpn-client'])) {
 	foreach($config['openvpn']['openvpn-client'] as &$client) {
 		if ($client['interface'] == $interface || empty($interface) || (!empty($gwgroups) && in_array($client['interface'], $gwgroups)))
-			openvpn_resync('client', $client);
+			openvpn_resync_if_needed('client', $client, $interface);
 	}
 }