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.lua;h=bcc44162103430f7b9e98312d738c21285b6970c;hp=e65dce4135a34554a42f9e5c7becb934578bb464;hb=b70cdbdb7b182d3aa6df850c2250c5596658abf4;hpb=746a5be1a896424b6e7db2cd0df107cb847831a8

diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
index e65dce413..bcc441621 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
@@ -15,6 +15,7 @@ $Id$
 local wa = require "luci.tools.webadmin"
 local nw = require "luci.model.network"
 local ut = require "luci.util"
+local nt = require "luci.sys".net
 local fs = require "nixio.fs"
 
 arg[1] = arg[1] or ""
@@ -106,33 +107,6 @@ local function txpower_current(pwr, list)
 	return (list[#list] and list[#list].driver_dbm) or pwr or 0
 end
 
-local function arplist(opt)
-	local _, e, mac, ip, name
-	local arp = { }
-
-	for _, e in ipairs(luci.sys.net.arptable()) do
-		arp[e["HW address"]:upper()] = { e["IP address"] }
-	end
-
-	if fs.access("/etc/ethers") then
-		for e in io.lines("/etc/ethers") do
-			mac, ip = e:match("^([a-f0-9]%S+) (%S+)")
-			if mac and ip then arp[mac:upper()] = { ip } end
-		end
-	end
-
-	if fs.access("/var/dhcp.leases") then
-		for e in io.lines("/var/dhcp.leases") do
-			mac, ip, name = e:match("^%d+ (%S+) (%S+) (%S+)")
-			if mac and ip then arp[mac:upper()] = { ip, name ~= "*" and name } end
-		end
-	end
-
-	for mac, e in luci.util.kspairs(arp) do
-		opt:value(mac, "%s (%s)" %{ mac, e[2] or e[1] })
-	end
-end
-
 local iw = luci.sys.wifi.getiwinfo(arg[1])
 local hw_modes      = iw.hwmodelist or { }
 local tx_power_list = txpower_list(iw)
@@ -192,7 +166,7 @@ if has_sta then
 else
 	ch = s:taboption("general", Value, "channel", translate("Channel"))
 	ch:value("auto", translate("auto"))
-	for _, f in ipairs(iw and iw.freqlist or luci.sys.wifi.channels()) do
+	for _, f in ipairs(iw and iw.freqlist) do
 		if not f.restricted then
 			ch:value(f.channel, "%i (%.3f GHz)" %{ f.channel, f.mhz / 1000 })
 		end
@@ -253,6 +227,18 @@ if hwtype == "mac80211" then
 	s:taboption("advanced", Value, "distance", translate("Distance Optimization"),
 		translate("Distance to farthest network member in meters."))
 
+	-- external antenna profiles
+	local eal = iw and iw.extant
+	if eal and #eal > 0 then
+		ea = s:taboption("advanced", ListValue, "extant", translate("Antenna Configuration"))
+		for _, eap in ipairs(eal) do
+			ea:value(eap.id, "%s (%s)" %{ eap.name, eap.description })
+			if eap.selected then
+				ea.default = eap.id
+			end
+		end
+	end
+
 	s:taboption("advanced", Value, "frag", translate("Fragmentation Threshold"))
 	s:taboption("advanced", Value, "rts", translate("RTS/CTS Threshold"))
 end
@@ -410,9 +396,8 @@ mode:value("adhoc", translate("Ad-Hoc"))
 bssid = s:taboption("general", Value, "bssid", translate("<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"))
 
 network = s:taboption("general", Value, "network", translate("Network"),
-	translate("Choose the network you want to attach to this wireless interface. " ..
-		"Select <em>unspecified</em> to not attach any network or fill out the " ..
-		"<em>create</em> field to define a new network."))
+	translate("Choose the network(s) you want to attach to this wireless interface or " ..
+		"fill out the <em>create</em> field to define a new network."))
 
 network.rmempty = true
 network.template = "cbi/network_netlist"
@@ -473,7 +458,7 @@ if hwtype == "mac80211" then
 	ml.datatype = "macaddr"
 	ml:depends({macfilter="allow"})
 	ml:depends({macfilter="deny"})
-	arplist(ml)
+	nt.mac_hints(function(mac, name) ml:value(mac, "%s (%s)" %{ mac, name }) end)
 
 	mode:value("ap-wds", "%s (%s)" % {translate("Access Point"), translate("WDS")})
 	mode:value("sta-wds", "%s (%s)" % {translate("Client"), translate("WDS")})
@@ -578,7 +563,7 @@ if hwtype == "atheros" then
 	ml.datatype = "macaddr"
 	ml:depends({macpolicy="allow"})
 	ml:depends({macpolicy="deny"})
-	arplist(ml)
+	nt.mac_hints(function(mac, name) ml:value(mac, "%s (%s)" %{ mac, name }) end)
 
 	s:taboption("advanced", Value, "rate", translate("Transmission Rate"))
 	s:taboption("advanced", Value, "mcast_rate", translate("Multicast Rate"))
@@ -652,7 +637,7 @@ if hwtype == "prism2" then
 	ml = s:taboption("macfilter", DynamicList, "maclist", translate("MAC-List"))
 	ml:depends({macpolicy="allow"})
 	ml:depends({macpolicy="deny"})
-	arplist(ml)
+	nt.mac_hints(function(mac, name) ml:value(mac, "%s (%s)" %{ mac, name }) end)
 
 	s:taboption("advanced", Value, "rate", translate("Transmission Rate"))
 	s:taboption("advanced", Value, "frag", translate("Fragmentation Threshold"))