backend:
* refine connection check (reduce ubus polling)
* further stabilize sta-/ap-handling
frontend (see LuCI repo):
* Automatically refresh the overview page after button onclick event,
e.g. 'Save & Apply'
Signed-off-by: Dirk Brenken <dev@brenken.org>
include $(TOPDIR)/rules.mk
PKG_NAME:=travelmate
include $(TOPDIR)/rules.mk
PKG_NAME:=travelmate
PKG_RELEASE:=1
PKG_LICENSE:=GPL-3.0+
PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
PKG_RELEASE:=1
PKG_LICENSE:=GPL-3.0+
PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
#
LC_ALL=C
PATH="/usr/sbin:/usr/bin:/sbin:/bin"
#
LC_ALL=C
PATH="/usr/sbin:/usr/bin:/sbin:/bin"
trm_sysver="$(ubus -S call system board | jsonfilter -e '@.release.description')"
trm_enabled=0
trm_debug=0
trm_sysver="$(ubus -S call system board | jsonfilter -e '@.release.description')"
trm_enabled=0
trm_debug=0
- local ifname radio cnt=1 mode="${1}"
+ local ifname radio status cnt=1 mode="${1}"
trm_ifstatus="false"
while [ ${cnt} -le ${trm_maxwait} ]
do
trm_ifstatus="false"
while [ ${cnt} -le ${trm_maxwait} ]
do
- if [ "${mode}" = "ap" ]
+ status="$(ubus -S call network.wireless status 2>/dev/null)"
+ if [ -n "${status}" ]
- for radio in ${trm_radiolist}
- do
- trm_ifstatus="$(ubus -S call network.wireless status | jsonfilter -e "@.${radio}.up")"
- if [ "${trm_ifstatus}" = "true" ]
+ if [ "${mode}" = "ap" ]
+ then
+ for radio in ${trm_radiolist}
+ do
+ trm_ifstatus="$(printf "%s" "${status}" | jsonfilter -e "@.${radio}.up")"
+ if [ "${trm_ifstatus}" = "true" ]
+ then
+ trm_aplist="${trm_aplist} $(printf "%s" "${status}" | jsonfilter -e "@.${radio}.interfaces[@.config.mode=\"ap\"].ifname")_${radio}"
+ ifname="${trm_aplist}"
+ else
+ trm_aplist=""
+ trm_ifstatus="false"
+ break
+ fi
+ done
+ else
+ ifname="$(printf "%s" "${status}" | jsonfilter -e '@.*.interfaces[@.config.mode="sta"].ifname')"
+ if [ -n "${ifname}" ]
- trm_aplist="${trm_aplist} $(ubus -S call network.wireless status | jsonfilter -e "@.${radio}.interfaces[@.config.mode=\"ap\"].ifname")_${radio}"
- ifname="${trm_aplist}"
- else
- trm_aplist=""
- trm_ifstatus="false"
- break
+ trm_ifstatus="$(ubus -S call network.interface dump 2>/dev/null | jsonfilter -e "@.interface[@.device=\"${ifname}\"].up")"
- done
- else
- ifname="$(ubus -S call network.wireless status | jsonfilter -l1 -e '@.*.interfaces[@.config.mode="sta"].ifname')"
- if [ -n "${ifname}" ]
- then
- trm_ifstatus="$(ubus -S call network.interface dump | jsonfilter -e "@.interface[@.device=\"${ifname}\"].up")"
fi
fi
if [ "${mode}" = "initial" ] || [ "${trm_ifstatus}" = "true" ]
fi
fi
if [ "${mode}" = "initial" ] || [ "${trm_ifstatus}" = "true" ]
if [ -n "$(uci -q changes wireless)" ]
then
uci -q commit wireless
if [ -n "$(uci -q changes wireless)" ]
then
uci -q commit wireless
- ubus call network reload
+ ubus call network restart
fi
f_check "ap"
f_log "debug" "ap-list: ${trm_aplist}, sta-list: ${trm_stalist}"
fi
f_check "ap"
f_log "debug" "ap-list: ${trm_aplist}, sta-list: ${trm_stalist}"
- if [ -z "${trm_aplist}" ] || [ -z "${trm_stalist}" ]
- then
- f_log "error" "no usable AP/STA configuration found"
- fi
for ap in ${trm_aplist}
do
cnt=1
for ap in ${trm_aplist}
do
cnt=1