Revision d7afd900
Added by Darren Embry over 13 years ago
| etc/inc/filter.inc | ||
|---|---|---|
| 528 | 528 |
} |
| 529 | 529 |
} |
| 530 | 530 |
|
| 531 |
function filter_expand_alias_array($alias_name) {
|
|
| 532 |
$expansion = filter_expand_alias($alias_name); |
|
| 533 |
return explode(" ", preg_replace('/\s+/', ' ', trim($expansion)));
|
|
| 534 |
} |
|
| 535 |
|
|
| 531 | 536 |
function filter_generate_aliases() {
|
| 532 | 537 |
global $config, $FilterIflist, $after_filter_configure_run; |
| 533 | 538 |
|
| etc/inc/util.inc | ||
|---|---|---|
| 1030 | 1030 |
return null; |
| 1031 | 1031 |
} |
| 1032 | 1032 |
|
| 1033 |
function alias_expand_array($name) {
|
|
| 1034 |
global $aliastable; |
|
| 1035 |
$result = array(); |
|
| 1036 |
if (isset($aliastable[$name])) {
|
|
| 1037 |
return explode(" ", $aliastable[$name]);
|
|
| 1038 |
} |
|
| 1039 |
else {
|
|
| 1040 |
return null; |
|
| 1041 |
} |
|
| 1042 |
} |
|
| 1043 |
|
|
| 1044 | 1033 |
function alias_expand_urltable($name) {
|
| 1045 | 1034 |
global $config; |
| 1046 | 1035 |
$urltable_prefix = "/var/db/aliastables/"; |
| etc/inc/vslb.inc | ||
|---|---|---|
| 156 | 156 |
function relayd_configure($kill_first=false) {
|
| 157 | 157 |
global $config, $g; |
| 158 | 158 |
|
| 159 |
require_once("filter.inc");
|
|
| 160 |
|
|
| 159 | 161 |
$vs_a = $config['load_balancer']['virtual_server']; |
| 160 | 162 |
$pool_a = $config['load_balancer']['lbpool']; |
| 161 | 163 |
$protocol_a = $config['load_balancer']['lbprotocol']; |
| ... | ... | |
| 262 | 264 |
|
| 263 | 265 |
$append_port_to_name = false; |
| 264 | 266 |
if (is_alias($vs_a[$i]['port'])) {
|
| 265 |
$src_port_array = alias_expand_array($vs_a[$i]['port']);
|
|
| 267 |
$src_port_array = filter_expand_alias_array($vs_a[$i]['port']);
|
|
| 266 | 268 |
$append_port_to_name = true; |
| 267 | 269 |
} |
| 268 | 270 |
else {
|
| 269 | 271 |
$src_port_array = array($vs_a[$i]['port']); |
| 270 | 272 |
} |
| 271 | 273 |
if (is_alias($pools[$vs_a[$i]['pool']]['port'])) {
|
| 272 |
$dest_port_array = alias_expand_array($pools[$vs_a[$i]['pool']]['port']);
|
|
| 274 |
$dest_port_array = filter_expand_alias_array($pools[$vs_a[$i]['pool']]['port']);
|
|
| 273 | 275 |
$append_port_to_name = true; |
| 274 | 276 |
} |
| 275 | 277 |
else {
|
Also available in: Unified diff
use existing filter_expand_alias (well, via a wrapper) instead of
reinventing it