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

travelmate: update 0.4.2

Browse source 
* optimized connection handling -
  removed needless timeouts & wireless commits
* set the pre-configured reload timeout to
  a more conservative/realistic value of 30 seconds
* further logging tweaks

Signed-off-by: Dirk Brenken <dev@brenken.org>
This commit is contained in:
Dirk Brenken 2017-03-07 08:40:54 +01:00
parent 437ecb0628
commit fc57661c12
3 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
net/travelmate/Makefile
View file

@ -6,8 +6,8 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=travelmate PKG_NAME:=travelmate
PKG_VERSION:=0.4.1 PKG_VERSION:=0.4.2
PKG_RELEASE:=2 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>

2
net/travelmate/files/travelmate.conf
View file

@ -5,7 +5,7 @@ config travelmate 'global'
option trm_enabled '0' option trm_enabled '0'
option trm_debug '0' option trm_debug '0'
option trm_active '0' option trm_active '0'
option trm_maxwait '20' option trm_maxwait '30'
option trm_maxretry '3' option trm_maxretry '3'
option trm_timeout '60' option trm_timeout '60'
option trm_iw '1' option trm_iw '1'

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

@ -10,12 +10,12 @@
# #
LC_ALL=C LC_ALL=C
PATH="/usr/sbin:/usr/bin:/sbin:/bin" PATH="/usr/sbin:/usr/bin:/sbin:/bin"
trm_ver="0.4.1-2" trm_ver="0.4.2"
trm_sysver="$(ubus -S call system board | jsonfilter -e '@.release.description')" trm_sysver="$(ubus -S call system board | jsonfilter -e '@.release.description')"
trm_enabled=1 trm_enabled=1
trm_debug=0 trm_debug=0
trm_active=0 trm_active=0
trm_maxwait=20 trm_maxwait=30
trm_maxretry=3 trm_maxretry=3
trm_timeout=60 trm_timeout=60
trm_iw=1 trm_iw=1
@ -150,7 +150,7 @@ f_log()
logger -t "travelmate-[${trm_ver}] ${class}" "${log_msg}" logger -t "travelmate-[${trm_ver}] ${class}" "${log_msg}"
if [ "${class}" = "error" ] if [ "${class}" = "error" ]
then then
logger -t "travelmate-[${trm_ver}] ${class}" "Please check the readme 'https://github.com/openwrt/packages/blob/master/net/travelmate/files/README.md' (${trm_sysver})" logger -t "travelmate-[${trm_ver}] ${class}" "Please check 'https://github.com/openwrt/packages/blob/master/net/travelmate/files/README.md' (${trm_sysver})"
f_active f_active
exit 255 exit 255
fi fi
@ -209,24 +209,21 @@ f_main()
if [ -n "$(printf "${ssid_list}" | grep -Fo "${ssid}")" ] && [ "${ap_radio}" = "${sta_radio}" ] if [ -n "$(printf "${ssid_list}" | grep -Fo "${ssid}")" ] && [ "${ap_radio}" = "${sta_radio}" ]
then then
uci -q set wireless."${config}".disabled=0 uci -q set wireless."${config}".disabled=0
uci -q commit wireless
ubus call network reload ubus call network reload
f_check "sta" f_check "sta"
if [ "${trm_ifstatus}" = "true" ] if [ "${trm_ifstatus}" = "true" ]
then then
f_log "info " "wwan interface connected to uplink ${ssid} (${cnt}/${trm_maxretry}, ${trm_sysver})" uci -q commit wireless
f_log "info " "wwan interface connected to uplink ${ssid} (${trm_sysver})"
sleep 5 sleep 5
return 0 return 0
else else
uci -q set wireless."${config}".disabled=1 uci -q revert wireless
uci -q commit wireless
ubus call network reload ubus call network reload
f_log "info " "wwan interface can't connect to uplink ${ssid} (${cnt}/${trm_maxretry}, ${trm_sysver})" f_log "info " "wwan interface can't connect to uplink ${ssid} (${trm_sysver})"
fi fi
fi fi
done done
else
f_log "info " "empty uplink list (${cnt}/${trm_maxretry}, ${trm_sysver})"
fi fi
cnt=$((cnt+1)) cnt=$((cnt+1))
sleep 5 sleep 5