package/gluon-web-osm/javascript/gluon-web-osm.min.js

+"use strict";function initOSM(o,r){var e=document.createElement("link");e.rel="stylesheet",e.type="text/css",e.href=o.openlayers_url+"/css/ol.css",document.head.appendChild(e);var t=document.createElement("script"),l=!1;t.onload=t.onreadystatechange=function(){if(!(l||this.readyState&&"loaded"!==this.readyState&&"complete"!==this.readyState)){l=!0;var t=new Image;t.onload=function(){var i,e=new ol.style.Style({image:new ol.style.Icon({img:t,imgSize:[30,45],anchor:[.5,1]})}),s=new ol.Feature;s.setStyle(e),i=o.tile_layer&&"XYZ"===o.tile_layer.type?new ol.source.XYZ({url:o.tile_layer.url,attributions:o.tile_layer.attributions}):new ol.source.OSM,r(function(e,t,o,r,l){function n(e){s.setGeometry(new ol.geom.Point(e))}var a=new ol.Map({target:e,layers:[new ol.layer.Tile({source:i}),new ol.layer.Vector({source:new ol.source.Vector({features:[s]})})],view:new ol.View({center:ol.proj.fromLonLat(t),zoom:o})});return a.addEventListener("click",function(e){n(e.coordinate),l(ol.proj.toLonLat(e.coordinate))}),r&&n(ol.proj.fromLonLat(t)),a})},t.src="data:image/svg+xml,"+escape('<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="30" height="45"><path d="M2,15A13,13,0,0,1,28,13Q28,28,15,45Q2,28,2,15" fill="#48b" stroke="#369" stroke-width="1.5" /><circle cx="15" cy="15" r="6" fill="#fff" /></svg>')}},t.src=o.openlayers_url+"/build/ol.js",document.head.appendChild(t)}
\ No newline at end of file

package/gluon-web-osm/javascript/osm.js

-/*
-	Build using:
-
-	uglifyjs javascript/osm.js -o files/lib/gluon/web/www/static/osm.js -c -m
-*/
-
-function findObj(name) {
-        list = document.getElementsByClassName("gluon-input-text");
-        for(i = 0; i < list.length; i++) {
-                item = list.item(i);
-                if(item.id.indexOf(name) >= 0) return item;
-        }
-        return false;
-}
-
-function showMap() {
-        if ("object" == typeof OpenLayers && false !== findObj("longitude")) {
-                document.getElementById("locationPickerMap").style.display = "block";
-                var e = new OpenLayers.Projection("EPSG:4326"),
-                        a = new OpenLayers.Projection("EPSG:900913"),
-                        t = zoom,
-                        n = new OpenLayers.Layer.Markers("Markers");
-                OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, {
-                        defaultHandlerOptions: {
-                                single: !0,
-                                "double": !1,
-                                pixelTolerance: 0,
-                                stopSingle: !1,
-                                stopDouble: !1
-                        },
-                        initialize: function() {
-                                this.handlerOptions = OpenLayers.Util.extend({}, this.defaultHandlerOptions), OpenLayers.Control.prototype.initialize.apply(this, arguments), this.handler = new OpenLayers.Handler.Click(this, {
-                                        click: this.trigger
-                                }, this.handlerOptions)
-                        },
-                        trigger: function(t) {
-                                var i = osmMap.getLonLatFromPixel(t.xy);
-                                oLon = findObj("longitude");
-                                oLat = findObj("latitude");
-                                lonlat1 = new OpenLayers.LonLat(i.lon, i.lat).transform(a, e),
-                                        oLon.value = lonlat1.lon,
-                                        oLat.value = lonlat1.lat,
-                                        n.clearMarkers(),
-                                        n.addMarker(new OpenLayers.Marker(i)),
-                                        oLon.className = oLon.className.replace(/ gluon-input-invalid/g, ""),
-                                        oLat.className = oLat.className.replace(/ gluon-input-invalid/g, "");
-                        }
-                }), osmMap = new OpenLayers.Map("locationPickerMap", {
-                        controls: [new OpenLayers.Control.Navigation, new OpenLayers.Control.PanZoomBar, new OpenLayers.Control.MousePosition],
-                        maxExtent: new OpenLayers.Bounds(-20037508.34, -20037508.34, 20037508.34, 20037508.34),
-                        numZoomLevels: 18,
-                        maxResolution: 156543,
-                        units: "m",
-                        projection: a,
-                        displayProjection: e
-                });
-                var i = new OpenLayers.Layer.OSM("OpenStreetMap");
-                osmMap.addLayer(i), osmMap.addLayer(n);
-                var o = longitude,
-                        r = latitude;
-                oLon = findObj("longitude");
-                oLat = findObj("latitude");
-                "" != oLon.value && (o = oLon.value),
-                "" != oLat.value && (r = oLat.value),
-                n.addMarker(new OpenLayers.Marker(new OpenLayers.LonLat(o, r).transform(e, a)));
-                var l = new OpenLayers.LonLat(o, r),
-                        d = l.transform(e, a);
-                osmMap.setCenter(d, t);
-                var s = new OpenLayers.Control.Click;
-                osmMap.addControl(s), s.activate()
-        } else setTimeout(showMap, 1e3)
-}

package/gluon-web-osm/luasrc/usr/lib/lua/gluon/web/model/osm.lua

+local classes = require 'gluon.web.model.classes'
+local util = require "gluon.web.util"
+
+local class = util.class
+
+
+local DEFAULT_URL =
+	'https://cdn.jsdelivr.net/gh/openlayers/openlayers.github.io@35ffe7626ce16c372143f3c903950750075e7068/en/v5.3.0'
+
+
+local M = {}
+
+local MapValue = class(classes.AbstractValue)
+M.MapValue = MapValue
+
+function MapValue:__init__(title, options)
+	classes.AbstractValue.__init__(self, title)
+	self.subtemplate  = "model/osm/map"
+	self.options = {
+		openlayers_url = options.openlayers_url or DEFAULT_URL,
+		tile_layer = options.tile_layer,
+	}
+	self.lon = options.lon
+	self.lat = options.lat
+
+	self.pos = options.pos or {lon = 0, lat = 0}
+	self.zoom = options.zoom or 0
+	self.set = options.set or false
+end
+
+function MapValue:cfgvalue()
+	local pos_lon = tonumber(self.lon and self.lon:cfgvalue())
+	local pos_lat = tonumber(self.lat and self.lat:cfgvalue())
+
+	if pos_lon and pos_lat then
+		return {
+			zoom = 18,
+			pos = { lon = pos_lon, lat = pos_lat },
+			set = true,
+		}
+	else
+		return self
+	end
+end
+
+function MapValue:validate()
+	return true
+end
+
+return M

package/gluon-web-private-wifi/Makefile

 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gluon-web-private-wifi
-PKG_VERSION:=1
-PKG_RELEASE:=1
 
 include ../gluon.mk
 
 define Package/gluon-web-private-wifi
-  DEPENDS:=+gluon-web-admin
+  DEPENDS:=+gluon-web-admin +gluon-private-wifi
   TITLE:=UI for activating a private WLAN
 endef
 

package/gluon-web-private-wifi/i18n/de.po

@@ -13,18 +13,45 @@ msgstr ""
 msgid "8-63 characters"
 msgstr "8-63 Zeichen"
 
+msgid "Disabled"
+msgstr "Deaktiviert"
+
 msgid "Enabled"
 msgstr "Aktiviert"
 
+msgid "Encryption"
+msgstr "Verschlüsselung"
+
 msgid "Key"
 msgstr "Schlüssel"
 
+msgid "Management Frame Protection"
+msgstr ""
+
 msgid "Name (SSID)"
 msgstr "Name (SSID)"
 
+msgid "Optional"
+msgstr ""
+
 msgid "Private WLAN"
 msgstr "Privates WLAN"
 
+msgid "Required"
+msgstr "Aktiviert"
+
+msgid "WPA2"
+msgstr ""
+
+msgid "WPA2 / WPA3"
+msgstr ""
+
+msgid "WPA3"
+msgstr ""
+
+msgid "Meshing on WAN interface is enabled. This can lead to problems."
+msgstr "Mesh auf WAN ist aktiv. Dies kann zu Problemen führen."
+
 msgid ""
 "Your node can additionally extend your private network by bridging the WAN "
 "interface with a separate WLAN. This feature is completely independent of "

package/gluon-web-private-wifi/i18n/fr.po

@@ -13,25 +13,49 @@ msgstr ""
 msgid "8-63 characters"
 msgstr "8-63 charactères"
 
+msgid "Disabled"
+msgstr ""
+
 msgid "Enabled"
 msgstr "Activé"
 
+msgid "Encryption"
+msgstr ""
+
 msgid "Key"
 msgstr "Clé"
 
+msgid "Management Frame Protection"
+msgstr ""
+
 msgid "Name (SSID)"
 msgstr "Nom (SSID)"
 
+msgid "Optional"
+msgstr ""
+
 msgid "Private WLAN"
 msgstr "Wi-Fi privé"
 
+msgid "Required"
+msgstr ""
+
+msgid "WPA2"
+msgstr ""
+
+msgid "WPA2 / WPA3"
+msgstr ""
+
+msgid "WPA3"
+msgstr ""
+
 msgid ""
 "Your node can additionally extend your private network by bridging the WAN "
 "interface with a separate WLAN. This feature is completely independent of "
 "the mesh functionality. Please note that the private WLAN and meshing on the "
 "WAN interface should not be enabled at the same time."
 msgstr ""
-"Votre nœud peut étendre votre réseau privé en interfaçant le WAN avec un "
-"Wi-Fi séparé. Cette fonction est complètement indépendante de les fonctions "
-"de MESH. Il ne faut pas activer la fonction de MESH et de Wi-Fi privé en même "
+"Votre nœud peut étendre votre réseau privé en interfaçant le WAN avec un Wi-"
+"Fi séparé. Cette fonction est complètement indépendante de les fonctions de "
+"MESH. Il ne faut pas activer la fonction de MESH et de Wi-Fi privé en même "
 "temps."

package/gluon-web-private-wifi/i18n/gluon-web-private-wifi.pot

@@ -4,18 +4,45 @@ msgstr "Content-Type: text/plain; charset=UTF-8"
 msgid "8-63 characters"
 msgstr ""
 
+msgid "Disabled"
+msgstr ""
+
 msgid "Enabled"
 msgstr ""
 
+msgid "Encryption"
+msgstr ""
+
 msgid "Key"
 msgstr ""
 
+msgid "Management Frame Protection"
+msgstr ""
+
 msgid "Name (SSID)"
 msgstr ""
 
+msgid "Optional"
+msgstr ""
+
 msgid "Private WLAN"
 msgstr ""
 
+msgid "Required"
+msgstr ""
+
+msgid "WPA2"
+msgstr ""
+
+msgid "WPA2 / WPA3"
+msgstr ""
+
+msgid "WPA3"
+msgstr ""
+
+msgid "Meshing on WAN interface is enabled. This can lead to problems."
+msgstr ""
+
 msgid ""
 "Your node can additionally extend your private network by bridging the WAN "
 "interface with a separate WLAN. This feature is completely independent of "

package/gluon-web-private-wifi/luasrc/lib/gluon/config-mode/controller/admin/privatewifi.lua

+local uci = require("simple-uci").cursor()
+local wireless = require 'gluon.wireless'
+
 package 'gluon-web-private-wifi'
 
+if wireless.device_uses_wlan(uci) then
 	entry({"admin", "privatewifi"}, model("admin/privatewifi"), _("Private WLAN"), 30)
+end

package/gluon-web-private-wifi/luasrc/lib/gluon/config-mode/model/admin/privatewifi.lua

 local uci = require("simple-uci").cursor()
+local wireless = require 'gluon.wireless'
 local util = require 'gluon.util'
 
 -- where to read the configuration from
@@ -13,9 +14,27 @@ local s = f:section(Section, nil, translate(
 	.. 'at the same time.'
 ))
 
+local uplink_interfaces = util.get_role_interfaces(uci, 'uplink')
+local mesh_on_wan = false
+
+for _, iface in ipairs(util.get_role_interfaces(uci, 'mesh')) do
+	if util.contains(uplink_interfaces, iface) then
+		mesh_on_wan = true
+	end
+end
+
 local enabled = s:option(Flag, "enabled", translate("Enabled"))
 enabled.default = uci:get('wireless', primary_iface) and not uci:get_bool('wireless', primary_iface, "disabled")
 
+local warning = s:element('model/warning', {
+	content = translate(
+		'Meshing on WAN interface is enabled. ' ..
+		'This can lead to problems.'
+	),
+	hide = not mesh_on_wan,
+}, 'warning')
+warning:depends(enabled, true)
+
 local ssid = s:option(Value, "ssid", translate("Name (SSID)"))
 ssid:depends(enabled, true)
 ssid.datatype = "maxlength(32)"
@@ -26,24 +45,52 @@ key:depends(enabled, true)
 key.datatype = "wpakey"
 key.default = uci:get('wireless', primary_iface, "key")
 
+local encryption = s:option(ListValue, "encryption", translate("Encryption"))
+encryption:depends(enabled, true)
+encryption:value("psk2", translate("WPA2"))
+if wireless.device_supports_wpa3() then
+	encryption:value("sae-mixed", translate("WPA2 / WPA3"))
+	encryption:value("sae", translate("WPA3"))
+end
+encryption.default = uci:get('wireless', primary_iface, 'encryption') or "psk2"
+
+local mfp = s:option(ListValue, "mfp", translate("Management Frame Protection"))
+mfp:depends(enabled, true)
+mfp:value("0", translate("Disabled"))
+if wireless.device_supports_mfp(uci) then
+	mfp:value("1", translate("Optional"))
+	mfp:value("2", translate("Required"))
+end
+mfp.default = uci:get('wireless', primary_iface, 'ieee80211w') or "0"
+
+
 function f:write()
-	util.foreach_radio(uci, function(radio, index)
+	wireless.foreach_radio(uci, function(radio, index)
 		local radio_name = radio['.name']
+		local suffix = radio_name:match('^radio(%d+)$')
 		local name   = "wan_" .. radio_name
 
 		if enabled.data then
-			local macaddr = util.get_wlan_mac(uci, radio, index, 4)
+			local macaddr = wireless.get_wlan_mac('wan_radio', index, radio)
 
-			uci:section('wireless', "wifi-iface", name, {
+			uci:section('wireless', 'wifi-iface', name, {
 				device     = radio_name,
-				network    = "wan",
+				network    = 'wan',
 				mode       = 'ap',
-				encryption = 'psk2',
+				encryption = encryption.data,
 				ssid       = ssid.data,
 				key        = key.data,
 				macaddr    = macaddr,
+				ifname     = suffix and 'wl-wan' .. suffix,
 				disabled   = false,
 			})
+
+			-- hostapd-mini won't start in case 802.11w is configured
+			if wireless.device_supports_mfp(uci) then
+				uci:set('wireless', name, 'ieee80211w', mfp.data)
+			else
+				uci:delete('wireless', name, 'ieee80211w')
+			end
 		else
 			uci:set('wireless', name, "disabled", true)
 		end

package/gluon-web-wifi-config/Makefile

 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gluon-web-wifi-config
-PKG_VERSION:=1
-PKG_RELEASE:=1
 
 include ../gluon.mk
 

package/gluon-web-wifi-config/i18n/de.po

@@ -19,14 +19,33 @@ msgstr "2,4GHz-WLAN"
 msgid "5GHz WLAN"
 msgstr "5GHz-WLAN"
 
+msgid ""
+"Configuring the node for outdoor use tunes the 5 GHz radio to a frequency "
+"and transmission power that conforms with the local regulatory requirements. "
+"It also enables dynamic frequency selection (DFS; radar detection). At the "
+"same time, mesh functionality is disabled as it requires neighbouring nodes "
+"to stay on the same channel permanently."
+msgstr ""
+"Ist der Knoten für den Einsatz im Freien konfiguriert, wird ein WLAN-Kanal "
+"auf dem 5-GHz-Band sowie eine Sendeleistung entsprechend den gesetzlichen "
+"Frequenzregulatorien gewählt. Gleichzeitig wird die dynamische Frequenzwahl "
+"(DFS; Radarerkennung) aktiviert und die Mesh-Funktionalität deaktiviert, da "
+"sich Nachbarknoten dauerhaft auf demselben Kanal befinden müssen."
+
 msgid "Enable client network (access point)"
 msgstr "Client-Netz aktivieren (Access Point)"
 
 msgid "Enable mesh network (802.11s)"
 msgstr "Mesh-Netz aktivieren (802.11s)"
 
-msgid "Enable mesh network (IBSS)"
-msgstr "Mesh-Netz aktivieren (IBSS)"
+msgid "HT Mode"
+msgstr "HT-Modus"
+
+msgid "Node will be installed outdoors"
+msgstr "Knoten wird im Außenbereich betrieben"
+
+msgid "Outdoor Installation"
+msgstr "Outdoor-Installation"
 
 msgid "Transmission power"
 msgstr "Sendeleistung"
@@ -37,15 +56,15 @@ msgstr "WLAN"
 msgid ""
 "You can enable or disable your node's client and mesh network SSIDs here. "
 "Please don't disable the mesh network without a good reason, so other nodes "
-"can mesh with yours.<br /><br />It is also possible to configure the WLAN "
+"can mesh with yours.<br><br>It is also possible to configure the WLAN "
 "adapters transmission power here. Please note that the transmission power "
 "values include the antenna gain where available, but there are many devices "
 "for which the gain is unavailable or inaccurate."
 msgstr ""
 "In diesem Abschnitt hast du die Möglichkeit, die SSIDs des Client- und des "
 "Mesh-Netzes zu aktivieren bzw. deaktivieren. Bitte lass die SSID des Mesh-"
-"Netzes aktiviert, damit sich andere Knoten mit deinem verbinden können.<br /"
-"><br />Außerdem kann hier die Sendeleistung des WLAN-Adapters konfiguriert "
+"Netzes aktiviert, damit sich andere Knoten mit deinem verbinden können.<br"
+"><br>Außerdem kann hier die Sendeleistung des WLAN-Adapters konfiguriert "
 "werden. Wenn möglich, ist in den Werten der Sendeleistung der Antennengewinn "
 "enthalten; diese Werte sind allerdings für viele Geräte nicht verfügbar oder "
 "fehlerhaft."

package/gluon-web-wifi-config/i18n/fr.po

 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "PO-Revision-Date: 2015-08-19 23:30+0100\n"
 "Last-Translator:Tobias Bernot <tqbs@airmail.cc>\n"
 "Language-Team: French\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
 msgid "(default)"
 msgstr "(défaut)"
 
@@ -18,14 +19,28 @@ msgstr "2,4GHz Wi-Fi"
 msgid "5GHz WLAN"
 msgstr "5GHz Wi-Fi"
 
+msgid ""
+"Configuring the node for outdoor use tunes the 5 GHz radio to a frequency "
+"and transmission power that conforms with the local regulatory requirements. "
+"It also enables dynamic frequency selection (DFS; radar detection). At the "
+"same time, mesh functionality is disabled as it requires neighbouring nodes "
+"to stay on the same channel permanently."
+msgstr ""
+
 msgid "Enable client network (access point)"
 msgstr "Activer le réseau client (Access Point)"
 
 msgid "Enable mesh network (802.11s)"
 msgstr "Activer le réseau MESH (802.11s)"
 
-msgid "Enable mesh network (IBSS)"
-msgstr "Activer le réseau MESH (IBSS)"
+msgid "HT Mode"
+msgstr "Mode HT"
+
+msgid "Node will be installed outdoors"
+msgstr ""
+
+msgid "Outdoor Installation"
+msgstr "Installation extérieure"
 
 msgid "Transmission power"
 msgstr "Puissance d'émission"
@@ -36,13 +51,14 @@ msgstr "Wi-Fi"
 msgid ""
 "You can enable or disable your node's client and mesh network SSIDs here. "
 "Please don't disable the mesh network without a good reason, so other nodes "
-"can mesh with yours.<br /><br />It is also possible to configure the WLAN "
+"can mesh with yours.<br><br>It is also possible to configure the WLAN "
 "adapters transmission power here. Please note that the transmission power "
 "values include the antenna gain where available, but there are many devices "
 "for which the gain is unavailable or inaccurate."
 msgstr ""
-"Ici vous pouvez activer ou désactiver la SSID du client ou MESH. "
-"Pensez a laisser la SSID du MESH activée pour que les autres nœuds puissent se connecter. "
-"<br /><br />Ici vous pouvez aussi configurer la puissance d'émmission se votre Wi-Fi. "
-"Prenez note que les valeurs fournies pour la puissance de transmission prennent "
-"en compte les gains fournis par l'antenne, et que ces valeurs ne sont pas toujours disponibles ou exactes."
+"Ici vous pouvez activer ou désactiver la SSID du client ou MESH. Pensez a "
+"laisser la SSID du MESH activée pour que les autres nœuds puissent se "
+"connecter. <br><br>Ici vous pouvez aussi configurer la puissance "
+"d'émmission se votre Wi-Fi. Prenez note que les valeurs fournies pour la "
+"puissance de transmission prennent en compte les gains fournis par "
+"l'antenne, et que ces valeurs ne sont pas toujours disponibles ou exactes."

package/gluon-web-wifi-config/i18n/gluon-web-wifi-config.pot

@@ -10,13 +10,27 @@ msgstr ""
 msgid "5GHz WLAN"
 msgstr ""
 
+msgid ""
+"Configuring the node for outdoor use tunes the 5 GHz radio to a frequency "
+"and transmission power that conforms with the local regulatory requirements. "
+"It also enables dynamic frequency selection (DFS; radar detection). At the "
+"same time, mesh functionality is disabled as it requires neighbouring nodes "
+"to stay on the same channel permanently."
+msgstr ""
+
 msgid "Enable client network (access point)"
 msgstr ""
 
 msgid "Enable mesh network (802.11s)"
 msgstr ""
 
-msgid "Enable mesh network (IBSS)"
+msgid "HT Mode"
+msgstr ""
+
+msgid "Node will be installed outdoors"
+msgstr ""
+
+msgid "Outdoor Installation"
 msgstr ""
 
 msgid "Transmission power"
@@ -28,7 +42,7 @@ msgstr ""
 msgid ""
 "You can enable or disable your node's client and mesh network SSIDs here. "
 "Please don't disable the mesh network without a good reason, so other nodes "
-"can mesh with yours.<br /><br />It is also possible to configure the WLAN "
+"can mesh with yours.<br><br>It is also possible to configure the WLAN "
 "adapters transmission power here. Please note that the transmission power "
 "values include the antenna gain where available, but there are many devices "
 "for which the gain is unavailable or inaccurate."

package/gluon-web-wifi-config/luasrc/lib/gluon/config-mode/controller/admin/wifi-config.lua

+local uci = require("simple-uci").cursor()
+local wireless = require 'gluon.wireless'
+
 package 'gluon-web-wifi-config'
 
+if wireless.device_uses_wlan(uci) then
 	entry({"admin", "wifi-config"}, model("admin/wifi-config"), _("WLAN"), 20)
+end

package/gluon-web-wifi-config/luasrc/lib/gluon/config-mode/model/admin/wifi-config.lua

 local iwinfo = require 'iwinfo'
 local uci = require("simple-uci").cursor()
-local util = require 'gluon.util'
+local site = require 'gluon.site'
+local wireless = require 'gluon.wireless'
 
 
 local function txpower_list(phy)
@@ -8,7 +9,6 @@ local function txpower_list(phy)
 	local off  = tonumber(iwinfo.nl80211.txpower_offset(phy)) or 0
 	local new  = { }
 	local prev = -1
-	local _, val
 	for _, val in ipairs(list) do
 		local dbm = val.dbm + off
 		local mw  = math.floor(10 ^ (dbm / 10))
@@ -24,26 +24,30 @@ local function txpower_list(phy)
 	return new
 end
 
-
 local f = Form(translate("WLAN"))
 
 f:section(Section, nil, translate(
 	"You can enable or disable your node's client and mesh network "
 	.. "SSIDs here. Please don't disable the mesh network without "
-	.. "a good reason, so other nodes can mesh with yours.<br /><br />"
+	.. "a good reason, so other nodes can mesh with yours.<br><br>"
 	.. "It is also possible to configure the WLAN adapters transmission power "
 	.. "here. Please note that the transmission power values include the antenna gain "
 	.. "where available, but there are many devices for which the gain is unavailable or inaccurate."
 ))
 
 
+local mesh_vifs_5ghz = {}
+
+
 uci:foreach('wireless', 'wifi-device', function(config)
 	local radio = config['.name']
 
+	local is_5ghz = false
 	local title
-	if config.hwmode == '11g' or config.hwmode == '11ng' then
+	if config.band == '2g' then
 		title = translate("2.4GHz WLAN")
-	elseif config.hwmode == '11a' or config.hwmode == '11na' then
+	elseif config.band == '5g' then
+		is_5ghz = true
 		title = translate("5GHz WLAN")
 	else
 		return
@@ -51,24 +55,52 @@ uci:foreach('wireless', 'wifi-device', function(config)
 
 	local p = f:section(Section, title)
 
-	local function vif_option(t, msg)
-		if not uci:get('wireless', t .. '_' .. radio) then
+	local function filter_existing_interfaces(interfaces)
+		local out = {}
+		for _, interface in ipairs(interfaces) do
+			if uci:get('wireless', interface .. '_' .. radio) then
+				table.insert(out, interface)
+			end
+		end
+		return out
+	end
+
+	local function has_active_interfaces(interfaces)
+		for _, interface in ipairs(interfaces) do
+			if not uci:get_bool('wireless', interface .. '_' .. radio, 'disabled') then
+				return true
+			end
+		end
+		return false
+	end
+
+	local function vif_option(name, interfaces, msg)
+		local existing_interfaces = filter_existing_interfaces(interfaces)
+
+		if #existing_interfaces == 0 then
 			return
 		end
 
-		local o = p:option(Flag, radio .. '_' .. t .. '_enabled', msg)
-		o.default = not uci:get_bool('wireless', t .. '_' .. radio, 'disabled')
+		local o = p:option(Flag, radio .. '_' .. name .. '_enabled', msg)
+		o.default = has_active_interfaces(existing_interfaces)
 
 		function o:write(data)
-			uci:set('wireless', t .. '_' .. radio, 'disabled', not data)
+			for _, interface in ipairs(existing_interfaces) do
+				uci:set('wireless', interface .. '_' .. radio, 'disabled', not data)
+			end
 		end
+
+		return o
 	end
 
-	vif_option('client', translate('Enable client network (access point)'))
-	vif_option('mesh', translate("Enable mesh network (802.11s)"))
-	vif_option('ibss', translate("Enable mesh network (IBSS)"))
+	vif_option('client', {'client', 'owe'}, translate('Enable client network (access point)'))
 
-	local phy = util.find_phy(config)
+	local mesh_vif = vif_option('mesh', {'mesh'}, translate("Enable mesh network (802.11s)"))
+	if is_5ghz then
+		table.insert(mesh_vifs_5ghz, mesh_vif)
+	end
+
+	local phy = wireless.find_phy(config)
 	if not phy then
 		return
 	end
@@ -97,7 +129,65 @@ uci:foreach('wireless', 'wifi-device', function(config)
 	end
 end)
 
+
+if wireless.device_uses_11a(uci) and not wireless.preserve_channels(uci) then
+	local r = f:section(Section, translate("Outdoor Installation"), translate(
+		"Configuring the node for outdoor use tunes the 5 GHz radio to a frequency "
+		.. "and transmission power that conforms with the local regulatory requirements. "
+		.. "It also enables dynamic frequency selection (DFS; radar detection). At the "
+		.. "same time, mesh functionality is disabled as it requires neighbouring nodes "
+		.. "to stay on the same channel permanently."
+	))
+
+	local outdoor = r:option(Flag, 'outdoor', translate("Node will be installed outdoors"))
+	outdoor.default = uci:get_bool('gluon', 'wireless', 'outdoor')
+
+	for _, mesh_vif in ipairs(mesh_vifs_5ghz) do
+		mesh_vif:depends(outdoor, false)
+		if outdoor.default then
+			mesh_vif.default = not site.wifi5.mesh.disabled(false)
+		end
+	end
+
+	function outdoor:write(data)
+		uci:set('gluon', 'wireless', 'outdoor', data)
+	end
+
+	uci:foreach('wireless', 'wifi-device', function(config)
+		local radio = config['.name']
+		local band = uci:get('wireless', radio, 'band')
+
+		if band ~= '5g' then
+			return
+		end
+
+		local phy = wireless.find_phy(config)
+
+		local ht = r:option(ListValue, 'outdoor_htmode', translate('HT Mode') .. ' (' .. radio .. ')')
+		ht:depends(outdoor, true)
+		ht.default = uci:get('gluon', 'wireless', 'outdoor_' .. radio .. '_htmode') or 'default'
+
+		ht:value('default', translate("(default)"))
+		for mode, available in pairs(iwinfo.nl80211.htmodelist(phy)) do
+			if available then
+				ht:value(mode, mode)
+			end
+		end
+
+		function ht:write(data)
+			if data == 'default' then
+				data = nil
+			end
+			uci:set('gluon', 'wireless', 'outdoor_' .. radio .. '_htmode', data)
+		end
+	end)
+end
+
+
 function f:write()
+	uci:commit('gluon')
+	os.execute('/lib/gluon/upgrade/200-wireless')
+	uci:commit('network')
 	uci:commit('wireless')
 end
 

package/gluon-web/Makefile

 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gluon-web
-PKG_VERSION:=1
 
 PKG_INSTALL:=1
 
 include ../gluon.mk
+include $(INCLUDE_DIR)/host-build.mk
 
 define Package/gluon-web
   TITLE:=Minimal Lua web framework derived from LuCI
@@ -24,4 +24,18 @@ define Package/gluon-web/config
 $(foreach lang,$(GLUON_SUPPORTED_LANGS),$(call lang-config,$(lang)))
 endef
 
+define Host/Prepare
+	$(CP) ./src/* $(HOST_BUILD_DIR)
+endef
+
+define Host/Compile
+	$(call Host/Compile/Default,gluon-po2lmo)
+endef
+
+define Host/Install
+	$(INSTALL_DIR) $(1)/bin
+	$(INSTALL_BIN) $(HOST_BUILD_DIR)/gluon-po2lmo $(1)/bin/
+endef
+
 $(eval $(call BuildPackageGluon,gluon-web))
+$(eval $(call HostBuild))

package/gluon-web/files/lib/gluon/web/view/error/404.html

 <%#
- Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
- Licensed to the public under the Apache License 2.0.
+SPDX-FileCopyrightText: 2008 Steven Barth <steven@midlink.org>
+SPDX-FileCopyrightText: 2008 Jo-Philipp Wich <jow@openwrt.org>
+SPDX-License-Identifier: Apache-2.0
 -%>
 
 <h2 name="content">404 <%:Not Found%></h2>

package/gluon-web/files/lib/gluon/web/view/error/500.html

 <%#
- Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
- Licensed to the public under the Apache License 2.0.
+SPDX-FileCopyrightText: 2008 Steven Barth <steven@midlink.org>
+SPDX-FileCopyrightText: 2008 Jo-Philipp Wich <jow@openwrt.org>
+SPDX-License-Identifier: Apache-2.0
 -%>
 
 <h2 name="content">500 <%:Internal Server Error%></h2>

package/gluon-web/i18n/de.po

@@ -17,7 +17,7 @@ msgid "Not Found"
 msgstr "Nicht Gefunden"
 
 msgid "Sorry, the object you requested was not found."
-msgstr "Entschuldigung, das anfgeforderte Objekt wurde nicht gefunden."
+msgstr "Entschuldigung, das angeforderte Objekt wurde nicht gefunden."
 
 msgid "Sorry, the server encountered an unexpected error."
 msgstr ""

package/gluon-web/luasrc/usr/lib/lua/gluon/web/dispatcher.lua

@@ -87,6 +87,7 @@ local function dispatch(config, http, request)
 		pcdata      = util.pcdata,
 		urlencode   = proto.urlencode,
 		attr        = attr,
+		json        = json.stringify,
 		url         = function(path) return build_url(http, path) end,
 	}, { __index = _G }))
 
@@ -108,8 +109,8 @@ local function dispatch(config, http, request)
 					return _node({...})
 				end,
 
-				entry = function(path, target, title, order)
-					local c = _node(path, true)
+				entry = function(entry_path, target, title, order)
+					local c = _node(entry_path, true)
 
 					c.target = target
 					c.title  = title
@@ -158,10 +159,10 @@ local function dispatch(config, http, request)
 			ctl()
 		end
 
-		for _, path in ipairs(glob.glob(base .. "*.lua") or {}) do
+		for _, path in ipairs(glob.glob(base .. "*.lua", 0) or {}) do
 			load_ctl(path)
 		end
-		for _, path in ipairs(glob.glob(base .. "*/*.lua") or {}) do
+		for _, path in ipairs(glob.glob(base .. "*/*.lua", 0) or {}) do
 			load_ctl(path)
 		end
 	end
@@ -183,9 +184,15 @@ local function dispatch(config, http, request)
 		return
 	end
 
-	http:parse_input(node.filehandler)
+	local ok, err = pcall(http.parse_input, http, node.filehandler)
+	if not ok then
+		http:status(400, "Bad request")
+		http:prepare_content("text/plain")
+		http:write(err .. "\r\n")
+		return
+	end
 
-	local ok, err = pcall(node.target)
+	ok, err = pcall(node.target)
 	if not ok then
 		http:status(500, "Internal Server Error")
 		renderer.render_layout("error/500", {
@@ -203,10 +210,10 @@ return function(config, http)
 		table.insert(request, node)
 	end
 
-	ok, err = pcall(dispatch, config, http, request)
+	local ok, err = pcall(dispatch, config, http, request)
 	if not ok then
 		http:status(500, "Internal Server Error")
 		http:prepare_content("text/plain")
-		http:write(err)
+		http:write(err .. "\r\n")
 	end
 end