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

travelmate: update to 2.0.3

Browse source 
* refine the wifi reconfigure logic

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 2b476ffd38)
This commit is contained in:
Dirk Brenken 2021-02-26 19:46:53 +01:00
parent d15c358b82
commit c094b09da2
No known key found for this signature in database
GPG key ID: 9D71CD547BFAE684
2 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
net/travelmate/Makefile
View file

@ -1,13 +1,13 @@
# #
# Copyright (c) 2016-2020 Dirk Brenken (dev@brenken.org) # Copyright (c) 2016-2021 Dirk Brenken (dev@brenken.org)
# This is free software, licensed under the GNU General Public License v3. # This is free software, licensed under the GNU General Public License v3.
# #
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=travelmate PKG_NAME:=travelmate
PKG_VERSION:=2.0.2 PKG_VERSION:=2.0.3
PKG_RELEASE:=4 PKG_RELEASE:=1
PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE:=GPL-3.0-or-later
PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org> PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>

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

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# travelmate, a wlan connection manager for travel router # travelmate, a wlan connection manager for travel router
# Copyright (c) 2016-2020 Dirk Brenken (dev@brenken.org) # Copyright (c) 2016-2021 Dirk Brenken (dev@brenken.org)
# This is free software, licensed under the GNU General Public License v3. # This is free software, licensed under the GNU General Public License v3.
# set (s)hellcheck exceptions # set (s)hellcheck exceptions
@ -10,7 +10,7 @@ export LC_ALL=C
export PATH="/usr/sbin:/usr/bin:/sbin:/bin" export PATH="/usr/sbin:/usr/bin:/sbin:/bin"
set -o pipefail set -o pipefail
trm_ver="2.0.2" trm_ver="2.0.3"
trm_enabled=0 trm_enabled=0
trm_debug=0 trm_debug=0
trm_iface="" trm_iface=""
@ -200,29 +200,27 @@ f_char()
# #
f_reconf() f_reconf()
{ {
local radio cnt="0" local radio tmp_radio cnt="0"
"${trm_wifi}" reconf "${trm_wifi}" reconf
for radio in ${trm_radiolist} for radio in ${trm_radiolist}
do do
while [ "$(ubus -S call network.wireless status | jsonfilter -l1 -e "@.${radio}.up")" != "true" ] while [ "$(ubus -S call network.wireless status | jsonfilter -l1 -e "@.${radio}.up")" != "true" ]
do do
if [ "${cnt}" = "$((trm_maxwait/2))" ]
then
if [ -x "/etc/init.d/wpad" ]
then
/etc/init.d/wpad restart
fi
fi
if [ "${cnt}" -ge "${trm_maxwait}" ] if [ "${cnt}" -ge "${trm_maxwait}" ]
then then
break 2 break 2
fi fi
if [ "${radio}" != "${tmp_radio}" ]
then
"${trm_wifi}" up "${radio}"
tmp_radio="${radio}"
fi
cnt="$((cnt+1))" cnt="$((cnt+1))"
sleep 1 sleep 1
done done
done done
f_log "debug" "f_reconf ::: radio_list: ${trm_radiolist}, cnt: ${cnt}" f_log "debug" "f_reconf ::: radio_list: ${trm_radiolist}, radio: ${radio}, cnt: ${cnt}"
} }
# vpn helper function # vpn helper function