diff options
| author | Darren Embry <dse@webonastick.com> | 2012-04-05 16:47:26 -0400 |
|---|---|---|
| committer | Darren Embry <dse@webonastick.com> | 2012-04-05 16:48:09 -0400 |
| commit | d7afd9001e83139bc3247644b70f359e3c40a361 (patch) | |
| tree | f0215c783894428077beef3858a3f8f2d338f861 /etc/inc | |
| parent | 67898061e6a31cec378acf59eec1a23b99cf5aa7 (diff) | |
| download | pfsense-d7afd9001e83139bc3247644b70f359e3c40a361.zip pfsense-d7afd9001e83139bc3247644b70f359e3c40a361.tar.gz | |
use existing filter_expand_alias (well, via a wrapper) instead of
reinventing it
Diffstat (limited to 'etc/inc')
| -rw-r--r-- | etc/inc/filter.inc | 5 | ||||
| -rw-r--r-- | etc/inc/util.inc | 11 | ||||
| -rw-r--r-- | etc/inc/vslb.inc | 6 |
3 files changed, 9 insertions, 13 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index 88c90d2..ada85ee 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -528,6 +528,11 @@ function filter_expand_alias($alias_name) } } +function filter_expand_alias_array($alias_name) { + $expansion = filter_expand_alias($alias_name); + return explode(" ", preg_replace('/\s+/', ' ', trim($expansion))); +} + function filter_generate_aliases() { global $config, $FilterIflist, $after_filter_configure_run; diff --git a/etc/inc/util.inc b/etc/inc/util.inc index a2f52ef..087bce8 100644 --- a/etc/inc/util.inc +++ b/etc/inc/util.inc @@ -1030,17 +1030,6 @@ function alias_expand($name) { return null; } -function alias_expand_array($name) { - global $aliastable; - $result = array(); - if (isset($aliastable[$name])) { - return explode(" ", $aliastable[$name]); - } - else { - return null; - } -} - function alias_expand_urltable($name) { global $config; $urltable_prefix = "/var/db/aliastables/"; diff --git a/etc/inc/vslb.inc b/etc/inc/vslb.inc index 7d3cf05..175c46b 100644 --- a/etc/inc/vslb.inc +++ b/etc/inc/vslb.inc @@ -156,6 +156,8 @@ function echo_lbaction($action) { function relayd_configure($kill_first=false) { global $config, $g; + require_once("filter.inc"); + $vs_a = $config['load_balancer']['virtual_server']; $pool_a = $config['load_balancer']['lbpool']; $protocol_a = $config['load_balancer']['lbprotocol']; @@ -262,14 +264,14 @@ function relayd_configure($kill_first=false) { $append_port_to_name = false; if (is_alias($vs_a[$i]['port'])) { - $src_port_array = alias_expand_array($vs_a[$i]['port']); + $src_port_array = filter_expand_alias_array($vs_a[$i]['port']); $append_port_to_name = true; } else { $src_port_array = array($vs_a[$i]['port']); } if (is_alias($pools[$vs_a[$i]['pool']]['port'])) { - $dest_port_array = alias_expand_array($pools[$vs_a[$i]['pool']]['port']); + $dest_port_array = filter_expand_alias_array($pools[$vs_a[$i]['pool']]['port']); $append_port_to_name = true; } else { |
