Update feed [ iopsys ] package [ dectmngr ]

-------------------------------------------------------------------------------
* 31602a48ca2a Makefile: Add -fcommon to CFLAGS
* 90979cf89bec app: ListAccess: sqlite: Ignore false return-local-addr warning
* c774379484a9 app: appcmbs: Fix inconsistent/misleading indentation
* b1694cb4a5fe Fix compilation with 64-bit time_t
* 56435633a6b4 Fix for setting extension_id for handset
-------------------------------------------------------------------------------
commit 31602a48ca2aee60d70a770834021100d4a17e6f
Author: Andreas Gnau <andreas.gnau@iopsys.eu>
Date: 2022-06-28 08:36:08 +0200

    Makefile: Add -fcommon to CFLAGS

    Add -fcommon to CFLAGS. Newer GCC and clang use -fno-common as default.
    Unfortunately, a larger part of third-party code defines variables in
    header-files. Explicitly set -fcommon for now to make the code compile with
    newer compilers. In the long term, the code should be fixed.

    Signed-off-by: Andreas Gnau <andreas.gnau@iopsys.eu>

Base directory -> /
 app/Makefile | 5 +++++
 1 file changed, 5 insertions(+)
-------------------------------------------------------------------------------
commit 90979cf89beccb55eff24519034179fa197182ce
Author: Andreas Gnau <andreas.gnau@iopsys.eu>
Date: 2022-06-28 08:32:23 +0200

    app: ListAccess: sqlite: Ignore false return-local-addr warning

    The vendored copy of sqlite emits a -Wreturn-local-addr in its
    sqlite3SelectNew function. It has been fixed in sqlite 3.33, but this copy
    of sqlite is version 3.8.2 from 2013.  ignore the warning using gcc-pragmas,
    because we know it is not a problem.

    See also: https://www.sqlite.org/src/vinfo/04e1edd8e5821a37

    Signed-off-by: Andreas Gnau <andreas.gnau@iopsys.eu>

Base directory -> /
 app/ListAccess/sqlite3.c | 3 +++
 1 file changed, 3 insertions(+)
-------------------------------------------------------------------------------
commit c774379484a9dbfe8dbdd11218786b7cda715b82
Author: Andreas Gnau <andreas.gnau@iopsys.eu>
Date: 2022-06-28 08:28:47 +0200

    app: appcmbs: Fix inconsistent/misleading indentation

    Fixes warning caused by inconsistent and misleading intentation.

    ./appcmbs/appcmbs.c: In function 'appcmbs_WaitForContainer':
    ./appcmbs/appcmbs.c:348:6: error: this 'if' clause does not guard...
     [-Werror=misleading-indentation]
     348 |      if (g_stSwupSetup.inProgress == false)
         |      ^~
    ./appcmbs/appcmbs.c:351:9: note: ...this statement, but the latter is
     misleadingly indented as if it were guarded by the 'if'
     351 |         while (bo_Run)
         |         ^~~~~

    Signed-off-by: Andreas Gnau <andreas.gnau@iopsys.eu>

Base directory -> /
 app/appcmbs/appcmbs.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
-------------------------------------------------------------------------------
commit b1694cb4a5fe12394238f56a1db8a61441bae946
Author: Andreas Gnau <andreas.gnau@iopsys.eu>
Date: 2022-06-28 08:24:19 +0200

    Fix compilation with 64-bit time_t

    Fix compilation with 64-bit time_t introduced in musl 1.2.0.
    https://musl.libc.org/time64.html

    Most likely, this can also be reproduced using -D_TIME_BITS=64 on
    glibc-based systems.

    * ListAccess/ListsApp.c:882:107: error: format '%ld' expects argument of
     type 'long int', but argument 4 has type 'time_t'
     {aka 'long long int'} [Werror=format=]
    * ListAccess/ListsApp.c:1015:107: error: format '%ld' expects argument
     of type 'long int', but argument 4 has type 'time_t'
     {aka 'long long int'} [Werror=format=]
    * ListAccess/ListsApp.c:1274:107: error: format '%ld' expects argument
     of type 'long int', but argument 4 has type 'time_t'
     {aka 'long long int'} [-Werror=format=]
    * ListAccess/ListsApp.c:1783:107: error: format '%ld' expects argument
     of type 'long int', but argument 4 has type 'time_t'
     {aka 'long long int'} [-Werror=format=]
    * ListAccess/ListsApp.c:2126:107: error: format '%ld' expects argument
     of type 'long int', but argument 4 has type 'time_t'
     {aka 'long long int'} [-Werror=format=]
    * ListAccess/ListsApp.c:2589:107: error: format '%ld' expects argument
     of type 'long int', but argument 4 has type 'time_t'
     {aka 'long long int'} [-Werror=format=]

    * tcx_hostlog.c:478:94: error: format '%ld' expects argument of type
     'long int', but argument 9 has type 'suseconds_t'
     {aka 'long long int'} [-Werror=format=]
    * tcx_hostlog.c:525:94: error: format '%ld' expects argument of type
     'long int', but argument 9 has type 'suseconds_t'
     {aka 'long long int'} [-Werror=format=]

    * tcx_log.c:392:93: error: format '%ld' expects argument of type 'long
     int', but argument 9 has type 'suseconds_t'
     {aka 'long long int'} [-Werror=format=]

    Signed-off-by: Andreas Gnau <andreas.gnau@iopsys.eu>

Base directory -> /
 app/ListAccess/ListsApp.c | 13 +++++++------
 app/tcx_hostlog.c         |  9 +++++----
 app/tcx_log.c             |  5 +++--
 3 files changed, 15 insertions(+), 12 deletions(-)
-------------------------------------------------------------------------------
commit 56435633a6b4f711ccfe7a4a6917b506d71ed3b4
Author: Grzegorz Sluja <grzegorz.sluja@iopsys.eu>
Date: 2022-06-24 07:21:16 +0000

    Fix for setting extension_id for handset

Base directory -> /
 app/dect_common.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
-------------------------------------------------------------------------------

bbf/Config_bbfdm.in

@@ -25,3 +25,7 @@ config BBFDM_ENABLE_JSON_PLUGIN
 config BBFDM_ENABLE_DOTSO_PLUGIN
 	bool "Enable shared library plugin to extend datamodel"
 	default y
+
+config BBF_MAX_OBJECT_INSTANCES
+	int "Maximum number of instances per object"
+	default 255

bbf/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libbbfdm
-PKG_VERSION:=6.7.3
+PKG_VERSION:=6.8.0
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
-PKG_SOURCE_VERSION:=b626edaa7174419a908d6e8d4de052d6ce09ac08
+PKG_SOURCE_VERSION:=d5798272529997b95decbefca5ead23d94244922
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 
@@ -104,7 +104,8 @@ CMAKE_OPTIONS += \
 
 CMAKE_OPTIONS += \
 	-DBBF_VENDOR_LIST:String="$(CONFIG_BBF_VENDOR_LIST)" \
-	-DBBF_VENDOR_PREFIX:String="$(CONFIG_BBF_VENDOR_PREFIX)"
+	-DBBF_VENDOR_PREFIX:String="$(CONFIG_BBF_VENDOR_PREFIX)" \
+	-DBBF_MAX_OBJECT_INSTANCES:Integer=$(CONFIG_BBF_MAX_OBJECT_INSTANCES)
 
 endif ##CONFIG_BBF_VENDOR_EXTENSION
 

dectmngr/Makefile

@@ -14,7 +14,7 @@ LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=0b48e92372c737855569c0b4f7966da7b06ec6b1
+PKG_SOURCE_VERSION:=31602a48ca2aee60d70a770834021100d4a17e6f
 PKG_MIRROR_HASH:=skip
 endif
 

easy-soc-libs/Makefile

@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=easy-soc-libs
-PKG_VERSION:=6.4.44
+PKG_VERSION:=6.4.45
 PKG_RELEASE:=1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=9d8ca7d62108dd4e47ad338b9a7f6fc651b55563
+PKG_SOURCE_VERSION:=b6baf5a2c1213230651912bd9141f1cee02e500a
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/easy-soc-libs.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz

endptmngr/Makefile

@@ -13,7 +13,7 @@ LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/endptmngr.git
-PKG_SOURCE_VERSION:=60d4be347f87cf7ee6dd2f4f0ab82006db220ac6
+PKG_SOURCE_VERSION:=20bdf55cd51274d405899f7cb79792abd3471548
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

evoice/Makefile

@@ -13,7 +13,7 @@ LOCAL_DEV_EVOICE_DIR=~/voip/evoice
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/evoice.git
-PKG_SOURCE_VERSION:=b9bc076b25f68cc46f8ca4328f75abe0bacc5d0a
+PKG_SOURCE_VERSION:=12d265aad8fe992afe929aebfb9a8e37cb551de8
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

icwmp/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=8.4.14
+PKG_VERSION:=8.4.19
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
-PKG_SOURCE_VERSION:=a3be4dd092de5e98022ccd29f10a5724863a360a
+PKG_SOURCE_VERSION:=887c2db3e1926de4b2fbede96028c9d521ee3f53
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 
@@ -28,9 +28,6 @@ PKG_CONFIG_DEPENDS:= \
 	CONFIG_CWMP_DEBUG \
 	CONFIG_CWMP_DEVEL_DEBUG
 
-# Avoid striping of binary
-STRIP:=:
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/icwmp/default

icwmp/files/etc/config/cwmp

@@ -15,6 +15,7 @@ config acs 'acs'
 	option ip_version '4'
 
 config cpe 'cpe'
+	option enable '1'
 	option default_wan_interface 'wan'
 	option log_to_console 'disable'
 	option log_to_file 'disable'

icwmp/files/etc/icwmpd/update.sh

@@ -6,9 +6,9 @@ log() {
 
 handle_icwmp_update() {
 	local defwan vendorspecinf update
-	local fallback_restart
+	local bootup_start
 
-	fallback_restart="${1:-0}"
+	bootup_start="${1:-0}"
 	update="0"
 	defwan="$(uci -q get cwmp.cpe.default_wan_interface)"
 	vendorspecinf="$(ifstatus "${defwan}" | jsonfilter -e "@.data.vendorspecinf")"
@@ -79,17 +79,23 @@ handle_icwmp_update() {
 		fi
 	}
 
+	if [ "${bootup_start}" -eq "1" ]; then
+		# if called at boot up then no need to reload the service, since it will start after
+		uci commit cwmp
+		return 0
+	fi
+
 	# In case of update restart icwmp
 	if [ "${update}" -eq "1" ]; then
 		log "CWMP uci changes, reload cwmp with uci commit"
 		ubus call uci commit '{"config":"cwmp"}'
 	else
 		status="$(ubus call tr069 status |jsonfilter -qe '@.last_session.status')"
-		if [ "$status" = "failure" ]; then
+		if [ "$status" = "failure" ] || [ "$status" = "" ]; then
 			log "Trigger out of bound inform, since last inform status was failure"
 			ubus -t 10 call tr069 inform >/dev/null 2>&1
-			# Handle timeout
-			if [ "$?" -eq 7 ]; then
+			# Handle timeout or tr069 object not found
+			if [ "$?" -eq 7 ] || [ "$?" -eq 4 ]; then
 				log "Restarting icwmp tr069 object"
 				/etc/init.d/icwmpd restart
 			fi

icwmp/files/etc/init.d/icwmpd

@@ -152,11 +152,6 @@ validate_defaults() {
 		fi
 	fi
 
-	[ -z "${url}" ] && [ -z "${dhcp_url}" ] && {
-		log "ACS url is empty can't start"
-		return 1;
-	}
-
 	validate_cpe_section || {
 		log "Validation of cpe section failed"
 		return 1;
@@ -165,16 +160,28 @@ validate_defaults() {
 	return 0;
 }
 
+boot() {
+	local dhcp_discovery="0"
+
+	config_load cwmp
+	config_get dhcp_discovery acs dhcp_discovery "0"
+
+	if [ "${dhcp_discovery}" == "enable" ] || [ "${dhcp_discovery}" == "1" ]; then
+		# Set dhcp option 43 if not already configured
+		config_get wan_interface cpe default_wan_interface "wan"
+		enable_dhcp_option43 "${wan_interface}"
+		/etc/icwmpd/update.sh 1
+	fi
+
+	start
+}
+
 start_service() {
 	local enable_cwmp
 	local wan_interface
-	local dhcp_discovery
-	local dhcp_url
 
 	config_load cwmp
 	config_get_bool enable_cwmp cpe enable 1
-	config_get dhcp_discovery acs dhcp_discovery "0"
-	config_get dhcp_url acs dhcp_url ''
 	config_get wan_interface cpe default_wan_interface "wan"
 
 	if [ "$enable_cwmp" = "0" ] || [ "$enable_cwmp" = "false" ]; then
@@ -182,22 +189,10 @@ start_service() {
 		return 0
 	fi
 
-	# Set dhcp option 43 if dhcp discovery enabled
-	if [ "${dhcp_discovery}" == "enable" ] || [ "${dhcp_discovery}" == "1" ]; then
-		enable_dhcp_option43 "${wan_interface}"
-	fi
-
 	[ -f /sbin/netifd ] && log "Waiting for Network to be started ..." && ubus -t 5 wait_for network.interface
 	[ -f /usr/sbin/dnsmasq ] && log "Waiting for DNS Proxy to be started ..." && ubus -t 5 wait_for dnsmasq
 	[ -f /etc/config/dhcp ] && log "Waiting for DNS Server(s) ..." && wait_for_resolvfile 20
 
-	if [ "${dhcp_discovery}" == "enable" ] || [ "${dhcp_discovery}" == "1" ]; then
-		if [ -z "${dhcp_url}" ]; then
-			log "Empty dhcp url, running update script"
-			/etc/icwmpd/update.sh
-		fi
-	fi
-
 	validate_defaults || {
 		log "Validation of defaults failed"
 		return 1;
@@ -242,7 +237,6 @@ service_triggers() {
                                json_add_array
                                        json_add_string "" "run_script"
                                        json_add_string "" "/etc/icwmpd/update.sh"
-                                       json_add_string "" "1"
                                json_close_array
                        json_close_array
                        json_add_int "" "2000"

ieee1905/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=4.9.2
+PKG_VERSION:=4.9.3
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=a5b0ffd78579d0b85f82aeba0a827535209e777d
+PKG_SOURCE_VERSION:=2ade9696979624031ac2144da24cb41347b0a8d2
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ieee1905.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip

ieee1905/patches/0001-timer-Use-uloop_timeout_remaining64.patch

@@ -0,0 +1,43 @@
+From 34eeb30ed57f13a4d69b0e7abb97b7f2871f963d Mon Sep 17 00:00:00 2001
+From: Andreas Gnau <andreas.gnau@iopsys.eu>
+Date: Thu, 23 Jun 2022 12:31:21 +0200
+Subject: [PATCH] timer: Use uloop_timeout_remaining64
+
+Fixes error: 'uloop_timeout_remaining' is deprecated: use
+uloop_timeout_remaining64 [-Werror=deprecated-declarations]
+
+Signed-off-by: Andreas Gnau <andreas.gnau@iopsys.eu>
+---
+ src/timer.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/timer.c b/src/timer.c
+index ce749a2d6ee6..49f86944441f 100644
+--- a/src/timer.c
++++ b/src/timer.c
+@@ -19,6 +19,7 @@
+ #endif
+ 
+ #include "timer.h"
++#include <stdint.h>
+ 
+ void timer_init(atimer_t *t, void (*function)(atimer_t *))
+ {
+@@ -43,12 +44,11 @@ int timer_del(atimer_t *t)
+ 
+ int timer_pending(atimer_t *t)
+ {
+-	int ret;
++	int64_t ret;
+ 
+ 	struct uloop_timeout *ut = (struct uloop_timeout *)t;
+ 
+-	ret = uloop_timeout_remaining(ut);
++	ret = uloop_timeout_remaining64(ut);
+ 
+ 	return (ret < 0) ? 0 : 1;
+ }
+-
+-- 
+2.36.1
+

iop/config

@@ -115,7 +115,7 @@ CONFIG_PACKAGE_xl2tpd=y
 CONFIG_PACKAGE_atftp=m
 CONFIG_PACKAGE_atftpd=m
 CONFIG_PACKAGE_ddns-scripts=y
-CONFIG_PACKAGE_miniupnpd=y
+CONFIG_PACKAGE_miniupnpd-iptables=y
 CONFIG_PACKAGE_mosquitto-client-ssl=y
 CONFIG_PACKAGE_mosquitto-ssl=y
 CONFIG_PACKAGE_nginx=y
@@ -136,7 +136,7 @@ CONFIG_PACKAGE_ethtool=y
 CONFIG_PACKAGE_ip-full=y
 CONFIG_PACKAGE_iperf3=y
 CONFIG_PACKAGE_ipset=y
-CONFIG_PACKAGE_iptables=y
+CONFIG_PACKAGE_iptables-legacy=y
 CONFIG_PACKAGE_iptables-mod-conntrack-extra=y
 CONFIG_PACKAGE_iptables-mod-filter=y
 CONFIG_PACKAGE_iptables-mod-ipopt=y
@@ -284,3 +284,10 @@ CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_SQUASHFS=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_UBIFS=y
 CONFIG_BUSYBOX_CONFIG_TIMEOUT=y
 CONFIG_BUSYBOX_CONFIG_NOHUP=y
+
+# Use fw3 iptables-based instead of newer nftables-based fw4
+# TODO: for now we cannot build an image with fw3 and luci-app-firewall (i.e. fw3)
+# Enabling luci-app-firewall enables fw4
+# CONFIG_PACKAGE_luci-app-firewall is not set
+CONFIG_PACKAGE_firewall=y
+# CONFIG_PACKAGE_firewall4 is not set

iop/scripts/feeds_update.sh

@@ -2,57 +2,65 @@
 
 function feeds_update {
 
-    developer=0
-    override=1
-    start=$(date -u +'%s');
-    while getopts "n" opt; do
-	case $opt in
-	    n)
-		override=0
-		;;
-	esac
-    done
+	developer=0
+	override=1
+	start=$(date -u +'%s')
+	while getopts "n" opt; do
+		case $opt in
+		n)
+			override=0
+			;;
+		esac
+	done
 
+	git remote -v | grep -qE '(git@|ssh://)' && developer=1
 
-    git remote -v | grep -qE '(git@|ssh://)' && developer=1
+	cp .config .genconfig_config_bak
 
-    cp .config .genconfig_config_bak
-
-    #if -d argument is passed, clone feeds with ssh instead of http
-    if [ $developer == 1 ]; then
-	./scripts/feeds update -g
-    else
-	./scripts/feeds update
-    fi
+	#if -d argument is passed, clone feeds with ssh instead of http
+	if [ $developer == 1 ]; then
+		./scripts/feeds update -g
+	else
+		./scripts/feeds update
+	fi
 	./scripts/feeds update -ai
 
-    # replace core packages with iopsys versions
-    if [ $override == 1 ]; then
+	# replace core packages with iopsys versions
+	if [ $override == 1 ]; then
 		./scripts/feeds install -f -p openwrt_core -a
-    fi
+	fi
 
-    # targets need to be installed explicitly
-    for target in $(ls ./feeds/targets)
-    do
-	rm -f target/linux/$target
-	./scripts/feeds install -p targets $target
-    done
+	# targets need to be installed explicitly
+	for target in $(ls ./feeds/targets); do
+		rm -f target/linux/$target
+		./scripts/feeds install -p targets $target
+	done
 
-    # install all packages
-    ./scripts/feeds install -a
+	# Workaround for bug in 22.03.0-rc4 where installed target path has been
+	# moved to target/linux/feeds but Config.in and Makefile from installed
+	# targets are not properly included from the new location.
+	# This hack is to be removed once the issues are fixed.
+	# Note that the above block of code might no longer necessary because
+	# targets no longer need to be installed explicitly.
+	echo "Working around installed-target-bug"
+	for f in target/linux/feeds/*; do
+		ln -vsf "feeds/$(basename "$f")" "target/linux/$(basename "$f")"
+	done
 
-    # remove broken symlinks ( for packages that are no longer in the feed )
-    find -L package/feeds -maxdepth 2 -type l -delete
+	# install all packages
+	./scripts/feeds install -a
 
-    cp .genconfig_config_bak .config
-    make defconfig
+	# remove broken symlinks ( for packages that are no longer in the feed )
+	find -L package/feeds -maxdepth 2 -type l -delete
 
-    # record when we last run this script
-    touch tmp/.iop_bootstrap
+	cp .genconfig_config_bak .config
+	make defconfig
 
-    # always return true
-    exit 0
+	# record when we last run this script
+	touch tmp/.iop_bootstrap
+
+	# always return true
+	exit 0
 }
 
 register_command "feeds_update" "Update feeds to point to commit hashes from feeds.conf"
-

iop/scripts/genconfig.sh

@@ -13,11 +13,11 @@ function genconfig {
 	export DEVELOPER=0
 	target="bogus"
 	target_config_path=""
-	brcm63xx_arm="target/linux/iopsys-brcm63xx-arm"
-	ramips="target/linux/iopsys-ramips"
-	econet="target/linux/iopsys-econet"
-	x86="target/linux/iopsys-x86"
-	armvirt="target/linux/iopsys-armvirt"
+	brcm63xx_arm="target/linux/feeds/iopsys-brcm63xx-arm"
+	ramips="target/linux/feeds/iopsys-ramips"
+	econet="target/linux/feeds/iopsys-econet"
+	x86="target/linux/feeds/iopsys-x86"
+	armvirt="target/linux/feeds/iopsys-armvirt"
 
 	Red='\033[0;31m'          # Red
 	Color_Off='\033[0m'       # Text Reset
@@ -83,8 +83,8 @@ function genconfig {
 
 		[ -n "$profile" ] || return
 
-		if [ -n "$TARGET" -a -d "./target/linux/$TARGET" ]; then
-			local targetpath="./target/linux/$TARGET"
+		if [ -n "$TARGET" -a -d "./target/linux/feeds/$TARGET" ]; then
+			local targetpath="./target/linux/feeds/$TARGET"
 			local profiles=
 			local pfound=0
 
@@ -328,6 +328,7 @@ function genconfig {
 			subtarget="en7562"
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
+			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
 		else
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${BOARDTYPE}=y" >> .config

iop/scripts/genconfig_min.sh

@@ -12,11 +12,11 @@ function genconfig_min {
 	export DEVELOPER=0
 	target="bogus"
 	target_config_path=""
-	brcm63xx_arm="target/linux/iopsys-brcm63xx-arm"
-	ramips="target/linux/iopsys-ramips"
-	econet="target/linux/iopsys-econet"
-	x86="target/linux/iopsys-x86"
-	armvirt="target/linux/iopsys-armvirt"
+	brcm63xx_arm="target/linux/feeds/iopsys-brcm63xx-arm"
+	ramips="target/linux/feeds/iopsys-ramips"
+	econet="target/linux/feeds/iopsys-econet"
+	x86="target/linux/feeds/iopsys-x86"
+	armvirt="target/linux/feeds/iopsys-armvirt"
 
 	Red='\033[0;31m'          # Red
 	Color_Off='\033[0m'       # Text Reset
@@ -82,8 +82,8 @@ function genconfig_min {
 
 		[ -n "$profile" ] || return
 
-		if [ -n "$TARGET" -a -d "./target/linux/$TARGET" ]; then
-			local targetpath="./target/linux/$TARGET"
+		if [ -n "$TARGET" -a -d "./target/linux/feeds/$TARGET" ]; then
+			local targetpath="./target/linux/feeds/$TARGET"
 			local profiles=
 			local pfound=0
 
@@ -319,6 +319,7 @@ function genconfig_min {
 			subtarget="en7562"
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
+			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
 		else
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${BOARDTYPE}=y" >> .config

map-agent/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=2.8.0.5
+PKG_VERSION:=2.9.0.0
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=747379e69f3dbc98e6d151dc44d995ca23690520
+PKG_SOURCE_VERSION:=c3887ca931d4e7fb6f773b4d71b4e6164f9f0372
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 
 PKG_LICENSE:=BSD-3-Clause

map-agent/files/etc/config/mapagent

@@ -10,6 +10,7 @@ config agent 'agent'
 
 config dynamic_backhaul
 	option missing_bh_timer '60'
+	option missing_bh_reconfig_timer '1800'
 
 config controller_select
 	option id 'auto'

map-agent/files/etc/init.d/mapagent

@@ -116,7 +116,7 @@ validate_ap_section() {
 	uci_validate_section mapagent $section "${1}" \
 			'ifname:string' \
 			'device:string' \
-			'band:or("2", "5")' \
+			'band:or("2", "5", "6")' \
 			'enabled:bool:true' \
 			'onboarded:bool:false' \
 			'ssid:string' \
@@ -187,6 +187,8 @@ validate_dyn_bh_section() {
 
 	uci_validate_section mapagent $section "${1}" \
 			'missing_bh_timer:range(1,255)'
+	uci_validate_section mapagent $section "${1}" \
+			'missing_bh_reconfig_timer:range(0,65535)'
 
 	[ "$?" -ne 0 ] && {
 		logger -s -t "mapagent" "Validation of dynamic backhaul section failed"

map-agent/files/lib/wifi/multiap

@@ -356,7 +356,7 @@ write_bsta_config() {
 
 	#echo result diff = $diff > /dev/console
 	[ "$diff" == "1" ] && {
-		config_foreach mapagent_apply_bssid_same_band bsta
+		(config_foreach mapagent_apply_bssid_same_band bsta)
 		#ubus call uci commit '{"config":"wireless"}'
 		#echo reloading wireless > /dev/console
 	}
@@ -488,10 +488,12 @@ bsta_to_wireless() {
 
 		mapagent_find_other_creds() {
 			#echo "trying to find other creds for $2" > /dev/console
+			local other_section="$2"
+
 			config_get band $1 band
 			config_get onboarded $1 onboarded "0"
 
-			[ "$3" != "$band" -o "$onboarded" = "0" ] && return
+			[ "$4" != "$band" -o "$onboarded" = "0" ] && return
 
 			config_get ssid $1 ssid
 			config_get key $1 key
@@ -499,7 +501,12 @@ bsta_to_wireless() {
 			config_get enabled $1 enabled "0"
 			config_get bssid $1 bssid
 
-			(mapagent_apply_wl_bsta $2 "$ssid" "$key" $encryption $4 "$bssid")
+			uci -q set mapagent.${other_section}.ssid="$ssid"
+			uci -q set mapagent.${other_section}.key="$key"
+			uci -q set mapagent.${other_section}.encryption=$encryption
+			uci -q set mapagent.${other_section}.bssid="$bssid"
+			uci commit mapagent
+			(mapagent_apply_wl_bsta "$3" "$ssid" "$key" $encryption "$5" "$bssid")
 		}
 
 		config_get band $1 band
@@ -508,7 +515,7 @@ bsta_to_wireless() {
 		config_get enabled $1 enabled "0"
 
 		if [ "$onboarded" = "0" ]; then
-			config_foreach mapagent_find_other_creds bsta $ifname $band $enabled
+			config_foreach mapagent_find_other_creds bsta $1 $ifname $band $enabled
 		else
 			config_get ssid $1 ssid
 			config_get key $1 key
@@ -665,7 +672,7 @@ bsta_scan_on_enabled() {
 
 bsta_enable_all() {
 	mapagent_enable_bk() {
-		config_get ifname $1 ifname "2"
+		config_get ifname $1 ifname
 		uci -q set mapagent.$1.enabled="1"
 	}
 
@@ -676,6 +683,54 @@ bsta_enable_all() {
 	bsta_scan_on_enabled
 }
 
+bsta_clear_all_bssid() {
+	mapagent_remove_bssid() {
+		uci -q set mapagent.$1.enabled="1"
+		uci -q del mapagent.$1.bssid
+	}
+
+	wireless_remove_bssid() {
+		config_get mode $1 mode
+		config_get ifname $1 ifname
+
+		[ "$mode" != "sta" ] && return
+
+		uci -q del wireless.$1.bssid
+		wpa_cli -i "$ifname" bssid 0 00:00:00:00:00:00 > /dev/null 2>&1
+		wpa_cli -i "$ifname" save_config > /dev/null 2>&1
+	}
+
+	config_load mapagent
+	config_foreach mapagent_remove_bssid bsta
+	uci commit mapagent
+
+	config_load wireless
+	config_foreach wireless_remove_bssid wifi-iface
+	uci commit wireless
+}
+
+# arg1 = ifname arg2 = bssid
+bsta_blacklist_bssid_set() {
+	local ifname="$1"
+	shift
+	local bssid="$@"
+
+	wpa_cli -i "$ifname" set_network 0 bssid_ignore "$bssid" > /dev/null 2>&1
+	wpa_cli -i "$ifname" save_config > /dev/null 2>&1
+}
+
+bsta_blacklist_bssid_clear() {
+	mapagent_blacklist_by_band() {
+		config_get ifname $1 ifname
+
+		wpa_cli -i "$ifname" set_network 0 bssid_ignore "" > /dev/null 2>&1
+		wpa_cli -i "$ifname" save_config > /dev/null 2>&1
+	}
+
+	config_load mapagent
+	config_foreach mapagent_blacklist_by_band bsta
+}
+
 bsta_disable_lower_priority() {
 	config_load mapagent
 
@@ -849,6 +904,9 @@ case "$func" in
 	sync_mapcontroller_from_wireless) sync_mapcontroller_from_wireless $@;;
 	ts) ts_sub $@;;
 	bsta_enable_all) bsta_enable_all $@;;
+	bsta_clear_all_bssid) bsta_clear_all_bssid $@;;
+	bsta_blacklist_bssid_set) bsta_blacklist_bssid_set $@;;
+	bsta_blacklist_bssid_clear) bsta_blacklist_bssid_clear $@;;
 	bsta_disable_lower_priority) bsta_disable_lower_priority $@;;
 	bsta_scan_on_enabled) bsta_scan_on_enabled $@;;
 	bsta_use_link) bsta_use_link $@;;

map-agent/files/lib/wifi/traffic_separation

@@ -2,6 +2,9 @@
 
 . /lib/functions.sh
 
+AL_BRIDGE=${AL_BRIDGE-"br-lan"}
+PRIMARY_VID=${PRIMARY_VID-1}
+
 ### Traffic Separation ###
 
 dbg() {
@@ -9,456 +12,157 @@ dbg() {
 }
 
 ts_sub() {
-
 	ts_usage() {
 		cat <<EOF
-Usage: $0 [create|delete|populate|primary|reload]
+Usage: $0 [create|reload]
 Traffic Separation related functions.
-create fh <iface> <vid>			- create vlan device and rules for wifi fronthaul
-create bh <iface> <vid> <profile>	- create vlan device and rules for wifi backhaul
-create eth <iface> <vid> <pbits>	- create vlan device and rules for logical ethernet interface
-delete <iface>				- delete vlan device
-populate eth <iface> <vid>		- add secondary network rules for logical ethernet interface
-primary get <iface>			- read primary VID for interface from driver (from Association Response frame IE)
-reload     				- reload network with new configuration
+create vid - create vlan configuration with vlan_id
+reload     - reload network with new configuration
 EOF
 	exit 1
 	}
 
-	_get_bridge() {
-		local bridge=$(ip link show $1 | grep -o "master [^\s]*" | cut -d ' ' -f 2)
-		echo $bridge
-	}
+	ts_create() {
+		_net_setup() {
+			local name=$1
+			local vid=$2
+			local proto=$3
+			local dev=$4
+			local port_dev=$5
 
-	set_wireless_bridge() {
-		config_load wireless
+			[ -z "$(uci -q get network.${name})" ] || return
 
-		_set_network() {
-			local sec=$1
-			local iface=$2
-			local bridge=$3
+			local ip_addr="192.168.${vid}.1"
+			local br_dev="${AL_BRIDGE/-/_}"
+			local tag=":t"
 
-			config_get ifname $sec ifname
-			[ "$iface" != "$ifname" ] && continue
+			[ "${vid}" = "${PRIMARY_VID}" ] && {
+				tag=""
 
-			config_get mode $sec mode
-			config_get multi_ap $sec multi_ap "0"
-			[ "$mode" = "sta" -a "$multi_ap" = "1" ] && continue
+				# Global options
+				[ -z "$(uci -q get network.${br_dev}.vlan_filtering)" ] && {
+					uci -q set network.${br_dev}.vlan_filtering=1;
+				}
 
-			config_get network $sec network
-			local new_network=${bridge##br-}
-			if [ "$new_network" != "$network" ] ; then
-				uci -q set wireless.${sec}.network=${new_network}
-				uci commit wireless
+				uci -q delete network.lan.proto
+				uci -q delete network.lan.ipaddr
+				uci -q delete network.lan.netmask
+				uci -q delete network.lan.ip6assign
+			}
+
+			uci -q set network.${name}="interface"
+			uci -q set network.${name}.device="$dev"
+			uci -q set network.${name}.is_lan="1"
+
+			if [ "$proto" = "static" ] ; then
+				uci -q set network.${name}.proto="static"
+				# TODO vid > 255
+				uci -q set network.${name}.ipaddr="${ip_addr}"
+				uci -q set network.${name}.netmask="255.255.255.0"
+				uci -q set network.${name}.ip6assign '60'
+			else
+				uci -q set network.${name}.proto="dhcp"
 			fi
 
-			brctl addif $bridge $iface &> /dev/null
-		}
+			uci -q add network bridge-vlan
+			uci -q set network.@bridge-vlan[-1].device="$AL_BRIDGE"
+			uci -q set network.@bridge-vlan[-1].vlan="$vid"
 
-		config_foreach _set_network wifi-iface ${1} ${2}
-	}
-
-	ts_create() {
-
-		_create_vlan_dev() {
-			iface=$1				# real iface
-			vid=$2					# Vlan ID
-			bridge=$3				# bridge iface should be connected
-			vlan_dev=$4
-
-			old_bridge="$(_get_bridge $iface)"	# bridge iface is connected to
-
-			# remove interface from bridge if it is in one
-			[ -n "$old_bridge" ] && brctl delif $old_bridge $iface &> /dev/null
-
-			# (re)create vlan device
-			ip link show $vlan_dev && vlanctl --if-delete $vlan_dev
-			vlanctl --mcast --if-create-name $iface $vlan_dev --if $iface --set-if-mode-rg
-
-			vlanctl --if $iface --tx --tags 0 --default-miss-drop
-			vlanctl --if $iface --tx --tags 1 --default-miss-drop
-			vlanctl --if $iface --tx --tags 2 --default-miss-drop
-			vlanctl --if $iface --rx --tags 0 --default-miss-drop
-			vlanctl --if $iface --rx --tags 1 --default-miss-drop
-			vlanctl --if $iface --rx --tags 2 --default-miss-drop
-
-			# bring the vlan device up and add back to bridge if it was in one
-			brctl addif $bridge $vlan_dev &> /dev/null
-		}
-
-		ts_create_fh() {
-			iface=$1				# fh iface
-			vid=$2					# SSID specific (secondary) or primary vid
-			bridge=$3
-
-			[ -n "$iface" ] && [ -n "$vid" ] && [ -n "$bridge" ]  || {
-				cat <<EOF
-Adding FH device requires IFACE, VID and bridge
-EOF
-				exit 1
-			}
-
-			# create vlan device
-			#set_wireless_bridge $iface $bridge
-
-			vlan_dev=${iface}_vlan${vid}
-			ip link set $vlan_dev down
-			_create_vlan_dev $iface $vid $bridge $vlan_dev
-
-			# add rules
-#			vlanctl --if $iface --rx --tags 0 --filter-ethertype 0x886c --set-rxif $vlan_dev --rule-append		# incoming brcm
-
-			# EAPOL frames
-			vlanctl --if $iface --rx --tags 0 --filter-ethertype 34958 --set-rxif $vlan_dev --rule-append
-			vlanctl --if $iface --rx --tags 1 --filter-ethertype 34958 --pop-tag --set-rxif $vlan_dev --rule-append
-			vlanctl --if $iface --tx --tags 0 --filter-txif $vlan_dev --filter-ethertype 34958 --rule-append
-
-			# 8021q vlan id TAG/UNTAG
-			vlanctl --if $iface --rx --tags 0 --set-rxif $vlan_dev --push-tag --set-vid $vid 0 --rule-append
-			vlanctl --if $iface --tx --tags 1 --filter-txif $vlan_dev --filter-vid $vid 0 --pop-tag --dscp2pbits 0 --rule-append
-
-			ip link set $iface up
-			ip link set $vlan_dev up
-		}
-
-		ts_create_bh() {
-			iface=$1				# bh iface
-			vid=$2					# primary vid
-			profile=$3				# agent profile (1 or 2)
-			bridge=$4				# bridge interface should be connected to
-
-			[ -n "$iface" ] && [ -n "$vid" ] && [ -n "$profile" ] || {
-				cat <<EOF
-Adding BH device requires IFACE, VID and PROFILE (1 or 2).
-EOF
-				exit 1
-			}
-
-			#[ -n "$bridge" ] && set_wireless_bridge $iface $bridge
-
-			old_vid=$(wl -i $1 map_8021q_settings)
-			old_vid=${old_vid##* }
-			old_profile=$(wl -i $1 map_profile | cut -d ' ' -f 3)
-
-			[ "$old_vid" = "$vid" -a "$old_profile" = "$profile" ] && return
-
-			wl vlan_mode 0 &> /dev/null				# make sure this is OFF, else driver won't handle vlan
-			wl -i $iface down &> /dev/null
-			wl -i $iface map_profile $profile &> /dev/null		# only has effect on profile 2
-			wl -i $iface map_8021q_settings $vid &> /dev/null	# can only be set on bBSS (read-only on bSTA)
-			wl -i $iface up &> /dev/null
-		}
-
-		ts_create_lei() {
-			vid=$1					# primary vid
-			pbits=$2				# default pbits to apply
-			vlan_bridge=$3				# name of ts subsystem bridge
-			lan_bridge=$4				# name of node local bridge
-
-			[ -n "$vid" ] && [ -n "$pbits" ] && [ -n "$vlan_bridge" ] && [ -n "$lan_bridge" ] || {
-				cat <<EOF
-Adding ETH device requires IFACE, VID, PBITS and name of vlan and lan bridges.
-EOF
-				exit 1
-			}
-
-			ip link show lei &> /dev/null || {
-				ip link add link lei name lei_lan type vlan id 1 2>/dev/null
-			}
-
-			old_vid=$(ip -d link show lei_lan | sed -n 's/vlan.*id \([0-9][0-9]*\) .*/\1/p')
-
-			[ "$old_vid" != "$vid" ] && {
-				ip link del lei_lan
-				ip link add link lei name lei_lan type vlan id ${vid}
-			}
-
-			brctl addif ${lan_bridge} lei_lan &>/dev/null
-			brctl addif ${vlan_bridge} lei_map &>/dev/null
-
-			ip link set lei up
-			ip link set lei_map up
-			ip link set lei_lan up
-		}
-
-		_create_eth() {
-			iface=$1				# Multi-AP Logical Ethernet Interface
-			vid=$2					# primary vid
-			bridge=$3				# name of ts subsystem bridge
-			pbits=0
-
-			[ -n "$iface" ] && [ -n "$vid" ] && [ -n "$bridge" ] || {
-				cat <<EOF
-Adding ETH device requires IFACE, VID, PBITS and name of vlan and lan bridges.
-EOF
-				exit 1
-			}
-
-			dbg create $@
-
-			ip link set $iface down
-
-			vlan_dev=${iface}_vlan${vid}
-			ip link set $vlan_dev down
-			_create_vlan_dev $iface $vid $bridge $vlan_dev
-
-			vlanctl --if $iface --rx --tags 0 --set-rxif $vlan_dev --push-tag --set-vid $vid 0 --set-pbits $pbits 0 --rule-append
-			vlanctl --if $iface --tx --tags 1 --filter-vid $vid 0 --filter-txif $vlan_dev --pop-tag --rule-append
-
-			[ $# -le 3 ] && exit 0
-			shift 3
-
-			while [ -n "$1" ] ; do
-				vid=$1
-				vlanctl --if $iface --rx --tags 1 --filter-vid $vid 0 --set-rxif $vlan_dev --rule-append
-				vlanctl --if $iface --tx --tags 1 --filter-vid $vid 0 --filter-txif $vlan_dev --rule-append
-				shift
+			for port in $(uci -q get network.${br_dev}.ports) ; do
+				echo $port | grep -q eth || continue
+				uci -q add_list network.@bridge-vlan[-1].ports="${port}${tag}"
 			done
 
-			ip link set $iface up
-			ip link set $vlan_dev up
+			uci -q add_list network.${br_dev}.ports="$port_dev"
+			uci -q add_list network.@bridge-vlan[-1].ports="$port_dev"
+
+			uci -q commit network
 		}
 
-		ts_create_eths() {
-			pvid=$1					# primary vid
-			bridge=$2				# name of ts subsystem bridge
+		_dhcp_setup() {
+			local name=$1
 
-			shift 2
-			# TODO use ieee1905 bridge
-			for iface in $(uci get network.br_lan.ports) ; do
-				[ "$iface" = "lei_lan" ] && continue
-				_create_eth $iface $pvid $bridge $@
-				ubus call ieee1905 del_interface "{\"ifname\":\"$iface\"}"
-			done
+			[ -n "$(uci -q get dhcp.${name})" ] && return
+
+			uci -q set dhcp.${name}=dhcp
+			uci -q set dhcp.${name}.interface="${name}"
+			uci -q set dhcp.${name}.start="100"
+			uci -q set dhcp.${name}.limit="150"
+			uci -q set dhcp.${name}.leasetime="1h"
+			uci -q set dhcp.${name}.dhcpv4="server"
+			uci -q set dhcp.${name}.dhcpv6="server"
+			uci -q set dhcp.${name}.ra="server"
+			uci -q set dhcp.${name}.ra_slaac="1"
+			uci -q add_list dhcp.${name}.ra_flags="managed-config"
+			uci -q add_list dhcp.${name}.ra_flags="other-config"
+
+			uci -q commit dhcp
 		}
 
-		ts_create_dhcp() {
-			local diff=""
+		_firewall_setup() {
+			local name=$1
+			local network=$1
+			local vid=$2
+			local zone_exist=0
 
-                        _net_setup() {
-				local name=$1
-				local devname=$2
-				local vid=$3
+			config_load firewall
 
-				[ -z "$(uci -q get network.${name})" ] && {
-					uci -q set network.${name}="interface"
-					uci -q set network.${name}.device="$devname"
-					uci -q set network.${name}.is_lan="1"
-					uci -q set network.${name}.proto="static"
-					# TODO vid > 255
-					local ip_addr="192.168.${vid}.1"
-					[ "${vid}" = "1" ] && ip_addr="192.168.${vid}.2"
-					uci -q set network.${name}.ipaddr="${ip_addr}"
-					uci -q set network.${name}.netmask="255.255.255.0"
+			_process_zone() {
+				local section=$1
+				local new_name=$2
+				local name
 
-					diff="1"
-				}
+				config_get name $section name
 
-				[ "$diff" = "1" ] && uci -q commit network
+				[ "$name" == "$new_name" ] && zone_exist=1
 			}
 
-			_br_setup() {
-				local name=$1
-				local sinkname=$2
-				local vid=$3
+			config_foreach _process_zone zone $name
 
-				[ -z "$(uci -q get network.${name}_dev)" ] && {
-					uci -q set network.${name}_dev="device"
-					uci -q set network.${name}_dev.name="br-${name}"
-					uci -q set network.${name}_dev.type="bridge"
-					uci -q set network.${name}_dev.bridge_empty="1"
-					uci -q add_list network.${name}_dev.ports="${sinkname}"
+			[ "$zone_exist" != "0" ] && return
 
-					diff="1"
-				}
-
-				[ -z "$(uci -q get network.${name})" ] && {
-					uci -q set network.${name}="interface"
-					uci -q set network.${name}.device="br-${name}"
-					uci -q set network.${name}.is_lan="1"
-					uci -q set network.${name}.proto="static"
-					uci -q set network.${name}.ipaddr="192.168.${vid}.1"
-					uci -q set network.${name}.netmask="255.255.255.0"
-
-					diff="1"
-				}
-
-				[ "$diff" = "1" ] && uci -q commit network
+			[ "${vid}" = "${PRIMARY_VID}" ] && {
+				uci -q delete firewall.lan
 			}
 
-			_dhcp_setup() {
-				local name=$1
+			uci -q add firewall zone
+			uci -q set firewall.@zone[-1].name="$name"
+			uci -q add_list firewall.@zone[-1].network="$network"
+			uci -q set firewall.@zone[-1].input='ACCEPT'
+			uci -q set firewall.@zone[-1].output='ACCEPT'
+			uci -q set firewall.@zone[-1].forward='ACCEPT'
 
-				[ -n "$(uci -q get dhcp.${name})" ] && return
+			uci -q add firewall forwarding
+			uci -q set firewall.@forwarding[-1].src="$name"
+			uci -q set firewall.@forwarding[-1].dest="wan"
 
-				uci -q set dhcp.${name}=dhcp
-				uci -q set dhcp.${name}.interface="${name}"
-				uci -q set dhcp.${name}.start="100"
-				uci -q set dhcp.${name}.limit="150"
-				uci -q set dhcp.${name}.leasetime="1h"
-				uci -q set dhcp.${name}.dhcpv4="server"
-				uci -q set dhcp.${name}.dhcpv6="server"
-				uci -q set dhcp.${name}.ra="server"
-				uci -q set dhcp.${name}.ra_slaac="1"
-				uci -q add_list dhcp.${name}.ra_flags="managed-config"
-				uci -q add_list dhcp.${name}.ra_flags="other-config"
-
-				diff="1"
-				uci -q commit dhcp
-			}
-
-			_firewall_setup() {
-				local name=$1
-				local network=$2
-				local zone_exist=0
-
-				config_load firewall
-
-				_process_zone() {
-					local section=$1
-					local new_name=$2
-					local name
-
-					config_get name $section name
-
-					[ "$name" == "$new_name" ] && zone_exist=1
-				}
-
-				config_foreach _process_zone zone $name
-
-				[ "$zone_exist" != "0" ] && return
-
-				uci -q add firewall zone
-				uci -q set firewall.@zone[-1].name="$name"
-				uci -q add_list firewall.@zone[-1].network="$network"
-				uci -q set firewall.@zone[-1].input='ACCEPT'
-				uci -q set firewall.@zone[-1].output='ACCEPT'
-				uci -q set firewall.@zone[-1].forward='ACCEPT'
-
-				uci -q add firewall forwarding
-				uci -q set firewall.@forwarding[-1].src="$name"
-				uci -q set firewall.@forwarding[-1].dest="wan"
-
-				diff="1"
-				uci -q commit firewall
-			}
-
-			vid=$1					# primary vid
-
-			[ -n "$vid" ] || {
-				cat <<EOF
-VID required to configure DHCP.
-EOF
-				exit 1
-			}
-
-			ip link show sink${vid} || {
-				ip link add sink${vid} type veth peer name sink${vid}_vlan
-				ip link add link sink${vid} name sink${vid}_peer type vlan id ${vid}
-			}
-
-			ip link set sink${vid} up
-			ip link set sink${vid}_peer up
-			ip link set sink${vid}_vlan up
-
-			diff=""
-			_net_setup sink${vid} sink${vid}_peer ${vid}
-			_dhcp_setup sink${vid}
-			_firewall_setup lan${vid} sink${vid}
-
-			[ "$diff" = "1" ] && {
-				ubus call network reload
-				ubus -t 5 wait_for network.interface.sink${vid}
-			}
-
-			brctl addif br-map sink${vid}_vlan &> /dev/null
+			uci -q commit firewall
 		}
 
-	local type=$1
-	shift
+		vid=$1
 
-	case "$type" in
-		fh) ts_create_fh $@;;
-		bh) ts_create_bh $@;;
-		lei) ts_create_lei $@;;
-		eths) ts_create_eths $@;;
-		dhcp) ts_create_dhcp $@;;
-		--help|help) ts_usage;;
-		*) ts_usage; exit 1;;
-	esac
-	}
-
-	ts_delete() {
-		iface=$1
-
-		path=$(ls -d /sys/class/net/${iface}/upper_*)
-		[ -z "$path" ] && exit 0
-
-		vlan_dev=${path##*upper_}
-		bridge="$(_get_bridge $vlan_dev)"
-
-		[ -n "$bridge" ] && {
-			vlanctl --if-delete $vlan_dev		# note: also removes rules and removes from bridge
-			brctl addif $bridge $iface &> /dev/null # needed to add again
-                }
-
-	}
-
-	ts_populate() {
-		local type=$1
-		shift
-
-		[ "$type" == "eth" ] || {
+		[ -n "$vid" ] || {
 			cat <<EOF
-Populating ETH rules requires IFACE and VID.
+VID required to configure.
 EOF
 			exit 1
 		}
 
-		iface=$1				# Multi-AP Logical Ethernet Interface
-		vid=$2					# secondary vid
+		ip link show sink${vid} 2> /dev/null || {
+			ip link add sink${vid} type veth peer name sink_peer${vid}
+		}
 
-		path=$(ls -d /sys/class/net/${iface}/upper_*)
-		[ -z "$path" ] && exit 1
-		vlan_dev=${path##*upper_}
+		ip link set sink${vid} up
+		ip link set sink_peer${vid} up
 
-		# add rules
-		#vlanctl --if $iface --rx --tags 1 --filter-vid $vid 0 --set-rxif $vlan_dev --rule-append		# note: retain secondary vids
-		#vlanctl --if $iface --tx --tags 1 --filter-vid $vid 0 --filter-txif $vlan_dev --rule-append		# note: already default
-	}
+		proto="dhcp"
+		[ -x "/usr/sbin/mapcontroller" ] && proto="static" ;
+		_net_setup "vlan${vid}" ${vid} ${proto} "sink${vid}" "sink_peer${vid}"
 
-	ts_primary() {
-		local func=$1
-		shift
-
-		case "$func" in
-			get) vid=$(wl -i $1 map_8021q_settings); echo ${vid##* };;
-			*) ts_usage; exit 1;;
-		esac
-	}
-
-	ts_unicast() {
-		local mac=$1
-		local iface=$2
-
-		# TODO: improve?
-		res=$(ebtables -t broute -L | grep -i "$mac" | grep "$iface")
-		[ -n "$res" ] && return
-
-		ebtables -t broute -D BROUTING -d "$mac" -p 0x893a -j DROP
-		ebtables -t broute -I BROUTING -i "$iface" -d "$mac" -p 0x893a -j DROP
-	}
-
-	ts_multicast() {
-		local iface=$1
-
-		# TODO: improve?
-		res=$(ebtables -t broute -L | grep -i "1:80:C2:00:00:13" | grep "$iface")
-		[ -n "$res" ] && return
-
-		ebtables -t broute -D BROUTING -d 01:80:C2:00:00:13 -p 0x893a -j DROP
-		ebtables -t broute -D BROUTING -i "$iface" -d 01:80:C2:00:00:13 -p 0x893a -j DROP
-		ebtables -t broute -I BROUTING -i "$iface" -d 01:80:C2:00:00:13 -p 0x893a -j DROP
+		[ -x "/usr/sbin/mapcontroller" ] && {
+			_dhcp_setup vlan${vid}
+			_firewall_setup vlan${vid} ${vid}
+		}
 	}
 
 	ts_reload() {
@@ -466,32 +170,32 @@ EOF
 
 		# workaround for missing backhaul wifi.ap.* ubus obj's:
 		# iterate in config and setup bh
-		config_load wireless
+#		config_load wireless
 
-		_setup_bh_iface() {
-			local sec=$1
-			local iface=$2
-			local bridge=$3
+# _setup_bh_iface() {
+#			local sec=$1
+#			local iface=$2
+#			local bridge=$3
 
-			config_get ifname $sec ifname
+#			config_get ifname $sec ifname
 
-			config_get mode $sec mode
-			config_get multi_ap $sec multi_ap "0"
-			[ "$mode" = "ap" -a "$multi_ap" = "1" ] && {
-				ts_create bh $ifname 1 2 br-map
-			}
-		}
+#			config_get mode $sec mode
+#			config_get multi_ap $sec multi_ap "0"
+#			[ "$mode" = "ap" -a "$multi_ap" = "1" ] && {
+#				ts_create bh $ifname 1 2 br-map
+#			}
+		#}
 
-		config_foreach _setup_bh_iface wifi-iface
+#		config_foreach _setup_bh_iface wifi-iface
 
 		[ -n "dhcp_reload" ] && /etc/init.d/dnsmasq reload
+		ubus call uci commit '{"config":"network"}'
+		/etc/init.d/firewall reload
 
-		# another workaround for netif? removed
-		# sink devices for br-map bridge
-		for sink in $(ubus list network.interface.sink*) ; do
-			local sink_vlan=${sink/network.interface./}_vlan
-			brctl addif br-map $sink_vlan &> /dev/null
-		done
+
+		#for sink in $(ubus list network.interface.sink*) ; do
+		#	local sink_vlan=${sink/network.interface./}_vlan
+		#done
 	}
 
 	local func=$1
@@ -499,11 +203,6 @@ EOF
 
 	case "$func" in
 		create) dbg "create $@"; ts_create $@;;
-		delete) dbg "delete $@"; ts_delete $@;;
-		populate) dbg "populate $@"; ts_populate $@;;
-		primary) dbg "primary $@"; ts_primary $@;;
-		unicast) dbg "unicast $@"; ts_unicast $@;;
-		multicast) dbg "multicast $@"; ts_multicast $@;;
 		reload) dbg "reload $@"; ts_reload $@;;
 		--help|help) ts_usage;;
 		*) ts_usage; exit 1;;

map-controller/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=2.7.0.1
+PKG_VERSION:=2.10.0.0
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=02f8f83b2886673771066ef15b05caf05a2432e0
+PKG_SOURCE_VERSION:=84328dba9612b66dc2d9469b913334f8b278e449
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)

map-controller/files/etc/config/mapcontroller

@@ -6,7 +6,7 @@ config controller 'controller'
 	option enable_bsta_steer '0'
 	option use_bcn_metrics '0'
 	option use_usta_metrics '0'
-	option primary_vid '1'
+	option primary_vid '0'
 	option primary_pcp '0'
 	option allow_bgdfs '0'
 	option channel_plan '0'

map-controller/files/etc/init.d/mapcontroller

@@ -39,7 +39,7 @@ validate_ap_section() {
 	local section="$1"
 
 	uci_validate_section mapcontroller $section "${1}" \
-			'band:or("2", "5")' \
+			'band:or("2", "5", "6")' \
 			'ssid:string' \
 			'encryption:or("sae", "sae+aes", "psk2",
 				"psk2+aes", "sae-mixed", "sae-mixed+aes")' \

map-topology/Makefile

@@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=map-topology
-PKG_VERSION:=2.5.0.2
+PKG_VERSION:=2.5.0.5
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_VERSION:=0198acea26b165248551494ad22306e46988af49
+PKG_SOURCE_VERSION:=8ddd80413d6ffd174cd1b4a6859e2a306af0d409
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/map-topology.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz

map-topology/patches/0001-timer-Use-uloop_timeout_remaining64.patch

@@ -0,0 +1,43 @@
+From a0ba4512bbcb68d207dadddd616172072ded0302 Mon Sep 17 00:00:00 2001
+From: Andreas Gnau <andreas.gnau@iopsys.eu>
+Date: Thu, 23 Jun 2022 17:58:51 +0200
+Subject: [PATCH] timer: Use uloop_timeout_remaining64
+
+Fixes error: 'uloop_timeout_remaining' is deprecated: use
+uloop_timeout_remaining64 [-Werror=deprecated-declarations].
+
+Signed-off-by: Andreas Gnau <andreas.gnau@iopsys.eu>
+---
+ src/timer.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/timer.c b/src/timer.c
+index e6e2f6ceb72a..373f9aa7a76e 100644
+--- a/src/timer.c
++++ b/src/timer.c
+@@ -11,6 +11,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <stdint.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <signal.h>
+@@ -44,12 +45,11 @@ int timer_del(atimer_t *t)
+ 
+ int timer_pending(atimer_t *t)
+ {
+-	int ret;
++	int64_t ret;
+ 
+ 	struct uloop_timeout *ut = (struct uloop_timeout *)t;
+ 
+-	ret = uloop_timeout_remaining(ut);
++	ret = uloop_timeout_remaining64(ut);
+ 
+ 	return (ret < 0) ? 0 : 1;
+ }
+-
+-- 
+2.36.1
+

obuspa/Config.in

@@ -21,5 +21,9 @@ config OBUSPA_MTP_ENABLE_STOMP
 config OBUSPA_MTP_ENABLE_COAP
 	bool "Enable CoAP as mtp protocol"
 	default n
+
+config OBUSPA_CONTROLLER_MTP_VERIFY
+	bool "Enable verification of MQTT response topic before processing the message"
+	default n
 endmenu
 endif

obuspa/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspa
-PKG_VERSION:=5.0.0.11
+PKG_VERSION:=5.0.0.15
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=b8bc6a70f07b40c8512e8894461602f47981df97
+PKG_SOURCE_VERSION:=cd47bcaf1cc82dfd5c10ea76491fd0dae4436cc6
 PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/obuspa.git
 PKG_MAINTAINER:=Vivek Dutta <vivek.dutta@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
@@ -43,11 +43,14 @@ define Package/obuspa/config
 endef
 
 TARGET_CFLAGS += \
-	-I$(STAGING_DIR)/usr/include \
 	-D_GNU_SOURCE \
 	-Wall \
 	-Werror
 
+ifneq ($(CONFIG_OBUSPA_CONTROLLER_MTP_VERIFY),)
+  TARGET_CFLAGS += -DOBUSPA_CONTROLLER_MTP_VERIFY
+endif
+
 ifneq ($(CONFIG_OBUSPA_DB_PATH),)
   CONFIGURE_ARGS += \
 	--localstatedir="$(CONFIG_OBUSPA_DB_PATH)"
@@ -103,6 +106,7 @@ define Package/obuspa/install
 	$(INSTALL_DATA) ./files/etc/obuspa/roles.json $(1)/etc/obuspa/roles.json
 	$(INSTALL_DATA) ./files/etc/obuspa/dmcaching_exclude.json $(1)/etc/obuspa/dmcaching_exclude.json
 	$(INSTALL_DATA) ./files/etc/bbfdm/json/USPAgent.json $(1)/etc/bbfdm/json/USPAgent.json
+	$(INSTALL_DATA) ./files/etc/bbfdm/json/CWMPManagementServer.json $(1)/etc/bbfdm/json/CWMPManagementServer.json
 endef
 
 $(eval $(call BuildPackage,obuspa))

obuspa/files/etc/bbfdm/json/CWMPManagementServer.json

@@ -0,0 +1,36 @@
+{
+	"json_plugin_version": 1,
+	"Device.CWMPManagementServer.": {
+		"type": "object",
+		"version": "2.15",
+		"protocols": [
+			"usp"
+		],
+		"access": false,
+		"array": false,
+		"dependency": "file:/etc/config/cwmp",
+		"EnableCWMP": {
+			"type": "boolean",
+			"version": "2.15",
+			"read": true,
+			"write": true,
+			"protocols": [
+				"usp"
+			],
+			"mapping": [
+				{
+					"type": "uci",
+					"uci": {
+						"file": "cwmp",
+						"section": {
+							"name": "cpe"
+						},
+						"option": {
+							"name": "enable"
+						}
+					}
+				}
+			]
+		}
+	}
+}

periodicstats/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=periodicstats
-PKG_VERSION:=1.1.3
+PKG_VERSION:=1.2.0
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=fe349c3074f7bffdbf15cacd77b6853b6b1665c7
+PKG_SOURCE_VERSION:=6c68428405bc88a9990e855f911aecc86f07f4a8
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/periodicstats.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

urlfilter/Makefile

@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=urlfilter
-PKG_VERSION:=1.1.2
+PKG_VERSION:=1.1.3
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
@@ -17,7 +17,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE
 
@@ -35,7 +34,6 @@ define Package/urlfilter/description
 endef
 
 TARGET_CFLAGS += \
-	-I$(STAGING_DIR)/usr/include \
         -D_GNU_SOURCE
 
 ifeq ($(LOCAL_DEV),1)

urlfilter/files/etc/bbfdm/json/urlfilter.json

@@ -115,6 +115,9 @@
 				"cwmp",
 				"usp"
 			],
+			"uniqueKeys": [
+				"Name"
+			],
 			"access": true,
 			"array": true,
 			"mapping": [
@@ -125,10 +128,40 @@
 						"section": {
 							"type": "profile"
 						},
-						"dmmapfile": "dmmap_urlfilter_profile"
+						"dmmapfile": "dmmap_urlfilter"
 					}
 				}
 			],
+			"Name": {
+				"type": "string",
+				"read": true,
+				"write": true,
+				"version": "2.14",
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"datatype": "string",
+				"range": [
+					{
+						"max": 64
+					}
+				],
+				"mapping": [
+					{
+						"type": "uci",
+						"uci": {
+							"file": "urlfilter",
+							"section": {
+								"type": "profile"
+							},
+							"option": {
+								"name": "@Name"
+							}
+						}
+					}
+				]
+			},
 			"WhitelistURL": {
 				"type": "string",
 				"version": "2.14",
@@ -225,7 +258,7 @@
 						"section": {
 							"type": "filter"
 						},
-						"dmmapfile": "dmmap_urlfilter_filter"
+						"dmmapfile": "dmmap_urlfilter"
 					}
 				}
 			],
@@ -273,11 +306,12 @@
 							"option": {
 								"name": "profile"
 							}
-						}
+						},
+						"linker_obj": "Device.{BBF_VENDOR_PREFIX}URLFilter.Profile."
 					}
 				]
 			},
-			"MacAddress": {
+			"MACAddress": {
 				"type": "string",
 				"version": "2.14",
 				"read": true,

uspd/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uspd
-PKG_VERSION:=2.2.9
+PKG_VERSION:=2.2.10
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/uspd.git
-PKG_SOURCE_VERSION:=23f5fab7428eaac3db4d732d80224c3cf581207b
+PKG_SOURCE_VERSION:=1bfd9937ae31c6878aff77fca25f9265d822b57d
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

wfadatad/patches/0001-timer-Use-uloop_timeout_remaining64.patch

@@ -0,0 +1,43 @@
+From d4b03e7fe288a006965463f74374e9da6e0f829b Mon Sep 17 00:00:00 2001
+From: Andreas Gnau <andreas.gnau@iopsys.eu>
+Date: Thu, 23 Jun 2022 15:18:30 +0200
+Subject: [PATCH] timer: Use uloop_timeout_remaining64
+
+Fixes error: 'uloop_timeout_remaining' is deprecated: use
+uloop_timeout_remaining64 [-Werror=deprecated-declarations].
+
+Signed-off-by: Andreas Gnau <andreas.gnau@iopsys.eu>
+---
+ src/timer.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/timer.c b/src/timer.c
+index e6e2f6ceb72a..373f9aa7a76e 100644
+--- a/src/timer.c
++++ b/src/timer.c
+@@ -11,6 +11,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <stdint.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <signal.h>
+@@ -44,12 +45,11 @@ int timer_del(atimer_t *t)
+ 
+ int timer_pending(atimer_t *t)
+ {
+-	int ret;
++	int64_t ret;
+ 
+ 	struct uloop_timeout *ut = (struct uloop_timeout *)t;
+ 
+-	ret = uloop_timeout_remaining(ut);
++	ret = uloop_timeout_remaining64(ut);
+ 
+ 	return (ret < 0) ? 0 : 1;
+ }
+-
+-- 
+2.36.1
+

wifimngr/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wifimngr
-PKG_VERSION:=14.0.7
+PKG_VERSION:=14.0.8
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=981ce51b2f135926d6e9135772dcd43d73c39b64
+PKG_SOURCE_VERSION:=af1c9ae51544532bc535814de63f9a55d2388792
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wifimngr.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz