X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fadmin-full%2Fluasrc%2Fcontroller%2Fadmin%2Fnetwork.lua;h=1e6892e16ee918b0df2a748a7ec994385c0d6578;hp=50623990fff559b20097a1c4aa4fe5fb8bdcd6e5;hb=9c97cdb7b6edcc62d29a72ca64cd682503e693f6;hpb=5ff3750b37a0f4b0fffe225c4c1ea25485b8ab27

diff --git a/modules/admin-full/luasrc/controller/admin/network.lua b/modules/admin-full/luasrc/controller/admin/network.lua
index 50623990f..1e6892e16 100644
--- a/modules/admin-full/luasrc/controller/admin/network.lua
+++ b/modules/admin-full/luasrc/controller/admin/network.lua
@@ -2,6 +2,7 @@
 LuCI - Lua Configuration Interface
 
 Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 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.
@@ -11,82 +12,409 @@ You may obtain a copy of the License at
 
 $Id$
 ]]--
+
 module("luci.controller.admin.network", package.seeall)
 
 function index()
-	require("luci.i18n")
 	local uci = require("luci.model.uci").cursor()
-	local i18n = luci.i18n.translate
+	local net = require "luci.model.network".init(uci)
+	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
 
-	local page  = node("admin", "network")
+	page = node("admin", "network")
 	page.target = alias("admin", "network", "network")
-	page.title  = i18n("network")  
+	page.title  = _("Network")
 	page.order  = 50
-	
-	local page  = node("admin", "network", "vlan")
-	page.target = cbi("admin_network/vlan")
-	page.title  = i18n("a_n_switch")
-	page.order  = 20
-	
-	local page  = node("admin", "network", "wireless")
-	page.target = form("admin_network/wireless")
-	page.title  = i18n("wifi")
-	page.i18n   = "wifi"
-	page.order  = 15
-	uci:foreach("wireless", "wifi-device",
-		function (section)
-			local ifc = section[".name"]
-				entry({"admin", "network", "wireless", ifc},
-				 alias("admin", "network", "wifi", ifc),
-				 ifc:upper()).i18n = "wifi"
+	page.index  = true
+
+	if has_switch then
+		page  = node("admin", "network", "vlan")
+		page.target = cbi("admin_network/vlan")
+		page.title  = _("Switch")
+		page.order  = 20
+	end
+
+	if has_wifi and has_wifi.size > 0 then
+		page = entry({"admin", "network", "wireless"}, arcombine(template("admin_network/wifi_overview"), cbi("admin_network/wifi")), _("Wifi"), 15)
+		page.leaf = true
+		page.subindex = true
+
+		page = entry({"admin", "network", "wireless_join"}, call("wifi_join"), nil)
+		page.leaf = true
+
+		page = entry({"admin", "network", "wireless_add"}, call("wifi_add"), nil)
+		page.leaf = true
+
+		page = entry({"admin", "network", "wireless_delete"}, call("wifi_delete"), nil)
+		page.leaf = true
+
+		page = entry({"admin", "network", "wireless_status"}, call("wifi_status"), nil)
+		page.leaf = true
+
+		page = entry({"admin", "network", "wireless_reconnect"}, call("wifi_reconnect"), nil)
+		page.leaf = true
+
+		page = entry({"admin", "network", "wireless_shutdown"}, call("wifi_reconnect"), nil)
+		page.leaf = true
+
+		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:id()},
+					alias("admin", "network", "wireless"),
+					wdev:name() .. ": " .. wnet:shortname()
+				)
+			end
 		end
-	)
-	
-	local page  = node("admin", "network", "wifi")
-	page.target = cbi("admin_network/wifi")
+	end
+
+	page = entry({"admin", "network", "network"}, arcombine(cbi("admin_network/network"), cbi("admin_network/ifaces")), _("Interfaces"), 10)
 	page.leaf   = true
-	page.i18n = "wifi"
-	
-	local page  = node("admin", "network", "network")
-	page.target = cbi("admin_network/network")
-	page.title  = i18n("interfaces", "Schnittstellen")
-	page.order  = 10
+	page.subindex = true
+
+	page = entry({"admin", "network", "iface_add"}, cbi("admin_network/iface_add"), nil)
+	page.leaf = true
+
+	page = entry({"admin", "network", "iface_delete"}, call("iface_delete"), nil)
+	page.leaf = true
+
+	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
+
 	uci:foreach("network", "interface",
 		function (section)
 			local ifc = section[".name"]
 			if ifc ~= "loopback" then
 				entry({"admin", "network", "network", ifc},
-				 alias("admin", "network", "ifaces", ifc),
+				 true,
 				 ifc:upper())
 			end
 		end
 	)
-	
-	local page  = node("admin", "network", "ifaces")
-	page.target = cbi("admin_network/ifaces")
-	page.leaf   = true
 
-	local page  = node("admin", "network", "dhcp")
-	page.target = cbi("admin_network/dhcp")
-	page.title  = "DHCP"
-	page.order  = 30
-	
-	entry(
-	 {"admin", "network", "dhcp", "leases"},
-	 cbi("admin_network/dhcpleases"),
-	 i18n("dhcp_leases")
-	) 
-	
-	local page  = node("admin", "network", "routes")
+	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  = i18n("a_n_routes")
-	page.order  = 40
-	page.leaf   = true
-	
-	entry(
-	 {"admin", "network", "routes", "static"},
-	 function() end,
-	 i18n("a_n_routes_static")
-	)
+	page.title  = _("Static Routes")
+	page.order  = 50
+
+	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_nslookup"}, call("diag_nslookup"), nil)
+	page.leaf = true
+
+	page = entry({"admin", "network", "diag_traceroute"}, call("diag_traceroute"), nil)
+	page.leaf = true
+end
+
+function wifi_join()
+	local function param(x)
+		return luci.http.formvalue(x)
+	end
+
+	local function ptable(x)
+		x = param(x)
+		return x and (type(x) ~= "table" and { x } or x) or {}
+	end
+
+	local dev  = param("device")
+	local ssid = param("join")
+
+	if dev and ssid then
+		local cancel  = (param("cancel") or param("cbi.cancel")) and true or false
+
+		if cancel then
+			luci.http.redirect(luci.dispatcher.build_url("admin/network/wireless_join?device=" .. dev))
+		else
+			local cbi = require "luci.cbi"
+			local tpl = require "luci.template"
+			local map = luci.cbi.load("admin_network/wifi_add")[1]
+
+			if map:parse() ~= cbi.FORM_DONE then
+				tpl.render("header")
+				map:render()
+				tpl.render("footer")
+			end
+		end
+	else
+		luci.template.render("admin_network/wifi_join")
+	end
+end
+
+function wifi_add()
+	local dev = luci.http.formvalue("device")
+	local ntm = require "luci.model.network".init()
+
+	dev = dev and ntm:get_wifidev(dev)
+
+	if dev then
+		local net = dev:add_wifinet({
+			mode       = "ap",
+			ssid       = "OpenWrt",
+			encryption = "none"
+		})
+
+		ntm:save("wireless")
+		luci.http.redirect(net:adminlink())
+	end
+end
+
+function wifi_delete(network)
+	local ntm = require "luci.model.network".init()
+
+	ntm:del_wifinet(network)
+	ntm:save("wireless")
+
+	luci.http.redirect(luci.dispatcher.build_url("admin/network/wireless"))
+end
+
+function iface_status()
+	local path = luci.dispatcher.context.requestpath
+	local netm = require "luci.model.network".init()
+	local rv   = { }
+
+	local iface
+	for iface in path[#path]:gmatch("[%w%.%-_]+") do
+		local net = netm:get_network(iface)
+		local device = net and net:get_interface()
+		if device then
+			local device = net:get_interface()
+			local data   = {
+				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 = { }
+			}
+
+			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
+				data.ip6addrs[#data.ip6addrs+1] = {
+					addr      = a:host():string(),
+					netmask   = a:mask():string(),
+					prefix    = a:prefix()
+				}
+			end
+
+			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
+
+	if #rv > 0 then
+		luci.http.prepare_content("application/json")
+		luci.http.write_json(rv)
+		return
+	end
+
+	luci.http.status(404, "No such device")
+end
+
+function iface_reconnect()
+	local path  = luci.dispatcher.context.requestpath
+	local iface = path[#path]
+	local netmd = require "luci.model.network".init()
+
+	local net = netmd:get_network(iface)
+	if net then
+		luci.sys.call("env -i /sbin/ifup %q >/dev/null 2>/dev/null" % iface)
+		luci.http.status(200, "Reconnected")
+		return
+	end
+
+	luci.http.status(404, "No such interface")
+end
+
+function iface_shutdown()
+	local path  = luci.dispatcher.context.requestpath
+	local iface = path[#path]
+	local netmd = require "luci.model.network".init()
+
+	local net = netmd:get_network(iface)
+	if net then
+		luci.sys.call("env -i /sbin/ifdown %q >/dev/null 2>/dev/null" % iface)
+		luci.http.status(200, "Shutdown")
+		return
+	end
+
+	luci.http.status(404, "No such interface")
+end
+
+function iface_delete()
+	local path  = luci.dispatcher.context.requestpath
+	local iface = path[#path]
+	local netmd = require "luci.model.network".init()
+
+	local net = netmd:del_network(iface)
+	if net then
+		luci.sys.call("env -i /sbin/ifdown %q >/dev/null 2>/dev/null" % iface)
+		luci.http.redirect(luci.dispatcher.build_url("admin/network/network"))
+		netmd:commit("network")
+		netmd:commit("wireless")
+		return
+	end
+
+	luci.http.status(404, "No such interface")
+end
+
+function wifi_status()
+	local path = luci.dispatcher.context.requestpath
+	local s    = require "luci.tools.status"
+	local rv   = { }
+
+	local dev
+	for dev in path[#path]:gmatch("[%w%.%-]+") do
+		rv[#rv+1] = s.wifi_network(dev)
+	end
+
+	if #rv > 0 then
+		luci.http.prepare_content("application/json")
+		luci.http.write_json(rv)
+		return
+	end
+
+	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
+		dev:set("disabled", nil)
+		net:set("disabled", (mode == "wireless_shutdown") and 1 or nil)
+		netmd:commit("wireless")
+
+		luci.sys.call("(env -i /sbin/wifi down; 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_json(s.dhcp_leases())
+end
+
+function diag_command(cmd)
+	local path = luci.dispatcher.context.requestpath
+	local addr = path[#path]
+
+	if addr and addr:match("^[a-zA-Z0-9%-%.:_]+$") then
+		luci.http.prepare_content("text/plain")
+
+		local util = io.popen(cmd % addr)
+		if util then
+			while true do
+				local ln = util:read("*l")
+				if not ln then break end
+				luci.http.write(ln)
+				luci.http.write("\n")
+			end
+
+			util:close()
+		end
+
+		return
+	end
+
+	luci.http.status(500, "Bad address")
+end
+
+function diag_ping()
+	diag_command("ping -c 5 -W 1 %q 2>&1")
+end
+
+function diag_traceroute()
+	diag_command("traceroute -q 1 -w 1 -n %q 2>&1")
+end
 
-end
\ No newline at end of file
+function diag_nslookup()
+	diag_command("nslookup %q 2>&1")
+end