mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolve alias value for rules

Browse Source
This commit is contained in:
Scott Ullrich 2005-10-12 00:57:30 +00:00
parent 8336a68a2c
commit 27ff8a3ced
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
etc/inc/filter.inc
View File

@ -526,13 +526,13 @@ function filter_nat_rules_generate() {
/* if item is an alias, expand */
if(alias_expand($rule['external-port']))
$extport[0] = alias_expand($rule['external-port']);
else
$extport[0] = alias_expand_value($rule['external-port']);
else
$extport = explode("-", $rule['external-port']);
/* if item is an alias, expand */
if(alias_expand($rule['local-port']))
$localport = alias_expand($rule['local-port']);
$localport = alias_expand_value($rule['local-port']);
else
$localport = $rule['local-port'];
@ -560,24 +560,15 @@ function filter_nat_rules_generate() {
$lanif = $lancfg['if'];
/*
* Expand aliases
* XXX: may want to integrate this into pf macros
*/
if(alias_expand($extport[0]))
$extport[0] = alias_expand($extport[0]);
if(alias_expand($extport[1]))
$extport[1] = alias_expand($extport[1]);
if(alias_expand($target))
$target = alias_expand($target);
if(alias_expand($localport))
$localport = alias_expand($localport);
if(alias_expand($extaddr))
$extaddr = alias_expand($extaddr);
if ((!$extport[1]) || ($extport[0] == $extport[1])) {
if($rule['protocol'] == "tcp/udp")
$natrules .=

11
etc/inc/util.inc
View File

@ -347,6 +347,17 @@ function is_alias($name) {
global $aliastable;
return isset($aliastable[$name]);
}
function alias_expand_value($name) {
global $aliastable, $config;
foreach($config['aliases']['alias'] as $alias) {
if($alias['name'] == $name)
return $alias['address'];
}
}
/* expand a host or network alias, if necessary */