frodovdr/raspberrymatic-addon-rmupdate
1
0
Fork 0
mirror of https://github.com/j-a-n/raspberrymatic-addon-rmupdate.git synced 2023-10-10 11:37:40 +00:00
Code Issues Releases Wiki Activity

Catch wlan_scan errors

Browse Source
This commit is contained in:
Jan Schneider 2020-12-12 17:03:27 +01:00
parent d3b820601a
commit 5a36e36793
1 changed files with 36 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
addon/lib/rmupdate.tcl
View File

@ -1818,44 +1818,48 @@ proc ::rmupdate::wlan_set_blocked {block {device "wlan0"}} {
proc ::rmupdate::wlan_scan {{as_json 0} {device "wlan0"}} { proc ::rmupdate::wlan_scan {{as_json 0} {device "wlan0"}} {
array set ssids {} array set ssids {}
set blocked [wlan_get_blocked $device] if [catch {
if {$blocked == 1} { set blocked [wlan_get_blocked $device]
wlan_set_blocked 0 $device if {$blocked == 1} {
} wlan_set_blocked 0 $device
catch { exec /sbin/ip link set $device up }
set data [exec /usr/sbin/iw $device scan]
if {$blocked == 1} {
wlan_set_blocked 1 $device
}
set cur_ssid ""
set cur_signal ""
set cur_connected 0
foreach d [split $data "\n"] {
if { [regexp {^\s*SSID:\s*(\S.*)\s*$} $d match ssid] } {
set cur_ssid $ssid
} }
if { [regexp {^\s*signal:\s*(\S.*)\s*$} $d match signal] } { catch { exec /sbin/ip link set $device up }
set cur_signal $signal set data [exec /usr/sbin/iw $device scan]
if {$blocked == 1} {
wlan_set_blocked 1 $device
} }
if { [regexp {^BSS\s([a-fA-F0-9\:]+)} $d match bss] } { set cur_ssid ""
if {$cur_ssid != "" && $cur_signal != ""} { set cur_signal ""
set ssids(${cur_ssid}::ssid) $cur_ssid set cur_connected 0
set ssids(${cur_ssid}::signal) $cur_signal foreach d [split $data "\n"] {
set ssids(${cur_ssid}::connected) $cur_connected if { [regexp {^\s*SSID:\s*(\S.*)\s*$} $d match ssid] } {
set cur_ssid "" set cur_ssid $ssid
set cur_signal ""
set cur_connected 0
} }
if { [regexp {associated} $d match] } { if { [regexp {^\s*signal:\s*(\S.*)\s*$} $d match signal] } {
set cur_connected 1 set cur_signal $signal
}
if { [regexp {^BSS\s([a-fA-F0-9\:]+)} $d match bss] } {
if {$cur_ssid != "" && $cur_signal != ""} {
set ssids(${cur_ssid}::ssid) $cur_ssid
set ssids(${cur_ssid}::signal) $cur_signal
set ssids(${cur_ssid}::connected) $cur_connected
set cur_ssid ""
set cur_signal ""
set cur_connected 0
}
if { [regexp {associated} $d match] } {
set cur_connected 1
}
} }
} }
if {$cur_ssid != "" && $cur_signal != ""} {
set ssids(${cur_ssid}::ssid) $cur_ssid
set ssids(${cur_ssid}::signal) $cur_signal
}
} err] {
write_log 1 "WLAN scan failed: ${err}"
} }
if {$cur_ssid != "" && $cur_signal != ""} {
set ssids(${cur_ssid}::ssid) $cur_ssid
set ssids(${cur_ssid}::signal) $cur_signal
}
if {$as_json == 1} { if {$as_json == 1} {
return [array_to_json [array get ssids]] return [array_to_json [array get ssids]]
} else { } else {