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

protocols/core: write override mac to wifi-iface for wifi interfaces

Browse source
This commit is contained in:
Jo-Philipp Wich 2012-08-17 08:18:06 +00:00
parent a5c891adb2
commit bde145be54
3 changed files with 52 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
protocols/core/luasrc/model/cbi/admin_network/proto_dhcp.lua
View file

@ -80,9 +80,7 @@ vendorclass = section:taboption("advanced", Value, "vendorid",
translate("Vendor Class to send when requesting DHCP")) translate("Vendor Class to send when requesting DHCP"))
macaddr = section:taboption("advanced", Value, "macaddr", translate("Override MAC address")) luci.tools.proto.opt_macaddr(section, ifc, translate("Override MAC address"))
macaddr.placeholder = ifc and ifc:mac() or "00:00:00:00:00:00"
macaddr.datatype = "macaddr"
mtu = section:taboption("advanced", Value, "mtu", translate("Override MTU")) mtu = section:taboption("advanced", Value, "mtu", translate("Override MTU"))

6
protocols/core/luasrc/model/cbi/admin_network/proto_static.lua
View file

@ -14,7 +14,7 @@ local map, section, net = ...
local ifc = net:get_interface() local ifc = net:get_interface()
local ipaddr, netmask, gateway, broadcast, dns, accept_ra, send_rs, ip6addr, ip6gw local ipaddr, netmask, gateway, broadcast, dns, accept_ra, send_rs, ip6addr, ip6gw
local macaddr, mtu, metric local mtu, metric
ipaddr = section:taboption("general", Value, "ipaddr", translate("IPv4 address")) ipaddr = section:taboption("general", Value, "ipaddr", translate("IPv4 address"))
@ -68,9 +68,7 @@ if luci.model.network:has_ipv6() then
end end
macaddr = section:taboption("advanced", Value, "macaddr", translate("Override MAC address")) luci.tools.proto.opt_macaddr(section, ifc, translate("Override MAC address"))
macaddr.placeholder = ifc and ifc:mac() or "00:00:00:00:00:00"
macaddr.datatype = "macaddr"
mtu = section:taboption("advanced", Value, "mtu", translate("Override MTU")) mtu = section:taboption("advanced", Value, "mtu", translate("Override MTU"))

49
protocols/core/luasrc/tools/proto.lua Normal file
View file

@ -0,0 +1,49 @@
--[[
LuCI - Lua Configuration Interface
Copyright 2012 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.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
]]--
module("luci.tools.proto", package.seeall)
local uci = require "luci.model.uci".cursor()
local net = require "luci.model.network"
function opt_macaddr(s, ifc, ...)
local v = luci.cbi.Value
local o = s:taboption("advanced", v, "macaddr", ...)
o.placeholder = ifc and ifc:mac()
o.datatype = "macaddr"
function o.cfgvalue(self, section)
local w = ifc and ifc:get_wifinet()
if w then
return w:get("macaddr")
else
return v.cfgvalue(self, section)
end
end
function o.write(self, section, value)
local w = ifc and ifc:get_wifinet()
if w then
w:set("macaddr", value)
elseif value then
v.write(self, section, value)
else
v.remove(self, section)
end
end
function o.remove(self, section)
self:write(self, section, nil)
end
end