diff options
| author | Darren Embry <dse@webonastick.com> | 2012-05-11 12:03:52 -0400 |
|---|---|---|
| committer | Darren Embry <dse@webonastick.com> | 2012-05-11 12:49:38 -0400 |
| commit | 06d84cf3988a4439340d36b8500f546044df6b23 (patch) | |
| tree | 84000f39ac31879adf45d45e3a1ace2b0a99ff83 /etc | |
| parent | 183ea34ce0d28b6e74ee3c675ad4cedee4b6d2cf (diff) | |
| download | pfsense-06d84cf3988a4439340d36b8500f546044df6b23.zip pfsense-06d84cf3988a4439340d36b8500f546044df6b23.tar.gz | |
allow port in virtual servers to be left blank
in which case listening port would be inherited from the pool
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/vslb.inc | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/etc/inc/vslb.inc b/etc/inc/vslb.inc index 04d52ca..0a975f0 100644 --- a/etc/inc/vslb.inc +++ b/etc/inc/vslb.inc @@ -267,25 +267,29 @@ function relayd_configure($kill_first=false) { for ($i = 0; isset($vs_a[$i]); $i++) { $append_port_to_name = false; - if (is_alias($vs_a[$i]['port'])) { - $src_port_array = filter_expand_alias_array($vs_a[$i]['port']); + if (is_alias($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 { - $src_port_array = array($vs_a[$i]['port']); + $dest_port_array = array($pools[$vs_a[$i]['pool']]['port']); } - if (is_alias($pools[$vs_a[$i]['pool']]['port'])) { - $dest_port_array = filter_expand_alias_array($pools[$vs_a[$i]['pool']]['port']); + if (is_alias($vs_a[$i]['port'])) { + $src_port_array = filter_expand_alias_array($vs_a[$i]['port']); $append_port_to_name = true; } + else if ($vs_a[$i]['port']) { + $src_port_array = array($vs_a[$i]['port']); + } else { - $dest_port_array = array($pools[$vs_a[$i]['pool']]['port']); + $src_port_array = $dest_port_array; } $append_ip_to_name = false; if (is_alias($vs_a[$i]['ipaddr'])) { - $ip_list = []; + $ip_list = array(); foreach (filter_expand_alias_array($vs_a[$i]['ipaddr']) as $item) { + log_error("item is $item"); if (is_subnetv4($item)) { $ip_list = array_merge($ip_list, subnetv4_expand($item)); } |
