diff options
author | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2012-10-03 13:27:30 +0000 |
---|---|---|
committer | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2012-10-03 13:27:30 +0000 |
commit | 14e6f61b4a7270076990b59a47405c849865b1cd (patch) | |
tree | 0e0f29842f2380e5b401f5afdc065789c3a328f5 | |
parent | 31a02a4d9dca063301ba59e703977d963bfeb5e7 (diff) | |
download | awall-14e6f61b4a7270076990b59a47405c849865b1cd.tar.bz2 awall-14e6f61b4a7270076990b59a47405c849865b1cd.tar.xz |
enforce common base class for all objects
-rw-r--r-- | awall/init.lua | 2 | ||||
-rw-r--r-- | awall/ipset.lua | 2 | ||||
-rw-r--r-- | awall/iptables.lua | 2 | ||||
-rw-r--r-- | awall/model.lua | 2 | ||||
-rw-r--r-- | awall/modules/filter.lua | 2 | ||||
-rw-r--r-- | awall/object.lua | 1 | ||||
-rw-r--r-- | awall/policy.lua | 4 |
7 files changed, 8 insertions, 7 deletions
diff --git a/awall/init.lua b/awall/init.lua index 6cce409..743a83b 100644 --- a/awall/init.lua +++ b/awall/init.lua @@ -69,7 +69,7 @@ end PolicySet = policy.PolicySet -Config = object.class(object.Object) +Config = object.class() function Config:init(policyconfig) diff --git a/awall/ipset.lua b/awall/ipset.lua index ceba5e6..5086d28 100644 --- a/awall/ipset.lua +++ b/awall/ipset.lua @@ -9,7 +9,7 @@ module(..., package.seeall) require 'awall.object' -IPSet = awall.object.class(awall.object.Object) +IPSet = awall.object.class() function IPSet:init(config) self.config = config or {} end diff --git a/awall/iptables.lua b/awall/iptables.lua index a974c84..02536e8 100644 --- a/awall/iptables.lua +++ b/awall/iptables.lua @@ -31,7 +31,7 @@ builtin = {filter={'FORWARD', 'INPUT', 'OUTPUT'}, local backupdir = '/var/run/awall' -local BaseIPTables = class(awall.object.Object) +local BaseIPTables = class() function BaseIPTables:print() for family, tbls in pairs(families) do diff --git a/awall/model.lua b/awall/model.lua index fe7ffdc..d2761ce 100644 --- a/awall/model.lua +++ b/awall/model.lua @@ -20,7 +20,7 @@ local combinations = awall.optfrag.combinations class = awall.object.class -ConfigObject = class(awall.object.Object) +ConfigObject = class() function ConfigObject:init(context, location) if context then diff --git a/awall/modules/filter.lua b/awall/modules/filter.lua index ffee4a9..a635939 100644 --- a/awall/modules/filter.lua +++ b/awall/modules/filter.lua @@ -19,7 +19,7 @@ local combinations = awall.optfrag.combinations local extend = awall.util.extend -Log = awall.object.class(awall.object.Object) +Log = awall.object.class() function Log:matchopts() return self.limit and '-m limit --limit '..self.limit..'/second' diff --git a/awall/object.lua b/awall/object.lua index a49e96c..90239fd 100644 --- a/awall/object.lua +++ b/awall/object.lua @@ -11,6 +11,7 @@ function class(base) local cls = {} local mt = {__index = cls} + if not base and Object then base = Object end if base then setmetatable(cls, {__index = base}) end function cls.new(...) return cls.morph({}, unpack(arg)) end diff --git a/awall/policy.lua b/awall/policy.lua index b191d85..6290847 100644 --- a/awall/policy.lua +++ b/awall/policy.lua @@ -17,7 +17,7 @@ local object = awall.object local util = awall.util -local PolicyConfig = object.class(object.Object) +local PolicyConfig = awall.object.class() function PolicyConfig:init(data, source, policies) self.data = data @@ -109,7 +109,7 @@ local function list(dirs) end -PolicySet = object.class(object.Object) +PolicySet = object.class() function PolicySet:init(confdirs, importdirs) self.autodirs = confdirs or {'/usr/share/awall/mandatory', '/etc/awall'} |