local type, pairs, ipairs, table, luci, math
= type, pairs, ipairs, table, luci, math
-local lmo = require "lmo"
+local tpl = require "luci.template.parser"
local utl = require "luci.util"
local uci = require "luci.model.uci"
uci_r:load(...)
end
+function get_defaults()
+ return defaults()
+end
+
+function new_zone(self)
+ local name = "newzone"
+ local count = 1
+
+ while self:get_zone(name) do
+ count = count + 1
+ name = "newzone%d" % count
+ end
+
+ return self:add_zone(name)
+end
+
function add_zone(self, n)
if _valid_id(n) and not self:get_zone(n) then
+ local d = defaults()
local z = uci_r:section("firewall", "zone", nil, {
name = n,
network = " ",
- input = defaults:input() or "DROP",
- forward = defaults:forward() or "DROP",
- output = defaults:output() or "DROP"
+ input = d:input() or "DROP",
+ forward = d:forward() or "DROP",
+ output = d:output() or "DROP"
})
return z and zone(z)
if uci_r:get("firewall", n) == "zone" then
local z = uci_r:get("firewall", n, "name")
- r = uci_r:delete("firwall", n)
+ r = uci_r:delete("firewall", n)
n = z
else
uci_r:foreach("firewall", "zone",
uci_r:foreach("firewall", "redirect",
function(s)
- if s.src == n then
+ if s.src == n or s.dest == n then
uci_r:delete("firewall", s['.name'])
end
end)
uci_r:foreach("firewall", "forwarding",
function(s)
- if s.src == n then
+ if s.src == n or s.dest == n then
uci_r:delete("firewall", s['.name'])
end
end)
end
function zone.input(self)
- return self:get("input") or "DROP"
+ return self:get("input") or defaults():input() or "DROP"
end
function zone.forward(self)
- return self:get("forward") or "DROP"
+ return self:get("forward") or defaults():forward() or "DROP"
end
function zone.output(self)
- return self:get("output") or "DROP"
+ return self:get("output") or defaults():output() or "DROP"
end
function zone.add_network(self, net)
elseif self and self:name() == "wan" then
return "#f09090"
elseif self then
- math.randomseed(lmo.hash(self:name()))
+ math.randomseed(tpl.hash(self:name()))
local r = math.random(128)
local g = math.random(128)