Merge alias_expand_value and filter_generate_aliases this makes the more sense from functionality. This removes alias_expand_value function as it is not needed in new world order.

2 files changed, 18 insertions, 33 deletions

diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index 1cdc287..d595560 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -398,6 +398,24 @@ function filter_generate_aliases() {
 			if ($aliased['type'] == "host" || $aliased['type'] == "network") {
 				$aliases .= "table <{$aliased['name']}> { {$addrlist}{$extralias} } \n";
 				$aliases .= "{$aliased['name']} = \"<{$aliased['name']}>\"\n";
+			} else if ($aliased['type'] == "openvpn") {
+				$openvpncfg = array();
+				foreach ($config['openvpn']['user'] as $openvpn)
+					/* XXX: Check if we have a correct ip? */
+					$openvpncfg[$openvpn['name']] = $openvpn['ip'];
+				$vpn_lines = split("\n", $addrlist);
+				foreach ($vpn_lines as $vpn_line) {
+					$vpn_address_split = split(" ", $vpn_line);
+					foreach($vpn_address_split as $vpnsplit) {
+						if(isset($openvpncfg[$vpnsplit])) {
+							$newaddress .= " ";
+							$newaddress .= $openvpn[$vpnsplit];
+							break;
+						}
+					}
+				}
+				$aliases .= "table <{$aliased['name']}> { {$newaddress}{$extralias} } \n";
+                                $aliases .= "{$aliased['name']} = \"<{$aliased['name']}>\"\n";
 			} else 
 				$aliases .= "{$aliased['name']} = \"{ {$aliased['address']}{$extralias} }\"\n";
 		}
diff --git a/etc/inc/util.inc b/etc/inc/util.inc
index 84204e4..ab07b92 100644
--- a/etc/inc/util.inc
+++ b/etc/inc/util.inc
@@ -648,39 +648,6 @@ function is_alias($name) {
 	return isset($aliastable[$name]);
 }
 
-function alias_expand_value($name) {
-
-	global $aliastable, $config;
-
-	$newaddress = "";
-	if($config['aliases']['alias'])
-		foreach($config['aliases']['alias'] as $alias) {
-			if($alias['name'] == $name) {
-				if($alias['type'] == "openvpn") {
-					$openvpncfg = array();
-					foreach ($config['openvpn']['user'] as $openvpn)
-						/* XXX: Check if we have the right ip? */
-						$openvpncfg[$openvpn['name']] = $openvpn['ip'];
-					$vpn_addresses = filter_generate_nested_alias($alias['address']);
-					$vpn_lines = split("\n", $vpn_addresses);
-					foreach ($vpn_lines as $vpn_line) {
-						$vpn_address_split = split(" ", $vpn_line);
-						foreach($vpn_address_split as $vpnsplit) {
-							if(isset($openvpncfg[$vpnsplit])) {
-								$newaddress .= " ";
-								$newaddress .= $openvpn[$vpnsplit];
-								break;
-							}
-						}
-					}
-				} else
-					$newaddress = filter_generate_nested_alias($alias['address']);
-				break;
-			}
-		}
-		return $newaddress;
-}
-
 /* expand a host or network alias, if necessary */
 function alias_expand($name) {