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

modules/admin-full: remove PVID support, its not really useful and confusing, fix parsing of port count and cpu port, expose hardware name

Browse source
This commit is contained in:
Jo-Philipp Wich 2011-10-09 23:21:19 +00:00
parent 21b2f45d02
commit 9e2e9a2b66
1 changed files with 7 additions and 157 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

164
modules/admin-full/luasrc/model/cbi/admin_network/vlan.lua
View file

@ -22,7 +22,6 @@ m.uci:foreach("network", "switch",
local has_vlan = nil local has_vlan = nil
local has_learn = nil local has_learn = nil
local has_vlan4k = nil local has_vlan4k = nil
local has_ptpvid = nil
local has_jumbo3 = nil local has_jumbo3 = nil
local min_vid = 0 local min_vid = 0
local max_vid = 16 local max_vid = 16
@ -30,6 +29,7 @@ m.uci:foreach("network", "switch",
local num_ports = 6 local num_ports = 6
local cpu_port = 5 local cpu_port = 5
local switch_title
local enable_vlan4k = false local enable_vlan4k = false
-- Parse some common switch properties from swconfig help output. -- Parse some common switch properties from swconfig help output.
@ -50,7 +50,8 @@ m.uci:foreach("network", "switch",
is_vlan_attr = false is_vlan_attr = false
is_port_attr = true is_port_attr = true
elseif line:match("^Switch %d+:") then elseif line:match("cpu @") then
switch_title = line:match("^switch%d: %w+%((.-)%)")
num_ports, cpu_port, num_vlans = num_ports, cpu_port, num_vlans =
line:match("ports: (%d+) %(cpu @ (%d+)%), vlans: (%d+)") line:match("ports: (%d+) %(cpu @ (%d+)%), vlans: (%d+)")
@ -61,7 +62,6 @@ m.uci:foreach("network", "switch",
elseif line:match(": pvid") or line:match(": tag") or line:match(": vid") then elseif line:match(": pvid") or line:match(": tag") or line:match(": vid") then
if is_vlan_attr then has_vlan4k = line:match(": (%w+)") end if is_vlan_attr then has_vlan4k = line:match(": (%w+)") end
if is_port_attr then has_ptpvid = line:match(": (%w+)") end
elseif line:match(": enable_vlan4k") then elseif line:match(": enable_vlan4k") then
enable_vlan4k = true enable_vlan4k = true
@ -81,37 +81,11 @@ m.uci:foreach("network", "switch",
end end
-- The PVID options (if any) are added to this table so that
-- section create below can add the just created vlan to the
-- choice list of the PVID options...
local pvid_opts = { }
-- This function re-reads all existing vlan ids and populates
-- PVID options choice lists
local function populate_pvids()
local vlan_ids = { }
m.uci:foreach("network", "switch_vlan",
function(s)
if s.device == switch_name then
local vid = s[has_vlan4k or "vlan"] or s["vlan"]
if vid ~= nil then
vlan_ids[#vlan_ids+1] = vid
end
end
end)
local opt, vid
for _, opt in ipairs(pvid_opts) do
opt:reset_values()
opt:value("", translate("none"))
for _, vid in luci.util.vspairs(vlan_ids) do
opt:value(vid, translatef("VLAN %d", tonumber(vid)))
end
end
end
-- Switch properties -- Switch properties
s = m:section(NamedSection, x['.name'], "switch", translatef("Switch %q", switch_name)) s = m:section(NamedSection, x['.name'], "switch",
switch_title and translatef("Switch %q (%s)", switch_name, switch_title)
or translatef("Switch %q", switch_name))
s.addremove = false s.addremove = false
if has_vlan then if has_vlan then
@ -166,7 +140,6 @@ m.uci:foreach("network", "switch",
end end
-- When creating a new vlan, preset it with the highest found vid + 1. -- When creating a new vlan, preset it with the highest found vid + 1.
-- Repopulate the PVID choice lists afterwards.
s.create = function(self, section, origin) s.create = function(self, section, origin)
-- Filter by switch -- Filter by switch
if m:get(origin, "device") ~= switch_name then if m:get(origin, "device") ~= switch_name then
@ -195,22 +168,9 @@ m.uci:foreach("network", "switch",
m.uci:set("network", sid, has_vlan4k, max_id + 1) m.uci:set("network", sid, has_vlan4k, max_id + 1)
end end
-- add newly created vlan to the pvid choice list
populate_pvids()
return sid return sid
end end
-- Repopulate PVId choice lists if a vlan gets removed.
s.remove = function(self, section)
local rv = TypedSection.remove(self, section)
-- repopulate pvid choices
populate_pvids()
return rv
end
local port_opts = { } local port_opts = { }
local untagged = { } local untagged = { }
@ -300,116 +260,6 @@ m.uci:foreach("network", "switch",
port_opts[#port_opts+1] = po port_opts[#port_opts+1] = po
end end
-- Does this switch support PVIDs?
if has_ptpvid then
-- Spawn a "virtual" section. We just attach it to the global
-- switch section here, the overrides below take care of writing
-- the actual values to the correct uci sections.
s = m:section(TypedSection, "switch",
translatef("Port PVIDs on %q", switch_name),
translate("Port <abbr title=\"Primary VLAN IDs\">PVIDs</abbr> specify " ..
"the default VLAN ID added to received untagged frames."))
s.template = "cbi/tblsection"
s.addremove = false
s.anonymous = true
-- Filter by switch
function s.filter(self, section)
return (m:get(section, "name") == switch_name)
end
-- Build port list, store pointers to the option objects in the
-- pvid_opts array so that other callbacks can repopulate their
-- choice lists.
local pt
for pt = 0, num_ports - 1 do
local po = s:option(ListValue, tostring(pt),
(pt == cpu_port) and translate("CPU") or translatef("Port %d", (pt + 1)))
-- When cbi queries the current config value for this post,
-- lookup the associated switch_port section (if any) and
-- return its "pvid" or "vlan" option value.
po.cfgvalue = function(self, section)
local val
m.uci:foreach("network", "switch_port",
function(s)
if s.port == self.option then
val = s[has_ptpvid]
return false
end
end)
return val
end
-- On write, find the actual switch_port section associated
-- to this port and set the value there. Create a new
-- switch_port section for this port if there is none yet.
po.write = function(self, section, value)
local found = false
m.uci:foreach("network", "switch_port",
function(s)
if s.port == self.option then
m.uci:set("network", s['.name'], has_ptpvid, value)
found = true
return false
end
end)
if not found then
m.uci:section("network", "switch_port", nil, {
["port"] = self.option,
[has_ptpvid] = value
})
end
end
-- If the user cleared the PVID value on this port, find
-- the associated switch_port section and clear it.
-- If the section does not contain any other unrelated
-- options (like led or blinkrate) then remove it completely,
-- else just clear out the "pvid" option.
po.remove = function(self, section)
m.uci:foreach("network", "switch_port",
function(s)
if s.port == self.option then
local k, found
local empty = true
for k, _ in pairs(s) do
if k:sub(1,1) ~= "." and k ~= "port" and k ~= has_ptpvid then
empty = false
break
end
end
if empty then
m.uci:delete("network", s['.name'])
else
m.uci:delete("network", s['.name'], has_ptpvid)
end
return false
end
end)
end
-- The referenced VLAN might just have been removed, simply
-- return "" (none) in this case to avoid triggering a
-- validation error.
po.validate = function(...)
return ListValue.validate(...) or ""
end
pvid_opts[#pvid_opts+1] = po
end
populate_pvids()
end
end end
) )