Browse Source

Merge pull request #13972 from dibdot/trm

travelmate: handle invalid wireless sections
lilik-openwrt-22.03
Dirk Brenken 4 years ago
committed by GitHub
parent
commit
c976b3aaa0
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
  1. +1
    -1
      net/travelmate/Makefile
  2. +6
    -1
      net/travelmate/files/travelmate.sh

+ 1
- 1
net/travelmate/Makefile View File

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


+ 6
- 1
net/travelmate/files/travelmate.sh View File

@ -73,7 +73,7 @@ f_env()
# #
if [ ! -r "/etc/config/travelmate" ] || [ -z "$(uci -q show travelmate.global.trm_vpn)" ] if [ ! -r "/etc/config/travelmate" ] || [ -z "$(uci -q show travelmate.global.trm_vpn)" ]
then 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 fi
# load travelmate config # load travelmate config
@ -871,6 +871,11 @@ f_main()
sta_bssid="$(uci_get "wireless" "${section}" "bssid")" sta_bssid="$(uci_get "wireless" "${section}" "bssid")"
sta_iface="$(uci_get "wireless" "${section}" "network")" sta_iface="$(uci_get "wireless" "${section}" "network")"
sta_mac="$(f_mac "get" "${section}")" 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}" ] if [ "${sta_radio}" = "${config_radio}" ] && [ "${sta_essid}" = "${config_essid}" ] && [ "${sta_bssid}" = "${config_bssid}" ]
then then
f_contrack "refresh" "${config_radio}" "${config_essid}" "${config_bssid}" f_contrack "refresh" "${config_radio}" "${config_essid}" "${config_bssid}"


Loading…
Cancel
Save