Revert "gluon-core: drop IBSS support"

This reverts commit 066158a27b.

package/gluon-core/check_site.lua

@@ -52,7 +52,14 @@ for _, config in ipairs({'wifi24', 'wifi5'}) do
 
 		obsolete({config, 'supported_rates'}, '802.11b rates are disabled by default.')
 		obsolete({config, 'basic_rate'}, '802.11b rates are disabled by default.')
-		obsolete({config, 'ibss'}, 'IBSS support has been dropped.')
+
+		if need_table({config, 'ibss'}, nil, false) then
+			need_string_match(in_domain({config, 'ibss', 'ssid'}), '^' .. ('.?'):rep(32) .. '$')
+			need_string_match(in_domain({config, 'ibss', 'bssid'}), '^%x[02468aAcCeE]:%x%x:%x%x:%x%x:%x%x:%x%x$')
+			need_one_of({config, 'ibss', 'mcast_rate'}, supported_rates, false)
+			need_number({config, 'ibss', 'vlan'}, false)
+			need_boolean({config, 'ibss', 'disabled'}, false)
+		end
 
 		if need_table({config, 'mesh'}, nil, false) then
 			need_string_match(in_domain({config, 'mesh', 'id'}), '^' .. ('.?'):rep(32) .. '$')

package/gluon-core/luasrc/lib/gluon/upgrade/200-wireless

@@ -103,10 +103,47 @@ local function first_non_nil(first, ...)
 end
 
 
-local function delete_ibss(radio_name)
+local function configure_ibss(config, radio, index, suffix, disabled)
+	local radio_name = radio['.name']
 	local name = 'ibss_' .. radio_name
 
 	uci:delete('wireless', name)
+
+	if not config then
+		return
+	end
+
+	local macaddr = util.get_wlan_mac(uci, radio, index, 3)
+	if not macaddr then
+		return
+	end
+
+	if config.vlan then
+		uci:section('network', 'interface', name, {
+			proto = 'none',
+		})
+
+		uci:section('network', 'interface', name .. '_vlan', {
+			ifname = '@' .. name .. '.' .. config.vlan,
+			proto = 'gluon_mesh',
+		})
+	else
+		uci:section('network', 'interface', name, {
+			proto = 'gluon_mesh',
+		})
+	end
+
+	uci:section('wireless', 'wifi-iface', name, {
+		device = radio_name,
+		network = name,
+		mode = 'adhoc',
+		ssid = config.ssid,
+		bssid = config.bssid,
+		macaddr = macaddr,
+		mcast_rate = config.mcast_rate,
+		ifname = suffix and 'ibss' .. suffix,
+		disabled = disabled,
+	})
 end
 
 local function configure_mesh(config, radio, index, suffix, disabled)
@@ -138,40 +175,23 @@ local function configure_mesh(config, radio, index, suffix, disabled)
 		id = string.format(id, channel)
 	end
 
-	-- mode mesh, adhoc
+	uci:section('network', 'interface', name, {
-	if mode == "mesh" then
+		proto = 'gluon_mesh',
-		uci:section('network', 'interface', name, {
+	})
-			proto = 'gluon_mesh',
-		})
 
-		uci:section('wireless', 'wifi-iface', name, {
+	uci:section('wireless', 'wifi-iface', name, {
-			device = radio_name,
+		device = radio_name,
-			network = name,
+		network = name,
-			mode = 'mesh',
+		mode = 'mesh',
-			mesh_id = id,
+		mesh_id = id,
-			mesh_fwding = false,
+		mesh_fwding = false,
-			macaddr = macaddr,
+		macaddr = macaddr,
-			mcast_rate = config.mcast_rate,
+		mcast_rate = config.mcast_rate,
-			ifname = suffix and 'mesh' .. suffix,
+		ifname = suffix and 'mesh' .. suffix,
-			disabled = disabled,
+		disabled = disabled,
-			macfilter = macfilter,
+		macfilter = macfilter,
-			maclist = maclist,
+		maclist = maclist,
-		})
+	})
-	elseif mode == "adhoc" then
-		uci:section('wireless', 'wifi-iface', name, {
-			device = radio_name,
-			network = name,
-			mode = 'adhoc',
-			ssid = id,
-			encryption = 'none',
-			macaddr = macaddr,
-			mcast_rate = config.mcast_rate,
-			ifname = suffix and 'mesh' .. suffix,
-			disabled = disabled,
-			macfilter = macfilter,
-			maclist = maclist,
-		})
-	end
 end
 
 local function fixup_wan(radio, index)
@@ -194,10 +214,20 @@ local function configure_mesh_wireless(radio, index, config, disabled)
 	local radio_name = radio['.name']
 	local suffix = radio_name:match('^radio(%d+)$')
 
+	local ibss_disabled = is_disabled('ibss_' .. radio_name)
+	local mesh_disabled = is_disabled('mesh_' .. radio_name)
+
+	configure_ibss(config.ibss(), radio, index, suffix,
+		first_non_nil(
+			ibss_disabled,
+			mesh_disabled,
+			config.ibss.disabled(false)
+		)
+	)
 	configure_mesh(config.mesh(), radio, index, suffix,
 		first_non_nil(
-			disabled,
+			mesh_disabled,
-			is_disabled('mesh_' .. radio_name),
+			ibss_disabled,
 			config.mesh.disabled(false)
 		)
 	)
@@ -206,8 +236,6 @@ end
 wireless.foreach_radio(uci, function(radio, index, config)
 	local radio_name = radio['.name']
 
-	delete_ibss(radio_name)
-
 	if not config() then
 		uci:set('wireless', radio_name, 'disabled', true)
 		return
@@ -263,7 +291,12 @@ end)
 
 
 if uci:get('system', 'rssid_wlan0') then
-	uci:set('system', 'rssid_wlan0', 'dev', 'mesh0')
+	if uci:get('wireless', 'mesh_radio0') then
+		uci:set('system', 'rssid_wlan0', 'dev', 'mesh0')
+	else
+		uci:set('system', 'rssid_wlan0', 'dev', 'ibss0')
+	end
+
 	uci:save('system')
 end