module namespace-related style adjustments

drop awall prefix when accessing submodules from the main module
remove module-level function/module shortcuts when used only once

3 files changed, 8 insertions, 9 deletions

diff --git a/awall/init.lua b/awall/init.lua
index fa109ae..8b4a0bd 100644
--- a/awall/init.lua
+++ b/awall/init.lua
@@ -35,12 +35,12 @@ function loadmodules(path)
 end
 
 
-Config = awall.object.class(awall.object.Object)
+Config = object.class(object.Object)
 
 function Config:init(confdirs, importdirs)
 
    self.input = {}
-   self.iptables = awall.iptables.IPTables.new()
+   self.iptables = iptables.IPTables.new()
 
    local required = {}
    local imported = {}
@@ -149,8 +149,8 @@ function Config:init(confdirs, importdirs)
    for i, mod in ipairs(modules) do
       for path, cls in pairs(mod.classmap) do
 	 if self.input[path] then	    
-	    awall.util.map(self.input[path],
-			   function(obj) return cls.morph(obj, self) end)
+	    util.map(self.input[path],
+		     function(obj) return cls.morph(obj, self) end)
 	    table.insert(locations, self.input[path])
 	 end
       end
@@ -165,7 +165,7 @@ function Config:init(confdirs, importdirs)
       end
    end
 
-   self.ipset = awall.ipset.IPSet.new(self.input.ipset)
+   self.ipset = ipset.IPSet.new(self.input.ipset)
 end
 
 function Config:dump(iptdir, ipsfile)
diff --git a/awall/iptables.lua b/awall/iptables.lua
index a571c63..2aa422b 100644
--- a/awall/iptables.lua
+++ b/awall/iptables.lua
@@ -13,7 +13,6 @@ require 'awall.object'
 require 'awall.util'
 
 local class = awall.object.class
-local contains = awall.util.contains
 
 
 local families = {inet={cmd='iptables', file='rules-save'},
@@ -67,7 +66,8 @@ function IPTables:dumpfile(family, iptfile)
    for tbl, chains in pairs(self.config[family]) do
       iptfile:write('*'..tbl..'\n')
       for chain, rules in pairs(chains) do
-	 iptfile:write(':'..chain..' '..(contains(builtin, chain) and
+	 iptfile:write(':'..chain..' '..(awall.util.contains(builtin,
+							     chain) and
 				      'DROP' or '-')..' [0:0]\n')
       end
       for chain, rules in pairs(chains) do
diff --git a/awall/modules/nat.lua b/awall/modules/nat.lua
index cf6a548..b3edce1 100644
--- a/awall/modules/nat.lua
+++ b/awall/modules/nat.lua
@@ -11,7 +11,6 @@ require 'awall.model'
 require 'awall.util'
 
 local model = awall.model
-local util = awall.util
 
 
 local NATRule = model.class(model.Rule)
@@ -19,7 +18,7 @@ local NATRule = model.class(model.Rule)
 function NATRule:init(context)
    model.Rule.init(self, context)
    for i, dir in ipairs({'in', 'out'}) do
-      if util.contains(self[dir], model.fwzone) then
+      if awall.util.contains(self[dir], model.fwzone) then
 	 error('NAT rules not allowed for firewall zone')
       end
    end