modules/admin-full: when toggling a wifi-iface, first bring the radio down, then...

[project/luci.git] / modules / admin-full / luasrc / controller / admin / network.lua

diff --git a/modules/admin-full/luasrc/controller/admin/network.lua b/modules/admin-full/luasrc/controller/admin/network.lua
index e701d1d..a79d080 100644 (file)
--- a/modules/admin-full/luasrc/controller/admin/network.lua
+++ b/modules/admin-full/luasrc/controller/admin/network.lua
@@ -31,7 +31,7 @@ function index()
        local page
 
        page = node("admin", "network")
-       page.target = alias("admin", "network", "network")
+       page.target = firstchild()
        page.title  = _("Network")
        page.order  = 50
        page.index  = true
@@ -48,16 +48,22 @@ function index()
                page.leaf = true
                page.subindex = true
 
-               page = entry({"admin", "network", "wireless_join"}, call("wifi_join"), nil, 16)
+               page = entry({"admin", "network", "wireless_join"}, call("wifi_join"), nil)
                page.leaf = true
 
-               page = entry({"admin", "network", "wireless_add"}, call("wifi_add"), nil, 16)
+               page = entry({"admin", "network", "wireless_add"}, call("wifi_add"), nil)
                page.leaf = true
 
-               page = entry({"admin", "network", "wireless_delete"}, call("wifi_delete"), nil, 16)
+               page = entry({"admin", "network", "wireless_delete"}, call("wifi_delete"), nil)
                page.leaf = true
 
-               page = entry({"admin", "network", "wireless_status"}, call("wifi_status"), nil, 16)
+               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
@@ -192,9 +198,21 @@ end
 
 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 net = wnet:get_network()
+               if dev then
+                       luci.sys.call("env -i /sbin/wifi down %q" % dev:name())
+                       ntm:del_wifinet(network)
+                       ntm:commit("wireless")
+                       if net:is_empty() then
+                               ntm:del_network(net:name())
+                               ntm:commit("network")
+                       end
+                       luci.sys.call("env -i /sbin/wifi up %q" % dev:name())
+               end
+       end
 
        luci.http.redirect(luci.dispatcher.build_url("admin/network/wireless"))
 end
@@ -209,8 +227,7 @@ function iface_status()
                local net = netm:get_network(iface)
                local device = net and net:get_interface()
                if device then
-                       local device = net:get_interface()
-                       local data   = {
+                       local data = {
                                id         = iface,
                                proto      = net:proto(),
                                uptime     = net:uptime(),
@@ -247,7 +264,7 @@ function iface_status()
                                }
                        end
 
-                       for _, device in ipairs(net:get_interfaces()) do
+                       for _, device in ipairs(net:get_interfaces() or {}) do
                                data.subdevices[#data.subdevices+1] = {
                                        name       = device:shortname(),
                                        type       = device:type(),
@@ -263,6 +280,12 @@ function iface_status()
                        end
 
                        rv[#rv+1] = data
+               else
+                       rv[#rv+1] = {
+                               id   = iface,
+                               name = iface,
+                               type = "ethernet"
+                       }
                end
        end
 
@@ -282,23 +305,6 @@ function iface_reconnect()
 
        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
@@ -367,11 +373,13 @@ function wifi_reconnect()
        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 down; env -i /sbin/wifi up) >/dev/null 2>/dev/null")
+               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