LuCI - Lua Configuration Interface
Copyright 2008 Steven Barth <steven@midlink.org>
-Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
+Copyright 2010-2011 Jo-Philipp Wich <xm@subsignal.org>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
m.uci:foreach("network", "switch",
function(x)
- local switch_name = x.name or x['.name']
+ local sid = x['.name']
+ local switch_name = x.name or sid
+ local has_vlan = nil
+ local has_learn = nil
local has_vlan4k = nil
local has_ptpvid = nil
+ local has_jumbo3 = nil
+ local min_vid = 0
local max_vid = 16
local num_vlans = 16
- local num_ports = 5
+ local num_ports = 6
local cpu_port = 5
+ local enable_vlan4k = false
+
-- Parse some common switch properties from swconfig help output.
local swc = io.popen("swconfig dev %q help 2>/dev/null" % switch_name)
if swc then
num_ports, cpu_port, num_vlans =
line:match("ports: (%d+) %(cpu @ (%d+)%), vlans: (%d+)")
- num_ports = tonumber(num_ports or 5)
- num_vlans = tonumber(num_vlans or 16)
- cpu_port = tonumber(cpu_port or 5)
+ num_ports = tonumber(num_ports) or 6
+ num_vlans = tonumber(num_vlans) or 16
+ cpu_port = tonumber(cpu_port) or 5
+ min_vid = 1
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_port_attr then has_ptpvid = line:match(": (%w+)") end
+ elseif line:match(": enable_vlan4k") then
+ enable_vlan4k = true
+
+ elseif line:match(": enable_vlan") then
+ has_vlan = "enable_vlan"
+
+ elseif line:match(": enable_learning") then
+ has_learn = "enable_learning"
+
+ elseif line:match(": max_length") then
+ has_jumbo3 = "max_length"
end
end
local vlan_ids = { }
m.uci:foreach("network", "switch_vlan",
function(s)
- local vid = s[has_vlan4k or "vlan"] or s["vlan"]
- if vid ~= nil then
- vlan_ids[#vlan_ids+1] = vid
+ 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)
s = m:section(NamedSection, x['.name'], "switch", translatef("Switch %q", switch_name))
s.addremove = false
- s:option(Flag, "enable", translate("Enable this switch"))
- .cfgvalue = function(self, section) return Flag.cfgvalue(self, section) or self.enabled end
+ if has_vlan then
+ s:option(Flag, has_vlan, translate("Enable VLAN functionality"))
+ end
+
+ if enable_vlan4k then
+ s:option(Flag, "enable_vlan4k", translate("Enable 4K VLANs"))
+ end
- s:option(Flag, "enable_vlan", translate("Enable VLAN functionality"))
- .cfgvalue = function(self, section) return Flag.cfgvalue(self, section) or self.enabled end
+ if has_learn then
+ x = s:option(Flag, has_learn, translate("Enable learning and aging"))
+ x.default = x.enabled
+ end
- s:option(Flag, "reset", translate("Reset switch during setup"))
- .cfgvalue = function(self, section) return Flag.cfgvalue(self, section) or self.enabled end
+ if has_jumbo3 then
+ x = s:option(Flag, has_jumbo3, translate("Enable Jumbo Frame passthrough"))
+ x.enabled = "3"
+ x.rmempty = true
+ end
-- VLAN table
s.addremove = true
s.anonymous = true
+ -- Filter by switch
+ s.filter = function(self, section)
+ local device = m:get(section, "device")
+ return (device and device == switch_name)
+ end
+
-- Override cfgsections callback to enforce row ordering by vlan id.
s.cfgsections = function(self)
local osections = TypedSection.cfgsections(self)
for _, section in luci.util.spairs(
osections,
function(a, b)
- return (tonumber(m.uci:get("network", osections[a], has_vlan4k or "vlan")) or 9999)
- < (tonumber(m.uci:get("network", osections[b], has_vlan4k or "vlan")) or 9999)
+ return (tonumber(m:get(osections[a], has_vlan4k or "vlan")) or 9999)
+ < (tonumber(m:get(osections[b], has_vlan4k or "vlan")) or 9999)
end
) do
sections[#sections+1] = section
-- When creating a new vlan, preset it with the highest found vid + 1.
-- Repopulate the PVID choice lists afterwards.
- s.create = function(self, section)
+ s.create = function(self, section, origin)
+ -- Filter by switch
+ if m:get(origin, "device") ~= switch_name then
+ return
+ end
+
local sid = TypedSection.create(self, section)
local max_nr = 0
m.uci:foreach("network", "switch_vlan",
function(s)
- local nr = tonumber(s.vlan)
- local id = has_vlan4k and tonumber(s[has_vlan4k])
- if nr ~= nil and nr > max_nr then max_nr = nr end
- if id ~= nil and id > max_id then max_id = id end
+ if s.device == switch_name then
+ local nr = tonumber(s.vlan)
+ local id = has_vlan4k and tonumber(s[has_vlan4k])
+ if nr ~= nil and nr > max_nr then max_nr = nr end
+ if id ~= nil and id > max_id then max_id = id end
+ end
end)
+ m.uci:set("network", sid, "device", switch_name)
m.uci:set("network", sid, "vlan", max_nr + 1)
if has_vlan4k then
-- Parse current tagging state from the "ports" option.
local portvalue = function(self, section)
local pt
- for pt in (m.uci:get("network", section, "ports") or ""):gmatch("%w+") do
+ for pt in (m:get(section, "ports") or ""):gmatch("%w+") do
local pc, tu = pt:match("^(%d+)([tu]*)")
if pc == self.option then return (#tu > 0) and tu or "u" end
end
if value == "u" then
if not untagged[self.option] then
untagged[self.option] = true
- else
+ elseif min_vid > 0 or tonumber(self.option) ~= cpu_port then -- enable multiple untagged cpu ports due to weird broadcom default setup
return nil,
translatef("Port %d is untagged in multiple VLANs!", tonumber(self.option) + 1)
end
vid.validate = function(self, value, section)
local v = tonumber(value)
local m = has_vlan4k and 4094 or (num_vlans - 1)
- if v ~= nil and v > 0 and v <= m then
+ if v ~= nil and v >= min_vid and v <= m then
return value
else
return nil,
- translatef("Invalid VLAN ID given! Only IDs between %d and %d are allowed.", 1, m)
+ translatef("Invalid VLAN ID given! Only IDs between %d and %d are allowed.", min_vid, m)
end
end
-- Fallback to "vlan" option if "vid" option is supported but unset.
vid.cfgvalue = function(self, section)
- return m.uci:get("network", section, has_vlan4k or "vlan")
- or m.uci:get("network", section, "vlan")
+ return m:get(section, has_vlan4k or "vlan")
+ or m:get(section, "vlan")
end
-- Build per-port off/untagged/tagged choice lists.
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.