module("luci.controller.admin.network", package.seeall)
function index()
- require("luci.i18n")
local uci = require("luci.model.uci").cursor()
- local net = require "luci.model.network".init(uci)
- local i18n = luci.i18n.translate
- local has_wifi = nixio.fs.stat("/etc/config/wireless")
- local has_switch = false
-
- uci:foreach("network", "switch",
- function(s)
- has_switch = true
- return false
- end
- )
-
local page
page = node("admin", "network")
- page.target = alias("admin", "network", "network")
- page.title = i18n("Network")
+ page.target = firstchild()
+ page.title = _("Network")
page.order = 50
page.index = true
- if has_switch then
- page = node("admin", "network", "vlan")
- page.target = cbi("admin_network/vlan")
- page.title = i18n("Switch")
- page.order = 20
- end
+-- if page.inreq then
+ local has_switch = false
- if has_wifi and has_wifi.size > 0 then
- page = entry({"admin", "network", "wireless"}, arcombine(template("admin_network/wifi_overview"), cbi("admin_network/wifi")), i18n("Wifi"), 15)
- page.leaf = true
- page.subindex = true
+ uci:foreach("network", "switch",
+ function(s)
+ has_switch = true
+ return false
+ end)
- page = entry({"admin", "network", "wireless_join"}, call("wifi_join"), nil, 16)
- page.leaf = true
+ if has_switch then
+ page = node("admin", "network", "vlan")
+ page.target = cbi("admin_network/vlan")
+ page.title = _("Switch")
+ page.order = 20
+ end
- page = entry({"admin", "network", "wireless_add"}, call("wifi_add"), nil, 16)
- page.leaf = true
- page = entry({"admin", "network", "wireless_delete"}, call("wifi_delete"), nil, 16)
- page.leaf = true
+ local has_wifi = false
- page = entry({"admin", "network", "wireless_status"}, call("wifi_status"), nil, 16)
- page.leaf = true
+ uci:foreach("wireless", "wifi-device",
+ function(s)
+ has_wifi = true
+ return false
+ end)
- local wdev
- for _, wdev in ipairs(net:get_wifidevs()) do
- local wnet
- for _, wnet in ipairs(wdev:get_wifinets()) do
- entry(
- {"admin", "network", "wireless", wnet.netid},
- alias("admin", "network", "wireless"),
- wdev:name() .. ": " .. wnet:shortname()
- )
- end
- end
- end
+ if has_wifi then
+ page = entry({"admin", "network", "wireless_join"}, call("wifi_join"), nil)
+ page.leaf = true
- page = entry({"admin", "network", "network"}, arcombine(cbi("admin_network/network"), cbi("admin_network/ifaces")), i18n("Interfaces"), 10)
- page.leaf = true
- page.subindex = true
+ page = entry({"admin", "network", "wireless_add"}, call("wifi_add"), nil)
+ page.leaf = true
- page = entry({"admin", "network", "iface_add"}, cbi("admin_network/iface_add"), nil)
- page.leaf = true
+ page = entry({"admin", "network", "wireless_delete"}, call("wifi_delete"), nil)
+ page.leaf = true
- page = entry({"admin", "network", "iface_delete"}, call("iface_delete"), nil)
- page.leaf = true
+ page = entry({"admin", "network", "wireless_status"}, call("wifi_status"), nil)
+ page.leaf = true
- page = entry({"admin", "network", "iface_status"}, call("iface_status"), nil)
- page.leaf = true
+ page = entry({"admin", "network", "wireless_reconnect"}, call("wifi_reconnect"), nil)
+ page.leaf = true
- page = entry({"admin", "network", "iface_reconnect"}, call("iface_reconnect"), nil)
- page.leaf = true
+ page = entry({"admin", "network", "wireless_shutdown"}, call("wifi_reconnect"), nil)
+ page.leaf = true
- page = entry({"admin", "network", "iface_shutdown"}, call("iface_shutdown"), nil)
- page.leaf = true
+ page = entry({"admin", "network", "wireless"}, arcombine(template("admin_network/wifi_overview"), cbi("admin_network/wifi")), _("Wifi"), 15)
+ page.leaf = true
+ page.subindex = true
- uci:foreach("network", "interface",
- function (section)
- local ifc = section[".name"]
- if ifc ~= "loopback" then
- entry({"admin", "network", "network", ifc},
- true,
- ifc:upper())
+ if page.inreq then
+ local wdev
+ local net = require "luci.model.network".init(uci)
+ for _, wdev in ipairs(net:get_wifidevs()) do
+ local wnet
+ for _, wnet in ipairs(wdev:get_wifinets()) do
+ entry(
+ {"admin", "network", "wireless", wnet:id()},
+ alias("admin", "network", "wireless"),
+ wdev:name() .. ": " .. wnet:shortname()
+ )
+ end
+ end
end
end
- )
- if nixio.fs.access("/etc/config/dhcp") then
- page = node("admin", "network", "dhcpleases")
- page.target = cbi("admin_network/dhcpleases")
- page.title = i18n("DHCP Leases")
- page.order = 30
- page = entry({"admin", "network", "dhcplease_status"}, call("lease_status"), nil)
+ page = entry({"admin", "network", "iface_add"}, cbi("admin_network/iface_add"), nil)
page.leaf = true
- page = node("admin", "network", "hosts")
- page.target = cbi("admin_network/hosts")
- page.title = i18n("Hostnames")
- page.order = 40
- end
+ page = entry({"admin", "network", "iface_delete"}, call("iface_delete"), nil)
+ page.leaf = true
- page = node("admin", "network", "routes")
- page.target = cbi("admin_network/routes")
- page.title = i18n("Static Routes")
- page.order = 50
+ page = entry({"admin", "network", "iface_status"}, call("iface_status"), nil)
+ page.leaf = true
+
+ page = entry({"admin", "network", "iface_reconnect"}, call("iface_reconnect"), nil)
+ page.leaf = true
+
+ page = entry({"admin", "network", "iface_shutdown"}, call("iface_shutdown"), nil)
+ page.leaf = true
+
+ page = entry({"admin", "network", "network"}, arcombine(cbi("admin_network/network"), cbi("admin_network/ifaces")), _("Interfaces"), 10)
+ page.leaf = true
+ page.subindex = true
+
+ if page.inreq then
+ uci:foreach("network", "interface",
+ function (section)
+ local ifc = section[".name"]
+ if ifc ~= "loopback" then
+ entry({"admin", "network", "network", ifc},
+ true, ifc:upper())
+ end
+ end)
+ end
+
+
+ if nixio.fs.access("/etc/config/dhcp") then
+ page = node("admin", "network", "dhcp")
+ page.target = cbi("admin_network/dhcp")
+ page.title = _("DHCP and DNS")
+ page.order = 30
+
+ page = entry({"admin", "network", "dhcplease_status"}, call("lease_status"), nil)
+ page.leaf = true
+
+ page = node("admin", "network", "hosts")
+ page.target = cbi("admin_network/hosts")
+ page.title = _("Hostnames")
+ page.order = 40
+ end
+
+ page = node("admin", "network", "routes")
+ page.target = cbi("admin_network/routes")
+ page.title = _("Static Routes")
+ page.order = 50
- page = node("admin", "network", "diagnostics")
- page.target = template("admin_network/diagnostics")
- page.title = i18n("Diagnostics")
- page.order = 60
+ page = node("admin", "network", "diagnostics")
+ page.target = template("admin_network/diagnostics")
+ page.title = _("Diagnostics")
+ page.order = 60
- page = entry({"admin", "network", "diag_ping"}, call("diag_ping"), nil)
- page.leaf = true
+ page = entry({"admin", "network", "diag_ping"}, call("diag_ping"), nil)
+ page.leaf = true
- page = entry({"admin", "network", "diag_nslookup"}, call("diag_nslookup"), nil)
- page.leaf = true
+ page = entry({"admin", "network", "diag_nslookup"}, call("diag_nslookup"), nil)
+ page.leaf = true
- page = entry({"admin", "network", "diag_traceroute"}, call("diag_traceroute"), nil)
- page.leaf = true
+ page = entry({"admin", "network", "diag_traceroute"}, call("diag_traceroute"), nil)
+ page.leaf = true
+-- end
end
function wifi_join()
function wifi_delete(network)
local ntm = require "luci.model.network".init()
-
- ntm:del_wifinet(network)
- ntm:save("wireless")
+ local wnet = ntm:get_wifinet(network)
+ if wnet then
+ local dev = wnet:get_device()
+ local nets = wnet:get_networks()
+ if dev then
+ luci.sys.call("env -i /sbin/wifi down %q >/dev/null" % dev:name())
+ ntm:del_wifinet(network)
+ ntm:commit("wireless")
+ local _, net
+ for _, net in ipairs(nets) do
+ if net:is_empty() then
+ ntm:del_network(net:name())
+ ntm:commit("network")
+ end
+ end
+ luci.sys.call("env -i /sbin/wifi up %q >/dev/null" % dev:name())
+ end
+ end
luci.http.redirect(luci.dispatcher.build_url("admin/network/wireless"))
end
local rv = { }
local iface
- for iface in path[#path]:gmatch("[%w%.%-]+") do
+ for iface in path[#path]:gmatch("[%w%.%-_]+") do
local net = netm:get_network(iface)
- if net then
- local info
- local dev = net:ifname()
+ local device = net and net:get_interface()
+ if device then
local data = {
- id = iface,
- proto = net:proto(),
- uptime = net:uptime(),
- gwaddr = net:gwaddr(),
- dnsaddrs = net:dnsaddrs()
+ id = iface,
+ proto = net:proto(),
+ uptime = net:uptime(),
+ gwaddr = net:gwaddr(),
+ dnsaddrs = net:dnsaddrs(),
+ name = device:shortname(),
+ type = device:type(),
+ ifname = device:name(),
+ macaddr = device:mac(),
+ is_up = device:is_up(),
+ rx_bytes = device:rx_bytes(),
+ tx_bytes = device:tx_bytes(),
+ rx_packets = device:rx_packets(),
+ tx_packets = device:tx_packets(),
+
+ ipaddrs = { },
+ ip6addrs = { },
+ subdevices = { }
}
- for _, info in ipairs(nixio.getifaddrs()) do
- local name = info.name:match("[^:]+")
- if name == dev then
- if info.family == "packet" then
- data.flags = info.flags
- data.stats = info.data
- data.macaddr = info.addr
- data.ifname = name
- elseif info.family == "inet" then
- data.ipaddrs = data.ipaddrs or { }
- data.ipaddrs[#data.ipaddrs+1] = {
- addr = info.addr,
- broadaddr = info.broadaddr,
- dstaddr = info.dstaddr,
- netmask = info.netmask,
- prefix = info.prefix
- }
- elseif info.family == "inet6" then
- data.ip6addrs = data.ip6addrs or { }
- data.ip6addrs[#data.ip6addrs+1] = {
- addr = info.addr,
- netmask = info.netmask,
- prefix = info.prefix
- }
- end
+
+ local _, a
+ for _, a in ipairs(device:ipaddrs()) do
+ data.ipaddrs[#data.ipaddrs+1] = {
+ addr = a:host():string(),
+ netmask = a:mask():string(),
+ prefix = a:prefix()
+ }
+ end
+ for _, a in ipairs(device:ip6addrs()) do
+ if not a:is6linklocal() then
+ data.ip6addrs[#data.ip6addrs+1] = {
+ addr = a:host():string(),
+ netmask = a:mask():string(),
+ prefix = a:prefix()
+ }
end
end
- if next(data) then
- rv[#rv+1] = data
+ for _, device in ipairs(net:get_interfaces() or {}) do
+ data.subdevices[#data.subdevices+1] = {
+ name = device:shortname(),
+ type = device:type(),
+ ifname = device:name(),
+ macaddr = device:mac(),
+ macaddr = device:mac(),
+ is_up = device:is_up(),
+ rx_bytes = device:rx_bytes(),
+ tx_bytes = device:tx_bytes(),
+ rx_packets = device:rx_packets(),
+ tx_packets = device:tx_packets(),
+ }
end
+
+ rv[#rv+1] = data
+ else
+ rv[#rv+1] = {
+ id = iface,
+ name = iface,
+ type = "ethernet"
+ }
end
end
local net = netmd:get_network(iface)
if net then
- local ifn
- for _, ifn in ipairs(net:get_interfaces()) do
- local wnet = ifn:get_wifinet()
- if wnet then
- local wdev = wnet:get_device()
- if wdev then
- luci.sys.call(
- "env -i /sbin/wifi up %q >/dev/null 2>/dev/null"
- % wdev:name()
- )
-
- luci.http.status(200, "Reconnected")
- return
- end
- end
- end
-
luci.sys.call("env -i /sbin/ifup %q >/dev/null 2>/dev/null" % iface)
luci.http.status(200, "Reconnected")
return
luci.http.status(404, "No such device")
end
+function wifi_reconnect()
+ local path = luci.dispatcher.context.requestpath
+ local mode = path[#path-1]
+ local wnet = path[#path]
+ local netmd = require "luci.model.network".init()
+
+ local net = netmd:get_wifinet(wnet)
+ local dev = net:get_device()
+ if dev and net then
+ luci.sys.call("env -i /sbin/wifi down >/dev/null 2>/dev/null")
+
+ dev:set("disabled", nil)
+ net:set("disabled", (mode == "wireless_shutdown") and 1 or nil)
+ netmd:commit("wireless")
+
+ luci.sys.call("env -i /sbin/wifi up >/dev/null 2>/dev/null")
+ luci.http.status(200, (mode == "wireless_shutdown") and "Shutdown" or "Reconnected")
+
+ return
+ end
+
+ luci.http.status(404, "No such radio")
+end
+
function lease_status()
local s = require "luci.tools.status"
luci.http.prepare_content("application/json")
+ luci.http.write('[')
luci.http.write_json(s.dhcp_leases())
+ luci.http.write(',')
+ luci.http.write_json(s.dhcp6_leases())
+ luci.http.write(']')
end
function diag_command(cmd)
projects / project / luci.git / blobdiff