From 8336a68a2c402658105bdc008414ef60f007a28d Mon Sep 17 00:00:00 2001 From: Erik Kristensen Date: Wed, 12 Oct 2005 00:33:28 +0000 Subject: Fix NAT Port Forward Alias issue --- etc/inc/filter.inc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'etc/inc') diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index 5be9a7a..437e096 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -526,8 +526,8 @@ function filter_nat_rules_generate() { /* if item is an alias, expand */ if(alias_expand($rule['external-port'])) - $extport = alias_expand($rule['external-port']); - else + $extport[0] = alias_expand($rule['external-port']); + else $extport = explode("-", $rule['external-port']); /* if item is an alias, expand */ @@ -560,6 +560,8 @@ function filter_nat_rules_generate() { $lanif = $lancfg['if']; + + /* * Expand aliases * XXX: may want to integrate this into pf macros @@ -575,6 +577,7 @@ function filter_nat_rules_generate() { if(alias_expand($extaddr)) $extaddr = alias_expand($extaddr); + if ((!$extport[1]) || ($extport[0] == $extport[1])) { if($rule['protocol'] == "tcp/udp") $natrules .= -- cgit v1.1