Fix various OpenVPN Client Export protocol issues that prevented the export from generating a valid IPv6 endpoint client config; Also the Windows installer files have been bumped to 2.3.3-I002

4 files changed, 21 insertions, 8 deletions

diff --git a/config/openvpn-client-export/openvpn-client-export.inc b/config/openvpn-client-export/openvpn-client-export.inc
index 91b8f198..b77802b5 100755
--- a/config/openvpn-client-export/openvpn-client-export.inc
+++ b/config/openvpn-client-export/openvpn-client-export.inc
@@ -236,7 +236,8 @@ function openvpn_client_export_config($srvid, $usrid, $crtid, $useaddr, $verifys
 
 	if (!empty($proxy)) {
 		if ($proxy['proxy_type'] == "http") {
-			if ($proto == "udp") {
+
+			if (strtoupper(substr($settings['protocol'], 0, 3)) == "UDP") {
 				$input_errors[] = "This server uses UDP protocol and cannot communicate with HTTP proxy.";
 				return;
 			}
@@ -733,7 +734,10 @@ function openvpn_client_export_sharedkey_config($srvid, $useaddr, $proxy, $zipco
 		} else {
 			if (!$interface)
 				$interface = "wan";
-			$server_host = get_interface_ip($interface);
+			if (in_array(strtolower($settings['protocol']), array("udp6", "tcp6")))
+				$server_host = get_interface_ipv6($interface);
+			else
+				$server_host = get_interface_ip($interface);
 		}
 	} else if ($useaddr == "serverhostname" || empty($useaddr)) {
 		$server_host = empty($config['system']['hostname']) ? "" : "{$config['system']['hostname']}.";
@@ -742,7 +746,10 @@ function openvpn_client_export_sharedkey_config($srvid, $useaddr, $proxy, $zipco
 		$server_host = $useaddr;
 
 	$server_port = $settings['local_port'];
-	$proto = (strtoupper($settings['protocol']) == 'UDP' ? 'udp' : "tcp-client");
+
+	$proto = strtolower($settings['protocol']);
+	if (strtolower(substr($settings['protocol'], 0, 3)) == "tcp")
+		$proto .= "-client";
 
 	$cipher = $settings['crypto'];
 	$digest = !empty($settings['digest']) ? $settings['digest'] : "SHA1";
@@ -837,7 +844,10 @@ function openvpn_client_export_build_remote_lines($settings, $useaddr, $interfac
 		} else {
 			if (!$interface || ($interface == "any"))
 				$interface = "wan";
-			$server_host = get_interface_ip($interface);
+			if (in_array(strtolower($settings['protocol']), array("udp6", "tcp6")))
+				$server_host = get_interface_ipv6($interface);
+			else
+				$server_host = get_interface_ip($interface);
 		}
 	} else if ($useaddr == "serverhostname" || empty($useaddr)) {
 		$server_host = empty($config['system']['hostname']) ? "" : "{$config['system']['hostname']}.";
@@ -845,7 +855,10 @@ function openvpn_client_export_build_remote_lines($settings, $useaddr, $interfac
 	} else
 		$server_host = $useaddr;
 
-	$proto = (strtoupper($settings['protocol']) == 'UDP' ? 'udp' : "tcp");
+	$proto = strtolower($settings['protocol']);
+	if (strtolower(substr($settings['protocol'], 0, 3)) == "tcp")
+		$proto .= "-client";
+
 	if (($expformat == "inlineios") && ($proto == "tcp-client"))
 		$proto = "tcp";
 
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 578e7085..fe610446 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -1096,7 +1096,7 @@
 		<depends_on_package_pbi>zip-3.0-##ARCH##.pbi p7zip-9.20.1_2-##ARCH##.pbi</depends_on_package_pbi>
 		<build_port_path>/usr/ports/archivers/p7zip</build_port_path>
 		<build_port_path>/usr/ports/archivers/zip</build_port_path>
-		<version>1.2.7</version>
+		<version>1.2.8</version>
 		<status>RELEASE</status>
 		<required_version>2.2</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/openvpn-client-export/openvpn-client-export.xml</config_file>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index ffd4943e..496b5a79 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1453,7 +1453,7 @@
 		<depends_on_package_pbi>zip-3.0-i386.pbi p7zip-9.20.1-i386.pbi</depends_on_package_pbi>
 		<build_port_path>/usr/ports/archivers/p7zip</build_port_path>
 		<build_port_path>/usr/ports/archivers/zip</build_port_path>
-		<version>1.2.7</version>
+		<version>1.2.8</version>
 		<status>RELEASE</status>
 		<required_version>2.0</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/openvpn-client-export/openvpn-client-export.xml</config_file>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index f8623d59..5de8f73c 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -1440,7 +1440,7 @@
 		<depends_on_package_pbi>zip-3.0-amd64.pbi p7zip-9.20.1-amd64.pbi</depends_on_package_pbi>
 		<build_port_path>/usr/ports/archivers/p7zip</build_port_path>
 		<build_port_path>/usr/ports/archivers/zip</build_port_path>
-		<version>1.2.7</version>
+		<version>1.2.8</version>
 		<status>RELEASE</status>
 		<required_version>2.0</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/openvpn-client-export/openvpn-client-export.xml</config_file>