Changeset 5374

Timestamp:

10/08/09 02:22:21 (4 years ago)

Author:

jow

Message:

libs/core: luci.model.firewall: make top level functions instance methods to keep interface consistent, implement rename_zone()

Files:

• luci/trunk/libs/core/luasrc/model/firewall.lua (modified) (6 diffs)

luci/trunk/libs/core/luasrc/model/firewall.lua

@@ -38 +38 @@
 end
 
-function add_zone(n)
-    if n then
+function add_zone(self, n)
+    if n and #n > 0 and n:match("^[a-zA-Z0-9_]+$") and not self:get_zone(n) then
         local z = ub.uci:section("firewall", "zone", nil, {
             name    = n,
@@ -52 +52 @@
 end
 
-function get_zone(n)
+function get_zone(self, n)
     local z
     ub.uci:foreach("firewall", "zone",
@@ -64 +64 @@
 end
 
-function get_zones()
+function get_zones(self)
     local zones = { }
     ub.uci:foreach("firewall", "zone",
@@ -75 +75 @@
 end
 
-function get_zones_by_network(net)
+function get_zones_by_network(self, net)
     local zones = { }
     ub.uci:foreach("firewall", "zone",
@@ -92 +92 @@
 end
 
-function del_zone(n)
+function del_zone(self, n)
     local r = false
     ub.uci:foreach("firewall", "zone",
@@ -124 +124 @@
 end
 
-function del_network(net)
+function rename_zone(self, old, new)
+    local r = false
+    if new and #new > 0 and new:match("^[a-zA-Z0-9_]+$") and not self:get_zone(new) then
+        ub.uci:foreach("firewall", "zone",
+            function(s)
+                if n and s.name == old then
+                    ub.uci:set("firewall", s['.name'], "name", new)
+                    r = true
+                    return false
+                end
+            end)
+        if r then
+            ub.uci:foreach("firewall", "rule",
+                function(s)
+                    if s.src == old then
+                        ub.uci:set("firewall", s['.name'], "src", new)
+                    elseif s.dest == old then
+                        ub.uci:set("firewall", s['.name'], "dest", new)
+                    end
+                end)
+            ub.uci:foreach("firewall", "redirect",
+                function(s)
+                    if s.src == old then
+                        ub.uci:set("firewall", s['.name'], "src", new)
+                    end
+                end)
+            ub.uci:foreach("firewall", "forwarding",
+                function(s)
+                    if s.src == old then
+                        ub.uci:set("firewall", s['.name'], "src", new)
+                    end
+                end)
+        end
+    end
+    return r
+end
+
+function del_network(self, net)
     local z
     if net then
-        for _, z in ipairs(get_zones()) do
+        for _, z in ipairs(self:get_zones()) do
             z:del_network(net)
         end