From ae138431b43970a4df5d6f176ce71f445b3bd8da Mon Sep 17 00:00:00 2001
From: Dirk Brenken <dev@brenken.org>
Date: Sat, 21 Nov 2020 18:17:51 +0100
Subject: [PATCH] travelmate: handle invalid wireless sections
* ignore invalid wireless sections
Signed-off-by: Dirk Brenken <dev@brenken.org>
---
net/travelmate/Makefile | 2 +-
net/travelmate/files/travelmate.sh | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/net/travelmate/Makefile b/net/travelmate/Makefile
index bf6dd1563..1f9935466 100644
--- a/net/travelmate/Makefile
+++ b/net/travelmate/Makefile
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=travelmate
PKG_VERSION:=2.0.2
-PKG_RELEASE:=2
+PKG_RELEASE:=3
PKG_LICENSE:=GPL-3.0-or-later
PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
diff --git a/net/travelmate/files/travelmate.sh b/net/travelmate/files/travelmate.sh
index a29a89d3d..7edaac509 100755
--- a/net/travelmate/files/travelmate.sh
+++ b/net/travelmate/files/travelmate.sh
@@ -73,7 +73,7 @@ f_env()
#
if [ ! -r "/etc/config/travelmate" ] || [ -z "$(uci -q show travelmate.global.trm_vpn)" ]
then
- f_log "err" "no valid travelmate config found, please re-install the package via opkg with the '--force-reinstall --force-maintainer' options"
+ f_log "err" "invalid travelmate config, please re-install the package via opkg with the '--force-reinstall --force-maintainer' options"
fi
# load travelmate config
@@ -871,6 +871,11 @@ f_main()
sta_bssid="$(uci_get "wireless" "${section}" "bssid")"
sta_iface="$(uci_get "wireless" "${section}" "network")"
sta_mac="$(f_mac "get" "${section}")"
+ if [ -z "${sta_radio}" ] || [ -z "${sta_essid}" ] || [ -z "${sta_iface}" ]
+ then
+ f_log "info" "invalid wireless section '${section}'"
+ continue
+ fi
if [ "${sta_radio}" = "${config_radio}" ] && [ "${sta_essid}" = "${config_essid}" ] && [ "${sta_bssid}" = "${config_bssid}" ]
then
f_contrack "refresh" "${config_radio}" "${config_essid}" "${config_bssid}"