multiap script check network_id

src/script/multiap

@@ -48,6 +48,12 @@ type_to_multi_ap () {
 	echo "0"
 }
 
+get_network_id() {
+	local ifname=$1
+	network_id=$(wpa_cli -i $ifname list_n|tail -n 1 | awk '{print $1}')
+	echo ${network_id}
+}
+
 get_type_by_section() {
 	section="$1"
 
@@ -487,8 +493,10 @@ bsta_to_wireless() {
 				uci -q set wireless.${section}.default_disabled='0'
 
 				[ "$disabled" != "1" ] && return
+
+				network_id=$(get_network_id $ifname)
 				wpa_cli -i "$bsta" disconnect > /dev/null 2>&1
-				wpa_cli -i "$bsta" disable_network 0 > /dev/null 2>&1
+				wpa_cli -i "$bsta" disable_network $network_id > /dev/null 2>&1
 				wpa_cli -i "$bsta" save_config > /dev/null 2>&1
 
 				echo 1
@@ -665,6 +673,7 @@ bsta_scan_on_enabled() {
 		config_get ifname $1 ifname
 		config_get band $1 band
 		config_get enabled $1 enabled
+		config_get ssid $1 ssid
 
 		[ "$enabled" = "0" ] && return
 
@@ -672,8 +681,9 @@ bsta_scan_on_enabled() {
 		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
+			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
 			wpa_cli -i "$ifname" reconnect > /dev/null 2>&1
 			wpa_cli -i "$ifname" save_config > /dev/null 2>&1
 		done
@@ -785,8 +795,9 @@ bsta_disable_lower_priority() {
 
 				[ "$enabled" != "0" ] && return
 
+				network_id=$(get_network_id $ifname)
 				wpa_cli -i "$ifname" disconnect > /dev/null 2>&1
-				wpa_cli -i "$ifname" disable_network 0 > /dev/null 2>&1
+				wpa_cli -i "$ifname" disable_network $network_id > /dev/null 2>&1
 				wpa_cli -i "$ifname" save_config > /dev/null 2>&1
 			}
 			local ifname="$1"
@@ -836,8 +847,9 @@ bsta_use_link() {
 
 		[ "$bsta" = "$ifname" ] && return
 
+		network_id=$(get_network_id $ifname)
 		wpa_cli -i "$ifname" disconnect > /dev/null 2>&1
-		wpa_cli -i "$ifname" disable_network 0 > /dev/null 2>&1
+		wpa_cli -i "$ifname" disable_network $network_id > /dev/null 2>&1
 		wpa_cli -i "$ifname" save_config > /dev/null 2>&1
 	}
 
@@ -850,7 +862,8 @@ bsta_swap_to_link() {
 	bsta_disable_lower_priority $1
 	bsta_use_link $1
 
-	wpa_cli -i "$1" enable_network 0 > /dev/null
+	network_id=$(get_network_id $1)
+	wpa_cli -i "$1" enable_network $network_id > /dev/null
 	wpa_cli -i "$1" reconnect > /dev/null
 	wpa_cli -i "$1" save_config > /dev/null
 }