Rework openvpn_vpnid_next() and remove duplicated code

1 files changed, 18 insertions, 26 deletions

diff --git a/src/etc/inc/openvpn.inc b/src/etc/inc/openvpn.inc
index 3ca9498..59a08b2 100644
--- a/src/etc/inc/openvpn.inc
+++ b/src/etc/inc/openvpn.inc
@@ -347,37 +347,29 @@ function openvpn_vpnid_next() {
 function openvpn_port_used($prot, $interface, $port, $curvpnid = 0) {
 	global $config;
 
+	$ovpn_settings = array();
 	if (is_array($config['openvpn']['openvpn-server'])) {
-		foreach ($config['openvpn']['openvpn-server'] as & $settings) {
-			if (isset($settings['disable'])) {
-				continue;
-			}
-
-			if ($curvpnid != 0 && $curvpnid == $settings['vpnid']) {
-				continue;
-			}
-
-			if ($port == $settings['local_port'] && $prot == $settings['protocol'] &&
-			    ($interface == $settings['interface'] || $interface == "any" || $settings['interface'] == "any")) {
-				return $settings['vpnid'];
-			}
-		}
+		$ovpn_settings = $config['openvpn']['openvpn-server'];
 	}
-
 	if (is_array($config['openvpn']['openvpn-client'])) {
-		foreach ($config['openvpn']['openvpn-client'] as & $settings) {
-			if (isset($settings['disable'])) {
-				continue;
-			}
+		$ovpn_settings = array_merge($ovpn_settings,
+		    $config['openvpn']['openvpn-client']);
+	}
 
-			if ($curvpnid != 0 && $curvpnid == $settings['vpnid']) {
-				continue;
-			}
+	foreach ($ovpn_settings as $settings) {
+		if (isset($settings['disable'])) {
+			continue;
+		}
 
-			if ($port == $settings['local_port'] && $prot == $settings['protocol'] &&
-			    ($interface == $settings['interface'] || $interface == "any" || $settings['interface'] == "any")) {
-				return $settings['vpnid'];
-			}
+		if ($curvpnid != 0 && $curvpnid == $settings['vpnid']) {
+			continue;
+		}
+
+		if ($port == $settings['local_port'] &&
+		    $prot == $settings['protocol'] &&
+		    ($interface == $settings['interface'] ||
+		    $interface == "any" || $settings['interface'] == "any")) {
+			return $settings['vpnid'];
 		}
 	}