From 4518ecf60bb271fb510192661df7ea85b67a51d8 Mon Sep 17 00:00:00 2001 From: Dirk Brenken Date: Tue, 9 Jan 2024 22:22:57 +0100 Subject: [PATCH] travelmate: update 2.1.2-2 * fix a possible re-connection issue/cornercase seen on single radio units Signed-off-by: Dirk Brenken --- net/travelmate/Makefile | 2 +- net/travelmate/files/travelmate.sh | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/net/travelmate/Makefile b/net/travelmate/Makefile index 93f405efd8..7ade58aab6 100644 --- a/net/travelmate/Makefile +++ b/net/travelmate/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=travelmate PKG_VERSION:=2.1.2 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_LICENSE:=GPL-3.0-or-later PKG_MAINTAINER:=Dirk Brenken diff --git a/net/travelmate/files/travelmate.sh b/net/travelmate/files/travelmate.sh index dca5bc8964..0af2e4ac6b 100755 --- a/net/travelmate/files/travelmate.sh +++ b/net/travelmate/files/travelmate.sh @@ -1,6 +1,6 @@ #!/bin/sh # travelmate, a wlan connection manager for travel router -# Copyright (c) 2016-2023 Dirk Brenken (dev@brenken.org) +# Copyright (c) 2016-2024 Dirk Brenken (dev@brenken.org) # This is free software, licensed under the GNU General Public License v3. # set (s)hellcheck exceptions @@ -692,6 +692,16 @@ f_check() { if [ -n "${ifname}" ] && [ "${enabled}" = "1" ]; then trm_ifquality="$(${trm_iwinfo} "${ifname}" info 2>/dev/null | awk -F '[ ]' '/Link Quality: [0-9]+\/[0-9]+/{split($NF,var0,"/");printf "%i\n",(var0[1]*100/var0[2])}')" if [ -z "${trm_ifquality}" ]; then + trm_ifstatus="$("${trm_ubuscmd}" -S call network.interface dump 2>/dev/null | "${trm_jsoncmd}" -ql1 -e "@.interface[@.device=\"${ifname}\"].up")" + if { [ -n "${trm_connection}" ] && [ "${trm_ifstatus}" = "false" ]; } || [ "${wait_time}" -eq "${trm_maxwait}" ]; then + f_log "info" "no signal from uplink" + f_vpn "disable" + unset trm_connection + trm_ifstatus="${status}" + f_ctrack "end" + f_jsnup + break + fi continue elif [ "${trm_ifquality}" -ge "${trm_minquality}" ]; then trm_ifstatus="$("${trm_ubuscmd}" -S call network.interface dump 2>/dev/null | "${trm_jsoncmd}" -ql1 -e "@.interface[@.device=\"${ifname}\"].up")" -- 2.30.2