nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

static/olsrd: add ibss support

Browse Source
This commit is contained in:
Maciej Krüger 2021-12-18 15:07:54 +01:00 committed by Alexander List
parent 0867f38ca2
commit 2ee2015e80
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
package/gluon-core/luasrc/lib/gluon/upgrade/200-wireless
View File

@ -113,13 +113,22 @@ local function configure_ibss(config, radio, index, suffix, disabled)
return return
end end
local macaddr = util.get_wlan_mac(uci, radio, index, 3) local macaddr = wireless.get_wlan_mac(uci, radio, index, 3)
if not macaddr then if not macaddr then
return return
end end
local ssid = config.ssid
local bssid = config.bssid
if radio.wireless_config.include_channel_in_id then
ssid = string.format(ssid, radio.current_channel)
bssid = string.format(bssid, radio.current_channel)
end
if config.vlan then if config.vlan then
uci:section('network', 'interface', name, { uci:section('network', 'interface', name, {
ifname = suffix and 'ibss' .. suffix,
proto = 'none', proto = 'none',
}) })
@ -130,6 +139,7 @@ local function configure_ibss(config, radio, index, suffix, disabled)
else else
uci:section('network', 'interface', name, { uci:section('network', 'interface', name, {
proto = 'gluon_mesh', proto = 'gluon_mesh',
ifname = suffix and 'ibss' .. suffix,
}) })
end end
@ -137,8 +147,8 @@ local function configure_ibss(config, radio, index, suffix, disabled)
device = radio_name, device = radio_name,
network = name, network = name,
mode = 'adhoc', mode = 'adhoc',
ssid = config.ssid, ssid = ssid,
bssid = config.bssid, bssid = bssid,
macaddr = macaddr, macaddr = macaddr,
mcast_rate = config.mcast_rate, mcast_rate = config.mcast_rate,
ifname = suffix and 'ibss' .. suffix, ifname = suffix and 'ibss' .. suffix,
@ -164,19 +174,15 @@ local function configure_mesh(config, radio, index, suffix, disabled)
return return
end end
-- TODO: source from site
user_adjustable_channel = true
channel = 5
mode = "adhoc"
local id = config.id local id = config.id
if user_adjustable_channel then if radio.wireless_config.include_channel_in_id then
id = string.format(id, channel) id = string.format(id, radio.current_channel)
end end
uci:section('network', 'interface', name, { uci:section('network', 'interface', name, {
proto = 'gluon_mesh', proto = 'gluon_mesh',
ifname = suffix and 'mesh' .. suffix,
}) })
uci:section('wireless', 'wifi-iface', name, { uci:section('wireless', 'wifi-iface', name, {
@ -256,6 +262,9 @@ wireless.foreach_radio(uci, function(radio, index, config)
uci:set('wireless', radio_name, 'htmode', htmode) uci:set('wireless', radio_name, 'htmode', htmode)
uci:set('wireless', radio_name, 'country', site.regdom()) uci:set('wireless', radio_name, 'country', site.regdom())
radio.current_channel = channel
radio.wireless_config = config
uci:delete('wireless', radio_name, 'supported_rates') uci:delete('wireless', radio_name, 'supported_rates')
uci:delete('wireless', radio_name, 'basic_rate') uci:delete('wireless', radio_name, 'basic_rate')