openwrt-mirror/packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2025-12-21 19:14:30 +04:00
Code Issues Packages Projects Releases Wiki Activity

travelmate: update 2.2.1-6

Browse Source 
- rework the iw device detection in the scan function
- remove any limits from the radio selection
- control the reverse radio processing order with a separate option 'trm_revradio'
- tweak a few (debug) log statements
- LuCI updates (separate commit)
- readme update

Signed-off-by: Dirk Brenken <dev@brenken.org>
This commit is contained in:
Dirk Brenken
2025-11-14 22:00:14 +01:00
parent b22fce1522
commit 1a1c0d07a9
4 changed files with 54 additions and 64 deletions
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.2.1 PKG_VERSION:=2.2.1
PKG_RELEASE:=5 PKG_RELEASE:=6
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>

3
net/travelmate/files/README.md
View File

@@ -92,7 +92,8 @@ automatically (re)connnects to configured APs/hotspots as they become available.
| trm_debug | 0, disabled | set to 1 to get the full debug output (logread -e "trm-") | | trm_debug | 0, disabled | set to 1 to get the full debug output (logread -e "trm-") |
| trm_iface | -, not set | uplink- and procd trigger network interface, configured by the 'Interface Wizard' | | trm_iface | -, not set | uplink- and procd trigger network interface, configured by the 'Interface Wizard' |
| trm_laniface | -, lan | logical LAN network interface, default is 'lan' | | trm_laniface | -, lan | logical LAN network interface, default is 'lan' |
| trm_radio | -, not set | restrict travelmate to a single radio or change the overall scanning order ('radio1 radio0') | | trm_radio | -, not set | restrict travelmate to certain radio(s) |
| trm_revradio | 0, disabled | change the radio processing order, e.g. 'radio1 radio0' |
| trm_scanmode | -, active | send active probe requests or passively listen for beacon frames with 'passive' | | trm_scanmode | -, active | send active probe requests or passively listen for beacon frames with 'passive' |
| trm_captive | 1, enabled | check the internet availability and handle captive portal redirections | | trm_captive | 1, enabled | check the internet availability and handle captive portal redirections |
| trm_netcheck | 0, disabled | treat missing internet availability as an error | | trm_netcheck | 0, disabled | treat missing internet availability as an error |

53
net/travelmate/files/travelmate.init
View File

@@ -76,39 +76,32 @@ status_service() {
} }
scan() { scan() {
local result scan_dev scan_mode radio_num radio_phy radio="${1}" local result scan_dev scan_mode radio_num radio_phy radio="${1:-"radio0"}"
scan_dev="$(ubus -S call network.wireless status 2>/dev/null | jsonfilter -ql1 -e "@.${radio}.interfaces[0].ifname")" radio_num="${radio//[a-z]/}"
radio_phy="phy${radio_num}"
scan_mode="$(uci_get travelmate global trm_scanmode "active")"
[ "${scan_mode}" != "passive" ] && scan_mode=""
scan_dev="$(iw dev | awk -v phy="${radio_phy}" '/Interface/{iface=$2} /type/{if(($2=="AP"||$2=="managed")&&iface ~ "^"phy"-"){printf"%s",iface;exit}}')"
if [ -z "${scan_dev}" ]; then if [ -z "${scan_dev}" ]; then
radio_num="${radio//[a-z]/}" iw phy "${radio_phy}" interface add "trmscan${radio_num}" type managed >/dev/null 2>&1
radio_phy="phy#${radio_num}" ip link set "trmscan${radio_num}" up >/dev/null 2>&1
scan_dev="$(iw dev 2>/dev/null | awk -v iw_phy="${radio_phy}" '{if($0==iw_phy){inside=1;next}if(inside&&/^phy#/){exit}if(inside&&$1=="Interface"){print $2;exit}}')" scan_dev="trmscan${radio_num}"
if [ -z "${scan_dev}" ]; then
if iw phy "phy${radio_num}" interface add "trmscan${radio_num}" type managed >/dev/null 2>&1; then
if ip link set "trmscan${radio_num}" up >/dev/null 2>&1; then
scan_dev="trmscan${radio_num}"
fi
fi
fi
fi fi
if [ -n "${scan_dev}" ]; then result="$(iw dev "${scan_dev}" scan ${scan_mode} 2>/dev/null |
scan_mode="$(uci_get travelmate global trm_scanmode "active")" awk '/^BSS /{if(bssid!=""){printf "%3s %3s %17s %s %s %10s %30s %s\n",signal,channel,bssid,rsn,wpa,cipher,auth,ssid};signal="";channel="";rsn="-";wpa="-";cipher="-";auth="-";ssid="";bssid=toupper(substr($2,1,17))}
[ "${scan_mode}" != "passive" ] && scan_mode="" /signal:/{signal=(2*($2+100)>100 ? 100 : 2*($2+100))}
result="$(iw dev "${scan_dev}" scan ${scan_mode} 2>/dev/null | /SSID:/{$1="";sub(/^ /,"",$0);ssid=$0}
awk '/^BSS /{if(bssid!=""){printf "%3s %3s %17s %s %s %10s %30s %s\n",signal,channel,bssid,rsn,wpa,cipher,auth,ssid};signal="";channel="";rsn="-";wpa="-";cipher="-";auth="-";ssid="";bssid=toupper(substr($2,1,17))} /freq:/{channel=int($2);if(channel>=2400&&channel<=2500)channel=int((channel-2407)/5);else if(channel>=4900&&channel<=5900)channel=int((channel-5000)/5);else if(channel>=5925&&channel<=7125)channel=int(((channel-5950)/5)+1)}
/signal:/{signal=(2*($2+100)>100 ? 100 : 2*($2+100))} /WPA:/{wpa="+"}
/SSID:/{$1="";sub(/^ /,"",$0);ssid=$0} /RSN:/{rsn="+"}
/freq:/{channel=int($2);if(channel>=2400&&channel<=2500)channel=int((channel-2407)/5);else if(channel>=4900&&channel<=5900)channel=int((channel-5000)/5);else if(channel>=5925&&channel<=7125)channel=int(((channel-5950)/5)+1)} /Group cipher:/{cipher=$4}
/WPA:/{wpa="+"} /Authentication suites:/{auth="";for(i=4;i<=NF;i++){auth=auth (i==4?"":",")$i}}
/RSN:/{rsn="+"} END{if(bssid!=""){printf "%3s %3s %17s %s %s %10s %30s %s\n",signal,channel,bssid,rsn,wpa,cipher,auth,ssid}}' | sort -rn)"
/Group cipher:/{cipher=$4} [ -n "${result}" ] && printf "%b\n" "${result}" > "${trm_scanfile}" || : > "${trm_scanfile}"
/Authentication suites:/{auth="";for(i=4;i<=NF;i++){auth=auth (i==4?"":",")$i}}
END{if(bssid!=""){printf "%3s %3s %17s %s %s %10s %30s %s\n",signal,channel,bssid,rsn,wpa,cipher,auth,ssid}}' | sort -rn)" if [ "${scan_dev}" = "trmscan${radio_num}" ]; then
printf "%b\n" "${result}" > "${trm_scanfile}"
else
: > "${trm_scanfile}"
fi
if [ -n "${radio_phy}" ] && [ -n "${radio_num}" ]; then
ip link set "trmscan${radio_num}" down >/dev/null 2>&1 ip link set "trmscan${radio_num}" down >/dev/null 2>&1
iw dev "trmscan${radio_num}" del >/dev/null 2>&1 iw dev "trmscan${radio_num}" del >/dev/null 2>&1
fi fi

60
net/travelmate/files/travelmate.sh
View File

@@ -28,6 +28,7 @@ trm_maxwait="30"
trm_maxautoadd="5" trm_maxautoadd="5"
trm_timeout="60" trm_timeout="60"
trm_radio="" trm_radio=""
trm_revradio="0"
trm_scanmode="active" trm_scanmode="active"
trm_connection="" trm_connection=""
trm_ssidfilter="" trm_ssidfilter=""
@@ -475,7 +476,7 @@ f_setdev() {
if { [ -z "${trm_radio}" ] && ! printf "%s" "${trm_radiolist}" | "${trm_grepcmd}" -q "${radio}"; } || if { [ -z "${trm_radio}" ] && ! printf "%s" "${trm_radiolist}" | "${trm_grepcmd}" -q "${radio}"; } ||
{ [ -n "${trm_radio}" ] && printf "%s" "${trm_radio}" | "${trm_grepcmd}" -q "${radio}"; }; then { [ -n "${trm_radio}" ] && printf "%s" "${trm_radio}" | "${trm_grepcmd}" -q "${radio}"; }; then
if [ -n "${trm_radio}" ] && [ "${trm_radio}" = "radio1 radio0" ]; then if [ "${trm_revradio}" = "1" ]; then
trm_radiolist="$(f_trim "${radio} ${trm_radiolist}")" trm_radiolist="$(f_trim "${radio} ${trm_radiolist}")"
else else
trm_radiolist="$(f_trim "${trm_radiolist} ${radio}")" trm_radiolist="$(f_trim "${trm_radiolist} ${radio}")"
@@ -485,7 +486,7 @@ f_setdev() {
uci_set wireless "${radio}" "disabled" "0" uci_set wireless "${radio}" "disabled" "0"
fi fi
fi fi
f_log "debug" "f_setdev ::: radio: ${radio:-"-"}, radio_conf: ${trm_radio:-"-"}, radio_list: ${trm_radiolist:-"-"}, disabled: ${disabled:-"-"}" f_log "debug" "f_setdev ::: device: ${radio:-"-"}, radio: ${trm_radio:-"-"}, radio_list: ${trm_radiolist:-"-"}, disabled: ${disabled:-"-"}"
} }
# set 'wifi-iface' sections # set 'wifi-iface' sections
@@ -732,11 +733,15 @@ f_check() {
else else
ifname="$(printf "%s" "${dev_status}" | "${trm_jsoncmd}" -ql1 -e '@.*.interfaces[@.config.mode="sta"].ifname')" ifname="$(printf "%s" "${dev_status}" | "${trm_jsoncmd}" -ql1 -e '@.*.interfaces[@.config.mode="sta"].ifname')"
if [ -n "${ifname}" ] && [ "${enabled}" = "1" ]; then if [ -n "${ifname}" ] && [ "${enabled}" = "1" ]; then
trm_ifquality="$("${trm_iwcmd}" dev "${ifname}" link 2>/dev/null | "${trm_awkcmd}" '/signal: /{printf "%s",2*($2+100)}')" trm_ifquality="$("${trm_iwcmd}" dev "${ifname}" link 2>/dev/null | "${trm_awkcmd}" '/signal:/ {val=2*($2+100); printf "%s", (val>100 ? 100 : val)}')"
if [ -z "${trm_ifquality}" ]; then 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")" 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 if { [ -n "${trm_connection}" ] && [ "${trm_ifstatus}" = "false" ]; } || [ "${wait_time}" -eq "${trm_maxwait}" ]; then
f_log "info" "no signal from uplink" if [ -n "${trm_connection}" ] && [ "${trm_ifstatus}" = "false" ]; then
f_log "info" "no signal from uplink"
else
f_log "info" "uplink connection could not be established after ${trm_maxwait} seconds"
fi
f_vpn "disable" f_vpn "disable"
trm_connection="" trm_connection=""
trm_ifstatus="${status}" trm_ifstatus="${status}"
@@ -824,7 +829,7 @@ f_check() {
break break
fi fi
done done
f_log "debug" "f_check ::: mode: ${mode}, name: ${ifname:-"-"}, status: ${trm_ifstatus}, enabled: ${enabled}, connection: ${trm_connection:-"-"}, wait: ${wait_time}, max_wait: ${trm_maxwait}, min_quality: ${trm_minquality}, captive: ${trm_captive}, netcheck: ${trm_netcheck}" f_log "debug" "f_check ::: mode: ${mode}, name: ${ifname:-"-"}, status: ${trm_ifstatus}, enabled: ${enabled}, connection: ${trm_connection:-"-"}, wait: ${wait_time}, max_wait: ${trm_maxwait}, min_quality/quality: ${trm_minquality}/${trm_ifquality:-"-"}, captive: ${trm_captive}, netcheck: ${trm_netcheck}"
} }
# update runtime information # update runtime information
@@ -974,38 +979,29 @@ f_main() {
f_log "debug" "f_main-5 ::: sta_radio: ${sta_radio}, sta_essid: \"${sta_essid}\", sta_bssid: ${sta_bssid:-"-"}" f_log "debug" "f_main-5 ::: sta_radio: ${sta_radio}, sta_essid: \"${sta_essid}\", sta_bssid: ${sta_bssid:-"-"}"
fi fi
if [ -z "${scan_list}" ]; then if [ -z "${scan_list}" ]; then
scan_dev="$("${trm_ubuscmd}" -S call network.wireless status 2>/dev/null | "${trm_jsoncmd}" -ql1 -e "@.${radio}.interfaces[0].ifname")" radio_num="${radio//[a-z]/}"
radio_phy="phy${radio_num}"
[ "${trm_scanmode}" != "passive" ] && scan_mode=""
scan_dev="$("${trm_iwcmd}" dev | "${trm_awkcmd}" -v phy="${radio_phy}" '/Interface/{iface=$2} /type/{if(($2=="AP"||$2=="managed")&&iface ~ "^"phy"-"){printf"%s",iface;exit}}')"
if [ -z "${scan_dev}" ]; then if [ -z "${scan_dev}" ]; then
radio_num="${radio//[a-z]/}" "${trm_iwcmd}" phy "${radio_phy}" interface add "trmscan${radio_num}" type managed >/dev/null 2>&1
radio_phy="phy#${radio_num}" "${trm_ipcmd}" link set "trmscan${radio_num}" up >/dev/null 2>&1
scan_dev="$("${trm_iwcmd}" dev 2>/dev/null | "${trm_awkcmd}" -v iw_phy="${radio_phy}" '{if($0==iw_phy){inside=1;next}if(inside&&/^phy#/){exit}if(inside&&$1=="Interface"){print $2;exit}}')" scan_dev="trmscan${radio_num}"
if [ -z "${scan_dev}" ]; then
if "${trm_iwcmd}" phy "phy${radio_num}" interface add "trmscan${radio_num}" type managed >/dev/null 2>&1; then
if "${trm_ipcmd}" link set "trmscan${radio_num}" up >/dev/null 2>&1; then
scan_dev="trmscan${radio_num}"
fi
fi
fi
fi fi
if [ -n "${scan_dev}" ]; then scan_list="$(printf "%b" "$("${trm_iwcmd}" dev "${scan_dev}" scan ${scan_mode} 2>/dev/null |
[ "${trm_scanmode}" != "passive" ] && scan_mode="" "${trm_awkcmd}" '/^BSS /{if(bssid!=""){if(ssid=="")ssid="unknown";printf "%s %s %s %s %s\n",signal,rsn,wpa,bssid,ssid};bssid=toupper(substr($2,1,17));ssid="";signal="";rsn="-";wpa="-"}
scan_list="$(printf "%b" "$("${trm_iwcmd}" dev "${scan_dev}" scan ${scan_mode} 2>/dev/null | /signal:/{signal=(2*($2+100)>100 ? 100 : 2*($2+100))}
"${trm_awkcmd}" '/^BSS /{if(bssid!=""){if(ssid=="")ssid="unknown";printf "%s %s %s %s %s\n",signal,rsn,wpa,bssid,ssid};bssid=toupper(substr($2,1,17));ssid="";signal="";rsn="-";wpa="-"} /SSID:/{$1="";sub(/^ /,"",$0);ssid="\""$0"\""}
/signal:/{signal=(2*($2+100)>100 ? 100 : 2*($2+100))} /WPA:/{wpa="+"}
/SSID:/{$1="";sub(/^ /,"",$0);ssid="\""$0"\""} /RSN:/{rsn="+"}
/WPA:/{wpa="+"} END{if(bssid!=""){if(ssid=="")ssid="unknown";printf "%s %s %s %s %s\n",signal,rsn,wpa,bssid,ssid}}' | "${trm_sortcmd}" -rn)")"
/RSN:/{rsn="+"} f_log "debug" "f_main-6 ::: radio: ${radio}, scan_device: ${scan_dev}, scan_mode: ${trm_scanmode:-"active"}, scan_cnt: $(printf "%s" "${scan_list}" | "${trm_grepcmd}" -c "^")"
END{if(bssid!=""){if(ssid=="")ssid="unknown";printf "%s %s %s %s %s\n",signal,rsn,wpa,bssid,ssid}}' | "${trm_sortcmd}" -rn)")"
f_log "debug" "f_main-6 ::: radio: ${radio}, scan_device: ${scan_dev}, scan_mode: ${trm_scanmode:-"active"}, scan_cnt: $(printf "%s" "${scan_list}" | "${trm_grepcmd}" -c "^")" if [ "${scan_dev}" = "trmscan${radio_num}" ]; then
fi
if [ -n "${radio_phy}" ] && [ -n "${radio_num}" ]; then
"${trm_ipcmd}" link set "trmscan${radio_num}" down >/dev/null 2>&1 "${trm_ipcmd}" link set "trmscan${radio_num}" down >/dev/null 2>&1
"${trm_iwcmd}" dev "trmscan${radio_num}" del >/dev/null 2>&1 "${trm_iwcmd}" dev "trmscan${radio_num}" del >/dev/null 2>&1
fi fi
if [ -z "${scan_dev}" ]; then
f_log "info" "no scan device on '${radio}'"
continue 2
fi
if [ -z "${scan_list}" ]; then if [ -z "${scan_list}" ]; then
f_log "info" "no scan results on '${radio}'" f_log "info" "no scan results on '${radio}'"
continue 2 continue 2