mirror of
https://github.com/Ysurac/openmptcprouter-feeds.git
synced 2025-03-09 15:40:03 +00:00
Add macvlan support
This commit is contained in:
Ycarus
parent
40fdd921b9
commit
9f8643647e
255 changed files with 134998 additions and 0 deletions
36
luci-base/luasrc/tools/proto.lua
Normal file
36
luci-base/luasrc/tools/proto.lua
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
-- Copyright 2012 Jo-Philipp Wich <jow@openwrt.org>
|
||||
-- Licensed to the public under the Apache License 2.0.
|
||||
|
||||
module("luci.tools.proto", package.seeall)
|
||||
|
||||
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(section, nil)
|
||||
end
|
||||
end
|
||||
230
luci-base/luasrc/tools/status.lua
Normal file
230
luci-base/luasrc/tools/status.lua
Normal file
|
|
@ -0,0 +1,230 @@
|
|||
-- Copyright 2011 Jo-Philipp Wich <jow@openwrt.org>
|
||||
-- Licensed to the public under the Apache License 2.0.
|
||||
|
||||
module("luci.tools.status", package.seeall)
|
||||
|
||||
local uci = require "luci.model.uci".cursor()
|
||||
|
||||
local function dhcp_leases_common(family)
|
||||
local rv = { }
|
||||
local nfs = require "nixio.fs"
|
||||
local leasefile = "/tmp/dhcp.leases"
|
||||
|
||||
uci:foreach("dhcp", "dnsmasq",
|
||||
function(s)
|
||||
if s.leasefile and nfs.access(s.leasefile) then
|
||||
leasefile = s.leasefile
|
||||
return false
|
||||
end
|
||||
end)
|
||||
|
||||
local fd = io.open(leasefile, "r")
|
||||
if fd then
|
||||
while true do
|
||||
local ln = fd:read("*l")
|
||||
if not ln then
|
||||
break
|
||||
else
|
||||
local ts, mac, ip, name, duid = ln:match("^(%d+) (%S+) (%S+) (%S+) (%S+)")
|
||||
local expire = tonumber(ts) or 0
|
||||
if ts and mac and ip and name and duid then
|
||||
if family == 4 and not ip:match(":") then
|
||||
rv[#rv+1] = {
|
||||
expires = (expire ~= 0) and os.difftime(expire, os.time()),
|
||||
macaddr = mac,
|
||||
ipaddr = ip,
|
||||
hostname = (name ~= "*") and name
|
||||
}
|
||||
elseif family == 6 and ip:match(":") then
|
||||
rv[#rv+1] = {
|
||||
expires = (expire ~= 0) and os.difftime(expire, os.time()),
|
||||
ip6addr = ip,
|
||||
duid = (duid ~= "*") and duid,
|
||||
hostname = (name ~= "*") and name
|
||||
}
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
fd:close()
|
||||
end
|
||||
|
||||
local lease6file = "/tmp/hosts/odhcpd"
|
||||
uci:foreach("dhcp", "odhcpd",
|
||||
function(t)
|
||||
if t.leasefile and nfs.access(t.leasefile) then
|
||||
lease6file = t.leasefile
|
||||
return false
|
||||
end
|
||||
end)
|
||||
local fd = io.open(lease6file, "r")
|
||||
if fd then
|
||||
while true do
|
||||
local ln = fd:read("*l")
|
||||
if not ln then
|
||||
break
|
||||
else
|
||||
local iface, duid, iaid, name, ts, id, length, ip = ln:match("^# (%S+) (%S+) (%S+) (%S+) (-?%d+) (%S+) (%S+) (.*)")
|
||||
local expire = tonumber(ts) or 0
|
||||
if ip and iaid ~= "ipv4" and family == 6 then
|
||||
rv[#rv+1] = {
|
||||
expires = (expire >= 0) and os.difftime(expire, os.time()),
|
||||
duid = duid,
|
||||
ip6addr = ip,
|
||||
hostname = (name ~= "-") and name
|
||||
}
|
||||
elseif ip and iaid == "ipv4" and family == 4 then
|
||||
local mac, mac1, mac2, mac3, mac4, mac5, mac6
|
||||
if duid and type(duid) == "string" then
|
||||
mac1, mac2, mac3, mac4, mac5, mac6 = duid:match("^(%x%x)(%x%x)(%x%x)(%x%x)(%x%x)(%x%x)$")
|
||||
end
|
||||
if not (mac1 and mac2 and mac3 and mac4 and mac5 and mac6) then
|
||||
mac = "FF:FF:FF:FF:FF:FF"
|
||||
else
|
||||
mac = mac1..":"..mac2..":"..mac3..":"..mac4..":"..mac5..":"..mac6
|
||||
end
|
||||
rv[#rv+1] = {
|
||||
expires = (expire >= 0) and os.difftime(expire, os.time()),
|
||||
macaddr = duid,
|
||||
macaddr = mac:lower(),
|
||||
ipaddr = ip,
|
||||
hostname = (name ~= "-") and name
|
||||
}
|
||||
end
|
||||
end
|
||||
end
|
||||
fd:close()
|
||||
end
|
||||
|
||||
return rv
|
||||
end
|
||||
|
||||
function dhcp_leases()
|
||||
return dhcp_leases_common(4)
|
||||
end
|
||||
|
||||
function dhcp6_leases()
|
||||
return dhcp_leases_common(6)
|
||||
end
|
||||
|
||||
function wifi_networks()
|
||||
local rv = { }
|
||||
local ntm = require "luci.model.network".init()
|
||||
|
||||
local dev
|
||||
for _, dev in ipairs(ntm:get_wifidevs()) do
|
||||
local rd = {
|
||||
up = dev:is_up(),
|
||||
device = dev:name(),
|
||||
name = dev:get_i18n(),
|
||||
networks = { }
|
||||
}
|
||||
|
||||
local net
|
||||
for _, net in ipairs(dev:get_wifinets()) do
|
||||
rd.networks[#rd.networks+1] = {
|
||||
name = net:shortname(),
|
||||
link = net:adminlink(),
|
||||
up = net:is_up(),
|
||||
mode = net:active_mode(),
|
||||
ssid = net:active_ssid(),
|
||||
bssid = net:active_bssid(),
|
||||
encryption = net:active_encryption(),
|
||||
frequency = net:frequency(),
|
||||
channel = net:channel(),
|
||||
signal = net:signal(),
|
||||
quality = net:signal_percent(),
|
||||
noise = net:noise(),
|
||||
bitrate = net:bitrate(),
|
||||
ifname = net:ifname(),
|
||||
assoclist = net:assoclist(),
|
||||
country = net:country(),
|
||||
txpower = net:txpower(),
|
||||
txpoweroff = net:txpower_offset(),
|
||||
disabled = (dev:get("disabled") == "1" or
|
||||
net:get("disabled") == "1")
|
||||
}
|
||||
end
|
||||
|
||||
rv[#rv+1] = rd
|
||||
end
|
||||
|
||||
return rv
|
||||
end
|
||||
|
||||
function wifi_network(id)
|
||||
local ntm = require "luci.model.network".init()
|
||||
local net = ntm:get_wifinet(id)
|
||||
if net then
|
||||
local dev = net:get_device()
|
||||
if dev then
|
||||
return {
|
||||
id = id,
|
||||
name = net:shortname(),
|
||||
link = net:adminlink(),
|
||||
up = net:is_up(),
|
||||
mode = net:active_mode(),
|
||||
ssid = net:active_ssid(),
|
||||
bssid = net:active_bssid(),
|
||||
encryption = net:active_encryption(),
|
||||
frequency = net:frequency(),
|
||||
channel = net:channel(),
|
||||
signal = net:signal(),
|
||||
quality = net:signal_percent(),
|
||||
noise = net:noise(),
|
||||
bitrate = net:bitrate(),
|
||||
ifname = net:ifname(),
|
||||
assoclist = net:assoclist(),
|
||||
country = net:country(),
|
||||
txpower = net:txpower(),
|
||||
txpoweroff = net:txpower_offset(),
|
||||
disabled = (dev:get("disabled") == "1" or
|
||||
net:get("disabled") == "1"),
|
||||
device = {
|
||||
up = dev:is_up(),
|
||||
device = dev:name(),
|
||||
name = dev:get_i18n()
|
||||
}
|
||||
}
|
||||
end
|
||||
end
|
||||
return { }
|
||||
end
|
||||
|
||||
function switch_status(devs)
|
||||
local dev
|
||||
local switches = { }
|
||||
for dev in devs:gmatch("[^%s,]+") do
|
||||
local ports = { }
|
||||
local swc = io.popen("swconfig dev %q show" % dev, "r")
|
||||
if swc then
|
||||
local l
|
||||
repeat
|
||||
l = swc:read("*l")
|
||||
if l then
|
||||
local port, up = l:match("port:(%d+) link:(%w+)")
|
||||
if port then
|
||||
local speed = l:match(" speed:(%d+)")
|
||||
local duplex = l:match(" (%w+)-duplex")
|
||||
local txflow = l:match(" (txflow)")
|
||||
local rxflow = l:match(" (rxflow)")
|
||||
local auto = l:match(" (auto)")
|
||||
|
||||
ports[#ports+1] = {
|
||||
port = tonumber(port) or 0,
|
||||
speed = tonumber(speed) or 0,
|
||||
link = (up == "up"),
|
||||
duplex = (duplex == "full"),
|
||||
rxflow = (not not rxflow),
|
||||
txflow = (not not txflow),
|
||||
auto = (not not auto)
|
||||
}
|
||||
end
|
||||
end
|
||||
until not l
|
||||
swc:close()
|
||||
end
|
||||
switches[dev] = ports
|
||||
end
|
||||
return switches
|
||||
end
|
||||
105
luci-base/luasrc/tools/webadmin.lua
Normal file
105
luci-base/luasrc/tools/webadmin.lua
Normal file
|
|
@ -0,0 +1,105 @@
|
|||
-- Copyright 2008 Steven Barth <steven@midlink.org>
|
||||
-- Copyright 2008-2015 Jo-Philipp Wich <jow@openwrt.org>
|
||||
-- Licensed to the public under the Apache License 2.0.
|
||||
|
||||
module("luci.tools.webadmin", package.seeall)
|
||||
|
||||
local util = require "luci.util"
|
||||
local uci = require "luci.model.uci"
|
||||
local ip = require "luci.ip"
|
||||
|
||||
function byte_format(byte)
|
||||
local suff = {"B", "KB", "MB", "GB", "TB"}
|
||||
for i=1, 5 do
|
||||
if byte > 1024 and i < 5 then
|
||||
byte = byte / 1024
|
||||
else
|
||||
return string.format("%.2f %s", byte, suff[i])
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
function date_format(secs)
|
||||
local suff = {"min", "h", "d"}
|
||||
local mins = 0
|
||||
local hour = 0
|
||||
local days = 0
|
||||
|
||||
secs = math.floor(secs)
|
||||
if secs > 60 then
|
||||
mins = math.floor(secs / 60)
|
||||
secs = secs % 60
|
||||
end
|
||||
|
||||
if mins > 60 then
|
||||
hour = math.floor(mins / 60)
|
||||
mins = mins % 60
|
||||
end
|
||||
|
||||
if hour > 24 then
|
||||
days = math.floor(hour / 24)
|
||||
hour = hour % 24
|
||||
end
|
||||
|
||||
if days > 0 then
|
||||
return string.format("%.0fd %02.0fh %02.0fmin %02.0fs", days, hour, mins, secs)
|
||||
else
|
||||
return string.format("%02.0fh %02.0fmin %02.0fs", hour, mins, secs)
|
||||
end
|
||||
end
|
||||
|
||||
function cbi_add_networks(field)
|
||||
uci.cursor():foreach("network", "interface",
|
||||
function (section)
|
||||
if section[".name"] ~= "loopback" then
|
||||
field:value(section[".name"])
|
||||
end
|
||||
end
|
||||
)
|
||||
field.titleref = luci.dispatcher.build_url("admin", "network", "network")
|
||||
end
|
||||
|
||||
function cbi_add_knownips(field)
|
||||
local _, n
|
||||
for _, n in ipairs(ip.neighbors({ family = 4 })) do
|
||||
if n.dest then
|
||||
field:value(n.dest:string())
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
function firewall_find_zone(name)
|
||||
local find
|
||||
|
||||
luci.model.uci.cursor():foreach("firewall", "zone",
|
||||
function (section)
|
||||
if section.name == name then
|
||||
find = section[".name"]
|
||||
end
|
||||
end
|
||||
)
|
||||
|
||||
return find
|
||||
end
|
||||
|
||||
function iface_get_network(iface)
|
||||
local link = ip.link(tostring(iface))
|
||||
if link.master then
|
||||
iface = link.master
|
||||
end
|
||||
|
||||
local cur = uci.cursor()
|
||||
local dump = util.ubus("network.interface", "dump", { })
|
||||
if dump then
|
||||
local _, net
|
||||
for _, net in ipairs(dump.interface) do
|
||||
if net.l3_device == iface or net.device == iface then
|
||||
-- cross check with uci to filter out @name style aliases
|
||||
local uciname = cur:get("network", net.interface, "ifname")
|
||||
if type(uciname) == "string" and uciname:sub(1,1) ~= "@" or uciname then
|
||||
return net.interface
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
Loading…
Add table
Add a link
Reference in a new issue