Return OpenVPN IP addresses when the alias type is openvpn.

1 files changed, 21 insertions, 4 deletions

diff --git a/etc/inc/util.inc b/etc/inc/util.inc
index c003c7f..35d3600 100644
--- a/etc/inc/util.inc
+++ b/etc/inc/util.inc
@@ -428,12 +428,29 @@ function is_alias($name) {
 function alias_expand_value($name) {
 
 	global $aliastable, $config;
+	$newaddress = "";
+	$firstentry = true;
 	if($config['aliases']['alias'])
 		foreach($config['aliases']['alias'] as $alias) {
-			if($alias['name'] == $name)
-				return $alias['address'];
+			if($alias['name'] == $name) {
+				if($alias['type'] == "openvpn") {
+					$vpn_address_split = split(" ", $alias['address']);
+					foreach($vpn_address_split as $vpnsplit) {
+						foreach($config['openvpn']['user'] as $openvpn) {
+							if($openvpn['name'] == $vpnsplit) {
+								if($firstentry == false) 
+									$newaddress .= " ";
+								$newaddress .= $openvpn['ip'];
+								$firstentry = false;
+							}
+						}
+					}
+				} else {
+					$newaddress = $alias['address'];
+				}
+			}
 		}
-
+		return $newaddress;
 }
 
 /* expand a host or network alias, if necessary */
@@ -599,4 +616,4 @@ function resolve_retry($hostname, $retries = 5) {
        return false;
 }
 
-?>
+?>
\ No newline at end of file