Change OpenVPN Compression settings to cover the full range of allowed settings on OpenVPN (unset, off, on, adaptive) rather than a simple off/on switch that either doesn't set the value or enables it with adaptive (OpenVPN's default).

1 files changed, 21 insertions, 0 deletions

diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc
index 3180524..0e8e5e8 100644
--- a/etc/inc/upgrade_config.inc
+++ b/etc/inc/upgrade_config.inc
@@ -3176,4 +3176,25 @@ function upgrade_100_to_101() {
 			$config['captiveportal'][$cpzone]['passthrumac'][$idx]['action'] = 'pass';
 	}
 }
+
+/* Convert OpenVPN Compression option to the new style */
+function upgrade_101_to_102() {
+	global $config;
+	// Nothing to do if there is no OpenVPN tag
+	if (!isset($config['openvpn']) || !is_array($config['openvpn']))
+		return;
+
+	if (is_array($config['openvpn']['openvpn-server'])) {
+		foreach ($config['openvpn']['openvpn-server'] as &$vpn) {
+			if (!empty($vpn['compression']))
+				$vpn['compression'] = "adaptive";
+		}
+	}
+	if (is_array($config['openvpn']['openvpn-client'])) {
+		foreach ($config['openvpn']['openvpn-client'] as &$vpn) {
+			if (!empty($vpn['compression']))
+				$vpn['compression'] = "adaptive";
+		}
+	}
+}
 ?>