diff options
| author | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2014-09-18 10:16:56 +0300 |
|---|---|---|
| committer | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2014-09-18 10:32:00 +0300 |
| commit | be8890f615cbe4da185321dd138090dd28ca554d (patch) | |
| tree | 719848609150b525d08fe5c54199f741db8c6240 | |
| parent | e04e525a968239a15706e6bf0d6e4314188fc7d1 (diff) | |
| download | awall-be8890f615cbe4da185321dd138090dd28ca554d.tar.bz2 awall-be8890f615cbe4da185321dd138090dd28ca554d.tar.xz | |
ConfigObject: inherit parent's label
| -rw-r--r-- | awall/model.lua | 5 | ||||
| -rw-r--r-- | awall/modules/filter.lua | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/awall/model.lua b/awall/model.lua index e6075cb..41e68ec 100644 --- a/awall/model.lua +++ b/awall/model.lua @@ -47,6 +47,11 @@ function M.ConfigObject:create(cls, params) self:error('Support for '..name..' objects not installed') end end + + if self.label then + params.label = self.label..(params.label and '-'..params.label or '') + end + return cls.morph(params, self.context, self.location) end diff --git a/awall/modules/filter.lua b/awall/modules/filter.lua index 527dfa3..d6cfd3a 100644 --- a/awall/modules/filter.lua +++ b/awall/modules/filter.lua @@ -121,7 +121,7 @@ function Filter:trules() local obj = self.extrarules[key] if not obj then - local params = {label=(self.label and self.label..'-' or '')..label} + local params = {label=label} for i, attr in ipairs( {'in', 'out', 'src', 'dest', 'dnat', 'ipset', 'ipsec', 'service'} ) do |