make module attributes optional

6 files changed, 3 insertions, 11 deletions

diff --git a/awall/init.lua b/awall/init.lua
index d89098a..14f2d08 100644
--- a/awall/init.lua
+++ b/awall/init.lua
@@ -26,12 +26,12 @@ function loadmodules(path)
    defrules = {}
 
    local function readmetadata(mod)
-      for i, clsdef in ipairs(mod.classes) do
+      for i, clsdef in ipairs(mod.classes or {}) do
 	 local path, cls = unpack(clsdef)
 	 classmap[path] = cls
 	 table.insert(procorder, path)
       end
-      for phase, rules in pairs(mod.defrules) do
+      for phase, rules in pairs(mod.defrules or {}) do
 	 if not defrules[phase] then defrules[phase] = {} end
 	 table.insert(defrules[phase], rules)
       end
diff --git a/awall/model.lua b/awall/model.lua
index 9a011d1..4a8ad1a 100644
--- a/awall/model.lua
+++ b/awall/model.lua
@@ -422,4 +422,4 @@ function ForwardOnlyRule:chain() return 'PREROUTING' end
 
 
 classes = {{'zone', Zone}}
-defrules = {}
+
diff --git a/awall/modules/clampmss.lua b/awall/modules/clampmss.lua
index 9202892..e4c26da 100644
--- a/awall/modules/clampmss.lua
+++ b/awall/modules/clampmss.lua
@@ -28,5 +28,3 @@ end
 
 
 classes = {{'clamp-mss', ClampMSSRule}}
-
-defrules = {}
diff --git a/awall/modules/masquerade.lua b/awall/modules/masquerade.lua
index 23d0fe4..2ca8d47 100644
--- a/awall/modules/masquerade.lua
+++ b/awall/modules/masquerade.lua
@@ -7,8 +7,6 @@ Licensed under the terms of GPL2
 
 module(..., package.seeall)
 
-classes = {}
-
 -- TODO configuration of the ipset via JSON config
 defrules = {['post-snat']={{family='inet', table='nat',
 			    chain='POSTROUTING',
diff --git a/awall/modules/nat.lua b/awall/modules/nat.lua
index 5559d11..3a23558 100644
--- a/awall/modules/nat.lua
+++ b/awall/modules/nat.lua
@@ -59,5 +59,3 @@ end
 
 classes = {{'dnat', DNATRule},
 	   {'snat', SNATRule}}
-
-defrules = {}
diff --git a/awall/modules/notrack.lua b/awall/modules/notrack.lua
index 4e7d66f..84d516d 100644
--- a/awall/modules/notrack.lua
+++ b/awall/modules/notrack.lua
@@ -23,5 +23,3 @@ end
 
 
 classes = {{'no-track', NoTrackRule}}
-
-defrules = {}