diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2005-10-12 00:57:30 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2005-10-12 00:57:30 +0000 |
| commit | 27ff8a3ced7369420acec56f2dd5c656e08e3ba0 (patch) | |
| tree | 0ecd97c550df4569365ab5697fb7cdcf1fa69697 /etc/inc/filter.inc | |
| parent | 8336a68a2c402658105bdc008414ef60f007a28d (diff) | |
| download | pfsense-27ff8a3ced7369420acec56f2dd5c656e08e3ba0.zip pfsense-27ff8a3ced7369420acec56f2dd5c656e08e3ba0.tar.gz | |
Resolve alias value for rules
Diffstat (limited to 'etc/inc/filter.inc')
| -rw-r--r-- | etc/inc/filter.inc | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index 437e096..cd727a1 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -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 .= |
