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

travelmate: update to 2.0.5-2

Browse source 
* scan for open uplinks even if no other station has been added/configured

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit e6e3c9481d)
This commit is contained in:
Dirk Brenken 2021-08-13 08:28:29 +02:00
parent 3eab476000
commit eed183c5fd
No known key found for this signature in database
GPG key ID: 9D71CD547BFAE684
2 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/travelmate/Makefile
View file

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

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

@ -73,8 +73,6 @@ f_env() {
elif [ "${name}" = "uplink" ]; then elif [ "${name}" = "uplink" ]; then
if [ "$(uci_get "travelmate.${type}.opensta")" = "1" ]; then if [ "$(uci_get "travelmate.${type}.opensta")" = "1" ]; then
eval "trm_opensta=\"$((${trm_opensta:-0} + 1))\"" eval "trm_opensta=\"$((${trm_opensta:-0} + 1))\""
else
eval "trm_opensta=\"${trm_opensta:-0}\""
fi fi
else else
option_cb() { option_cb() {
@ -391,7 +389,7 @@ f_addsta() {
local IFS uci_cfg new_uplink="1" offset="1" radio="${1}" essid="${2}" local IFS uci_cfg new_uplink="1" offset="1" radio="${1}" essid="${2}"
if [ "${trm_maxautoadd}" = "0" ] || [ "${trm_opensta}" -lt "${trm_maxautoadd}" ]; then if [ "${trm_maxautoadd}" = "0" ] || [ "${trm_opensta:-0}" -lt "${trm_maxautoadd}" ]; then
config_cb() { config_cb() {
local type="${1}" name="${2}" local type="${1}" name="${2}"
@ -737,33 +735,35 @@ f_main() {
for radio in ${trm_radiolist}; do for radio in ${trm_radiolist}; do
if ! printf "%s" "${trm_stalist}" | grep -q "\\-${radio}"; then if ! printf "%s" "${trm_stalist}" | grep -q "\\-${radio}"; then
if [ "${trm_autoadd}" = "0" ]; then if [ "${trm_autoadd}" = "0" ]; then
f_log "info" "no station on radio '${radio}'" f_log "info" "no enabled station on radio '${radio}'"
continue continue
fi fi
fi fi
# station loop # station loop
# #
for sta in ${trm_stalist}; do for sta in ${trm_stalist:-"${radio}"}; do
section="${sta%%-*}" if [ "${sta}" != "${radio}" ]; then
sta_radio="$(uci_get "wireless" "${section}" "device")" section="${sta%%-*}"
sta_essid="$(uci_get "wireless" "${section}" "ssid")" sta_radio="$(uci_get "wireless" "${section}" "device")"
sta_bssid="$(uci_get "wireless" "${section}" "bssid")" sta_essid="$(uci_get "wireless" "${section}" "ssid")"
sta_iface="$(uci_get "wireless" "${section}" "network")" sta_bssid="$(uci_get "wireless" "${section}" "bssid")"
sta_mac="$(f_mac "get" "${section}")" sta_iface="$(uci_get "wireless" "${section}" "network")"
sta_mac="$(f_mac "get" "${section}")"
if [ -z "${sta_radio}" ] || [ -z "${sta_essid}" ] || [ -z "${sta_iface}" ]; then if [ -z "${sta_radio}" ] || [ -z "${sta_essid}" ] || [ -z "${sta_iface}" ]; then
f_log "info" "invalid wireless section '${section}'" f_log "info" "invalid wireless section '${section}'"
continue continue
fi fi
if [ "${radio}" = "${config_radio}" ] && [ "${sta_radio}" = "${config_radio}" ] && if [ "${radio}" = "${config_radio}" ] && [ "${sta_radio}" = "${config_radio}" ] &&
[ "${sta_essid}" = "${config_essid}" ] && [ "${sta_bssid}" = "${config_bssid}" ]; then [ "${sta_essid}" = "${config_essid}" ] && [ "${sta_bssid}" = "${config_bssid}" ]; then
f_ctrack "refresh" f_ctrack "refresh"
f_log "info" "uplink still in range '${config_radio}/${config_essid}/${config_bssid:-"-"}' with mac '${sta_mac:-"-"}'" f_log "info" "uplink still in range '${config_radio}/${config_essid}/${config_bssid:-"-"}' with mac '${sta_mac:-"-"}'"
break 2 break 2
fi
f_log "debug" "f_main-4 ::: sta_radio: ${sta_radio}, sta_essid: \"${sta_essid}\", sta_bssid: ${sta_bssid:-"-"}"
fi fi
f_log "debug" "f_main-4 ::: sta_radio: ${sta_radio}, sta_essid: \"${sta_essid}\", sta_bssid: ${sta_bssid:-"-"}"
if [ -z "${scan_list}" ]; then if [ -z "${scan_list}" ]; then
scan_dev="$(ubus -S call network.wireless status 2>/dev/null | jsonfilter -q -l1 -e "@.${radio}.interfaces[0].ifname")" scan_dev="$(ubus -S call network.wireless status 2>/dev/null | jsonfilter -q -l1 -e "@.${radio}.interfaces[0].ifname")"
scan_list="$("${trm_iwinfo}" "${scan_dev:-${radio}}" scan 2>/dev/null | scan_list="$("${trm_iwinfo}" "${scan_dev:-${radio}}" scan 2>/dev/null |