summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2012-09-13 06:21:37 +0000
committerKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2012-09-13 06:21:37 +0000
commitc9d2c65a28bed823e4c6f6e69ad00cafec744210 (patch)
tree0c172a5bfaa9bcdb560a2244c1020c27a071f421
parent8b0b3709ad0b93b91f53f09a1bd3e0ba92a5002a (diff)
downloadawall-c9d2c65a28bed823e4c6f6e69ad00cafec744210.tar.bz2
awall-c9d2c65a28bed823e4c6f6e69ad00cafec744210.tar.xz
make port-range work in NAT rules when ip-range not definedv0.2.10
-rw-r--r--awall/modules/nat.lua9
1 files changed, 6 insertions, 3 deletions
diff --git a/awall/modules/nat.lua b/awall/modules/nat.lua
index 68c452d..9c56b1c 100644
--- a/awall/modules/nat.lua
+++ b/awall/modules/nat.lua
@@ -31,12 +31,15 @@ function NATRule:table() return 'nat' end
function NATRule:target()
if self.action then return model.Rule.target(self) end
+ local range = self['ip-range']
local target
- if self['ip-range'] then
- target = self.params.target..' --to-'..self.params.subject..' '..self['ip-range']
+ if range then
+ target = self.params.target..' --to-'..self.params.subject..' '..range
else target = self.params.deftarget end
- if self['port-range'] then target = target..':'..self['port-range'] end
+ if self['port-range'] then
+ target = target..(range and ':' or ' --to-ports ')..self['port-range']
+ end
return target
end