Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

modules/admin-full: use firewall picker in interface config pages

Browse source
This commit is contained in:
Jo-Philipp Wich 2009-10-08 00:36:22 +00:00
parent 2e6995ea4d
commit 4854a46c68
1 changed files with 28 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua
View file

@ -13,8 +13,8 @@ You may obtain a copy of the License at
$Id$ $Id$
]]-- ]]--
local wa = require "luci.tools.webadmin"
local fs = require "nixio.fs" local fs = require "nixio.fs"
local fw = require "luci.model.firewall"
arg[1] = arg[1] or "" arg[1] = arg[1] or ""
@ -26,6 +26,9 @@ local has_pppoa = fs.glob("/usr/lib/pppd/*/pppoatm.so")()
local has_ipv6 = fs.access("/proc/net/ipv6_route") local has_ipv6 = fs.access("/proc/net/ipv6_route")
m = Map("network", translate("interfaces"), translate("a_n_ifaces1")) m = Map("network", translate("interfaces"), translate("a_n_ifaces1"))
m:chain("firewall")
fw.init(m.uci)
s = m:section(NamedSection, arg[1], "interface") s = m:section(NamedSection, arg[1], "interface")
s.addremove = true s.addremove = true
@ -91,49 +94,36 @@ for i,d in ipairs(luci.sys.net.devices()) do
end end
end end
local zones = wa.network_get_zones(arg[1])
if zones then
if #zones == 0 then
m:chain("firewall")
fwzone = s:taboption("general", Value, "_fwzone", fwzone = s:taboption("general", Value, "_fwzone",
translate("network_interface_fwzone"), translate("network_interface_fwzone"),
translate("network_interface_fwzone_desc")) translate("network_interface_fwzone_desc"))
fwzone.rmempty = true
fwzone:value("", "- " .. translate("none") .. " -")
fwzone:value(arg[1])
m.uci:load("firewall")
m.uci:foreach("firewall", "zone",
function (section)
fwzone:value(section.name)
end
)
function fwzone.write(self, section, value) fwzone.template = "cbi/firewall_zonelist"
local zone = wa.firewall_find_zone(value) fwzone.rmempty = false
local stat
if not zone then function fwzone.cfgvalue(self, section)
stat = m.uci:section("firewall", "zone", nil, { self.iface = section
name = value, local z = fw.get_zones_by_network(section)[1]
network = section return z and z:name()
}) end
else
local net = m.uci:get("firewall", zone, "network")
net = (net or value) .. " " .. section
stat = m.uci:set("firewall", zone, "network", net)
end
if stat then function fwzone.write(self, section, value)
self.render = function() end
end fw.del_network(section)
local zone = fw.get_zone(value)
if not zone then
value = m:formvalue(self:cbid(section) .. ".newzone")
if value and #value > 0 and value:match("^[a-zA-Z0-9_]+$") then
zone = fw.add_zone(value)
end end
else
fwzone = s:taboption("general", DummyValue, "_fwzone", translate("zone"))
fwzone.value = table.concat(zones, ", ")
end end
fwzone.titleref = luci.dispatcher.build_url("admin", "network", "firewall", "zones")
m.uci:unload("firewall") if zone then
zone:add_network(section)
end
end end
ipaddr = s:taboption("general", Value, "ipaddr", translate("ipaddress")) ipaddr = s:taboption("general", Value, "ipaddr", translate("ipaddress"))