Compare commits

...

3 Commits

Author SHA1 Message Date
Bartlomiej Grzeskowiak
04d688561a iopsys-econet: Take mapagent from econet-devel
Needed for netdev patch that is not delivered yet.

Signed-off-by: Bartlomiej Grzeskowiak <bartlomiej.grzeskowiak@iopsys.eu>
2022-02-23 17:26:33 +01:00
Lukasz Kotasa
150b069a4e map-agent: multiap: set_start_disabled 2022-02-23 17:26:15 +01:00
Janusz Dziedzic
943738b9f7 map-agent: enable only onboarded bands
This is important when we are using
default_disabled UCI setting - which disable
network wpa_supplicant block.

Before we could enable network, so default_disabled
could work incorrectly.

Signed-off-by: Janusz Dziedzic <janusz.dziedzic@iopsys.eu>
2022-02-23 17:25:56 +01:00
2 changed files with 42 additions and 8 deletions

View File

@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=map-agent
PKG_VERSION:=7.1.4
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_VERSION:=f6b35c7c909618e6407449062e56ed6ddc4f9e02
PKG_SOURCE_VERSION:=econet-devel
PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
PKG_LICENSE:=PROPRIETARY IOPSYS

View File

@@ -464,7 +464,7 @@ brcm_bsta_to_wireless() {
uci -q set wireless.${section}.key="$key"
uci -q set wireless.${section}.encryption=$encryption
uci -q set wireless.${section}.bssid="$bssid"
#uci -q set wireless.${section}.disabled=$disabled
uci -q set wireless.${section}.default_disabled='0'
[ "$disabled" != "1" ] && return
wpa_cli -i "$bsta" disconnect > /dev/null 2>&1
@@ -622,21 +622,37 @@ sync_mapcontroller_from_wireless() {
}
bsta_scan_on_enabled() {
config_load mapagent
local onboarded_bands=""
mapagent_onboarded_bands() {
config_get band $1 band
config_get onboarded $1 onboarded "0"
[ "$onboarded" = "0" ] && return
onboarded_bands="$onboarded_bands $band"
}
mapagent_enable_bk() {
config_get ifname $1 ifname
config_get band $1 band
config_get enabled $1 enabled
echo ifname $ifname enabled $enabled
[ "$enabled" = "0" ] && return
wpa_cli -i "$ifname" enable_network 0 > /dev/null 2>&1
wpa_cli -i "$ifname" reconnect > /dev/null 2>&1
wpa_cli -i "$ifname" save_config > /dev/null 2>&1
for onboarded_band in $onboarded_bands
do
[ "$onboarded_band" != "$band" ] && continue
logger -t multiap "bsta_scan_on_enabled $ifname $band"
wpa_cli -i "$ifname" enable_network 0 > /dev/null 2>&1
wpa_cli -i "$ifname" reconnect > /dev/null 2>&1
wpa_cli -i "$ifname" save_config > /dev/null 2>&1
done
}
config_load mapagent
config_foreach mapagent_onboarded_bands bsta
config_foreach mapagent_enable_bk bsta
}
@@ -777,6 +793,23 @@ unset_uplink() {
rm "$MAPFILE" > /dev/null 2>&1
}
set_start_disabled() {
local value=$1
mapagent_set_start_disabled() {
local section=$1
local value=$2
config_get ifname $section ifname
hostapd_cli -i "$ifname" set start_disabled $value
hostapd_cli -i "$ifname" reload
}
config_load mapagent
config_foreach mapagent_set_start_disabled ap $value
}
func=$1
shift
@@ -801,6 +834,7 @@ case "$func" in
set_uplink) set_uplink $@;;
set_uplink_backhaul_info) set_uplink_backhaul_info $@;;
unset_uplink) unset_uplink $@;;
set_start_disabled) set_start_disabled $@;;
--help|help) usage;;
*) usage; exit 1;;
esac