X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fadmin-full%2Fluasrc%2Fmodel%2Fcbi%2Fadmin_network%2Fwifi_add.lua;h=3d0d7550eb882dc0a4123db7065c21aceda7c137;hp=327f24e4fd9a93427c22fdd555138cf6b4b42b97;hb=1aa676d501f806109d626665cd82390c175fd029;hpb=a50452e3e37bd3c79b4e69447420c8cd4cc2388b
diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/wifi_add.lua b/modules/admin-full/luasrc/model/cbi/admin_network/wifi_add.lua
index 327f24e4f..3d0d7550e 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi_add.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi_add.lua
@@ -12,14 +12,21 @@ You may obtain a copy of the License at
$Id$
]]--
+local fs = require "nixio.fs"
local nw = require "luci.model.network"
local fw = require "luci.model.firewall"
-local wl = require "luci.model.wireless"
local uci = require "luci.model.uci".cursor()
local http = require "luci.http"
local iw = luci.sys.wifi.getiwinfo(http.formvalue("device"))
+local has_firewall = fs.access("/etc/config/firewall")
+
+if not iw then
+ luci.http.redirect(luci.dispatcher.build_url("admin/network/wireless"))
+ return
+end
+
m = SimpleForm("network", translate("Join Network: Settings"))
m.cancel = translate("Back to scan results")
m.reset = false
@@ -34,7 +41,6 @@ end
nw.init(uci)
fw.init(uci)
-wl.init(uci)
m.hidden = {
device = http.formvalue("device"),
@@ -50,6 +56,8 @@ m.hidden = {
if iw and iw.mbssid_support then
replace = m:field(Flag, "replace", translate("Replace wireless configuration"),
translate("An additional network will be created if you leave this unchecked."))
+
+ function replace.cfgvalue() return "1" end
else
replace = m:field(DummyValue, "replace", translate("Replace wireless configuration"))
replace.default = translate("The hardware is not multi-SSID capable and existing " ..
@@ -63,149 +71,114 @@ if http.formvalue("wep") == "1" then
translate("Specify the secret encryption key here."))
key.password = true
+ key.datatype = "wepkey"
-elseif (tonumber(m.hidden.wpa_version) or 0) > 0 and m.hidden.wpa_suites == "PSK" then
+elseif (tonumber(m.hidden.wpa_version) or 0) > 0 and
+ (m.hidden.wpa_suites == "PSK" or m.hidden.wpa_suites == "PSK2")
+then
key = m:field(Value, "key", translate("WPA passphrase"),
translate("Specify the secret encryption key here."))
key.password = true
+ key.datatype = "wpakey"
--m.hidden.wpa_suite = (tonumber(http.formvalue("wpa_version")) or 0) >= 2 and "psk2" or "psk"
end
-attachnet = m:field(Flag, "_attach", translate("Attach to existing network"),
- translate("If the interface is attached to an existing network it will be bridged " ..
- "to the existing interfaces and is covered by the firewall zone of the choosen network. " ..
- "Uncheck this option to define a new standalone network."
- ))
-
-attachnet.rmempty = false
-attachnet.default = http.formvalue("cbi.submit") and nil or "1"
-
-function attachnet.formvalue(self, section)
- if not http.formvalue("cbi.submit") then
- return m.hidden.mode == "Ad-Hoc" and "0" or "1"
- else
- return Value.formvalue(self, section) and "1" or "0"
- end
-end
-
-attachnet.cfgvalue = attachnet.formvalue
-
newnet = m:field(Value, "_netname_new", translate("Name of the new network"),
translate("The allowed characters are: A-Z, a-z, " ..
"0-9 and _"
))
-newnet:depends("_attach", "")
-newnet.default = m.hidden.mode == "Ad-Hoc" and "mesh"
+newnet.default = m.hidden.mode == "Ad-Hoc" and "mesh" or "wwan"
+newnet.datatype = "uciname"
-addnet = m:field(Value, "_netname_attach",
- translate("Network to attach interface to"))
+if has_firewall then
+ fwzone = m:field(Value, "_fwzone",
+ translate("Create / Assign firewall-zone"),
+ translate("Choose the firewall zone you want to assign to this interface. Select unspecified to remove the interface from the associated zone or fill out the create field to define a new zone and attach the interface to it."))
-addnet.template = "cbi/network_netlist"
-addnet.widget = "radio"
-addnet.default = "wan"
-addnet.nocreate = true
-addnet:depends("_attach", "1")
-
-fwzone = m:field(Value, "_fwzone",
- translate("Create / Assign firewall-zone"),
- translate("Choose the firewall zone you want to assign to this interface. Select unspecified to remove the interface from the associated zone or fill out the create field to define a new zone and attach the interface to it."))
+ fwzone.template = "cbi/firewall_zonelist"
+ fwzone.default = m.hidden.mode == "Ad-Hoc" and "mesh" or "wan"
+end
-fwzone.template = "cbi/firewall_zonelist"
-fwzone:depends("_attach", "")
-fwzone.default = m.hidden.mode == "Ad-Hoc" and "mesh"
+function newnet.parse(self, section)
+ local net, zone
-function attachnet.parse(self, section)
- Flag.parse(self, section)
+ local value = self:formvalue(section)
+ net = nw:add_network(value, { proto = "dhcp" })
- if http.formvalue("cbi.submit") then
- local net, zone
- local value = self:formvalue(section)
+ if has_firewall then
+ local zval = fwzone:formvalue(section)
+ zone = fw:get_zone(zval)
- if value == "1" then
- net = nw:get_network(addnet:formvalue(section))
- if net then
- net:type("bridge")
+ if not zone and zval == '-' then
+ zval = m:formvalue(fwzone:cbid(section) .. ".newzone")
+ if zval and #zval > 0 then
+ zone = fw:add_zone(zval)
end
- else
- local zval = fwzone:formvalue(section)
+ end
+ end
+
+ if not net then
+ self.error = { [section] = "missing" }
+ else
+ local wdev = nw:get_wifidev(m.hidden.device)
- net = nw:add_network(newnet:formvalue(section), { proto = "dhcp" })
- zone = fw:get_zone(zval)
+ wdev:set("disabled", false)
+ wdev:set("channel", m.hidden.channel)
- if not zone and zval == '-' then
- zval = m:formvalue(fwzone:cbid(section) .. ".newzone")
- if zval and #zval > 0 then
- zone = fw:add_zone(zval)
- end
+ if replace:formvalue(section) then
+ local n
+ for _, n in ipairs(wdev:get_wifinets()) do
+ wdev:del_wifinet(n)
end
end
- if not net then
- self.error = { [section] = "missing" }
+ local wconf = {
+ device = m.hidden.device,
+ ssid = m.hidden.join,
+ mode = (m.hidden.mode == "Ad-Hoc" and "adhoc" or "sta"),
+ network = net:name()
+ }
+
+ if m.hidden.wep == "1" then
+ wconf.encryption = "wep"
+ wconf.key = key and key:formvalue(section) or ""
+ elseif (tonumber(m.hidden.wpa_version) or 0) > 0 then
+ wconf.encryption = (tonumber(m.hidden.wpa_version) or 0) >= 2 and "psk2" or "psk"
+ wconf.key = key and key:formvalue(section) or ""
else
- local wdev = wl:get_device(m.hidden.device)
- wdev:disabled(false)
- wdev:channel(m.hidden.channel)
-
- if replace:formvalue(section) then
- local n
- for _, n in ipairs(wdev:get_networks()) do
- wl:del_network(n:name())
- end
- end
+ wconf.encryption = "none"
+ end
- local wconf = {
- device = m.hidden.device,
- ssid = m.hidden.join,
- mode = (m.hidden.mode == "Ad-Hoc" and "adhoc" or "sta"),
- network = net:name()
- }
-
- if m.hidden.wep == "1" then
- wconf.encryption = "wep"
- wconf.key = key and key:formvalue(section) or ""
- elseif (tonumber(m.hidden.wpa_version) or 0) > 0 then
- wconf.encryption = (tonumber(m.hidden.wpa_version) or 0) >= 2 and "psk2" or "psk"
- wconf.key = key and key:formvalue(section) or ""
- else
- wconf.encryption = "none"
- end
+ if wconf.mode == "adhoc" then
+ wconf.bssid = m.hidden.bssid
+ end
- if wconf.mode == "adhoc" then
- wconf.bssid = m.hidden.bssid
+ local wnet = wdev:add_wifinet(wconf)
+ if wnet then
+ if zone then
+ fw:del_network(net:name())
+ zone:add_network(net:name())
end
- local wnet = wl:add_network(wconf)
-
- if wnet then
- if zone then
- fw:del_network(net:name())
- zone:add_network(net:name())
- end
-
- uci:save("wireless")
- uci:save("network")
- uci:save("firewall")
-
- uci:commit("wireless")
- uci:commit("network")
- uci:commit("firewall")
+ uci:save("wireless")
+ uci:save("network")
+ uci:save("firewall")
- luci.http.redirect(luci.dispatcher.build_url("admin/network/wireless",
- wdev:name(), wnet:name()))
- end
+ luci.http.redirect(luci.dispatcher.build_url(
+ "admin/network/wireless", wdev:name(), wnet:ifname()
+ ))
end
end
end
-attachnet.remove = attachnet.write
-
-function fwzone.cfgvalue(self, section)
- self.iface = section
- local z = fw:get_zone_by_network(section)
- return z and z:name()
+if has_firewall then
+ function fwzone.cfgvalue(self, section)
+ self.iface = section
+ local z = fw:get_zone_by_network(section)
+ return z and z:name()
+ end
end
return m