travelmate: update 2.4.0-2

* fixed a busybox awk problem in the new scan function
* minor cleanups
* LuCI: more eslint fixes

Signed-off-by: Dirk Brenken <dev@brenken.org>
This commit is contained in:
Dirk Brenken
2026-02-20 18:07:07 +01:00
parent 6080e2de27
commit 559c6c7dec
2 changed files with 11 additions and 4 deletions

View File

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

View File

@@ -85,6 +85,8 @@ f_cmd() {
# load travelmate config # load travelmate config
# #
f_conf() { f_conf() {
local device
unset trm_stalist trm_radiolist trm_uplinklist trm_vpnifacelist trm_uplinkcfg trm_activesta trm_ssidfilter unset trm_stalist trm_radiolist trm_uplinklist trm_vpnifacelist trm_uplinkcfg trm_activesta trm_ssidfilter
config_cb() { config_cb() {
@@ -1013,7 +1015,7 @@ f_scan() {
json_get_var channel channel json_get_var channel channel
ssid="$(printf "%s" "${ssid}" | "${trm_awkcmd}" '{ ssid="$(printf "%s" "${ssid}" | "${trm_awkcmd}" '{
gsub(/[\x00-\x1F\x7F]/, ""); # nur Steuerzeichen entfernen gsub(/[[:cntrl:]]/, "");
sub(/^[ \t]+/, ""); sub(/^[ \t]+/, "");
sub(/[ \t]+$/, ""); sub(/[ \t]+$/, "");
print print
@@ -1086,9 +1088,11 @@ f_scan() {
# main function for connection handling # main function for connection handling
# #
f_main() { f_main() {
local radio radio_num radio_phy cnt retrycnt scan_dev scan_list scan_essid scan_bssid scan_rsn scan_wpa scan_quality scan_open local radio cnt retrycnt scan_list scan_essid scan_bssid scan_rsn scan_wpa scan_quality scan_open station_id
local station_id section sta sta_essid sta_bssid sta_radio sta_mac open_sta open_essid config_radio config_essid config_bssid local section sta sta_essid sta_bssid sta_radio sta_mac open_sta open_essid config_radio config_essid config_bssid
# initial check
#
f_check "initial" "false" f_check "initial" "false"
if [ "${trm_proactive}" = "0" ]; then if [ "${trm_proactive}" = "0" ]; then
if [ "${trm_connection%%/*}" = "net ok" ]; then if [ "${trm_connection%%/*}" = "net ok" ]; then
@@ -1098,6 +1102,9 @@ f_main() {
fi fi
fi fi
f_log "debug" "f_main-1 ::: status: ${trm_ifstatus}, connection: ${trm_connection%%/*}, proactive: ${trm_proactive}" f_log "debug" "f_main-1 ::: status: ${trm_ifstatus}, connection: ${trm_connection%%/*}, proactive: ${trm_proactive}"
# proactive connection handling
#
if [ "${trm_ifstatus}" != "true" ] || [ "${trm_proactive}" = "1" ]; then if [ "${trm_ifstatus}" != "true" ] || [ "${trm_proactive}" = "1" ]; then
config_load wireless config_load wireless
config_foreach f_setif wifi-iface "${trm_proactive}" config_foreach f_setif wifi-iface "${trm_proactive}"