Skip to content
Snippets Groups Projects
Commit bf2f9466 authored by Jakob Olsson's avatar Jakob Olsson
Browse files

script: multiap: don't invoke wpa_cli with empty ifname

Causes it to get stuck when using global wpa_supplicant
parent f7e0018d
Branches
No related tags found
1 merge request!520script: multiap: don't invoke wpa_cli with empty ifname
Pipeline #137104 passed
......@@ -50,6 +50,8 @@ type_to_multi_ap () {
get_network_id() {
local ifname=$1
[ -n "$ifname" ] || return
network_id=$(wpa_cli -i $ifname list_n|tail -n 1 | awk '{print $1}')
echo ${network_id}
}
......@@ -71,6 +73,8 @@ setup_conf() {
bsta_disable() {
local ifname=$1
[ -n "$ifname" ] || return
network_id=$(get_network_id $ifname)
wpa_cli -i "$ifname" disconnect > /dev/console
wpa_cli -i "$ifname" disable_network $network_id > /dev/console
......@@ -283,6 +287,8 @@ set_network_bssid() {
local bssid=$2
local network_id=$(get_network_id $ifname)
[ -n "$ifname" ] || return
wpa_cli -i $ifname set_n $network_id bssid $bssid
}
......@@ -291,6 +297,8 @@ bsta_steer() {
local bssid=$2
local network_id=$(get_network_id $ifname)
[ -n "$ifname" ] || return
rc=$(wpa_cli -i $ifname set_n $network_id bssid $bssid)
[ "$rc" == "FAIL" ] && {
echo "1"
......@@ -357,6 +365,9 @@ write_bsta_config() {
[ "$old_bssid" == "$bssid" ] && break
uci -q set wireless.${section}.bssid=$bssid
[ -n "$ifname" ] || return
network_id=$(get_network_id $bsta)
wpa_cli -i "$bsta" set_n $network_id bssid $bssid
wpa_cli -i "$bsta" save_config
......@@ -535,6 +546,8 @@ bsta_to_wireless() {
[ "$disabled" != "1" ] && return
[ -n "$ifname" ] || return
network_id=$(get_network_id $ifname)
wpa_cli -i "$bsta" disconnect > /dev/null 2>&1
wpa_cli -i "$bsta" disable_network $network_id > /dev/null 2>&1
......@@ -722,6 +735,8 @@ bsta_scan_on_enabled() {
do
[ "$onboarded_band" != "$band" ] && continue
[ -n "$ifname" ] || return
network_id=$(get_network_id $ifname)
logger -t multiap "bsta_scan_on_enabled $ifname $band id ${network_id}"
wpa_cli -i "$ifname" enable_network $network_id > /dev/null 2>&1
......@@ -774,6 +789,8 @@ bsta_clear_bssid() {
[ -n "$iface" -a "$iface" != "$ifname" ] && return
[ -n "$ifname" ] || return
network_id=$(get_network_id $ifname)
uci -q del wireless.$1.bssid
wpa_cli -i "$ifname" bssid $network_id 00:00:00:00:00:00 > /dev/null 2>&1
......@@ -795,6 +812,8 @@ bsta_blacklist_bssid_set() {
shift
local bssid="$@"
[ -n "$ifname" ] || return
network_id=$(get_network_id $ifname)
wpa_cli -i "$ifname" set_network $network_id bssid_ignore "$bssid" > /dev/null 2>&1
......@@ -805,6 +824,8 @@ bsta_blacklist_bssid_clear() {
mapagent_blacklist_by_band() {
config_get ifname $1 ifname
[ -n "$ifname" ] || return
network_id=$(get_network_id $ifname)
wpa_cli -i "$ifname" set_network $network_id bssid_ignore "" > /dev/null 2>&1
......@@ -841,6 +862,8 @@ bsta_disable_lower_priority() {
[ "$enabled" != "0" ] && return
[ -n "$ifname" ] || return
network_id=$(get_network_id $ifname)
wpa_cli -i "$ifname" disconnect > /dev/null 2>&1
wpa_cli -i "$ifname" disable_network $network_id > /dev/null 2>&1
......@@ -892,6 +915,8 @@ bsta_use_link() {
[ "$bsta" = "$ifname" ] && return
[ -n "$ifname" ] || return
network_id=$(get_network_id $ifname)
wpa_cli -i "$ifname" disconnect > /dev/null 2>&1
wpa_cli -i "$ifname" disable_network $network_id > /dev/null 2>&1
......@@ -904,6 +929,10 @@ bsta_use_link() {
}
bsta_swap_to_link() {
local ifname=$1
[ -n "$ifname" ] || return
bsta_disable_lower_priority $1
bsta_use_link $1
......@@ -1065,6 +1094,8 @@ db_get() {
bsta_scan() {
ifname=$1
[ -n "$ifname" ] || return
network_id=$(get_network_id $ifname)
logger -t multiap "bsta_scan $ifname id ${network_id}"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment