Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #8016 from dibdot/travelmate

Browse source 
travelmate: release 1.3.3
This commit is contained in:
Dirk Brenken 2019-01-22 17:12:59 +01:00 committed by GitHub
commit 6fbf3576ea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/travelmate/Makefile
View file

@ -6,7 +6,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=travelmate PKG_NAME:=travelmate
PKG_VERSION:=1.3.2 PKG_VERSION:=1.3.3
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_LICENSE:=GPL-3.0+ PKG_LICENSE:=GPL-3.0+
PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org> PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>

16
net/travelmate/files/travelmate.sh
View file

@ -10,7 +10,7 @@
# #
LC_ALL=C LC_ALL=C
PATH="/usr/sbin:/usr/bin:/sbin:/bin" PATH="/usr/sbin:/usr/bin:/sbin:/bin"
trm_ver="1.3.2" trm_ver="1.3.3"
trm_sysver="unknown" trm_sysver="unknown"
trm_enabled=0 trm_enabled=0
trm_debug=0 trm_debug=0
@ -148,7 +148,10 @@ f_check()
then then
trm_ifstatus="false" trm_ifstatus="false"
else else
ubus call network reload if [ "${status}" = "false" ]
then
ubus call network reload
fi
fi fi
while [ ${wait} -le ${trm_maxwait} ] while [ ${wait} -le ${trm_maxwait} ]
do do
@ -300,6 +303,7 @@ f_main()
local sta sta_essid sta_bssid sta_radio sta_iface active_essid active_bssid active_radio active_prio local sta sta_essid sta_bssid sta_radio sta_iface active_essid active_bssid active_radio active_prio
f_check "initial" f_check "initial"
f_log "debug" "f_main ::: status: ${trm_ifstatus}, proactive: ${trm_proactive}"
if [ "${trm_ifstatus}" != "true" ] || [ ${trm_proactive} -eq 1 ] if [ "${trm_ifstatus}" != "true" ] || [ ${trm_proactive} -eq 1 ]
then then
config_load wireless config_load wireless
@ -320,7 +324,7 @@ f_main()
f_log "debug" "f_main ::: iwinfo: ${trm_iwinfo:-"-"}, dev_list: ${trm_devlist:-"-"}, sta_list: ${trm_stalist:0:800}, faulty_list: ${faulty_list:-"-"}" f_log "debug" "f_main ::: iwinfo: ${trm_iwinfo:-"-"}, dev_list: ${trm_devlist:-"-"}, sta_list: ${trm_stalist:0:800}, faulty_list: ${faulty_list:-"-"}"
for dev in ${trm_devlist} for dev in ${trm_devlist}
do do
f_log "debug" "f_main ::: dev: ${dev}" f_log "debug" "f_main ::: device: ${dev}"
if [ -z "$(printf "%s" "${trm_stalist}" | grep -o "\-${dev}")" ] if [ -z "$(printf "%s" "${trm_stalist}" | grep -o "\-${dev}")" ]
then then
f_log "debug" "f_main ::: no station on '${dev}' - continue" f_log "debug" "f_main ::: no station on '${dev}' - continue"
@ -347,12 +351,12 @@ f_main()
([ "${dev}" != "${active_radio}" ] && [ "${active_prio}" = "true" ]) ([ "${dev}" != "${active_radio}" ] && [ "${active_prio}" = "true" ])
then then
active_prio="true" active_prio="true"
f_log "debug" "f_main ::: active station prioritized '${active_radio}/${active_essid}/${active_bssid:-"-"}' - break" f_log "debug" "f_main ::: active station prioritized '${active_radio}/${active_essid}/${active_bssid:-"-"}' - continue"
break continue 3
fi fi
if [ -z "${scan_list}" ] if [ -z "${scan_list}" ]
then then
scan_list="$(f_trim "$(${trm_iwinfo} "${dev}" scan 2>/dev/null | \ scan_list="$(f_trim "$("${trm_iwinfo}" "${dev}" scan 2>/dev/null | \
awk 'BEGIN{FS="[/ ]"}/Address:/{var1=$NF}/ESSID:/{var2="";for(i=12;i<=NF;i++) \ awk 'BEGIN{FS="[/ ]"}/Address:/{var1=$NF}/ESSID:/{var2="";for(i=12;i<=NF;i++) \
if(var2==""){var2=$i}else{var2=var2" "$i}}/Quality:/{printf "%i,%s,%s\n",(100/$NF*$(NF-1)),var1,var2}' | \ if(var2==""){var2=$i}else{var2=var2" "$i}}/Quality:/{printf "%i,%s,%s\n",(100/$NF*$(NF-1)),var1,var2}' | \
sort -rn | awk '{ORS=",";print $0}')")" sort -rn | awk '{ORS=",";print $0}')")"