uci-defaults: add l2mode dedicated wanport

Don't require wan port to be added as a bridge
port in UCI default config.

bbfdm/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bbfdm
-PKG_VERSION:=1.15.14
+PKG_VERSION:=1.16.7
 
 USE_LOCAL:=0
 ifneq ($(USE_LOCAL),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bbfdm.git
-PKG_SOURCE_VERSION:=e3757b5f37d2683b08edf9dae175210093e47cea
+PKG_SOURCE_VERSION:=b6fdc87df88b0a625480301d52fbfc2bdfb0aa58
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -155,6 +155,10 @@ define Package/bbfdmd/install
 	
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_BIN) ./files/etc/uci-defaults/91-fix-bbfdmd-enabled-option $(1)/etc/uci-defaults/
+	$(INSTALL_BIN) ./files/etc/uci-defaults/ruleng.bbfdm $(1)/etc/uci-defaults
+
+	$(INSTALL_DIR) $(1)/etc/ruleng
+	$(INSTALL_BIN) ./files/etc/ruleng/bbfdm.json $(1)/etc/ruleng
 endef
 
 define Package/dm-service/install

bbfdm/files/etc/bbfdm/critical_services.json

@@ -8,15 +8,16 @@
 			"ieee1905",
 			"mapcontroller",
 			"mosquitto",
-			"nginx"
+			"nginx",
+			"netmode"
 	],
 	"cwmp": [
 			"firewall",
 			"network",
 			"dhcp",
-			"stunc",
-			"xmpp",
+			"mapcontroller",
 			"wireless",
-			"time"
+			"time",
+			"netmode"
 	]
 }

bbfdm/files/etc/init.d/bbf_configd

@@ -10,19 +10,10 @@ log() {
 	echo "${@}"|logger -t bbf.config -p info
 }
 
-create_needed_directories()
-{
-	mkdir -p /tmp/bbfdm/.cwmp
-	mkdir -p /tmp/bbfdm/.usp
-	mkdir -p /tmp/bbfdm/.bbfdm
-}
-
 start_service()
 {
 	local log_level
 
-	create_needed_directories
-
 	config_load bbfdm
 	config_get log_level "reload_handler" log_level 2
 

bbfdm/files/etc/ruleng/bbfdm.json

@@ -0,0 +1,66 @@
+{
+	"hosts_refresh": {
+		"if" : [
+			{
+				"event": "host"
+			}
+		],
+		"then" : [
+			{
+				"object": "bbfdm.hostmngr",
+				"method":"refresh_references_db",
+				"args" : {},
+				"timeout": 1
+			}
+		]
+	},
+	"dhcp_refresh": {
+		"if_operator": "OR",
+		"if" : [
+			{
+				"event": "host"
+			},
+			{
+				"event": "wifi.dataelements.Associated"
+			}
+		],
+		"then" : [
+			{
+				"object": "bbfdm.dhcpmngr",
+				"method":"refresh_references_db",
+				"args" : {},
+				"timeout": 1
+			}
+		]
+	},
+	"ieee1905_refresh_add": {
+		"if" : [
+			{
+				"event": "ieee1905.neighbor.add"
+			}
+		],
+		"then" : [
+			{
+				"object": "bbfdm.ieee1905",
+				"method":"refresh_references_db",
+				"args" : {},
+				"timeout": 1
+			}
+		]
+	},
+	"ieee1905_refresh_del": {
+		"if" : [
+			{
+				"event": "ieee1905.neighbor.del"
+			}
+		],
+		"then" : [
+			{
+				"object": "bbfdm.ieee1905",
+				"method":"refresh_references_db",
+				"args" : {},
+				"timeout": 1
+			}
+		]
+	}
+}

bbfdm/files/etc/uci-defaults/ruleng.bbfdm

@@ -0,0 +1,2 @@
+uci -q set ruleng.bbfdm=rule
+uci -q set ruleng.bbfdm.recipe='/etc/ruleng/bbfdm.json'

bridgemngr/Makefile

@@ -5,14 +5,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bridgemngr
-PKG_VERSION:=1.0.14
+PKG_VERSION:=1.1.1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/bridgemngr
-PKG_SOURCE_VERSION:=99bc3a3a0a2571917eda7085c21952f779fdb471
+PKG_SOURCE_VERSION:=b6a657e1c83b49f09323b4012ef229c604b82854
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

bulkdata/Makefile

@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bulkdata
-PKG_VERSION:=2.1.19
+PKG_VERSION:=2.1.20
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bulkdata.git
-PKG_SOURCE_VERSION:=628525b02ae9ccd39f4bc85cf616ed4a102bca48
+PKG_SOURCE_VERSION:=a5e57962938ca143ede65d92be90b6e9fce66e15
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

ddnsmngr/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ddnsmngr
-PKG_VERSION:=1.0.11
+PKG_VERSION:=1.0.12
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/ddnsmngr.git
-PKG_SOURCE_VERSION:=9f2f4dabc71c4f405b1c5df576d20d793d299e94
+PKG_SOURCE_VERSION:=44af9a7b3fec3929f8554af9633a5b8068189b48
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

decollector/Makefile

@@ -1,22 +1,23 @@
 #
-# Copyright (C) 2021-2023 IOPSYS Software Solutions AB
+# Copyright (C) 2021-2024 IOPSYS Software Solutions AB
+# Copyright (C) 2025 Genexis AB
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=decollector
-PKG_VERSION:=6.2.0.1
+PKG_VERSION:=6.2.1.7
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=575ecfff3779aadcea83d890ba975109c0f7d6a3
+PKG_SOURCE_VERSION:=ca92325ece080389ffb405c95048b64071eda653
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/decollector.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
+PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@genexis.eu>
 
 
 PKG_LICENSE:=BSD-3-Clause

dectmngr/Makefile

@@ -2,13 +2,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dectmngr
 PKG_RELEASE:=3
-PKG_VERSION:=3.7.4
+PKG_VERSION:=3.7.10
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=393dfd7637fdeccc24ef286c3daec9a232896b98
+PKG_SOURCE_VERSION:=1f851980a6ba616df54f79930225f8bcd563b711
 PKG_MIRROR_HASH:=skip
 endif
 

dectmngr/files/etc/config/dect

@@ -1,3 +1,6 @@
 config dect 'global'
- 	option log_dect_cmbs 'syslog'
-        option log_level 'realtime,warning,error'
+	option log_dect_cmbs 'syslog'
+	option log_level 'realtime,warning,error'
+
+config dect 'base'
+	option enable '1'

dectmngr/files/etc/init.d/dectmngr

@@ -11,6 +11,25 @@ LOG_PATH=/var/log/dectmngr
 DB_PATH=/etc/dect
 DCX81_UART_DT_ALIAS=/proc/device-tree/aliases/dcx81-uart
 
+get_extension_shift() {
+   local dect_exts
+
+   get_dect_extension() {
+       local ext=$1
+       local type
+
+       config_get type $ext type
+
+       [ "$type" == "dect" ] && echo $ext
+    }
+
+    config_load "asterisk"
+
+    dect_exts=$(config_foreach get_dect_extension "extension" |sort |head -n1)
+
+    echo "${dect_exts#extension}"
+}
+
 # Ask dectmngr to exit nicely and wait for it to clean up, which is a slow process.
 stop_and_wait_dectmngr() {
 	dect_pid=$(pidof $PROG)
@@ -38,13 +57,53 @@ get_dcx81_device() {
 			device_name_line="$(grep '^DEVNAME=' "$uevent_file")" || return 1
 			readonly device="/dev/${device_name_line##DEVNAME=}"
 			[ -c "$device" ] || return 1
-			printf "%s" "$device"
+			printf "%s" "$(basename $device)"
 			return 0
 		fi
 	done
 	return 1
 }
 
+check_dcx81_firmware() {
+	local dcx81_uart=$1
+	local fw_link="/lib/firmware/dcx81_firmware"
+	local fw_file
+
+	[ -L "$fw_link" ] || return
+
+	fw_file=$(readlink -f $fw_link)
+	[ -f "$fw_file" ] || return
+
+	# the symbolic link is not needed
+	rm -f $fw_link
+
+	eval $(/sbin/cmbs_tcx -comname "$dcx81_uart" -fw_version |grep DCX81_FW_Version)
+	[ -n "$DCX81_FW_Version" ] || return
+
+	if echo $(basename $fw_file) | grep -qi "$DCX81_FW_Version" ; then
+		logger -t "$PROG" "DCX81 running expected $DCX81_FW_Version"
+		return;
+	fi
+
+	logger -t "$PROG" "DCX81 firmware upgrading to $fw_file"
+	/sbin/cmbs_tcx -comname "$dcx81_uart" -fwu "$fw_file" 2>&1 >/dev/null &
+
+	echo -n "Updrading DCX81 firmware.." >/dev/console
+	local wait_time=0
+	while pidof cmbs_tcx >/dev/null && [ "$wait_time" -lt "200" ] ; do
+		sleep 5
+		wait_time=$(($wait_time + 5))
+		echo -n "." >/dev/console
+	done
+
+	if pidof cmbs_tcx >/dev/null ; then
+		killall -9 cmbs_tcx
+		logger -t "$PROG" "DCX81 firmware upgrade timeout"
+	else
+		logger -t "$PROG" "DCX81 firmware upgrade done"
+	fi
+}
+
 start_service() {
 	local opt_ext=
 	local rfpi=
@@ -59,9 +118,13 @@ start_service() {
 	local dcx81_uart_device
 	if ! dcx81_uart_device="$(get_dcx81_device)"; then
 		logger -t "$PROG" -p daemon.warning "Could not determine DCX81 UART device. Falling back to default ttyH0."
-		dcx81_uart_device=/dev/ttyH0
+		dcx81_uart_device="ttyH0"
 	fi
 
+	check_dcx81_firmware $dcx81_uart_device
+
+	opt_ext="-extensionShift $(get_extension_shift)"
+
 	rfpi=$(db -q get hw.board.dect_rfpi)
 	[ -n "$rfpi" -a ${#rfpi} -eq 14 ] && opt_ext="$opt_ext -rfpi $rfpi"
 
@@ -77,24 +140,27 @@ start_service() {
 
 	config_load dect
 	config_get log_dect_cmbs global log_dect_cmbs syslog
+	config_get pcm_slot_start global pcm_slot_start
+	config_get pcm_fsync global pcm_fsync
+
+        [ -n "$pcm_fsync" ] && opt_ext="$opt_ext -sync $pcm_fsync"
+        [ -n "$pcm_slot_start" ] && opt_ext="$opt_ext -slotsShift $pcm_slot_start"
 
 	procd_open_instance
 
-	# dectmngr takes expects device without /dev
-	readonly dcx81_uart_device_wo_dev="${dcx81_uart_device##/dev/}"
 	case "$log_dect_cmbs" in
 	none)
 		echo "Starting dectmngr with cmbs logging disabled"
-		procd_set_param command "$PROG" -comname "$dcx81_uart_device_wo_dev" $opt_ext
+		procd_set_param command "$PROG" -comname "$dcx81_uart_device" $opt_ext
 		rm -f $LOG_PATH/*
 		;;
 	file)
 		echo "Starting dectmngr with cmbs logging enabled to file"
-		procd_set_param command "$PROG" -comname "$dcx81_uart_device_wo_dev" -log $LOG_PATH/dect-cmbs.log $opt_ext
+		procd_set_param command "$PROG" -comname "$dcx81_uart_device" -log $LOG_PATH/dect-cmbs.log $opt_ext
 		;;
 	*)
 		echo "Starting dectmngr with cmbs logging enabled to syslog"
-		procd_set_param command "$PROG" -comname "$dcx81_uart_device_wo_dev" -syslog $opt_ext
+		procd_set_param command "$PROG" -comname "$dcx81_uart_device" -syslog $opt_ext
 		rm -f $LOG_PATH/*
 		;;
 	esac

dhcpmngr/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dhcpmngr
-PKG_VERSION:=1.0.5
+PKG_VERSION:=1.0.6
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/dhcpmngr.git
-PKG_SOURCE_VERSION:=2a517188211849bcc324a9f9727eeb34d076c032
+PKG_SOURCE_VERSION:=986f66608959f4f589009d580b046e250d8c620d
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

dnsmngr/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dnsmngr
-PKG_VERSION:=1.0.16
+PKG_VERSION:=1.0.18
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/dnsmngr.git
-PKG_SOURCE_VERSION:=32bd2501fca8a4f45ba13ee0e4762756c60fe721
+PKG_SOURCE_VERSION:=80fa147e6f1f0d9c1a62a62a693ff3adaef45363
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

dslmngr/Makefile

@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dslmngr
-PKG_VERSION:=1.2.9
+PKG_VERSION:=1.2.10
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/hal/dslmngr.git
-PKG_SOURCE_VERSION:=5340cb31f759301f5aca3fd848fc3a63b0b4663f
+PKG_SOURCE_VERSION:=8fb4093b4d26b3cb06603e110d424005e33cf5d6
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MAINTAINER:=Rahul Thakur <rahul.thakur@iopsys.eu>
 PKG_MIRROR_HASH:=skip
@@ -30,6 +30,8 @@ include ../bbfdm/bbfdm.mk
 
 ifeq ($(CONFIG_TARGET_brcmbca),y)
   TARGET_PLATFORM=BROADCOM
+else ifneq ($(CONFIG_TARGET_airoha),)
+  TARGET_PLATFORM=AIROHA
 else
   $(info Unexpected CONFIG_TARGET)
 endif
@@ -41,7 +43,7 @@ define Package/dslmngr
   CATEGORY:=Utilities
   TITLE:=XDSL status and configration utility
   DEPENDS:=+libdsl +libuci +libubox +ubus +libpthread +libnl-genl +libeasy
-  DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service
+  DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service +TARGET_airoha:br2684ctl
 endef
 
 define Package/dslmngr/description
@@ -75,7 +77,10 @@ define Package/dslmngr/install
 	$(CP) ./files/common/* $(1)/
 ifeq ($(CONFIG_TARGET_brcmbca),y)
 	$(CP) ./files/broadcom/* $(1)/
+else ifneq ($(CONFIG_TARGET_airoha),)
+	$(CP) ./files/airoha/* $(1)/
 endif
+
 	$(INSTALL_DIR) $(1)/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/dslmngr $(1)/sbin/
 	$(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) $(PKG_NAME)

dslmngr/files/airoha/etc/init.d/xdsl_wan

@@ -0,0 +1,26 @@
+#!/bin/sh /etc/rc.common
+
+START=99
+STOP=99
+USE_PROCD=1
+
+start_service() {
+	readonly need_xdsl="$(jsonfilter -i /etc/board.json -e @.dsl)"
+	[ -f /etc/board.json ] || return 0
+
+	if [ "$need_xdsl" != "" ]; then
+		procd_open_instance xdsl_wan
+		procd_set_param command /sbin/xdsl_wan
+		procd_set_param respawn
+		procd_close_instance
+	fi
+}
+
+boot() {
+	: # boot-up is handled from 'hsm' application
+}
+
+service_triggers()
+{
+	procd_add_reload_trigger "dsl"
+}

dslmngr/files/airoha/lib/dsl/airoha.sh

@@ -0,0 +1,28 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+xtm_remove_devices() {
+	:
+}
+
+xtm_create_devices() {
+	:
+}
+
+xdsl_configure() {
+	# Support bridged WAN interface
+	ebtables --concurrent -t broute -D BROUTING -p 0xbeed -j DROP 2> /dev/null
+	ebtables --concurrent -t broute -I BROUTING -p 0xbeed -j DROP
+}
+
+xdsl_stop() {
+	return 0
+}
+
+xdsl_init() {
+	readonly need_xdsl="$(jsonfilter -i /etc/board.json -e @.dsl)"
+	[ "$need_xdsl" = "" ] && exit 0
+
+	echo "Starting DSL"
+}

dslmngr/files/airoha/sbin/xdsl_wan

@@ -0,0 +1,240 @@
+#!/bin/sh
+
+source "/lib/functions.sh"
+source "/lib/functions/network.sh"
+source "/lib/functions/system.sh"
+
+PREVLINK=""
+PREVWANMODE=""
+WANMODE=""
+CONFIGURED=0
+CINDEX=0
+WANPORT="$(jsonfilter -i /etc/board.json -e @.network.wan.device)"
+
+delete_atm_device() {
+	/userfs/bin/blapi_cmd xdsl atm_delete_interface $CINDEX
+	CINDEX=$((CINDEX+1))
+}
+
+delete_atm_devices() {
+	CINDEX=0
+	config_load dsl
+	config_foreach delete_atm_device atm-device
+}
+
+configure_atm_device() {
+	local vpi vci encapsulation qos_class pcr mbs scr
+	local encap qos ethmac
+
+	config_get vpi $1 vpi "8"
+	config_get vci $1 vci "35"
+	config_get encapsulation $1 encapsulation "llc"
+	config_get qos_class $1 qos_class "ubr"
+	config_get pcr $1 pcr "0"
+	config_get mbs $1 mbs "0"
+	config_get scr $1 scr "0"
+
+	case $encapsulation in # llc, vcmux
+		vcmux)
+			encap="1483 Bridged IP VC-Mux"
+		;;
+		*)
+			encap="1483 Bridged IP LLC"
+		;;
+
+	esac
+
+	ethmac="$(echo -n "$(macaddr_add 02:AA:BB:01:23:40 $((CINDEX+2)))" | sed 's#:##g')"
+
+	/userfs/bin/blapi_cmd xdsl create_device $CINDEX ATM "" "$ethmac"
+	/userfs/bin/blapi_cmd xdsl atm_create_interface $CINDEX ATM "$qos_class" "$encap" "$vpi" "$vci" "$pcr" "$scr" "$mbs" 0
+
+	CINDEX=$((CINDEX+1))
+}
+
+create_atm_devices() {
+	delete_atm_devices
+
+	CINDEX=0
+	config_foreach configure_atm_device atm-device
+}
+
+configure_line() {
+	local mode profile bitswap sra us0 sesdrop sos ginp mod prof
+	local adsl1_flag=0 issue2_flag=0 Glite_flag=0 adsl2_flag=0 adsl2p_flag=0 vdsl2_flag=0
+	local pro_8a_flag=0 pro_8b_flag=0 pro_8c_flag=0 pro_8d_flag=0 pro_12a_flag=0 pro_12b_flag=0 pro_17a_flag=0 pro_30a_flag=0 pro_35b_flag=0
+
+	config_get mode $1 mode "vdsl2"
+	config_get profile $1 profile "35b"
+	config_get bitswap $1 bitswap "1"
+	config_get sra $1 sra "1"
+	config_get us0 $1 us0 "1"
+	config_get sos $1 sos "0"
+	config_get sos $1 roc "0"
+	config_get sos $1 ginp "0"
+
+	for mod in $mode; do
+		[ "$mod" = "gdmt" ] && adsl1_flag=1
+		[ "$mod" = "glite" ] && Glite_flag=1
+		[ "$mod" = "t1413" ] && issue2_flag=1
+		[ "$mod" = "adsl2" ] && adsl2_flag=1
+		[ "$mod" = "adsl2p" ] && adsl2p_flag=1
+		[ "$mod" = "vdsl2" ] && vdsl2_flag=1
+	done
+
+	for prof in $profile; do
+		[ "$prof" = "8a" ] && pro_8a_flag=1
+		[ "$prof" = "8b" ] && pro_8b_flag=1
+		[ "$prof" = "8c" ] && pro_8c_flag=1
+		[ "$prof" = "8d" ] && pro_8d_flag=1
+		[ "$prof" = "12a" ] && pro_12a_flag=1
+		[ "$prof" = "12b" ] && pro_12b_flag=1
+		[ "$prof" = "17a" ] && pro_17a_flag=1
+		[ "$prof" = "30a" ] && pro_30a_flag=1
+		[ "$prof" = "35b" ] && pro_35b_flag=1
+	done
+
+	/userfs/bin/blapi_cmd xdsl set_adsl_profile "$pro_8a_flag" "$pro_8b_flag" "$pro_8c_flag" "$pro_8d_flag" "$pro_12a_flag" "$pro_12b_flag" "$pro_17a_flag" "$pro_30a_flag" "$pro_35b_flag"
+	/userfs/bin/blapi_cmd xdsl set_adsl_mode "$adsl1_flag" "$issue2_flag" "$Glite_flag" "$adsl2_flag" "$adsl2p_flag" "$vdsl2_flag"
+	/userfs/bin/blapi_cmd xdsl set_adsl_ginp "$((!ginp))"
+	/userfs/bin/blapi_cmd xdsl set_adsl_sos_roc "$((!sos))" "$((!roc))"
+	/userfs/bin/blapi_cmd xdsl set_adsl_us0 "$((!us0))"
+	/userfs/bin/blapi_cmd xdsl set_adsl_sra "$((!sra))"
+	/userfs/bin/blapi_cmd xdsl set_adsl_bitswap "$((!bitswap))"
+
+	CONFIGURED=1
+}
+
+configure_lines() {
+	config_load dsl
+	config_foreach configure_line dsl-line
+}
+
+call_wan_hotplug() {
+	# initializations
+	local updown="$1"
+	local ethwan="$2"
+
+	# ethernet hotlugs expect LINK and PORT environment variables set
+	env -i LINK="$updown" PORT="$ethwan" /sbin/hotplug-call ethernet
+}
+
+if [ "$WANPORT" = "ae_wan" -a -f /proc/device-tree/ae_wan/wan-dsl ]; then
+	/etc/init.d/br2684ctl stop
+else
+	/etc/init.d/br2684ctl start
+fi
+
+# Wait for nas0 interface to come up.
+while [ "$(devstatus "$WANPORT" | jsonfilter -e @.up)" != "true" ]; do
+	sleep 1
+done
+
+while [ true ]; do
+	LINK="$(awk '/ADSL link status:/{print $4}' /proc/tc3162/adsl_stats)"
+	[ \( "$LINK" = "down" -o "$LINK" = "up" \) ] && break
+	sleep 1
+done
+sleep 2
+
+/userfs/bin/blapi_cmd xdsl set_adsl_sysvid "26 00 47 4E 58 53 00 00" # GNXS vendor id
+/userfs/bin/blapi_cmd xdsl set_adsl_version "$(ubus call fwbank dump | jsonfilter -e "@.bank[@.active=true].swver" | cut -f1 -d'_' | cut -f1 -d'-' | hexdump -e '11/1 "%02x " "\n"' | head -n1)"
+/userfs/bin/blapi_cmd xdsl set_power_up_down 1
+/userfs/bin/blapi_cmd xdsl set_power_up_down 0
+sleep 1
+
+while [ true ]; do
+	LINK="$(awk '/ADSL link status:/{print $4}' /proc/tc3162/adsl_stats)"
+
+	if [ "$LINK" != "$PREVLINK" -a \( "$LINK" = "down" -o "$LINK" = "up" \) ]; then
+		if [ "$LINK" = "down" ]; then
+			[ "$CONFIGURED" -eq 0 ] && configure_lines # Needs to be done once the slave SoC is in down state and we've not been able to auto-sync.
+			if [ -n "$WANMODE" ]; then
+				if [ "$WANMODE" = "PTM" ]; then
+					/userfs/bin/blapi_cmd xdsl ptm_do_reset_sequence 0 1
+				else
+					delete_atm_devices
+				fi
+			fi
+
+			call_wan_hotplug "down" "$WANPORT"
+		else
+			CONFIGURED=1
+			WANMODE="$(awk '/TPSTC type:/{print $4}' /proc/tc3162/adsl_stats)"
+			if [ "$WANMODE" != "$PREVWANMODE" ]; then
+				OLDWANPORT="$WANPORT"
+				network_defer_device "$OLDWANPORT"
+
+				if [ -f /proc/device-tree/ae_wan/wan-dsl ]; then
+					WANPORT="ae_wan"
+				else
+					WANPORT="nas10"
+				fi
+
+				if [ "$WANMODE" = "PTM" ]; then
+					/etc/init.d/br2684ctl stop
+					delete_atm_devices
+					/userfs/bin/blapi_cmd system set_wan_mode 1
+					/userfs/bin/blapi_cmd xdsl reload_ko 2
+					/userfs/bin/blapi_cmd xdsl ptm_do_reset_sequence 1 2
+
+					# Set extended TPID for PTM packet flow
+					sys memwl 1FB50000 81001839
+					# VLAN TPID - VLAN
+					sys memwl 1FB50F18 8100
+
+					ifconfig ${WANPORT} mtu 1500
+				else
+					/userfs/bin/blapi_cmd system set_wan_mode 0
+					/userfs/bin/blapi_cmd xdsl reload_ko 1
+					/etc/init.d/br2684ctl start
+
+					# Set extended TPID for ATM packet flow
+					sys memwl 1FB50000 884C1839
+					# VLAN TPID - MPOA
+					sys memwl 1FB50F18 884C
+
+					ifconfig ${WANPORT} mtu 1982
+					ifconfig ${WANPORT} down up
+
+					OLDWANPORT="$WANPORT"
+					ATMINDEX="$(cat /sys/class/atm/TSARM*/atmindex | tail -n1 2> /dev/null)"
+					WANPORT="nas$((ATMINDEX))"
+				fi
+
+				if [ "$OLDWANPORT" != "$WANPORT" ]; then
+					call_wan_hotplug "down" "$OLDWANPORT"
+
+					FILES="$(grep "$OLDWANPORT" /etc/config/* | cut -f1 -d: | uniq | cut -f4 -d/ | xargs)"
+					for FILE in $FILES; do
+						sed -i -e "s#${OLDWANPORT}#${WANPORT}#g" "/etc/config/${FILE}"
+						"/etc/init.d/${FILE}" restart
+					done
+				else
+					/etc/init.d/network restart
+				fi
+				ifconfig ${OLDWANPORT} down up
+			fi
+
+			if [ "$WANMODE" = "PTM" ]; then
+				: # ToDo
+			else
+				create_atm_devices
+			fi
+
+			call_wan_hotplug "up" "$WANPORT"
+			PREVWANMODE="$WANMODE"
+		fi
+
+		# Toggle link state
+		network_defer_device "$WANPORT"
+		network_ready_device "$WANPORT"
+
+		# We are only interested in the transtion from init -> up/down and up/down -> down/up and vice versa.
+		# Since we poll the status via in-band signaling packets might get lost and the /procfs file is empty.
+		# This state we don't want to handle as it will toggle the link and do a re-setup which is totally unnecessary and unwanted.
+		PREVLINK="$LINK"
+	fi
+
+	sleep 5
+done

dslmngr/files/common/etc/config/dsl

@@ -25,6 +25,7 @@ config dsl-line line
 	list profile 12b
 	list profile 17a
 	list profile 30a
+	list profile 35b
 	option bitswap 1
 	option sra 1
 	option us0 1 # VDSL2 only

ethmngr/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ethmngr
-PKG_VERSION:=3.0.6
+PKG_VERSION:=3.0.8
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/hal/ethmngr.git
-PKG_SOURCE_VERSION:=171cf63d972c6fa81b97281531e457a0967c16c7
+PKG_SOURCE_VERSION:=c73e5b15718ca40b2740bbe6151dfbb2bcca16df
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
 endif

ethmngr/files/etc/hotplug.d/ethernet/ethport-deprecated-ubus-event

@@ -1,23 +0,0 @@
-#!/bin/sh
-
-[ -n "$PORT" -a -n "$LINK" ] || exit 0
-
-case "$PORT" in
-	# do not generate ethport ubus event
-	# for wifi, dsl and brige devices
-	wl*|wds*|atm*|ptm*|br-*)
-		exit 0
-	;;
-esac
-
-speed=0
-duplex=full
-
-if [ "$LINK" = "up" ]; then
-	devspeed="$(ubus -t 2 call network.device status "{\"name\":\"$PORT\"}" | jsonfilter -e @.speed)"
-	speed=${devspeed:0:-1}
-	duplex=${devspeed:0-1}
-	[ "$duplex" == "H" ] && duplex="half" || duplex="full"
-fi
-
-ubus send ethport "{\"ifname\":\"$PORT\",\"link\":\"$LINK\",\"speed\":\"$speed\",\"duplex\":\"$duplex\"}"

ethmngr/files/etc/ruleng/ethport.json

@@ -2,7 +2,10 @@
 	"ethport_update": {
 		"if" : [
 			{
-				"event": "network.device"
+				"event": "network.device",
+				"match": {
+					"wireless": false
+				}
 			}
 		],
 		"then" : [

firewallmngr/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=firewallmngr
-PKG_VERSION:=1.0.9
+PKG_VERSION:=1.0.10
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/firewallmngr.git
-PKG_SOURCE_VERSION:=77ad8425b73a3ac63f6160dc217635394ac87907
+PKG_SOURCE_VERSION:=05ad0d6f7f21520eecd05429c14d1963de2a8463
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

firewallmngr/files/firewall.service

@@ -2,6 +2,8 @@
 
 . /lib/functions.sh
 
+ZONE_NAME_FILE="/tmp/service_fw_zone"
+
 log() {
 	echo "${@}"|logger -t firewall.service -p info
 }
@@ -17,6 +19,37 @@ exec_cmd() {
 	return 0
 }
 
+collect_zone_name() {
+	local name network
+
+	config_get name "${1}" name ""
+	if [ -z "${name}" ]; then
+		return
+	fi
+
+	config_get network "${1}" network ""
+	for i in ${network}; do
+		var="${i}_zone"
+		echo "${var}=${name}" >> "${ZONE_NAME_FILE}"
+	done
+}
+
+load_zone_names() {
+	rm -f "${ZONE_NAME_FILE}"
+	config_foreach collect_zone_name zone
+}
+
+get_firewall_zone() {
+	if [ ! -f "${ZONE_NAME_FILE}" ]; then
+		echo ""
+		return
+	fi
+
+	var="${1}_zone="
+	name="$(cat ${ZONE_NAME_FILE} | grep ${var} | head -n 1 | cut -d'=' -f 2)"
+	echo "${name}"
+}
+
 add_iptable_rule() {
 	chain_name=$1
 	protocol=$2
@@ -135,9 +168,14 @@ add_service() {
 	fi
 
 	action=$(echo "${target}" | tr a-z A-Z)
-	chain_name="zone_${interface}_input"
-	res=0
+	zone_name="$(get_firewall_zone ${interface})"
+	if [ -z "${zone_name}" ]; then
+		log "Rule can not be added without zone name for interface ${interface}"
+		return
+	fi
 
+	chain_name="zone_${zone_name}_input"
+	res=0
 	count=$(echo "${proto}" | sed -n "/-1/p" | wc -l)
 
 	if [ "${count}" -eq 0 ]; then
@@ -160,4 +198,9 @@ add_service() {
 }
 
 config_load firewall
+
+load_zone_names
+
 config_foreach add_service "service"
+
+rm -f "${ZONE_NAME_FILE}"

firewallmngr/files/port-trigger/etc/init.d/port-trigger

@@ -7,7 +7,11 @@ USE_PROCD=1
 . /lib/port-trigger/port_trigger.sh
 
 start_service() {
-	port_trigger_handling
+	port_trigger_add
+}
+
+stop_service() {
+	port_trigger_clean
 }
 
 service_triggers()
@@ -17,5 +21,6 @@ service_triggers()
 }
 
 reload_service() {
+	stop
 	start
 }

firewallmngr/files/port-trigger/lib/port-trigger/port_trigger.sh

@@ -119,18 +119,12 @@ process_port_trigger() {
 	fi
 }
 
-port_trigger_handling() {
+port_trigger_add() {
 	rm /tmp/port_trigger_iptables 2> /dev/null
 	rm /tmp/port_trigger_ip6tables 2> /dev/null
 	touch /tmp/port_trigger_iptables
 	touch /tmp/port_trigger_ip6tables
 
-	echo "iptables -w -t nat -F prerouting_porttrigger 2> /dev/null">>/tmp/port_trigger_iptables
-	echo "iptables -w -t filter -F forwarding_wan_porttrigger 2> /dev/null">>/tmp/port_trigger_iptables
-	echo "iptables -w -t nat -F prerouting_wan_porttrigger 2> /dev/null">>/tmp/port_trigger_iptables
-	echo "ip6tables -w -t nat -F prerouting_porttrigger 2> /dev/null">>/tmp/port_trigger_ip6tables
-	echo "ip6tables -w -t filter -F forwarding_wan_porttrigger 2> /dev/null">>/tmp/port_trigger_ip6tables
-
 	echo "iptables -w -t nat -N prerouting_porttrigger 2> /dev/null">>/tmp/port_trigger_iptables
 	ret=$?
 	[ $ret -eq 0 ] && echo "iptables -w -t nat -I PREROUTING -j prerouting_porttrigger 2> /dev/null">>/tmp/port_trigger_iptables
@@ -139,7 +133,7 @@ port_trigger_handling() {
 	[ $ret -eq 0 ] && echo "iptables -w -t filter -I forwarding_wan_rule -j forwarding_wan_porttrigger 2> /dev/null">>/tmp/port_trigger_iptables
 	echo "iptables -w -t nat -N prerouting_wan_porttrigger 2> /dev/null">>/tmp/port_trigger_iptables
 	ret=$?
-	[ $ret -eq 0 ] && echo "iptables -w -t nat -I prerouting_wan_rule -j prerouting_wan_porttrigger 2> /dev/null">>/tmp/port_trigger_iptables
+	[ $ret -eq 0 ] && echo "iptables -w -t nat -A prerouting_wan_rule -j prerouting_wan_porttrigger 2> /dev/null">>/tmp/port_trigger_iptables
 
 	echo "ip6tables -w -t nat -N prerouting_porttrigger 2> /dev/null">>/tmp/port_trigger_ip6tables
 	ret=$?
@@ -155,3 +149,21 @@ port_trigger_handling() {
 	sh /tmp/port_trigger_iptables
 	sh /tmp/port_trigger_ip6tables
 }
+
+port_trigger_clean() {
+	iptables -w -t nat -D PREROUTING -j prerouting_porttrigger 2> /dev/null
+	iptables -w -t nat -F prerouting_porttrigger 2> /dev/null
+	iptables -w -t nat -X prerouting_porttrigger 2> /dev/null
+	iptables -w -t nat -D prerouting_wan_rule -j prerouting_wan_porttrigger 2> /dev/null
+	iptables -w -t nat -F prerouting_wan_porttrigger 2> /dev/null
+	iptables -w -t nat -X prerouting_wan_porttrigger 2> /dev/null
+	iptables -w -t filter -D forwarding_wan_rule -j forwarding_wan_porttrigger 2> /dev/null
+	iptables -w -t filter -F forwarding_wan_porttrigger 2> /dev/null
+	iptables -w -t filter -X forwarding_wan_porttrigger 2> /dev/null
+	ip6tables -w -t nat -D PREROUTING -j prerouting_porttrigger 2> /dev/null
+	ip6tables -w -t nat -F prerouting_porttrigger 2> /dev/null
+	ip6tables -w -t nat -X prerouting_porttrigger 2> /dev/null
+	ip6tables -w -t filter -D forwarding_wan_rule -j forwarding_wan_porttrigger 2> /dev/null
+	ip6tables -w -t filter -F forwarding_wan_porttrigger 2> /dev/null
+	ip6tables -w -t filter -X forwarding_wan_porttrigger 2> /dev/null
+}

fluent-bit/Makefile

@@ -1,18 +1,20 @@
 #
-# Copyright (C) 2024 IOPSYS
+# Copyright (C) 2024-2025 IOPSYS
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fluent-bit
-PKG_VERSION:=3.1.0
+PKG_VERSION:=4.0.4
 PKG_RELEASE:=$(AUTORELEASE)
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/fluent/fluent-bit.git
+PKG_SOURCE_VERSION=v$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://github.com/fluent/fluent-bit/archive/v$(PKG_VERSION)
-PKG_HASH:=7a49e110cf3050b6c29c911063494b8081f3c743274d1d95e52562d0476ba1eb
+PKG_MIRROR_HASH:=skip
 endif
 
 PKG_LICENSE:=Apache-2.0
@@ -23,7 +25,7 @@ include $(INCLUDE_DIR)/cmake.mk
 
 define Package/fluent-bit
 	CATEGORY:=Utilities
-	DEPENDS:= +libyaml +libopenssl +libcurl +libatomic +musl-fts +flex +bison
+	DEPENDS:= +libyaml +libopenssl +libcurl +libatomic +musl-fts +flex +bison +libstdcpp +@OPENSSL_WITH_NPN
 	TITLE:=Fluent-Bit
 	URL:=https://fluentbit.io/
 endef
@@ -45,13 +47,14 @@ CMAKE_OPTIONS+= \
 	-DFLB_RELEASE=Yes \
 	-DFLB_SMALL=No \
 	-DEXCLUDE_FROM_ALL=true \
-	-DFLB_SHARED_LIBS=Yes \
+	-DFLB_SHARED_LIB=Yes \
 	-DFLB_DEBUG=Yes \
 	-DFLB_ALL=No \
 	-DFLB_JEMALLOC=No \
 	-DFLB_EXAMPLES=No \
 	-DFLB_CHUNK_TRACE=No \
 	-DFLB_BACKTRACE=No \
+	-DFLB_KAFKA=No \
 	-DFLB_WASM=No \
 	-DFLB_LUAJIT=No
 
@@ -63,15 +66,15 @@ CMAKE_OPTIONS += \
 	-DFLB_IN_DISK=Yes \
 	-DFLB_IN_EXEC=Yes \
 	-DFLB_IN_HEAD=Yes \
+	-DFLB_IN_KMSG=Yes \
+	-DFLB_IN_TAIL=Yes \
 	-DFLB_IN_FORWARD=No \
-	-DFLB_IN_KMSG=No \
 	-DFLB_IN_PROC=No \
 	-DFLB_IN_RANDOM=No \
 	-DFLB_IN_SERIAL=No \
 	-DFLB_IN_MQTT=No \
 	-DFLB_IN_STDIN=No \
 	-DFLB_IN_SYSTEMD=No \
-	-DFLB_IN_TAIL=No \
 	-DFLB_IN_TCP=No \
 	-DFLB_IN_THERMAL=No \
 	-DFLB_IN_UDP=No \
@@ -100,7 +103,7 @@ CMAKE_OPTIONS += \
 
 
 # Filter options
-CMAKE_OPTIONS += 
+CMAKE_OPTIONS += \
 	-DFLB_FILTER_AWS=No \
 	-DFLB_FILTER_ECS=No \
 	-DFLB_FILTER_KUBERNETES=No \
@@ -138,6 +141,7 @@ CMAKE_OPTIONS += \
 	-DFLB_OUT_ES=No \
 	-DFLB_OUT_GELF=No \
 	-DFLB_OUT_INFLUXDB=No \
+	-DFLB_OUT_KAFKA=No \
 	-DFLB_OUT_NRLOGS=No \
 	-DFLB_OUT_OPENSEARCH=No \
 	-DFLB_OUT_TD=No \
@@ -167,6 +171,7 @@ CMAKE_OPTIONS += \
 define Package/fluent-bit/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/etc/fluent-bit
+	$(INSTALL_DIR) $(1)/etc/fluent-bit/conf.d
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/fluent-bit $(1)/usr/sbin/
 	$(INSTALL_DATA) ./files/fluent-bit.conf $(1)/etc/fluent-bit/fluent-bit.conf
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/conf/parsers.conf $(1)/etc/fluent-bit/parsers.conf

fluent-bit/files/fluent-bit.conf

@@ -9,6 +9,10 @@
     tag             syslog
     path            /dev/log
 
+[INPUT]
+    name            kmsg
+    tag             kernel
+
 [OUTPUT]
     name            null
     match           *

fluent-bit/patches/0003-prepend_length_in_syslog_output.patch

@@ -0,0 +1,47 @@
+diff --git a/plugins/out_syslog/syslog.c b/plugins/out_syslog/syslog.c
+index 4ecc7c4ac..cfe568245 100644
+--- a/plugins/out_syslog/syslog.c
++++ b/plugins/out_syslog/syslog.c
+@@ -776,12 +776,42 @@ static flb_sds_t syslog_format(struct flb_syslog *ctx, msgpack_object *o,
+         }
+ 
+         if (ctx->parsed_mode != FLB_SYSLOG_UDP) {
++            unsigned int msg_len = 0;
++
++            /* Create new SDS for length prefix */
++            flb_sds_t prefix = flb_sds_create_size(ctx->maxsize + 32);
++            if (!prefix) {
++                ret_sds = NULL;
++                goto clean;
++            }
++
++            /* Add newline also to make behaviour similar to syslog-ng */
+             tmp = flb_sds_cat(*s, "\n", 1);
+             if (!tmp) {
++                flb_sds_destroy(prefix);
+                 ret_sds = NULL;
+                 goto clean;
+             }
+             *s = tmp;
++
++            msg_len = flb_sds_len(*s);
++            tmp = flb_sds_printf(&prefix, "%u ", msg_len);
++            if (!tmp) {
++                flb_sds_destroy(prefix);
++                ret_sds = NULL;
++                goto clean;
++            }
++            prefix = tmp;
++
++            tmp = flb_sds_cat(prefix, *s, msg_len);
++            if (!tmp) {
++                flb_sds_destroy(prefix);
++                ret_sds = NULL;
++                goto clean;
++            }
++
++            flb_sds_destroy(*s);
++            *s = tmp;
+         }
+     }
+     else {

fluent-bit/patches/0005-kmsg_log.patch

@@ -0,0 +1,32 @@
+diff --git a/plugins/in_kmsg/in_kmsg.c b/plugins/in_kmsg/in_kmsg.c
+index cd5c4cd17..9524cf194 100644
+--- a/plugins/in_kmsg/in_kmsg.c
++++ b/plugins/in_kmsg/in_kmsg.c
+@@ -165,6 +165,15 @@ static inline int process_line(const char *line,
+ 
+     flb_time_set(&ts, ctx->boot_time.tv_sec + tv.tv_sec, tv.tv_usec * 1000);
+ 
++    /* Format syslog timestamp: "Jul 03 10:31:53" */
++    time_t real_time = ctx->boot_time.tv_sec + tv.tv_sec;
++    struct tm tm_info;
++    char syslog_ts[32];
++
++    localtime_r(&real_time, &tm_info);
++    strftime(syslog_ts, sizeof(syslog_ts), "%b %d %H:%M:%S", &tm_info);
++    int syslog_ts_len = strlen(syslog_ts);
++
+     /* Now process the human readable message */
+     p = strchr(p, ';');
+     if (!p) {
+@@ -198,7 +207,10 @@ static inline int process_line(const char *line,
+                 FLB_LOG_EVENT_UINT64_VALUE(tv.tv_usec),
+ 
+                 FLB_LOG_EVENT_CSTRING_VALUE("msg"),
+-                FLB_LOG_EVENT_STRING_VALUE((char *) p, line_len - 1));
++                FLB_LOG_EVENT_STRING_VALUE((char *) p, line_len - 1),
++
++                FLB_LOG_EVENT_CSTRING_VALUE("syslog_ts"),
++                FLB_LOG_EVENT_STRING_VALUE(syslog_ts, syslog_ts_len));
+     }
+ 
+     if (ret == FLB_EVENT_ENCODER_SUCCESS) {

hostmngr/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hostmngr
-PKG_VERSION:=1.2.16
+PKG_VERSION:=1.3.1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=3b50823da3f2904191332634c1e45d46090def1d
+PKG_SOURCE_VERSION:=3663ca4d001508509774115d6797b932f9ed4f69
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/hostmngr.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip

icwmp/Config.in

@@ -7,4 +7,16 @@ config ICWMP_MGMT_FROM_USP
 config ICWMP_BACKUP_EVENTS
 	bool "Create backup of session events to persistent storage after each successful session"
 	default y
+
+config ICWMP_ENABLE_VENDOR_EXTN
+	bool "Enable datamodel vendor extension"
+	default y
+
+config ICWMP_VENDOR_PREFIX
+	string "Package specific datamodel Vendor Prefix for TR181 extensions"
+	default ""
+
+config ICWMP_ENABLE_SMM_SUPPORT
+	bool "Enable software module management support"
+	default n
 endmenu

icwmp/Makefile

@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=9.8.41
+PKG_VERSION:=9.9.10
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/icwmp.git
-PKG_SOURCE_VERSION:=1e192605446b420c103a08e8a145be114ebdcabc
+PKG_SOURCE_VERSION:=1a842e0a3836f616973e6a92f0b0b6ca82ec39bb
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -52,6 +52,21 @@ ifeq ($(CONFIG_ICWMP_BACKUP_EVENTS),y)
 EXTRA_CFLAGS += -DPERSIST_BACKUP_SESSION_EVENTS
 endif
 
+ifeq ($(CONFIG_ICWMP_ENABLE_VENDOR_EXTN),y)
+EXTRA_CFLAGS += -DICWMP_ENABLE_VENDOR_EXTN
+endif
+
+ifeq ($(CONFIG_ICWMP_ENABLE_SMM_SUPPORT),y)
+EXTRA_CFLAGS += -DICWMP_ENABLE_SMM_SUPPORT
+endif
+
+ifeq ($(CONFIG_ICWMP_VENDOR_PREFIX),"")
+CMAKE_OPTIONS += -DBBF_VENDOR_PREFIX:String="$(CONFIG_BBF_VENDOR_PREFIX)"
+else
+CMAKE_OPTIONS += -DBBF_VENDOR_PREFIX:String="$(CONFIG_ICWMP_VENDOR_PREFIX)"
+endif
+
+
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
 	$(CP) -rf ~/git/icwmp/* $(PKG_BUILD_DIR)/
@@ -73,6 +88,7 @@ define Package/icwmp/install
 	$(INSTALL_BIN) ./files/etc/uci-defaults/90-cwmpfirewall $(1)/etc/uci-defaults/
 	$(INSTALL_BIN) ./files/etc/uci-defaults/95-set-random-inform-time $(1)/etc/uci-defaults/
 	$(INSTALL_BIN) ./files/etc/uci-defaults/85-migrate-gw-info $(1)/etc/uci-defaults/
+	$(INSTALL_BIN) ./files/etc/uci-defaults/999-cwmp-conn-config $(1)/etc/uci-defaults/
 	$(INSTALL_BIN) ./files/etc/icwmpd/vendor_log.sh $(1)/etc/icwmpd/vendor_log.sh
 	$(INSTALL_BIN) ./files/etc/icwmpd/firewall.cwmp $(1)/etc/icwmpd/firewall.cwmp
 	$(INSTALL_DATA) ./files/lib/upgrade/keep.d/icwmp $(1)/lib/upgrade/keep.d/icwmp

icwmp/bbfdm_service.json

@@ -15,7 +15,8 @@
       },
       {
         "parent_dm": "Device.",
-        "object": "XMPP"
+        "object": "XMPP",
+        "proto": "cwmp"
       }
     ],
     "config": {

icwmp/files/etc/config/cwmp

@@ -1,6 +1,6 @@
 config acs 'acs'
 	option userid '' #$OUI-$SER
-	option passwd 'iopsys'
+	option passwd ''
 	option periodic_inform_enable 'true'
 	option periodic_inform_interval '1800'
 	option periodic_inform_time '0001-01-01T00:00:00Z'
@@ -29,7 +29,7 @@ config cpe 'cpe'
 	option log_file_name '/var/log/icwmpd.log'
 	option log_max_size '102400'
 	option userid '' #$OUI-$SER
-	option passwd 'iopsys'
+	option passwd ''
 	option port '7547'
 	option provisioning_code ''
 	option amd_version '5'
@@ -45,6 +45,7 @@ config cpe 'cpe'
 	option fw_upgrade_keep_settings '1'
 	option clock_sync_timeout '128'
 	option disable_datatype_check '0'
+	#list allowed_cr_ip '10.5.1.0/24'
 	
 config lwn 'lwn'
 	option enable '0'

icwmp/files/etc/icwmpd/firewall.cwmp

@@ -1,24 +1,59 @@
 #!/bin/sh
 
+. /lib/functions.sh
+
+ZONE_NAME_FILE="/tmp/cwmp_fw_zone"
+
 #created by the icwmp package
 log() {
 	echo "${@}"|logger -t firewall.cwmp -p info
 }
 
-get_firewall_zone() {
-	zone="$(uci show firewall|grep network|grep -w ${1}|cut -d. -f 2)"
-	zone="${zone:-wan}" # defaults to wan zone
-	echo "$zone"
+collect_zone_name() {
+	local name network
+
+	config_get name "${1}" name ""
+	if [ -z "${name}" ]; then
+		return
+	fi
+
+	config_get network "${1}" network ""
+	for i in ${network}; do
+		var="${i}_zone"
+		echo "${var}=${name}" >> "${ZONE_NAME_FILE}"
+	done
 }
 
-cleanup_exiting_rules() {
-        while iptables -w 1 -nL zone_"${1}"_input --line-numbers 2>/dev/null | grep "Open_ACS_port"; do
+load_zone_names() {
+	rm -f "${ZONE_NAME_FILE}"
+	config_load firewall
+	config_foreach collect_zone_name zone
+}
+
+get_firewall_zone() {
+	if [ ! -f "${ZONE_NAME_FILE}" ]; then
+		echo ""
+		return
+	fi
+
+	var="${1}_zone="
+	name="$(cat ${ZONE_NAME_FILE} | grep ${var} | head -n 1 | cut -d'=' -f 2)"
+	echo "${name}"
+}
+
+cleanup_upstream_rules() {
+	if [ -z "${1}" ]; then
+		log "Rule can not be cleaned without zone name"
+		return
+	fi
+
+	while iptables -w 1 -nL zone_"${1}"_input --line-numbers 2>/dev/null | grep "Open_ACS_port"; do
 		rule_num="$(iptables -w 1 -nL zone_"${1}"_input --line-numbers | grep "Open_ACS_port" | head -1|awk '{print $1}')"
 		if [ -n "${rule_num}" ]; then
 			iptables -w 1 -D zone_"${1}"_input "${rule_num}";
 		fi
 	done
-        while ip6tables -w 1 -nL zone_"${1}"_input --line-numbers 2>/dev/null | grep "Open_ACS_port"; do
+	while ip6tables -w 1 -nL zone_"${1}"_input --line-numbers 2>/dev/null | grep "Open_ACS_port"; do
 		rule_num="$(ip6tables -w 1 -nL zone_"${1}"_input --line-numbers | grep "Open_ACS_port" | head -1|awk '{print $1}')"
 		if [ -n "${rule_num}" ]; then
 			ip6tables -w 1 -D zone_"${1}"_input "${rule_num}";
@@ -26,76 +61,144 @@ cleanup_exiting_rules() {
 	done
 }
 
-enable="$(uci -q get cwmp.cpe.enable)"
-enable="${enable:-1}"
-
-if [ "$enable" -eq 0 ]; then
-	log "CWMP not enabled"
-	exit 0;
-fi
-
-wan="$(uci -q get cwmp.cpe.default_wan_interface)"
-wan="${wan:-wan}"
-
-zone_name="$(get_firewall_zone $wan)"
-
-port=$(uci -q get cwmp.cpe.port)
-port="${port:-7547}"
-
-incoming_rule=$(uci -q get cwmp.cpe.incoming_rule|awk '{print tolower($0)}')
-incoming_rule="${incoming_rule:-port_only}"
-
-ipaddr=$(uci -c /var/state -q get icwmp.acs.ip)
-ip6addr=$(uci -c /var/state -q get icwmp.acs.ip6)
-
-cmd="iptables -w 1 -I zone_${zone_name}_input -p tcp"
-cmd6="ip6tables -w 1 -I zone_${zone_name}_input -p tcp"
-
-# default incoming rule is Port only
-if [ "${incoming_rule}" = "ip_only" ]; then
-	if [ -n "${ipaddr}" ]; then
-		cmd="${cmd} -s ${ipaddr}"
-	fi
-	if [ -n "${ip6addr}" ]; then
-		cmd6="${cmd6} -s ${ip6addr}"
-	fi
-elif [ "${incoming_rule}" = "port_only" ]; then
-	if [ -n "${port}" ]; then
-		cmd="${cmd} --dport ${port}"
-		cmd6="${cmd6} --dport ${port}"
-	fi
-else
-	if [ -n "${ipaddr}" ]; then
-		cmd="${cmd} -s ${ipaddr}"
+cleanup_downstream_rules() {
+	if [ -z "${1}" ]; then
+		log "Rule can not be cleaned without zone name"
+		return
 	fi
 
-	if [ -n "${ip6addr}" ]; then
-		cmd6="${cmd6} -s ${ip6addr}"
+	while iptables -w 1 -nL zone_"${1}"_input --line-numbers 2>/dev/null | grep "Close_ACS_port"; do
+		rule_num="$(iptables -w 1 -nL zone_"${1}"_input --line-numbers | grep "Close_ACS_port" | head -1|awk '{print $1}')"
+		if [ -n "${rule_num}" ]; then
+			iptables -w 1 -D zone_"${1}"_input "${rule_num}";
+		fi
+	done
+	while ip6tables -w 1 -nL zone_"${1}"_input --line-numbers 2>/dev/null | grep "Close_ACS_port"; do
+		rule_num="$(ip6tables -w 1 -nL zone_"${1}"_input --line-numbers | grep "Close_ACS_port" | head -1|awk '{print $1}')"
+		if [ -n "${rule_num}" ]; then
+			ip6tables -w 1 -D zone_"${1}"_input "${rule_num}";
+		fi
+	done
+}
+
+close_downstream_acs_port() {
+	lan="${1}"
+	port="${2}"
+	zone_name="$(get_firewall_zone $lan)"
+
+	if [ -z "${zone_name}" ]; then
+		log "Rule can not be added without zone name"
+		return
 	fi
 
-	if [ -n "${port}" ]; then
-		cmd="${cmd} --dport ${port}"
-		cmd6="${cmd6} --dport ${port}"
-	fi
-fi
-
-cleanup_exiting_rules "${zone_name}"
-
-echo "${cmd}"|grep -q "\-\-dport \|\-s "
-if [ "$?" -eq 0 ]; then
-	cmd="${cmd} -j ACCEPT -m comment --comment=Open_ACS_port"
+	cmd="iptables -w 1 -I zone_${zone_name}_input -p tcp --dport ${port} -j DROP -m comment --comment=Close_ACS_port"
 	${cmd}
 	log "Applied [${cmd}]"
-fi
 
-echo "${cmd6}"|grep -q "\-\-dport \|\-s "
-if [ "$?" -eq 0 ]; then
-	cmd6="${cmd6} -j ACCEPT -m comment --comment=Open_ACS_port"
-	${cmd6}
-	log "Applied [${cmd6}]"
-fi
+	cmd="ip6tables -w 1 -I zone_${zone_name}_input -p tcp --dport ${port} -j DROP -m comment --comment=Close_ACS_port"
+	${cmd}
+	log "Applied [${cmd}]"
+}
 
-if [ -f "/var/state/icwmp" ]; then
-	uci -c /var/state -q set icwmp.cpe.firewall_restart="init"
-	uci -c /var/state -q commit icwmp
-fi
+add_firewall_rule() {
+	version="${1}"
+	ipaddr="${2}"
+	port="${3}"
+	zone_name="${4}"
+	cmd=""
+
+	if [ -z "${zone_name}" ]; then
+		log "Rule can not be added without zone name"
+		return
+	fi
+
+	if [ "${version}" = "ipv6" ]; then
+		cmd="ip6tables -w 1 -I zone_${zone_name}_input -p tcp"
+	else
+		cmd="iptables -w 1 -I zone_${zone_name}_input -p tcp"
+	fi
+
+	if [ -n "${ipaddr}" ]; then
+		cmd="${cmd} -s ${ipaddr}"
+	fi
+
+	if [ -n "${port}" ]; then
+		cmd="${cmd} --dport ${port}"
+	fi
+
+	if echo "${cmd}"|grep -q "\-\-dport \|\-s "; then
+		cmd="${cmd} -j ACCEPT -m comment --comment=Open_ACS_port"
+		${cmd}
+		log "Applied [${cmd}]"
+	fi
+}
+
+configure_connection_req_rules() {
+	app="${1}"
+
+	wan="$(uci -q get cwmp.cpe.default_wan_interface)"
+	wan="${wan:-wan}"
+
+	wan_zone_name="$(get_firewall_zone $wan)"
+
+	cleanup_upstream_rules "${wan_zone_name}"
+
+	lan="$(uci -q get cwmp.cpe.default_lan_interface)"
+	lan="${lan:-lan}"
+
+	if [ "${lan}" != "${wan}" ]; then
+		lan_zone_name="$(get_firewall_zone $lan)"
+		cleanup_downstream_rules "${lan_zone_name}"
+	fi
+
+	enable="$(uci -q get cwmp.cpe.enable)"
+	enable="${enable:-1}"
+
+	if [ "$enable" -eq 0 ]; then
+		exit 0
+	fi
+
+	url="$(uci -q get cwmp.acs.url)"
+	if [ -z "${url}" ]; then
+		url="$(uci -q get cwmp.acs.dhcp_url)"
+	fi
+
+	# no need to apply firewall rule, acs url not configured
+	if [ -z "${url}" ]; then
+		exit 0
+	fi
+
+	if [ -z "${app}" ]; then
+		if ! ubus -t 1 list tr069 2>/dev/null; then
+			log "cwmp client not running"
+			exit 0
+		fi
+	fi
+
+	port=$(uci -q get cwmp.cpe.port)
+	port="${port:-7547}"
+
+	ipaddr=$(uci -q get cwmp.cpe.allowed_cr_ip)
+	if [ -n "${ipaddr}" ]; then
+		for ip in $ipaddr; do
+			if echo "${ip}" | grep -q ":"; then
+				add_firewall_rule "ipv6" "${ip}" "${port}" "${wan_zone_name}"
+			else
+				add_firewall_rule "ipv4" "${ip}" "${port}" "${wan_zone_name}"
+			fi
+		done
+	else
+		# Port-only
+		add_firewall_rule "ipv6" "" "${port}" "${wan_zone_name}"
+		add_firewall_rule "ipv4" "" "${port}" "${wan_zone_name}"
+	fi
+
+	if [ "${lan}" != "${wan}" ]; then
+		# Close the ACS port at Lan side
+		close_downstream_acs_port "${lan}" "${port}"
+	fi
+}
+
+load_zone_names
+configure_connection_req_rules "$@"
+rm -f "${ZONE_NAME_FILE}"

icwmp/files/etc/init.d/icwmpd

@@ -16,79 +16,6 @@ log() {
 	echo "${@}"|logger -t cwmp.init -p info
 }
 
-regenerate_ssl_link() {
-	local cert_dir
-
-	cert_dir="${1%/}"
-	if [ -f "${cert_dir}" ]; then
-		return 0
-	fi
-
-	# do not generate the c_rehash if its system default cert path
-	# ca-certificate package already generates c_rehash on compilation
-	[ ! -d "${cert_dir}" ] || [ "${cert_dir}" = "/etc/ssl/certs" ] && return 0
-
-	generate_links() {
-		local file_type="$1"
-		local files="${cert_dir}"/*."${file_type}"
-		for cfile in ${files}; do
-			if [ -f "${cfile}" ]; then
-				rehash="$(openssl x509 -hash -noout -in "${cfile}")"
-				if [ ! -f "${cert_dir}/${rehash}.0" ]; then
-					log "Generating c_rehash for ${cfile}=>${rehash}.0"
-					ln -s "${cfile}" "${cert_dir}/${rehash}.0"
-				fi
-			fi
-		done
-	}
-
-	generate_links "pem"
-}
-
-enable_dhcp_option43() {
-	local wan="${1}"
-
-	### Ask for DHCP Option 43 only if CWMP is enabled ###
-	local reqopts="$(uci -q get network."${wan}".reqopts)"
-	local proto="$(uci -q get network."${wan}".proto)"
-	local newreqopts=""
-	local option43_present=0
-
-	for ropt in $reqopts; do
-		case $ropt in
-			43) option43_present=1 ;;
-			*) ;;
-		esac
-	done
-
-	if [ ${option43_present} -eq 1 ]; then
-		return;
-	fi
-
-	newreqopts="$reqopts 43"
-	if [ "${proto}" = "dhcp" ]; then
-		uci -q set network."${wan}".reqopts="$newreqopts"
-		uci commit network
-		ubus call network reload
-	fi
-}
-
-set_vendor_id() {
-	local wan="${1}"
-	local proto="$(uci -q get network."${wan}".proto)"
-
-	if [ "${proto}" = "dhcp" ]; then
-		vendorid="$(uci -q get network."${wan}".vendorid)"
-		if [ -z "${vendorid}" ]; then
-			uci -q set network."${wan}".vendorid="dslforum.org"
-			ubus call uci commit '{"config":"network"}'
-		elif [[ $vendorid != *"dslforum.org"* ]]; then
-			uci -q set network."${wan}".vendorid="${vendorid},dslforum.org"
-			ubus call uci commit '{"config":"network"}'
-		fi
-	fi
-}
-
 wait_for_resolvfile() {
 	local time=$1
 	local tm=1
@@ -211,28 +138,6 @@ validate_defaults() {
 }
 
 boot() {
-	local dhcp_discovery wan_interface skip_dhcp_boot_options
-
-	config_load cwmp
-	config_get wan_interface cpe default_wan_interface "wan"
-	config_get dhcp_discovery acs dhcp_discovery "0"
-	config_get skip_dhcp_boot_options acs skip_dhcp_boot_options "0"
-
-	if [ "${dhcp_discovery}" = "enable" ] || [ "${dhcp_discovery}" = "1" ]; then
-		if [ "${skip_dhcp_boot_options}" -ne 1 ]; then
-			# Set dhcp option 43 if not already configured
-			enable_dhcp_option43 "${wan_interface}"
-			# Set dhcp option 60
-			set_vendor_id "${wan_interface}"
-		fi
-	fi
-
-	config_get ssl_capath acs ssl_capath
-
-	if [ -n "${ssl_capath}" ]; then
-		regenerate_ssl_link "${ssl_capath}"
-	fi
-
 	# Copy backup data so that if it restart latter on, it gets the info
 	copy_cwmp_etc_files_to_varstate
 	mkdir -p /var/run/icwmpd/

icwmp/files/etc/uci-defaults/85-cwmp-set-userid

@@ -4,6 +4,10 @@
 # Copy defaults by the factory to the cwmp UCI user section.
 config_load cwmp
 
+if [ -f "/lib/functions/iopsys-environment.sh" ]; then
+	. /lib/functions/iopsys-environment.sh
+fi
+
 # Get Manufacturer OUI.
 config_get oui cpe manufacturer_oui ""
 if [ -z "${oui}" ]; then
@@ -38,4 +42,14 @@ if [ -z "${enable_cwmp}" ]; then
     uci -q set cwmp.cpe.enable="1"
 fi
 
+default_password="$(get_acs_password)"
+config_get pass cpe passwd ""
+if [ -z "${pass}" ]; then
+	uci -q set cwmp.cpe.passwd="${default_password:-iopsys}"
+fi
+
+config_get pass acs passwd ""
+if [ -z "${pass}" ]; then
+	uci -q set cwmp.acs.passwd="${default_password:-iopsys}"
+fi
 # No need for commit here, it is done by uci_apply_defaults().

icwmp/files/etc/uci-defaults/999-cwmp-conn-config

@@ -0,0 +1,107 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+log() {
+	echo "${@}"|logger -t cwmp.defaults -p info
+}
+
+set_vendor_id() {
+	local wan="${1}"
+	local proto="$(uci -q get network."${wan}".proto)"
+
+	if [ "${proto}" = "dhcp" ]; then
+		vendorid="$(uci -q get network."${wan}".vendorid)"
+		if [ -z "${vendorid}" ]; then
+			uci -q set network."${wan}".vendorid="dslforum.org"
+		elif [[ $vendorid != *"dslforum.org"* ]]; then
+			uci -q set network."${wan}".vendorid="${vendorid},dslforum.org"
+		fi
+	fi
+}
+
+enable_dhcp_option43() {
+	local wan="${1}"
+
+	local reqopts="$(uci -q get network."${wan}".reqopts)"
+	local proto="$(uci -q get network."${wan}".proto)"
+	local newreqopts=""
+	local option43_present=0
+
+	for ropt in $reqopts; do
+		case $ropt in
+			43) option43_present=1 ;;
+			*) ;;
+		esac
+	done
+
+	if [ ${option43_present} -eq 1 ]; then
+		return;
+	fi
+
+	newreqopts="$reqopts 43"
+	if [ "${proto}" = "dhcp" ]; then
+		uci -q set network."${wan}".reqopts="$newreqopts"
+	fi
+}
+
+regenerate_ssl_link() {
+	local cert_dir
+
+	cert_dir="${1%/}"
+	if [ -f "${cert_dir}" ]; then
+		return 0
+	fi
+
+	# do not generate the c_rehash if its system default cert path
+	# ca-certificate package already generates c_rehash on compilation
+	[ ! -d "${cert_dir}" ] || [ "${cert_dir}" = "/etc/ssl/certs" ] && return 0
+
+	generate_links() {
+		local file_type="$1"
+		local files="${cert_dir}"/*."${file_type}"
+		for cfile in ${files}; do
+			if [ -f "${cfile}" ]; then
+				rehash="$(openssl x509 -hash -noout -in "${cfile}")"
+				if [ ! -f "${cert_dir}/${rehash}.0" ]; then
+					log "Generating c_rehash for ${cfile}=>${rehash}.0"
+					ln -s "${cfile}" "${cert_dir}/${rehash}.0"
+				fi
+			fi
+		done
+	}
+
+	generate_links "pem"
+}
+
+configure_dhcp_discovery() {
+	local dhcp_discovery wan_interface skip_dhcp_boot_options
+
+	config_load cwmp
+	config_get wan_interface cpe default_wan_interface "wan"
+	config_get dhcp_discovery acs dhcp_discovery "0"
+	config_get skip_dhcp_boot_options acs skip_dhcp_boot_options "0"
+
+	if [ "${dhcp_discovery}" = "enable" ] || [ "${dhcp_discovery}" = "1" ]; then
+		if [ "${skip_dhcp_boot_options}" -ne 1 ]; then
+			# Set dhcp option 43 if not already configured
+			enable_dhcp_option43 "${wan_interface}"
+			# Set dhcp option 60
+			set_vendor_id "${wan_interface}"
+		fi
+	fi
+}
+
+configure_ssl_path() {
+	local ssl_capath
+
+	config_load cwmp
+	config_get ssl_capath acs ssl_capath
+
+	if [ -n "${ssl_capath}" ]; then
+		regenerate_ssl_link "${ssl_capath}"
+	fi
+}
+
+configure_dhcp_discovery
+configure_ssl_path

ieee1905/Makefile

@@ -1,16 +1,17 @@
 #
 # Copyright (C) 2020-2024 IOPSYS Software Solutions AB
+# Copyright (C) 2025 Genexis Sweden AB
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=8.7.4
+PKG_VERSION:=8.7.33
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=c01ef079c78045670a834dbc0fbb937652dd7e70
+PKG_SOURCE_VERSION:=cb5b8f76c854b89607cd1750d3a4052ecd71ac9d
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/ieee1905.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
@@ -105,6 +106,7 @@ TARGET_CFLAGS += -DHAS_UBUS
 
 ifeq ($(CONFIG_IEEE1905_BUILD_TR181_PLUGIN),y)
 TARGET_CFLAGS += -DBUILD_TR181_PLUGIN
+TARGET_CFLAGS += -DBBF_VENDOR_PREFIX=\\\"$(CONFIG_BBF_VENDOR_PREFIX)\\\"
 endif
 
 MAKE_FLAGS += \
@@ -114,7 +116,7 @@ MAKE_PATH:=src
 
 
 define Package/ieee1905/install
-	$(CP) ./files/* $(1)/
+	$(CP) ./files/etc $(1)/
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/lib/ieee1905
 	$(INSTALL_DIR) $(1)/usr/sbin

ieee1905/files/datamodel_description.json

@@ -0,0 +1,23 @@
+{
+	"Device.IEEE1905.AL.": {
+		"type": "object",
+		"protocols": [
+			"cwmp",
+			"usp"
+		],
+		"access": false,
+		"array": false,
+		"{BBF_VENDOR_PREFIX}LocalOnlyMode": {
+			"type": "boolean",
+			"read": true,
+			"write": true,
+			"protocols": [
+				"cwmp",
+				"usp"
+			],
+			"description": "Enable or disable interfaces from ieee1905.",
+			"datatype": "boolean"
+		}
+	}
+}
+

ieee1905/files/etc/config/ieee1905

@@ -12,6 +12,7 @@ config al-iface
 	list ifname 'br-lan'
 	list ifname '/eth.*'
 	list ifname '/wl.*'
+	list ifname '/ra.*'
 	list ifname '/wds.*'
 
 # ap sections are auto-generated/overwritten during onboarding

ieee1905/files/etc/uci-defaults/30-set-ieee1905-al-macaddr

@@ -1,10 +1,9 @@
 #!/bin/sh
 
+. /lib/functions/system.sh
 
-BMAC=$(db -q get hw.board.basemac)
+BMAC=$(get_mac_label)
 BMAC=${BMAC//:/}
-BMAC=${BMAC// /}
-BMAC=$(printf "%12.12X" $((0x$BMAC)))
 
 [ "$BMAC" == "" ] && exit 1
 

ieee1905/files/etc/uci-defaults/32-ieee1905-device-info

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+. /etc/os-release
+
+set_val() {
+	uci -q get "$1" > /dev/null || uci set "${1}=${2:-${3}}"
+}
+
+set_val ieee1905.ieee1905.manufacturer "$OPENWRT_DEVICE_MANUFACTURER" IOPSYS
+set_val ieee1905.ieee1905.model_name "$(cat /tmp/sysinfo/model)" 1905-SampleDev
+set_val ieee1905.ieee1905.device_name "$NAME" 1905Device
+
+exit 0

iopsys-analytics/Makefile

@@ -4,7 +4,7 @@ PKG_NAME:=iopsys-analytics
 PKG_RELEASE:=$(COMMITCOUNT)
 PKG_LICENSE:=PROPRIETARY
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=00189cea0a78b7a30dbfdd363b6d8e836437d1bc
+PKG_SOURCE_VERSION:=25e32ac5a860aec6e53e3449565b71595073e014
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/iopsys-analytics.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
@@ -31,8 +31,8 @@ define Package/$(PKG_NAME)
     +@PACKAGE_COLLECTD_ENCRYPTED_NETWORK                \
   # remote syslog
   DEPENDS+=                                             \
-    +syslog-ng                                          \
-    +@SYSLOGNG_LOGROTATE                                \
+    +@PACKAGE_syslog-ng:SYSLOGNG_LOGROTATE              \
+    +PACKAGE_fluent-bit:logrotate                       \
 
 endef
 
@@ -44,7 +44,13 @@ endef
 Build/Compile=
 
 define Package/$(PKG_NAME)/install
-	$(CP) -r $(PKG_BUILD_DIR)/files/*  $(1)/
+	$(CP) -r $(PKG_BUILD_DIR)/files/common/*  $(1)/
+ifneq ($(CONFIG_PACKAGE_fluent-bit),)
+	$(CP) -r $(PKG_BUILD_DIR)/files/fluent-bit/*  $(1)/
+endif
+ifneq ($(CONFIG_PACKAGE_syslog-ng),)
+	$(CP) -r $(PKG_BUILD_DIR)/files/syslog-ng/*  $(1)/
+endif
 endef
 
 $(eval $(call BuildPackage,$(PKG_NAME)))

ipt-trigger/Makefile

@@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ipt-trigger
-PKG_VERSION:=1.0.2
+PKG_VERSION:=1.0.3
 PKG_LICENSE:=GPL-2.0
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=4f3d4427403e0a9be7653c1b92907ae8ae5f21ae
+PKG_SOURCE_VERSION:=ac1beae4794f99533b28db7d0e6e80f4c268a3e8
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/ipt-trigger.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

json-schema-validator/Makefile

@@ -0,0 +1,55 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=json-schema-validator
+PKG_VERSION:=2.3.0
+PKG_RELEASE:=1
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/pboettch/json-schema-validator.git
+PKG_SOURCE_VERSION:=$(PKG_VERSION)
+PKG_MIRROR_HASH:=skip
+
+PKG_LICENSE:=MIT
+PKG_LICENSE_FILES:=LICENSE
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_BUILD_PARALLEL:=1
+PKG_INSTALL:=1
+
+PKG_BUILD_DEPENDS:=nlohmann-json
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+CMAKE_OPTIONS += \
+	-DJSON_VALIDATOR_BUILD_TESTS=OFF \
+	-DJSON_VALIDATOR_BUILD_EXAMPLES=OFF \
+	-DJSON_VALIDATOR_INSTALL=ON \
+	-DJSON_VALIDATOR_SHARED_LIBS=OFF
+
+define Package/json-schema-validator
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=JSON Schema Validator for nlohmann::json
+  URL:=https://github.com/pboettch/json-schema-validator
+  DEPENDS:=+libstdcpp +nlohmann-json
+endef
+
+define Package/json-schema-validator/description
+  A JSON Schema Validator for Modern C++ using nlohmann/json.
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include/nlohmann
+	$(CP) $(PKG_BUILD_DIR)/src/nlohmann/json-schema.hpp $(1)/usr/include/nlohmann/
+
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libnlohmann_json_schema_validator*.a $(1)/usr/lib/ 2>/dev/null || true
+	$(CP) $(PKG_BUILD_DIR)/libnlohmann_json_schema_validator*.so* $(1)/usr/lib/ 2>/dev/null || true
+endef
+
+define Package/json-schema-validator/install
+	true
+endef
+
+$(eval $(call BuildPackage,json-schema-validator))

jsonval/Makefile

@@ -0,0 +1,44 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=jsonval
+PKG_VERSION:=1.0.0
+PKG_RELEASE:=1
+
+PKG_LICENSE:=MIT
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/jsonval
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=Command-line JSON Schema Validator
+  DEPENDS:=+nlohmann-json +json-schema-validator +libstdcpp
+endef
+
+define Package/jsonval/description
+  A small CLI tool to validate JSON files against a schema using json-schema-validator and nlohmann/json.
+endef
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+	cp -r ./src/* $(PKG_BUILD_DIR)/
+endef
+
+define Build/Compile
+	$(TARGET_CXX) \
+		$(TARGET_CXXFLAGS) -std=c++17 \
+		-I$(STAGING_DIR)/usr/include \
+		-I$(STAGING_DIR)/usr/include/nlohmann \
+		-L$(STAGING_DIR)/usr/lib \
+		$(PKG_BUILD_DIR)/main.cpp \
+		-o $(PKG_BUILD_DIR)/jsonval \
+		-lnlohmann_json_schema_validator
+endef
+
+define Package/jsonval/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/jsonval $(1)/usr/bin/
+endef
+
+$(eval $(call BuildPackage,jsonval))

jsonval/src/main.cpp

@@ -0,0 +1,64 @@
+#include <iostream>
+#include <fstream>
+#include <string>
+#include <nlohmann/json.hpp>
+#include <nlohmann/json-schema.hpp>
+
+using nlohmann::json;
+using nlohmann::json_schema::json_validator;
+using namespace std;
+
+void print_usage(const string& prog_name) {
+	cerr << "Usage: " << prog_name << " -s <schema.json> -j <data.json>" << endl;
+}
+
+int main(int argc, char* argv[]) {
+	string schema_path, data_path;
+
+	// Simple argument parsing
+	for (int i = 1; i < argc; ++i) {
+		string arg = argv[i];
+		if ((arg == "-s" || arg == "--schema") && i + 1 < argc) {
+			schema_path = argv[++i];
+		} else if ((arg == "-j" || arg == "--json") && i + 1 < argc) {
+			data_path = argv[++i];
+		} else {
+			print_usage(argv[0]);
+			return 1;
+		}
+	}
+
+	if (schema_path.empty() || data_path.empty()) {
+		print_usage(argv[0]);
+		return 1;
+	}
+
+	ifstream schema_file(schema_path);
+	ifstream data_file(data_path);
+
+	if (!schema_file.is_open() || !data_file.is_open()) {
+		cerr << "Error: Could not open one or both files." << endl;
+		return 2;
+	}
+
+	json schema, document;
+	try {
+		schema_file >> schema;
+		data_file >> document;
+	} catch (const json::parse_error& e) {
+		cerr << "Parse error: " << e.what() << endl;
+		return 3;
+	}
+
+	try {
+		json_validator validator;
+		validator.set_root_schema(schema);
+		validator.validate(document);
+		cout << "Valid" << endl;
+	} catch (const std::exception& e) {
+		cerr << "Validation failed: " << e.what() << endl;
+		return 4;
+	}
+
+	return 0;
+}

libdsl/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libdsl
-PKG_VERSION:=7.2.100
+PKG_VERSION:=7.3.0
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=20875ec79fcc7c546c2f1253c867d6afbc8bff75
 PKG_SOURCE_URL:=https://dev.iopsys.eu/hal/libdsl.git
+PKG_SOURCE_VERSION:=2a7a49fac35c3d8078ffe051594c0425d355cacd
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
 endif
@@ -37,6 +37,9 @@ else ifeq ($(CONFIG_TARGET_x86),y)
 else ifeq ($(CONFIG_TARGET_armvirt),y)
   TARGET_PLATFORM=TEST
   TARGET_CFLAGS +=-DIOPSYS_TEST
+else ifeq ($(CONFIG_TARGET_airoha),y)
+  TARGET_PLATFORM=AIROHA
+  TARGET_CFLAGS +=-DIOPSYS_AIROHA
 endif
 
 TARGET_CFLAGS += \
@@ -57,7 +60,7 @@ define Package/libdsl
   SUBMENU:=IOPSYS HAL libs
   MENU:=1
   TITLE:= xDSL library (libdsl)
-  DEPENDS+=TARGET_brcmbca:bcm963xx-bsp
+  DEPENDS+=TARGET_brcmbca:bcm963xx-bsp +TARGET_airoha:libeasy
 endef
 
 define Package/libdsl/description

libeasy/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libeasy
-PKG_VERSION:=7.4.5
+PKG_VERSION:=7.4.6
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=67e6b91b8aca4c068a71f097f5f0576b47ec1d2e
+PKG_SOURCE_VERSION:=ca7b20068c9d373e41045a2e899a9c697576262c
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libeasy.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz

libvoice-airoha/Makefile

@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libvoice-airoha
 PKG_RELEASE:=1
-PKG_VERSION:=1.1.2
+PKG_VERSION:=1.1.7
 PKG_LICENSE:=PROPRIETARY
 PKG_LICENSE_FILES:=LICENSE
 
@@ -17,7 +17,7 @@ LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/$(PKG_NAME).git
-PKG_SOURCE_VERSION:=1ded9a4bb0f2f8a5f3989799b5500e328e086c99
+PKG_SOURCE_VERSION:=3a30086a68a3409f0396acb01380f91daabf7a2f
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

libvoice-airoha/files/etc/uci-defaults/991-libvoice-airoha

@@ -1,16 +1,30 @@
 #!/bin/sh
 
 hasVoice=$(db -q get hw.board.hasVoice)
-
 [ "$hasVoice" = "1" ] || exit 0
 
-SLIC=`cat /proc/device-tree/airoha-voice/slic-type`
-[ "${SLIC#pef}" != "${SLIC}" ] || exit 0
+SLIC=$(cat /proc/device-tree/airoha-voice/slic-type)
+[ "${SLIC#pef}" != "${SLIC}" ] && {
+    echo Configure TxGain and RxGain for MXL SLIC $SLIC
 
-echo Configure TxGain and RxGain for MXL SLIC $SLIC
+    ports=$(db -q get hw.board.VoicePorts)
+    for p in $(seq 0 $((ports-1))); do
+        uci set asterisk.extension${p}.txgain='10'
+        uci set asterisk.extension${p}.rxgain='-15'
+    done
+}
 
-ports=$(db -q get hw.board.VoicePorts)
-for p in $(seq 0 $((ports-1))); do
-    uci set asterisk.extension${p}.txgain='10'
-    uci set asterisk.extension${p}.rxgain='-15'
-done
+hasDect=$(db -q get hw.board.hasDect)
+[ "$hasDect" = "1" ] || exit 0
+
+# Set the DECT RFPI
+. /lib/functions/iopsys-environment.sh
+db set hw.board.dect_rfpi=$(get_dect_rfpi)
+db commit
+
+# configure the PCM for DECT/DCX81
+[ -f "/proc/device-tree/aliases/dcx81-uart" ] && {
+    uci set dect.global.pcm_fsync='SHORT_LF'
+    uci set dect.global.pcm_slot_start='8'
+    uci set dect.global.dect_channel_start='3'
+}

libwifi/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libwifi
-PKG_VERSION:=7.10.9
+PKG_VERSION:=7.13.7
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=b2718296b4312e0bb6bd4cab802453d696a666d2
+PKG_SOURCE_VERSION:=65a7cd643c07e3f0a11d5b20225d4d87b8646513
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libwifi.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz

logmngr/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=logmngr
-PKG_VERSION:=1.0.14
+PKG_VERSION:=1.0.17
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/system/logmngr.git
-PKG_SOURCE_VERSION:=1561b71a2225af737db9f091204247ab4e141abb
+PKG_SOURCE_VERSION:=ad2636c642d56967e78c0c84bf82cb0e2b6311f2
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -29,10 +29,10 @@ define Package/logmngr
  CATEGORY:=Utilities
  TITLE:=Logging Manager
  DEPENDS:=+LOGMNGR_BACKEND_FLUENTBIT:fluent-bit
- DEPENDS+=+@LOGMNGR_BACKEND_FLUENTBIT:BUSYBOX_CONFIG_KLOGD
  DEPENDS+=+LOGMNGR_BACKEND_SYSLOG_NG:syslog-ng
  DEPENDS+=+LOGMNGR_LOGROTATE:logrotate
  DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service
+ CONFLICTS:=logd
 endef
 
 define Package/logmngr/description
@@ -60,10 +60,8 @@ define Package/logmngr/install
 	$(INSTALL_DIR) $(1)/lib/logmngr
 ifeq ($(CONFIG_LOGMNGR_BACKEND_FLUENTBIT),y)
 	$(INSTALL_DATA) ./files/lib/logmngr/fluent-bit.sh $(1)/lib/logmngr/
-	$(INSTALL_DIR) $(1)/usr/libexec
-	$(INSTALL_BIN) ./files/logmngr-klogd $(1)/usr/libexec/
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) ./files/logread $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) ./files/logread $(1)/sbin/
 endif
 ifeq ($(CONFIG_LOGMNGR_BACKEND_SYSLOG_NG),y)
 	$(INSTALL_DATA) ./files/lib/logmngr/syslog-ng.sh $(1)/lib/logmngr/

logmngr/files/lib/logmngr/fluent-bit.sh

@@ -5,6 +5,7 @@
 
 CONF_FILE=/etc/fluent-bit/fluent-bit.conf
 TMP_CONF_FILE=/tmp/fluent-bit/fluent-bit.conf
+FLUENT_BIT_CONF_DIR=/etc/fluent-bit/conf.d
 
 append_conf() {
 	echo "$*" >> ${TMP_CONF_FILE}
@@ -14,6 +15,14 @@ create_config_file() {
 	mkdir -p /tmp/fluent-bit
 	rm -f ${TMP_CONF_FILE}
 	touch ${TMP_CONF_FILE}
+	# include all files placed in FLUENT_BIT_CONF_DIR directory
+	# fluent-bit does not support using directory in include directive
+	# also, if no file is found then fluent-bit aborts
+	# so only add include if any file is present in the FLUENT_BIT_CONF_DIR
+	if [ -d "$FLUENT_BIT_CONF_DIR" ] && [ "$(ls -A "$FLUENT_BIT_CONF_DIR")" ]; then
+		echo "@INCLUDE ${FLUENT_BIT_CONF_DIR}/*" >> ${TMP_CONF_FILE}
+	fi
+	echo "" >> ${TMP_CONF_FILE}
 }
 
 create_service_section() {
@@ -23,7 +32,23 @@ create_service_section() {
 	echo "    flush        1" >> ${TMP_CONF_FILE}
 	echo "    daemon       off" >> ${TMP_CONF_FILE}
 	echo "    log_level    info" >> ${TMP_CONF_FILE}
+	echo "    coro_stack_size    24576" >> ${TMP_CONF_FILE}
 	echo "    parsers_file /etc/fluent-bit/parsers.conf" >> ${TMP_CONF_FILE}
+	echo "    hot_reload        on" >> ${TMP_CONF_FILE}
+	echo "" >> ${TMP_CONF_FILE}
+
+	# Generate default input for kmsg
+	echo "[INPUT]" >> ${TMP_CONF_FILE}
+	echo "    name       kmsg" >> ${TMP_CONF_FILE}
+	echo "    Tag        KMSG"  >> ${TMP_CONF_FILE}
+	echo "" >> ${TMP_CONF_FILE}
+
+	echo "[OUTPUT]" >> ${TMP_CONF_FILE}
+	echo "    name         file" >> ${TMP_CONF_FILE}
+	echo "    match        KMSG" >> ${TMP_CONF_FILE}
+	echo "    file         /var/log/messages" >> ${TMP_CONF_FILE}
+	echo "    format       template" >> ${TMP_CONF_FILE}
+	echo "    template     {syslog_ts} {hostname} kernel: {msg}" >> ${TMP_CONF_FILE}
 	echo "" >> ${TMP_CONF_FILE}
 }
 
@@ -329,9 +354,4 @@ logmngr_init() {
 	fi
 	procd_set_param respawn
 	procd_close_instance
-
-	procd_open_instance klogd
-	procd_set_param command /usr/libexec/logmngr-klogd
-	procd_set_param respawn
-	procd_close_instance
 }

logmngr/files/lib/logmngr/logrotate.sh

@@ -4,14 +4,16 @@
 
 LOGROTATE_FILE=/etc/logrotate.conf
 LOGROTATE_TMP_FILE=/tmp/logrotate/logrotate.conf
+CONF_DIR=/etc/logrotate.d
 
 create_logrotate_file() {
 	mkdir -p /tmp/logrotate
 	rm -f ${LOGROTATE_TMP_FILE}
-	touch ${LOGROTATE_FILE}
+	touch ${LOGROTATE_TMP_FILE}
+	echo -e "include ${CONF_DIR}" >> ${LOGROTATE_TMP_FILE}
+	echo -e "" >> ${LOGROTATE_TMP_FILE}
 }
 
-
 handle_logrotate() {
 	local section="$1"
 

logmngr/files/logmngr-klogd

@@ -1,7 +0,0 @@
-#!/bin/sh
-
-until [ -S /dev/log ]; do
-	sleep 1
-done
-
-exec /sbin/klogd -n

ltq-nand/Makefile

@@ -1,36 +0,0 @@
-#
-# Copyright (C) 2008-2016 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ltq-nand
-PKG_VERSION:=1.0
-
-PKG_SOURCE:=v$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://github.com/merbanan/ltq-nand/archive/
-#PKG_SOURCE_PROTO:=git
-#PKG_SOURCE_URL:=https://github.com/merbanan/ltq-nand/releases/download/v$(PKG_VERSION)/
-#PKG_SOURCE_URL:=https://github.com/merbanan/ltq-nand.git
-#PKG_SOURCE_VERSION:=07b5b0331af6de4174dab2c02bf260ee9625452a
-
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
-
-include $(INCLUDE_DIR)/host-build.mk
-
-
-define Host/Compile
-	$(MAKE) -C $(HOST_BUILD_DIR)
-endef
-
-define Host/Install
-	$(CP) \
-		$(HOST_BUILD_DIR)/ltq-nand \
-		$(STAGING_DIR_HOST)/bin/
-endef
-
-$(eval $(call HostBuild))
-

map-agent/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=6.3.3.9
+PKG_VERSION:=6.3.6.7
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=81b815c32aafbf5476bba4691ce36b9a446c3363
+PKG_SOURCE_VERSION:=f611be0c05e3f4fb3d35a5a1ad51f5a4ad6406ca
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>
 
 PKG_LICENSE:=BSD-3-Clause

map-agent/files/etc/hotplug.d/ethernet/map-dynamic-backhaul

@@ -1,6 +1,5 @@
 #!/bin/sh
 
-conn_ports_file="/var/run/multiap/map.connected.ports"
 map_bh_file="/var/run/multiap/multiap.backhaul"
 
 # Exit if AL Bridge is not configured to be a bridge device
@@ -18,42 +17,12 @@ for port_bridge_sec in $port_bridge_sec_list; do
 	fi
 done
 
-# Exit if the PORT Bridge Name is empty
-[ -z "$port_bridge_name" ]  && exit 0
-
-# Exit if the PORT is not member of the AL Bridge
-[ "$port_bridge_name" = "$al_bridge" ] || exit 0
-
 # Exit if the device is not operating in extender/repeater mode
 al_brnet="${al_bridge:3}"
 [ "$(uci -q get network.${al_brnet}.proto)" == "dhcp" ] || exit 0
 
 ############## Dynamic Backhaul Daemon ##############
 if [ -n "$(which dynbhd)" ]; then
-	pidof dynbhd >/dev/null && exit 0 # dynbhd is managing the links
-
-	if [ ! -f $conn_ports_file ]; then
-		mkdir -p /var/run/multiap
-		touch $conn_ports_file
-		if [ "$LINK" = "up" ]; then
-			touch $conn_ports_file
-			echo "$PORT" > $conn_ports_file
-			brctl delif $al_bridge $PORT
-			#ubus call network.interface.lan remove_device "{\"name\":\"$PORT\"}"
-		fi
-	else
-		if [ "$LINK" = "up" ]; then
-			brctl delif $al_bridge $PORT
-			echo "$PORT" >> $conn_ports_file
-			#ubus call network.interface.lan remove_device "{\"name\":\"$PORT\"}"
-		else
-			sed -i -E "/(^|:)${PORT}(:|$)/d" $conn_ports_file
-			#ubus call network.interface.lan add_device "{\"name\":\"$PORT\"}"
-			brctl addif $al_bridge $PORT
-			[ "$(cat $conn_ports_file | wc -c)" = "0" ] && rm -f $conn_ports_file
-		fi
-	fi
-
 	exit 0
 fi
 ########################################################
@@ -61,9 +30,16 @@ fi
 ################ Dedicated ETH WAN Port ################
 wanport="$(jsonfilter -i /etc/board.json -e @.network.wan.device)"
 if [ -n "$wanport" ]; then
+	# Don't require wanport to be part of port bridge
 	[ "$wanport" = "$PORT" ] || exit 0
 ########################################################
 else
+	# Exit if the PORT Bridge Name is empty
+	[ -z "$port_bridge_name" ]  && exit 0
+
+	# Exit if the PORT is not member of the AL Bridge
+	[ "$port_bridge_name" = "$al_bridge" ] || exit 0
+
 #################### DHCP Discovery ####################
 	if [ "$LINK" = "up" ]; then
 		brctl delif $al_bridge $PORT
@@ -86,6 +62,14 @@ remove_from_bridge() {
 	[ -n "$ifname" ] && brctl delif ${al_bridge} ${ifname}
 }
 
+get_network_id() {
+	local ifname=$1
+
+	[ -n "$ifname" ] || return
+	network_id=$(wpa_cli -i $ifname list_n|tail -n 1 | awk '{print $1}')
+	echo ${network_id}
+}
+
 update_bstas() {
 	section="$1"
 	action="$2"
@@ -93,14 +77,15 @@ update_bstas() {
 	config_get ifname "$section" ifname
 	config_get_bool enabled "$section" enabled 0
 
+	network_id=$(get_network_id $ifname)
 	if [ "$action" = "down" ]; then
 		wpa_cli -i "$ifname" disconnect > /dev/null 2>&1
-		wpa_cli -i "$ifname" disable_network 0  > /dev/null 2>&1
+		wpa_cli -i "$ifname" disable_network $network_id  > /dev/null 2>&1
 #		wpa_cli -i "$ifname" save_config  > /dev/null 2>&1
 	elif [ "$action" = "up" ]; then
 		[ "$enabled" -eq 0 ] && return
 		wpa_cli -i "$ifname" reconnect > /dev/null 2>&1
-		wpa_cli -i "$ifname" enable_network 0  > /dev/null 2>&1
+		wpa_cli -i "$ifname" enable_network $network_id  > /dev/null 2>&1
 #		wpa_cli -i "$ifname" save_config  > /dev/null 2>&1
 	fi
 }
@@ -111,8 +96,12 @@ if [ "$LINK" = "up" ]; then
 	config_foreach remove_from_bridge bsta
 	config_foreach update_bstas bsta down
 
+	brctl addif $al_bridge $PORT
+	logger -t "dynamic-backhaul" "brctl addif $al_bridge $PORT"
 	/lib/wifi/multiap set_uplink "eth" "$PORT"
 else
+	brctl delif $al_bridge $PORT
+	logger -t "dynamic-backhaul" "brctl delif $al_bridge $PORT"
 	/lib/wifi/multiap unset_uplink "eth"
 	#rm -f "$map_bh_file"
 	config_load "mapagent"

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

@@ -203,7 +203,7 @@ start_service() {
 
 	procd_open_instance
 	create_dir
-	procd_set_param command "/usr/sbin/mapagent" "-d"
+	procd_set_param command "/usr/sbin/mapagent" "-d" "-o" "/tmp/mapagent.log" "-f"
 	procd_set_param respawn
 #	procd_set_param stdout 1
 #	procd_set_param stderr 1

map-controller/Config.in

@@ -15,6 +15,11 @@ config CONTROLLER_PROVISION_DISABLED_AP
 	bool "Enable vendor extension that provisions disabled APs to agents"
 	default n
 
+config CONTROLLER_PROVISION_BRIDGE
+	depends on CONTROLLER_EASYMESH_VENDOR_EXT
+	bool "Enable vendor extension that provisions custom bridge for APs to agents, if configured"
+	default n
+
 config CONTROLLER_EASYMESH_VENDOR_EXT_OUI_DEFAULT
 	hex "Vendor OUI default"
 	default 0xB456FA

map-controller/Makefile

@@ -6,9 +6,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=6.3.0.10
+PKG_VERSION:=6.4.0.12
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=4abd4db59e3bc5e19c263dba07a10d5326bfa98c
+PKG_SOURCE_VERSION:=ae10f447f8d83ed6b98d2b82da2dda64be2c3183
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@genexis.eu>
 
 LOCAL_DEV=0
@@ -65,18 +65,38 @@ TARGET_CFLAGS += -DEASYMESH_VENDOR_EXT
 ifeq ($(CONFIG_CONTROLLER_PROVISION_DISABLED_AP),y)
 TARGET_CFLAGS += -DPROVISION_DISABLED_AP
 endif
+ifeq ($(CONFIG_CONTROLLER_PROVISION_BRIDGE),y)
+TARGET_CFLAGS += -DPROVISION_BRIDGE
+endif
 endif
 
 ifeq ($(CONFIG_CONTROLLER_PROPAGATE_PROBE_REQ),y)
 TARGET_CFLAGS += -DPROPAGATE_PROBE_REQ
 endif
 
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include/map-controller
+	$(INSTALL_DIR) $(1)/usr/include/map-controller/utils
+	$(CP) $(PKG_BUILD_DIR)/src/wifi_dataelements.h $(1)/usr/include/map-controller
+	$(CP) $(PKG_BUILD_DIR)/src/cntlr_commands_impl.h $(1)/usr/include/map-controller
+	$(CP) $(PKG_BUILD_DIR)/src/cntlr_commands.h $(1)/usr/include/map-controller
+	$(CP) $(PKG_BUILD_DIR)/src/cntlr_apis.h $(1)/usr/include/map-controller
+	$(CP) $(PKG_BUILD_DIR)/src/wifi_opclass.h $(1)/usr/include/map-controller
+	$(CP) $(PKG_BUILD_DIR)/src/steer_module.h $(1)/usr/include/map-controller
+	$(CP) $(PKG_BUILD_DIR)/src/timer.h $(1)/usr/include/map-controller
+	$(CP) $(PKG_BUILD_DIR)/src/timer_impl.h $(1)/usr/include/map-controller
+	$(CP) $(PKG_BUILD_DIR)/src/utils/debug.h $(1)/usr/include/map-controller/utils
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/src/libcntlr-apis.so $(1)/usr/lib
+endef
+
 define Package/map-controller/install
 	$(INSTALL_DIR) $(1)/etc
 	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mapcontroller $(1)/usr/sbin/
 	$(INSTALL_DIR) $(1)/usr/lib/mapcontroller
+	$(CP) $(PKG_BUILD_DIR)/src/libcntlr-apis.so $(1)/usr/lib
 	$(CP) $(PKG_BUILD_DIR)/src/plugins/steer/rcpi/rcpi.so $(1)/usr/lib/mapcontroller/rcpi.so
 endef
 

map-controller/files/etc/config/mapcontroller

@@ -8,9 +8,7 @@ config controller 'controller'
 	option enable_ts '0'
 	option primary_vid '1'
 	option primary_pcp '0'
-	option allow_bgdfs '0'
 	option stale_sta_timeout '30d'
-	option channel_plan '0'
 	option de_collect_interval '60'
 
 config sta_steering
@@ -26,6 +24,10 @@ config sta_steering
 	option plugins_policy 'any'
 	list plugins 'rcpi'
 
+config channel_plan
+	option preclear_dfs '0'
+	option acs '0'
+
 ###################
 # Default AP sections credentials will by updated
 # by uci-defaults script 99-mapcntlr
@@ -33,27 +35,27 @@ config sta_steering
 
 config ap
 	option band '2'
-	option ssid '$DEVICE_MANUFACTURER-$BASEMAC_ADDR'
-	option encryption 'sae-mixed'
-	option key '$WIFI_FH_KEY'
+	option ssid '$WIFI_FH_2G_SSID'
+	option encryption '$WIFI_FH_2G_ENCRYPTION'
+	option key '$WIFI_FH_2G_KEY'
 	option vid '1'
 	option type 'fronthaul'
 	option mld_id '1'
 
 config ap
 	option band '5'
-	option ssid '$DEVICE_MANUFACTURER-$BASEMAC_ADDR'
-	option encryption 'sae-mixed'
-	option key '$WIFI_FH_KEY'
+	option ssid '$WIFI_FH_5G_SSID'
+	option encryption '$WIFI_FH_5G_ENCRYPTION'
+	option key '$WIFI_FH_5G_KEY'
 	option vid '1'
 	option type 'fronthaul'
 	option mld_id '1'
 
 config ap
 	option band '6'
-	option ssid '$DEVICE_MANUFACTURER-$BASEMAC_ADDR'
-	option encryption 'sae'
-	option key '$WIFI_FH_KEY'
+	option ssid '$WIFI_FH_6G_SSID'
+	option encryption '$WIFI_FH_6G_ENCRYPTION'
+	option key '$WIFI_FH_6G_KEY'
 	option vid '1'
 	option type 'fronthaul'
 	option mld_id '1'
@@ -87,8 +89,8 @@ config ap
 
 config mld
 	option id '1'
-	option ssid '$DEVICE_MANUFACTURER-$BASEMAC_ADDR'
-	option key '$WIFI_FH_KEY'
+	option ssid '$WIFI_FH_ALL_SSID'
+	option key '$WIFI_FH_ALL_KEY'
 #	option vid '1'
 	option type 'fronthaul'
 

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

@@ -71,7 +71,7 @@ validate_ap_section() {
 			'encryption:or("sae", "sae+aes", "psk2",
 				"psk2+aes", "sae-mixed", "sae-mixed+aes",
 				"none", "psk-mixed", "psk-mixed+aes",
-				"psk", "psk+aes")' \
+				"psk", "psk+aes", "wpa", "wpa2", "wpa-mixed")' \
 			'key:string' \
 			'vid:range(1,65535):1' \
 			'type:or("backhaul", "fronthaul", "combined")' \

map-controller/files/etc/uci-defaults/99-mapcntlr

@@ -1,18 +1,95 @@
 #!/bin/sh
 
+. /lib/functions/system.sh
+. /usr/share/libubox/jshn.sh
+
+CFG=/etc/board.json
 . /etc/device_info
 
 WIFI_BH_KEY=$(openssl rand -rand /dev/urandom -hex 64 2>/dev/null | openssl dgst -hex -sha256 | cut -d " " -f 2)
 WIFI_BH_KEY=${WIFI_BH_KEY::-1}
 
-BASEMAC_ADDR="$(fw_printenv -n ethaddr | tr -d ':' | tr 'a-z' 'A-Z')"
-[ ${#BASEMAC_ADDR} -eq 12 ] || BASEMAC_ADDR="$(db -q get device.deviceinfo.BaseMACAddress | tr -d ':')"
+BASEMAC_ADDR="$(get_mac_label | tr -d ':' | tr 'a-z' 'A-Z')"
 
-WIFI_FH_KEY="$(db get hw.board.wpa_key)"
-WIFI_FH_KEY="${WIFI_FH_KEY:-1234567890}"
+FALLBACK_SSID="$DEVICE_MANUFACTURER-$BASEMAC_ADDR"
+FALLBACK_KEY="1234567890"
+FALLBACK_2G_ENCRYPTION="sae-mixed"
+FALLBACK_5G_ENCRYPTION="sae-mixed"
+FALLBACK_6G_ENCRYPTION="sae"
+FALLBACK_ALL_ENCRYPTION="sae-mixed"
+
+set_per_band_callback() {
+	local band="$2"
+	json_select "$band" || return
+	local ssid encryption key
+	json_get_vars ssid encryption key
+	case "$band" in
+	all|2g|5g|6g)
+		local band_upper="$(printf "%s" "$band" | tr 'a-z' 'A-Z')"
+		eval "WIFI_FH_${band_upper}_SSID=\$ssid"
+		eval "WIFI_FH_${band_upper}_ENCRYPTION=\$encryption"
+		eval "WIFI_FH_${band_upper}_KEY=\$key"
+		;;
+	esac
+	json_select ..
+}
+
+set_vars_from_board_json() {
+	json_init
+	json_load_file "$CFG"
+	if json_select wlan && json_select defaults && json_is_a ssids object; then
+		json_for_each_item set_per_band_callback ssids
+	fi
+	json_cleanup
+}
+
+set_in_priority() {
+	local destination="$1"
+	local alternative value
+	shift
+	for alternative in "$@"; do
+		eval "value=\${${alternative}}"
+		if [ -n "$value" ]; then
+			echo "Setting $destination to '$value' from \$$alternative"
+			eval "${destination}=\$value"
+			break
+		fi
+	done
+}
+
+set_missing_vars_from_fallback() {
+	local band what
+	for band in ALL 2G 5G 6G; do
+		for what in SSID KEY; do
+			set_in_priority \
+				WIFI_FH_${band}_${what} \
+				WIFI_FH_${band}_${what} \
+				WIFI_FH_ALL_${what} \
+				FALLBACK_${what}
+		done
+		# Per band fallback variables for encryption because SAE is mandatory on 6 GHz
+		set_in_priority \
+			WIFI_FH_${band}_ENCRYPTION \
+			WIFI_FH_${band}_ENCRYPTION \
+			FALLBACK_${band}_ENCRYPTION
+	done
+}
+
+set_vars_from_board_json
+set_missing_vars_from_fallback
 
 sed -i  -e "s/\$BASEMAC_ADDR/$BASEMAC_ADDR/g" \
-	-e "s/\$WIFI_FH_KEY/$WIFI_FH_KEY/g" \
+	-e "s/\$WIFI_FH_2G_KEY/$WIFI_FH_2G_KEY/g" \
+	-e "s/\$WIFI_FH_5G_KEY/$WIFI_FH_5G_KEY/g" \
+	-e "s/\$WIFI_FH_6G_KEY/$WIFI_FH_6G_KEY/g" \
+	-e "s/\$WIFI_FH_ALL_KEY/$WIFI_FH_ALL_KEY/g" \
+	-e "s/\$WIFI_FH_2G_SSID/$WIFI_FH_2G_SSID/g" \
+	-e "s/\$WIFI_FH_5G_SSID/$WIFI_FH_5G_SSID/g" \
+	-e "s/\$WIFI_FH_6G_SSID/$WIFI_FH_6G_SSID/g" \
+	-e "s/\$WIFI_FH_ALL_SSID/$WIFI_FH_ALL_SSID/g" \
+	-e "s/\$WIFI_FH_2G_ENCRYPTION/$WIFI_FH_2G_ENCRYPTION/g" \
+	-e "s/\$WIFI_FH_5G_ENCRYPTION/$WIFI_FH_5G_ENCRYPTION/g" \
+	-e "s/\$WIFI_FH_6G_ENCRYPTION/$WIFI_FH_6G_ENCRYPTION/g" \
+	-e "s/\$WIFI_FH_ALL_ENCRYPTION/$WIFI_FH_ALL_ENCRYPTION/g" \
 	-e "s/\$WIFI_BH_KEY/$WIFI_BH_KEY/g" \
-	-e "s/\$DEVICE_MANUFACTURER/$DEVICE_MANUFACTURER/g" \
 	/etc/config/mapcontroller	2>/dev/null

map-plugins/Config.in

@@ -0,0 +1,11 @@
+if (PACKAGE_map-plugins)
+
+menu "Options"
+
+config STEER_RATE_PLUGIN
+	bool "STA steering based on estimated throughput of target-AP"
+	default PACKAGE_map-plugins-steer-rate
+
+endmenu
+
+endif

map-plugins/Makefile

@@ -0,0 +1,68 @@
+#
+# Copyright (C) 2025 Genexis Sweden AB
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=map-plugins
+PKG_VERSION:=0.0.4
+
+LOCAL_DEV=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=74bf151851112ecee731d447af016c8dc668adcf
+PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/map-plugins.git
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
+PKG_MIRROR_HASH:=skip
+endif
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_LICENSE:=PROPRIETARY GENEXIS
+PKG_LICENSE_FILES:=LICENSE
+
+PKG_CONFIG_DEPENDS := CONFIG_PACKAGE_mapcontroller
+PKG_BUILD_DEPENDS := map-controller
+
+include $(INCLUDE_DIR)/package.mk
+
+include $(wildcard plugins/*.mk)
+
+MAKE_FLAGS += \
+	CFLAGS="$(TARGET_CFLAGS) -Wall"
+
+plugins := \
+	$(if $(CONFIG_PACKAGE_map-plugins-steer-rate),steer-rate)
+
+ppkg:=$(patsubst plugins/%.mk,map-plugins-%,$(wildcard plugins/*.mk))
+
+define Package/map-plugins/Default
+	SECTION:=utils
+	CATEGORY:=Utilities
+	SUBMENU:=Multi-AP value added services
+endef
+
+define Package/map-plugins/config
+  source "$(SOURCE)/Config.in"
+endef
+
+define Package/map-plugins
+	$(call Package/map-plugins/Default)
+	TITLE:=Multi-AP plugins modules
+	DEPENDS+=+libeasy +libwifiutils +map-controller
+endef
+
+define Package/map-plugins/description
+	Provides extra Multi-AP services viz. steering, channel-planning etc.
+endef
+
+define Package/map-plugins/install
+	:
+endef
+
+define Build/Compile
+	$(foreach p,$(ppkg),$(call Build/Compile/$(p),$(1)))
+endef
+
+
+$(eval $(call BuildPackage,map-plugins))
+$(eval $(foreach p,$(ppkg),$(call BuildPackage,$(p))))

map-plugins/plugins/steer-rate.mk

@@ -0,0 +1,20 @@
+define Package/map-plugins-steer-rate
+	$(call Package/map-plugins/Default)
+	TITLE:=STA steering based on estimated throughput of target-AP
+	DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
+		 +libjson-c +libblobmsg-json +map-controller \
+		 +map-plugins
+endef
+
+define Package/map-plugins-steer-rate/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_DIR) $(1)/usr/lib/mapcontroller
+	$(CP) $(PKG_BUILD_DIR)/steer/rate/rate.so $(1)/usr/lib/mapcontroller/rate.so
+endef
+
+define Build/Compile/map-plugins-steer-rate
+	$(MAKE) -C $(PKG_BUILD_DIR)/steer/rate \
+		CC="$(TARGET_CC)" \
+		CFLAGS="$(TARGET_CFLAGS)" \
+		LDFLAGS="$(TARGET_LDFLAGS)"
+endef

mcastmngr/files/common/etc/uci-defaults/61-mcast_config_generate

@@ -65,12 +65,69 @@ generate_igmp_proxy_config(){
 	uci add_list mcast.@proxy[-1].filter="239.0.0.0/8"
 }
 
+generate_mld_snooping_config(){
+	local u_itf="$1"
+
+	uci add mcast snooping
+	uci rename mcast.@snooping[-1]="mc_snooping_MLD"
+	uci set mcast.@snooping[-1].enable="1"
+	uci set mcast.@snooping[-1].proto="mld"
+	uci set mcast.@snooping[-1].version="2"
+	uci set mcast.@snooping[-1].robustness="2"
+	uci set mcast.@snooping[-1].query_interval="125"
+	uci set mcast.@snooping[-1].query_response_interval="100"
+	uci set mcast.@snooping[-1].last_member_query_interval="10"
+	uci set mcast.@snooping[-1].fast_leave="1"
+	uci set mcast.@snooping[-1].snooping_mode="2"
+	uci set mcast.@snooping[-1].interface="$u_itf"
+}
+
+generate_igmp_snooping_config(){
+	local u_itf="$1"
+
+	uci add mcast snooping
+	uci rename mcast.@snooping[-1]="igmp_snooping_1"
+	uci set mcast.@snooping[-1].enable="1"
+	uci set mcast.@snooping[-1].proto="igmp"
+	uci set mcast.@snooping[-1].version="2"
+	uci set mcast.@snooping[-1].robustness="2"
+	uci set mcast.@snooping[-1].query_interval="125"
+	uci set mcast.@snooping[-1].query_response_interval="100"
+	uci set mcast.@snooping[-1].last_member_query_interval="10"
+	uci set mcast.@snooping[-1].fast_leave="1"
+	uci set mcast.@snooping[-1].snooping_mode="2"
+	uci set mcast.@snooping[-1].interface="$u_itf"
+
+	uci add_list mcast.@snooping[-1].filter="239.0.0.0/8"
+}
+
+check_wan_bridge() {
+	local config="$1"
+	local wan_device="$2"
+	local name type
+
+	[ $((is_wan_bridge)) -ne 0 ] && return
+
+	config_get type "$config" type
+	config_get name "$config" name
+
+	[ "$type" = "bridge" -a "$wan_device" = "$name" ] && is_wan_bridge=1
+}
+
 generate_mcast_config(){
+	local up_itf="$(uci -q get network.wan.device)"
+	local is_wan_bridge=0
 
-	up_itf="$(uci -q get network.wan.device)"
+	config_load network
+	config_foreach check_wan_bridge device "$up_itf"
 
-	generate_igmp_proxy_config "$up_itf"
-	generate_mld_proxy_config "$up_itf"
+	if [ $((is_wan_bridge)) -eq 0 ]; then
+		generate_igmp_proxy_config "$up_itf"
+		generate_mld_proxy_config "$up_itf"
+	else
+		generate_igmp_snooping_config "$up_itf"
+		generate_mld_snooping_config "$up_itf"
+	fi
 }
 
 interfaces_ok(){

mcastmngr/files/linux/etc/firewall.mcast

@@ -1,2 +1,140 @@
-# Forward multicast packets from wan to lan
-iptables -w -t filter -A zone_wan_forward -p udp -d 224.0.0.0/240.0.0.0 -m comment --comment "!fw3: Allow-Multicast-UDP" -j zone_lan_dest_ACCEPT
+#!/bin/sh
+
+. /lib/functions.sh
+. /usr/share/libubox/jshn.sh
+
+ZONE_NAME_FILE="/tmp/mcast_fw_zone"
+
+log() {
+	echo "${@}"|logger -t firewall.mcast -p info
+}
+
+collect_zone_name() {
+	local name network
+
+	config_get name "${1}" name ""
+	if [ -z "${name}" ]; then
+		return
+	fi
+
+	config_get network "${1}" network ""
+	for i in ${network}; do
+		var="${i}_zone"
+		echo "${var}=${name}" >> "${ZONE_NAME_FILE}"
+	done
+}
+
+load_zone_names() {
+	rm -f "${ZONE_NAME_FILE}"
+	config_load firewall
+	config_foreach collect_zone_name zone
+}
+
+get_firewall_zone() {
+	if [ ! -f "${ZONE_NAME_FILE}" ]; then
+		echo ""
+		return
+	fi
+
+	var="${1}_zone="
+	name="$(cat ${ZONE_NAME_FILE} | grep ${var} | head -n 1 | cut -d'=' -f 2)"
+
+	echo "${name}"
+}
+
+# Get interface name for a device (e.g., br-lan -> lan)
+find_interface_for_device() {
+	local dev="${1}"
+	local intf=""
+	local intf_dump idx
+
+	if [ -z "${dev}" ]; then
+		echo ""
+		return
+	fi
+
+	intf_dump="$(ubus -t 5 call network.interface dump)"
+	if [ -z "${intf_dump}" ]; then
+		echo ""
+		return
+	fi
+
+	json_load "${intf_dump}"
+	json_select interface
+	if [ "$?" -ne 0 ]; then
+		echo ""
+		return
+	fi
+
+	idx=1
+	while json_is_a ${idx} object; do
+		json_select ${idx}
+		if [ "$?" -ne 0 ]; then
+			break
+		fi
+
+		json_get_var device device
+		if [ "${device}" = "${dev}" ]; then
+			json_get_var intf interface
+			break
+		fi
+
+		idx=$(( idx + 1 ))
+		json_select ..
+	done
+
+	echo "${intf}"
+}
+
+# Setup iptables rule to allow multicast from upstream to downstream
+setup_multicast_rule() {
+	local upstream_dev="$1"
+	local downstream_dev="$2"
+	local upstream_zone downstream_zone
+	local upstream_iface downstream_iface
+
+	upstream_iface=$(find_interface_for_device "$upstream_dev")
+	downstream_iface=$(find_interface_for_device "$downstream_dev")
+
+	[ -z "$upstream_iface" ] || [ -z "$downstream_iface" ] && {
+		log "Failed to map devices to interfaces"
+		return
+	}
+
+	upstream_zone=$(get_firewall_zone "$upstream_iface")
+	downstream_zone=$(get_firewall_zone "$downstream_iface")
+
+	[ -z "$upstream_zone" ] || [ -z "$downstream_zone" ] && {
+		log "Failed to map interfaces to zones"
+		return
+	}
+
+	iptables -w -t filter -A zone_${upstream_zone}_forward -p udp \
+	  -d 224.0.0.0/240.0.0.0 \
+	  -m comment --comment "!fw3: Allow-Multicast-UDP" \
+	  -j zone_${downstream_zone}_dest_ACCEPT
+}
+
+apply_mcast_rule() {
+	local cfg="$1"
+	local up down proto
+
+	config_get proto "$cfg" proto
+	[ "$proto" = "igmp" ] || return
+
+	config_get up "$cfg" upstream_interface
+	config_get down "$cfg" downstream_interface
+
+	[ -n "$up" ] && [ -n "$down" ] && setup_multicast_rule "$up" "$down"
+}
+
+add_multicast_rules() {
+	config_load mcast
+	config_foreach apply_mcast_rule proxy
+}
+
+load_zone_names
+
+add_multicast_rules
+
+rm -f "${ZONE_NAME_FILE}"

netmngr/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=netmngr
-PKG_VERSION:=1.1.5
+PKG_VERSION:=1.1.8
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/netmngr.git
-PKG_SOURCE_VERSION:=77158d2ee3ac2d144681f6352d6d18dde0db4b22
+PKG_SOURCE_VERSION:=6310f32b80f8abeccbf99ad55ce88792b19342d6
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

netmode/Makefile

@@ -8,11 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=netmode
-PKG_VERSION:=1.0.1
+PKG_VERSION:=1.1.5
 PKG_RELEASE:=1
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_LICENSE:=GPL-2.0-only
 include $(INCLUDE_DIR)/package.mk
+include $(TOPDIR)/feeds/iopsys/bbfdm/bbfdm.mk
 
 define Package/netmode
   CATEGORY:=Utilities
@@ -23,11 +24,29 @@ define Package/netmode/description
 	Network Modes and Utils
 endef
 
+define Package/$(PKG_NAME)/config
+	config NETMODE_VENDOR_PREFIX
+		depends on PACKAGE_netmode
+		string "Vendor Extension used for netmode datamodel"
+		default ""
+endef
+
+ifeq ($(CONFIG_NETMODE_VENDOR_PREFIX),"")
+VENDOR_PREFIX = $(CONFIG_BBF_VENDOR_PREFIX)
+else
+VENDOR_PREFIX = $(CONFIG_NETMODE_VENDOR_PREFIX)
+endif
+
 define Build/Compile
 endef
 
 define Package/netmode/install
-	$(CP) ./files/* $(1)/
+	$(INSTALL_DIR) $(1)/etc
+	$(INSTALL_DIR) $(1)/lib
+	$(CP) ./files/etc/* $(1)/etc/
+	$(CP) ./files/lib/* $(1)/lib/
+	$(BBFDM_REGISTER_SERVICES) -v ${VENDOR_PREFIX} ./bbfdm_service.json $(1) $(PKG_NAME)
+	$(BBFDM_INSTALL_MS_DM) -v ${VENDOR_PREFIX} ./files/datamodel.json $(1) $(PKG_NAME)
 endef
 
 $(eval $(call BuildPackage,netmode))

netmode/bbfdm_service.json

@@ -0,0 +1,16 @@
+{
+  "daemon": {
+    "enable": "1",
+    "service_name": "netmode",
+    "unified_daemon": false,
+    "services": [
+      {
+        "parent_dm": "Device.",
+        "object": "{BBF_VENDOR_PREFIX}NetMode"
+      }
+    ],
+    "config": {
+      "loglevel": "3"
+    }
+  }
+}

netmode/files/datamodel.json

@@ -0,0 +1,284 @@
+{
+	"json_plugin_version": 2,
+	"Device.{BBF_VENDOR_PREFIX}NetMode.": {
+		"type": "object",
+		"protocols": [
+			"cwmp",
+			"usp"
+		],
+		"description": "Datamodel vendor extension to support easy switching between wan types, a reboot is required in some cases after switching the mode",
+		"access": false,
+		"array": false,
+		"dependency": "file:/etc/config/netmode",
+		"Enable": {
+			"type": "boolean",
+			"read": true,
+			"write": true,
+			"description": "Enable/Disable WAN switching using netmode",
+			"protocols": [
+				"cwmp",
+				"usp"
+			],
+			"mapping": [
+				{
+					"type": "uci",
+					"uci": {
+						"file": "netmode",
+						"section": {
+							"name": "global"
+						},
+						"option": {
+							"name": "enabled"
+						}
+					}
+				}
+			]
+		},
+		"Mode": {
+			"type": "string",
+			"read": true,
+			"write": true,
+			"description": "Current configured netmode value",
+			"protocols": [
+				"cwmp",
+				"usp"
+			],
+			"flags": [
+				"Reference"
+			],
+			"mapping": [
+				{
+					"type": "uci",
+					"uci": {
+						"file": "netmode",
+						"section": {
+							"name": "global"
+						},
+						"option": {
+							"name": "mode"
+						}
+					},
+					"linker_obj": "Device.{BBF_VENDOR_PREFIX}NetMode.SupportedModes.[Name==@key]."
+				}
+			]
+		},
+		"SupportedModesNumberOfEntries": {
+			"type": "unsignedInt",
+			"read": true,
+			"write": false,
+			"description": "SupportedModes Number of entries in the current config",
+			"protocols": [
+				"cwmp",
+				"usp"
+			],
+			"mapping": [
+			{
+				"type": "uci",
+				"uci": {
+					"file": "netmode",
+					"section": {
+						"type": "supported_modes"
+					},
+					"option": {
+						"name": "@Count"
+					}
+				}
+			}
+			]
+		},
+		"Device.{BBF_VENDOR_PREFIX}NetMode.SupportedModes.{i}.": {
+			"type": "object",
+			"protocols": [
+				"cwmp",
+				"usp"
+			],
+			"access": false,
+			"array": true,
+			"description": "Object to list supported wan modes",
+			"mapping": [
+				{
+					"type": "uci",
+					"uci": {
+						"file": "netmode",
+						"section": {
+							"type": "supported_modes"
+						},
+						"dmmapfile": "dmmap_netmode"
+					}
+				}
+			],
+			"Name": {
+				"type": "string",
+				"read": true,
+				"write": false,
+				"description": "Name of the wan mode, it has to be unique and in sync with /etc/netmodes/",
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"flags": [
+					"Linker",
+					"Unique"
+				],
+				"mapping": [
+					{
+						"type": "uci_sec",
+						"data": "@Parent",
+						"key": "name"
+					}
+				]
+			},
+			"Description": {
+				"type": "string",
+				"read": true,
+				"write": false,
+				"description": "Human readable description for this mode",
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"mapping": [
+					{
+						"type": "uci_sec",
+						"data": "@Parent",
+						"key": "description"
+					}
+				]
+			},
+			"SupportedArgumentsNumberOfEntries": {
+				"type": "unsignedInt",
+				"read": true,
+				"write": false,
+				"description": "SupportedModes Number of entries in the current config",
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"mapping": [
+				{
+					"type": "uci",
+					"uci": {
+						"file": "netmode",
+						"section": {
+							"type": "supported_args"
+						},
+						"option": {
+							"name": "@Count"
+						}
+					}
+				}
+				]
+			},
+			"Device.{BBF_VENDOR_PREFIX}NetMode.SupportedModes.{i}.SupportedArguments.{i}.": {
+				"type": "object",
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"access": false,
+				"array": true,
+				"description": "Extra arguments for this Mode",
+				"mapping": [
+					{
+						"type": "uci",
+						"uci": {
+							"file": "netmode",
+							"section": {
+								"type": "supported_args"
+							},
+							"dmmapfile": "dmmap_netmode"
+						}
+					}
+				],
+				"Name": {
+					"type": "string",
+					"read": true,
+					"write": false,
+					"description": "Name of the argument",
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"mapping": [
+						{
+							"type": "uci_sec",
+							"data": "@Parent",
+							"key": "name"
+						}
+					]
+				},
+				"Type": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"description": "Datatype for this argument",
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"mapping": [
+						{
+							"type": "uci_sec",
+							"data": "@Parent",
+							"key": "type"
+						}
+					]
+				},
+				"Description": {
+					"type": "string",
+					"read": true,
+					"write": false,
+					"description": "Human readable description for this Argument",
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"mapping": [
+						{
+							"type": "uci_sec",
+							"data": "@Parent",
+							"key": "description"
+						}
+					]
+				},
+				"Required": {
+					"type": "boolean",
+					"read": true,
+					"write": false,
+					"description": "If Required is true, then Name and Value is mandatory for mode to apply",
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"mapping": [
+						{
+							"type": "uci_sec",
+							"data": "@Parent",
+							"key": "required"
+						}
+					]
+				},
+				"Value": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"description": "Value for this SupportedArguments Name, get on this parameter result into empty output",
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"flags": [
+						"Secure"
+					],
+					"mapping": [
+						{
+							"type": "uci_sec",
+							"data": "@Parent",
+							"key": "value"
+						}
+					]
+				}
+			}
+		}
+	}
+}

netmode/files/etc/config/netmode

@@ -1,3 +1,2 @@
 config netmode global
 	option enabled 0
-#	option mode 'router'

netmode/files/etc/init.d/netmode

@@ -6,28 +6,119 @@ USE_PROCD=1
 . /lib/functions.sh
 
 MODEDIR="/etc/netmodes"
+SUPP_MODES_SEC=""
+
+_log() {
+	logger -s -p user.info -t "netmode" "$*"
+}
 
 libnetmode_exec() {
 	when="$1"
 	# Execute /lib/netmode scripts
 	if [ -d /lib/netmode/$when ]; then
-		logger -s -p user.info -t "netmode" "Executing /lib/netmode/$when scripts"
+		_log "Executing /lib/netmode/$when scripts"
 		for script in $(ls /lib/netmode/$when/); do
 			sh /lib/netmode/$when/$script
 		done
 	fi
 }
 
+_get_modes_sec_name() {
+	local sec mode name
+
+	sec="${1}"
+	mode="${2}"
+
+	config_get name ${1} name ""
+	if [ "${name}" = "${mode}" ]; then
+		SUPP_MODES_SEC="${sec}"
+		break;
+	fi
+}
+
+_set_env_args() {
+	local sec name value required dm_parent
+
+	sec="${1}"
+
+	config_get_bool required ${sec} required "0"
+	config_get name ${sec} name ""
+	config_get value ${sec} value ""
+	config_get dm_parent ${sec} dm_parent ""
+
+	if [ -z "${dm_parent}" ]; then
+		continue;
+	fi
+
+	if [ "${dm_parent}" != "${SUPP_MODES_SEC}" ]; then
+		continue;
+	fi
+
+	if [ "${required}" -eq "1" ]; then
+		if [ -z "${name}" -o -z "${value}" ]; then
+			_log "Can't apply mode, name[${name}] or value[${value}] is missing"
+			exit 0
+		fi
+	fi
+
+	if [ -n "${name}" -a -n "${value}" ]; then
+		export NETMODE_${name}="${value}"
+	fi
+}
+
+configure_env_vars() {
+	local mode
+
+	mode="${1}"
+	if [ -z "${mode}" ]; then
+		_log "mode info missing"
+		exit 0
+	fi
+
+	SUPP_MODES_SEC=""
+	config_load "netmode"
+	config_foreach _get_modes_sec_name supported_modes "${mode}"
+
+	if [ -z "${SUPP_MODES_SEC}" ]; then
+		_log "mode ${mode} not found in uci"
+		exit 0
+	fi
+
+	config_foreach _set_env_args supported_args
+}
+
+cleanup_arg_values() {
+	local dm_parent
+
+	config_get dm_parent ${1} dm_parent ""
+	if [ "${dm_parent}" = "${SUPP_MODES_SEC}" ]; then
+		uci -q set netmode.${1}.value=""
+	fi
+}
+
+cleanup_env_vars() {
+	for e in $(env); do
+		if echo ${e} |grep -q "^NETMODE_"; then
+			unset ${e}
+		fi
+	done
+
+	if [ -n "${SUPP_MODES_SEC}" ]; then
+		config_load "netmode"
+		config_foreach cleanup_arg_values supported_args
+		uci commit netmode
+	fi
+}
+
 start_service() {
 	[ -f /etc/config/netmode ] || return
 
 	config_load netmode
-
 	config_get_bool enabled global enabled '0'
 	[ $enabled -eq 0 ] && return
 
 	# Get the desired netmode from config
-	config_get mode global mode
+	config_get mode global mode ""
 	# Check if netmode is set as boot environment parameter
 	[ -n "$mode" ] || mode="$(fw_printenv -n netmode 2>/dev/null)"
 	# Return if mode is not set
@@ -38,18 +129,16 @@ start_service() {
 	# Return if desired mode is same as last saved mode
 	[ "$mode" == "$lastmode" ] && return
 
-	# Save mode as last mode
-	[ -d $MODEDIR ] || mkdir -p $MODEDIR
-	echo "$mode" > $MODEDIR/.last_mode
-
-	logger -s -p user.info -t "netmode" "Switching to $mode Mode" >/dev/console
+	_log "Switching to [${mode}] Mode" >/dev/console
 
+	# Configure env variables
+	configure_env_vars ${mode}
 	# Execute netmode generic pre-mode-switch scripts
 	libnetmode_exec "pre"
 
 	# Copy netmode UCI config files
 	if [ -d $MODEDIR/$mode/uci ]; then
-		logger -s -p user.info -t "netmode" "Copying $MODEDIR/$mode/uci/* to /etc/config/"
+		_log "Copying $MODEDIR/$mode/uci/* to /etc/config/"
 		cp $MODEDIR/$mode/uci/* /etc/config/ 2>/dev/null
 	fi
 
@@ -58,7 +147,7 @@ start_service() {
 
 	# Execute mode specific scripts
 	if [ -d $MODEDIR/$mode/scripts ]; then
-		logger -s -p user.info -t "netmode" "Executing $MODEDIR/$mode/scripts/* scripts"
+		_log "Executing $MODEDIR/$mode/scripts/* scripts"
 		for script in $(ls $MODEDIR/$mode/scripts/); do
 			sh $MODEDIR/$mode/scripts/$script
 		done
@@ -66,6 +155,12 @@ start_service() {
 
 	# Execute netmode generic post-mode-switch scripts
 	libnetmode_exec "post"
+	cleanup_env_vars "${mode}"
+
+	# Save mode as last mode
+	[ -d $MODEDIR ] || mkdir -p $MODEDIR
+	echo "$mode" > $MODEDIR/.last_mode
+	_log "Switching to Mode [${mode}] done, last mode updated" >/dev/console
 }
 
 service_triggers()

netmode/files/etc/netmodes/bridged/scripts/10-bridged

@@ -0,0 +1,127 @@
+#!/bin/sh
+
+. /lib/functions.sh
+. /usr/share/libubox/jshn.sh
+
+source "/etc/device_info"
+
+l2_mcast_config() {
+	# configure L2 mcast config for snooping
+	logger -s -p user.info -t "netmode" "Generating L2 mcast configuration"
+
+	# remove proxy sections
+	uci -q delete mcast.igmp_proxy_1
+	uci -q delete mcast.mc_proxy_MLD
+
+	# add igmp_snooping section
+	uci -q set mcast.igmp_snooping_1=snooping
+	uci -q set mcast.igmp_snooping_1.enable='1'
+	uci -q set mcast.igmp_snooping_1.proto='igmp'
+	uci -q set mcast.igmp_snooping_1.version='2'
+	uci -q set mcast.igmp_snooping_1.robustness='2'
+	uci -q set mcast.igmp_snooping_1.query_interval='125'
+	uci -q set mcast.igmp_snooping_1.query_response_interval='100'
+	uci -q set mcast.igmp_snooping_1.last_member_query_interval='10'
+	uci -q set mcast.igmp_snooping_1.fast_leave='1'
+	uci -q set mcast.igmp_snooping_1.snooping_mode='2'
+	uci -q set mcast.igmp_snooping_1.interface='br-lan'
+	uci -q add_list mcast.igmp_snooping_1.filter='239.0.0.0/8'
+
+	# add mld_snooping section
+	uci -q set mcast.mld_snooping_1=snooping
+	uci -q set mcast.mld_snooping_1.enable='1'
+	uci -q set mcast.mld_snooping_1.proto='mld'
+	uci -q set mcast.mld_snooping_1.version='2'
+	uci -q set mcast.mld_snooping_1.robustness='2'
+	uci -q set mcast.mld_snooping_1.query_interval='125'
+	uci -q set mcast.mld_snooping_1.query_response_interval='100'
+	uci -q set mcast.mld_snooping_1.last_member_query_interval='10'
+	uci -q set mcast.mld_snooping_1.fast_leave='1'
+	uci -q set mcast.mld_snooping_1.snooping_mode='2'
+	uci -q set mcast.mld_snooping_1.interface='br-lan'
+
+	uci -q commit mcast
+}
+
+l2_network_config() {
+	logger -s -p user.info -t "netmode" "Generating L2 network configuration"
+
+	# Configure L2 Network Mode
+	uci -q set network.lan=interface
+	uci -q set network.lan.proto='dhcp'
+	uci -q set network.lan.vendorid="$(uci -q get network.wan.vendorid)"
+	uci -q set network.lan.clientid="$(uci -q get network.wan.clientid)"
+	uci -q set network.lan.reqopts="$(uci -q get network.wan.reqopts)"
+	uci -q set network.lan.sendopts="$(uci -q get network.wan.sendopts)"
+	uci -q set network.lan.device='br-lan'
+	uci -q set network.lan.force_link='1'
+
+	uci -q set network.lan6=interface
+	uci -q set network.lan6.proto='dhcpv6'
+	uci -q set network.lan6.device='@lan'
+	uci -q set network.lan6.reqprefix='no'
+
+	uci -q set network.wan.disabled='1'
+	uci -q set network.wan6.disabled='1'
+
+	uci -q delete network.br_lan.ports
+	uci -q set network.br_lan.bridge_empty='1'
+
+	add_port_to_br_lan() {
+		port="$1"
+		[ -n "$port" -a -d /sys/class/net/$port ] || continue
+		uci add_list network.br_lan.ports="$port"
+	}
+
+	if [ -f /etc/board.json ]; then
+		json_load_file /etc/board.json
+		json_select network
+		json_select lan
+		if json_is_a ports array; then
+			json_for_each_item add_port_to_br_lan ports
+		else
+			json_get_var device device
+			[ -n "$device" ] && uci add_list network.br_lan.ports="$device"
+		fi
+		json_select ..
+		json_select wan 2>/dev/null
+		json_get_var device device
+		[ -n "$device" ] && uci add_list network.br_lan.ports="$device"
+		json_cleanup
+	fi
+
+	uci -q commit network
+
+	# Disable DHCP Server
+	uci -q set dhcp.lan.ignore=1
+	uci -q commit dhcp
+	/etc/init.d/odhcpd disable
+
+	# Disable SSDPD
+	uci -q set ssdpd.ssdp.enabled="0"
+	uci -q commit ssdpd
+
+	# Update CWMP Agent WAN Interface
+	uci -q set cwmp.cpe.default_wan_interface="lan"
+	uci -q commit cwmp
+
+	# Update gateway WAN Interface
+	uci -q set gateway.global.wan_interface="lan"
+	uci -q commit gateway
+
+	# disable firewall
+	uci -q set firewall.globals.enabled="0"
+	uci -q commit firewall
+}
+
+l2_network_config
+l2_mcast_config
+
+# If device is already boot-up, assume netmode changed during runtime
+if [ -f /var/run/boot_complete ]; then
+	/etc/init.d/odhcpd stop 2>/dev/null
+	for config in network dhcp ssdpd cwmp gateway firewall mcast; do
+		ubus call uci commit "{\"config\":\"$config\"}"
+		sleep 1
+	done
+fi

netmode/files/etc/netmodes/routed-dhcp/scripts/10-routed-dhcp

@@ -0,0 +1,108 @@
+#!/bin/sh
+
+. /lib/functions.sh
+. /usr/share/libubox/jshn.sh
+
+source "/etc/device_info"
+
+l3_mcast_config() {
+	# configure L3 mcast config
+	logger -s -p user.info -t "netmode" "Generating L3 mcast configuration"
+
+	rm -f /etc/config/mcast
+	sh /rom/etc/uci-defaults/61-mcast_config_generate
+	uci -q commit mcast
+}
+
+l3_network_config() {
+	logger -s -p user.info -t "netmode" "Generating L3 network configuration"
+
+	# Configure L3 Network Mode
+	uci -q set network.lan=interface
+	uci -q set network.lan.device='br-lan'
+	uci -q set network.lan.proto='static'
+	uci -q set network.lan.ipaddr='192.168.1.1'
+	uci -q set network.lan.netmask='255.255.255.0'
+	uci -q set network.lan.ip6assign='60'
+	uci -q delete network.lan.vendorid
+	uci -q delete network.lan.clientid
+	uci -q delete network.lan.reqopts
+	uci -q delete network.lan.sendopts
+
+	uci -q delete network.lan6	
+
+	uci -q set network.wan=interface
+	uci -q set network.wan.proto='dhcp'
+	uci -q delete network.wan.disabled
+	uci -q delete network.wan.username
+	uci -q delete network.wan.password
+
+	uci -q set network.wan6=interface
+	uci -q set network.wan6.proto='dhcpv6'
+	uci -q delete network.wan6.disabled
+
+	uci -q delete network.br_lan.ports
+	uci -q set network.br_lan.bridge_empty='1'
+
+	add_port_to_br_lan() {
+		port="$1"
+		[ -n "$port" -a -d /sys/class/net/$port ] || continue
+		uci add_list network.br_lan.ports="$port"
+	}
+
+	if [ -f /etc/board.json ]; then
+		json_load_file /etc/board.json
+		json_select network
+		json_select lan
+		if json_is_a ports array; then
+			json_for_each_item add_port_to_br_lan ports
+		else
+			json_get_var device device
+			[ -n "$device" ] && uci add_list network.br_lan.ports="$device"
+		fi
+		json_select ..
+		json_select wan 2>/dev/null
+		json_get_var device device
+		if [ -n "$device" ]; then
+			uci -q set network.wan.device="$device"
+			uci -q set network.wan6.device="$device"
+		fi
+		json_cleanup
+	fi
+
+	uci -q commit network
+
+	# Enable DHCP Server
+	uci -q set dhcp.lan.ignore=0
+	uci -q set dhcp.wan.ignore=1
+	uci -q commit dhcp
+	/etc/init.d/odhcpd enable
+
+	# Enable SSDPD
+	uci -q set ssdpd.ssdp.enabled="1"
+	uci -q commit ssdpd
+
+	# Update CWMP Agent WAN Interface
+	uci -q set cwmp.cpe.default_wan_interface="wan"
+	uci -q commit cwmp
+
+	# Update gateway WAN Interface
+	uci -q set gateway.global.wan_interface="wan"
+	uci -q commit gateway
+
+	# Enable firewall
+	uci -q set firewall.globals.enabled="1"
+	uci -q commit firewall
+}
+
+l3_network_config
+l3_mcast_config
+
+# If device is already boot-up, assume netmode changed during runtime
+if [ -f /var/run/boot_complete ]; then
+	/etc/init.d/odhcpd restart 2>/dev/null
+	for config in network dhcp ssdpd cwmp gateway firewall mcast; do
+		ubus call uci commit "{\"config\":\"$config\"}"
+		sleep 1
+	done
+fi

netmode/files/etc/netmodes/routed-pppoe/scripts/10-routed-pppoe

@@ -0,0 +1,106 @@
+#!/bin/sh
+
+. /lib/functions.sh
+. /usr/share/libubox/jshn.sh
+
+source "/etc/device_info"
+
+l3_mcast_config() {
+	# configure L3 mcast config
+	logger -s -p user.info -t "netmode" "Generating L3 mcast configuration"
+
+	rm -f /etc/config/mcast
+	sh /rom/etc/uci-defaults/61-mcast_config_generate
+	uci -q commit mcast
+}
+
+l3_network_pppoe_config() {
+	logger -s -p user.info -t "netmode" "Generating L3 network configuration"
+
+	# Configure L3 Network Mode
+	uci -q set network.lan=interface
+	uci -q set network.lan.device='br-lan'
+	uci -q set network.lan.proto='static'
+	uci -q set network.lan.ipaddr='192.168.1.1'
+	uci -q set network.lan.netmask='255.255.255.0'
+	uci -q set network.lan.ip6assign='60'
+	uci -q delete network.lan.vendorid
+	uci -q delete network.lan.clientid
+	uci -q delete network.lan.reqopts
+	uci -q delete network.lan.sendopts
+
+	uci -q delete network.lan6
+
+	uci -q set network.wan=interface
+	uci -q set network.wan.proto='pppoe'
+	uci -q set network.wan.username="$NETMODE_username"
+	uci -q set network.wan.password="$NETMODE_password"
+	uci -q delete network.wan.disabled
+
+	uci -q set network.wan6.disabled='1'
+
+	uci -q delete network.br_lan.ports
+	uci -q set network.br_lan.bridge_empty='1'
+
+	add_port_to_br_lan() {
+		port="$1"
+		[ -n "$port" -a -d /sys/class/net/$port ] || continue
+		uci add_list network.br_lan.ports="$port"
+	}
+
+	if [ -f /etc/board.json ]; then
+		json_load_file /etc/board.json
+		json_select network
+		json_select lan
+		if json_is_a ports array; then
+			json_for_each_item add_port_to_br_lan ports
+		else
+			json_get_var device device
+			[ -n "$device" ] && uci add_list network.br_lan.ports="$device"
+		fi
+		json_select ..
+		json_select wan 2>/dev/null
+		json_get_var device device
+		if [ -n "$device" ]; then
+			uci -q set network.wan.device="$device"
+			uci -q set network.wan6.device="$device"
+		fi
+		json_cleanup
+	fi
+
+	uci -q commit network
+
+	# Enable DHCP Server
+	uci -q set dhcp.lan.ignore=0
+	uci -q set dhcp.wan.ignore=1
+	uci -q commit dhcp
+	/etc/init.d/odhcpd enable
+
+	# Enable SSDPD
+	uci -q set ssdpd.ssdp.enabled="1"
+	uci -q commit ssdpd
+
+	# Update CWMP Agent WAN Interface
+	uci -q set cwmp.cpe.default_wan_interface="wan"
+	uci -q commit cwmp
+
+	# Update gateway WAN Interface
+	uci -q set gateway.global.wan_interface="wan"
+	uci -q commit gateway
+
+	# Enable firewall
+	uci -q set firewall.globals.enabled="1"
+	uci -q commit firewall
+}
+
+l3_network_pppoe_config
+l3_mcast_config
+
+# If device is already boot-up, assume netmode changed during runtime
+if [ -f /var/run/boot_complete ]; then
+	/etc/init.d/odhcpd restart 2>/dev/null
+	for config in network dhcp ssdpd cwmp gateway firewall mcast; do
+		ubus call uci commit "{\"config\":\"$config\"}"
+		sleep 1
+	done
+fi

netmode/files/etc/netmodes/supported_modes.json

@@ -0,0 +1,29 @@
+{
+  "#mode": "routed-pppoe",
+  "supported_modes": [
+    {
+      "name": "routed-dhcp",
+      "description": "WAN with DHCP proto (Layer 3)"
+    },
+    {
+      "name": "routed-pppoe",
+      "description": "WAN with PPPoE (Layer 3)",
+      "supported_args": [
+        {
+          "name": "username",
+          "description": "PPPoE username",
+          "required": true,
+	  "type": "string",
+          "#value": "TestUser"
+        },
+        {
+          "name": "password",
+          "description": "PPPoE password",
+          "required": true,
+	  "type": "string",
+          "#value": "TestPassword"
+        }
+      ]
+    }
+  ]
+}

netmode/files/etc/uci-defaults/40_supported_mode

@@ -0,0 +1,106 @@
+#!/bin/sh
+
+. /lib/functions.sh
+. /usr/share/libubox/jshn.sh
+
+COUNT=1
+SUPP_ARGS=1
+SUPPORTED_MODE="/etc/netmodes/supported_modes.json"
+
+if [ ! -f "/etc/config/netmode" ]; then
+	exit 0
+fi
+
+if [ ! -f "${SUPPORTED_MODE}" ]; then
+	exit 0
+fi
+
+configure_supp_modes_args()
+{
+	local obj inst name description required value parent type
+
+	obj="${1}"
+	inst="${2}"
+	parent="${3}"
+
+	if [ -z "${inst}" ]; then
+		return 0
+	fi
+
+	json_select ${inst}
+	json_get_var name name
+	json_get_var description description
+	json_get_var value value
+	json_get_var required required
+	json_get_var type type
+
+	uci -q set netmode.${parent}_supprted_args_${SUPP_ARGS}=supported_args
+	uci -q set netmode.${parent}_supprted_args_${SUPP_ARGS}.name="${name}"
+	uci -q set netmode.${parent}_supprted_args_${SUPP_ARGS}.description="${description}"
+	uci -q set netmode.${parent}_supprted_args_${SUPP_ARGS}.required="${required}"
+	uci -q set netmode.${parent}_supprted_args_${SUPP_ARGS}.value="${value}"
+	uci -q set netmode.${parent}_supprted_args_${SUPP_ARGS}.type="${type}"
+	uci -q set netmode.${parent}_supprted_args_${SUPP_ARGS}.dm_parent="${parent}"
+
+	json_select ..
+	SUPP_ARGS="$((SUPP_ARGS + 1))"
+}
+
+configure_supp_modes()
+{
+	local obj inst name description args
+
+	obj="${1}"
+	inst="${2}"
+
+	if [ -z "${inst}" ]; then
+		return 0
+	fi
+
+	json_select ${inst}
+	json_get_var name name
+	json_get_var description description
+
+	if [ -d "/etc/netmodes/${name}" ]; then
+		uci -q set netmode.mode_${COUNT}=supported_modes
+		uci -q set netmode.mode_${COUNT}.name="${name}"
+		uci -q set netmode.mode_${COUNT}.description="${description}"
+	fi
+
+	SUPP_ARGS=1
+	json_for_each_item configure_supp_modes_args supported_args mode_${COUNT}
+
+	json_select ..
+	COUNT="$((COUNT + 1))"
+}
+
+remove_mode()
+{
+	uci -q delete netmode.${1}
+}
+
+cleanup_modes()
+{
+	config_load "netmode"
+	config_foreach remove_mode supported_modes
+}
+
+update_modes()
+{
+	local mode
+
+	json_init
+	json_load_file "${SUPPORTED_MODE}"
+	json_get_var mode mode ""
+
+	if [ -n "${mode}" ]; then
+		uci -q set netmode.global.mode="${mode}"
+	fi
+
+
+	json_for_each_item configure_supp_modes supported_modes
+
+}
+
+cleanup_modes
+update_modes

netmode/files/etc/uci-defaults/62-netmode.l2mode

@@ -80,7 +80,11 @@ l2_network_config() {
 		json_select ..
 		json_select wan 2>/dev/null
 		json_get_var device device
-		[ -n "$device" ] && uci add_list network.br_lan.ports="$device"
+		[ -n "$device" ] && {
+			# dedicated wan port - create uplink device
+			uci -q set network.l2wan=interface
+			uci -q set network.l2wan.device="$device"
+		}
 		json_cleanup
 	fi
 
@@ -109,7 +113,7 @@ l2_network_config() {
 }
 
 network_mode="$(fw_printenv -n netmode 2>/dev/null)"
-	
+
 case "$network_mode" in
 	layer2|extender)
 		l2_network_config

netmode/files/lib/netmode/post/datamodel_init.sh

@@ -0,0 +1,25 @@
+#!/bin/sh
+
+# This script is to cleanup dmmap and restart datamodel related services
+# when wan mode changes
+
+if [ -d "/etc/bbfdm/dmmap/" ]; then
+	rm -rf /etc/bbfdm/dmmap/*
+fi
+
+# If device is booting up, no need to restart services
+if [ ! -f /var/run/boot_complete ]; then
+	return 0
+fi
+
+if [ -x "/etc/init.d/bbfdm.services" ]; then
+	/etc/init.d/bbfdm.services restart
+fi
+
+if [ -x "/etc/init.d/bbfdmd" ]; then
+	/etc/init.d/bbfdmd restart
+fi
+
+if [ -x "/etc/init.d/obuspa" ]; then
+	/etc/init.d/obuspa restart
+fi

nlohmann-json/Makefile

@@ -0,0 +1,42 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=nlohmann-json
+PKG_VERSION:=3.11.2
+PKG_RELEASE:=1
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/nlohmann/json.git
+PKG_SOURCE_VERSION:=v$(PKG_VERSION)
+PKG_MIRROR_HASH:=skip
+
+PKG_LICENSE:=MIT
+PKG_LICENSE_FILES:=LICENSE.MIT
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/nlohmann-json
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=JSON for Modern C++ (nlohmann/json)
+endef
+
+define Package/nlohmann-json/description
+  JSON for Modern C++ is a single-header C++ library for working with JSON.
+endef
+
+define Build/Compile
+	# Header-only, nothing to compile
+	true
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include/nlohmann
+	$(CP) $(PKG_BUILD_DIR)/single_include/nlohmann/json.hpp $(1)/usr/include/nlohmann/
+endef
+
+define Package/nlohmann-json/install
+	true
+endef
+
+$(eval $(call BuildPackage,nlohmann-json))

nng/Makefile

@@ -0,0 +1,43 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=nng
+PKG_VERSION:=1.11
+PKG_RELEASE:=1
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/nanomsg/nng.git
+PKG_SOURCE_VERSION:=v$(PKG_VERSION)
+PKG_MIRROR_HASH:=skip
+
+PKG_LICENSE:=MIT
+PKG_LICENSE_FILES:=LICENSE.txt
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+define Package/nng
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=NNG - nanomsg-next-gen
+  URL:=https://github.com/nanomsg/nng
+  DEPENDS:=+libpthread +libatomic
+endef
+
+define Package/nng/description
+  NNG is a lightweight messaging library, a successor to nanomsg.
+endef
+
+CMAKE_OPTIONS += \
+	-DBUILD_SHARED_LIBS=ON \
+	-DNNG_ENABLE_EXAMPLES=OFF \
+	-DNNG_ENABLE_TESTS=OFF
+
+define Package/nng/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libnng.so* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,nng))

obuspa/Config.in

@@ -70,4 +70,13 @@ config OBUSPA_VENDOR_PREFIX
 config OBUSPA_OVERRIDE_CT_ROLE
 	bool "Override ControllerTrust role with factory default roles"
 	default y
+
+config OBUSPA_VC_POLL_PERIOD
+	int "Polling interval in sec for ValueChange Subscriptions"
+	range 15 120
+	default "15"
+	help
+	 Obuspa relies on a polling mechanism to determine the ValueChange, Add, Del Subscriptions.
+	 Short poll period could give more responsive subscription events, but might delay overall experience in slower CPUs with good amount of subscriptions, on the other hand, a bigger value results into less responsive subscription handling. This value must be in range of 15 to 120 secs. (default 15)
+
 endif

obuspa/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspa
-PKG_VERSION:=9.0.4.13
+PKG_VERSION:=10.0.4.1
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/obuspa.git
-PKG_SOURCE_VERSION:=9bd0c3c895cbcf34b922329c55a8262180b1fa86
+PKG_SOURCE_VERSION:=6b888812299de0d836a8dcf33bc899ec8ff16030
 PKG_MAINTAINER:=Vivek Dutta <vivek.dutta@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -107,6 +107,10 @@ ifneq ($(CONFIG_OBUSPA_MAX_CONTROLLERS_NUM),)
 TARGET_CFLAGS += -DOBUSPA_MAX_CONTROLLERS_NUM=$(CONFIG_OBUSPA_MAX_CONTROLLERS_NUM)
 endif
 
+ifneq ($(CONFIG_OBUSPA_VC_POLL_PERIOD),)
+TARGET_CFLAGS += -DOBUSPA_VC_POLL_PERIOD=$(CONFIG_OBUSPA_VC_POLL_PERIOD)
+endif
+
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
 	$(CP) -rf ~/git/obuspa/* $(PKG_BUILD_DIR)/

obuspa/files/etc/config/obuspa

@@ -1,6 +1,5 @@
 config obuspa 'global'
 	option enabled '1'
-	option debug '1'
 	option dhcp_discovery '1'
 	option log_level '2'
 	option prototrace '0'
@@ -9,6 +8,6 @@ config obuspa 'global'
 	#option max_cache_time '600'
 	#option trust_cert '/etc/obuspa/ca.pem'
 	#option client_cert '/etc/obuspa/client.pem'
-	#option log_dest '/tmp/obuspa.log'
+	option log_dest 'syslog'
 	option dm_caching_exclude '/etc/obuspa/transient_dm.json'
-
+	option dualstack_pref 'IPv6'

obuspa/files/etc/init.d/obuspa

@@ -156,7 +156,6 @@ validate_obuspa_section()
 		'client_cert:file' \
 		'interface:string' \
 		'ifname:string' \
-		'debug:bool:0' \
 		'prototrace:bool:0' \
 		'log_level:uinteger' \
 		'min_num_to_group:uinteger' \
@@ -242,7 +241,8 @@ validate_mqtt_client_section()
 		'Password:string' \
 		'ProtocolVersion:or("3.1", "3.1.1","5.0"):5.0' \
 		'TransportProtocol:or("TCP/IP","TLS"):TCP/IP' \
-		'ClientID:string'
+		'ClientID:string' \
+		'RequestResponseInfo:bool:1'
 }
 
 validate_challenge_section()
@@ -278,6 +278,11 @@ update_reset_reason()
 	fi
 }
 
+update_dual_stack_pref()
+{
+	db_set Internal.DualStackPreference "${1}"
+}
+
 get_role_index()
 {
 	local name drole
@@ -603,7 +608,7 @@ configure_stomp_connection() {
 
 configure_mqtt_client() {
 	local BrokerAddress BrokerPort Enable Username Password ProtocolVersion
-	local TransportProtocol ClientID
+	local TransportProtocol ClientID RequestResponseInfo
 	local sec
 
 	sec="${1}"
@@ -628,22 +633,16 @@ configure_mqtt_client() {
 	db_set "${BASEPATH}.ProtocolVersion" "${ProtocolVersion}"
 	db_set "${BASEPATH}.TransportProtocol" "${TransportProtocol}"
 	db_set "${BASEPATH}.ClientID" "${ClientID}"
+	db_set "${BASEPATH}.RequestResponseInfo" "${RequestResponseInfo}"
 }
 
 
 configure_obuspa() {
-	local enabled trust_cert ifname interface debug prototrace log_level db_file log_dest
+	local enabled trust_cert ifname interface prototrace log_level db_file log_dest
 	local client_cert
 
 	validate_obuspa_section "global"
 
-	if [ "${debug}" -ne "0" ]; then
-		# Forward stdout of the command to logd
-		procd_set_param stdout 1
-		# Same for stderr
-		procd_set_param stderr 1
-	fi
-
 	if [ "${prototrace}" -eq 1 ]; then
 		procd_append_param command -p
 	fi
@@ -995,6 +994,8 @@ db_init()
 
 	#log "Create reset file ...."
 	config_load $CONFIGURATION
+	config_get dualstack_pref global dualstack_pref "IPv6"
+
 	global_init
 	config_foreach configure_localagent localagent
 	global_init
@@ -1009,8 +1010,10 @@ db_init()
 	config_foreach configure_subscription subscription
 	global_init
 	config_foreach configure_challenges challenge
-	global_init
+
 	update_reset_reason
+	update_dual_stack_pref "${dualstack_pref}"
+
 	uci_commit ${CONFIGURATION}
 
 	cp /etc/config/obuspa /tmp/obuspa/

obuspa/files/etc/users/roles/full_access.json

@@ -0,0 +1,14 @@
+{
+  "tr181": {
+    "name": "full_access",
+    "instance": 1,
+    "permission": [
+      {
+        "object": "Device.",
+        "perm": [
+          "PERMIT_ALL"
+        ]
+      }
+    ]
+  }
+}

obuspa/files/etc/users/roles/untrusted.json

@@ -0,0 +1,6 @@
+{
+  "tr181": {
+    "name": "Untrusted",
+    "instance": 2
+  }
+}

obuspa/patches/0001-fix_segfault_invalid_uds.patch

@@ -1,6 +1,8 @@
---- a/src/core/device_uds.c
-+++ b/src/core/device_uds.c
-@@ -182,10 +182,7 @@ int DEVICE_UDS_Start(void)
+Index: obuspa-10.0.0.1/src/core/device_uds.c
+===================================================================
+--- obuspa-10.0.0.1.orig/src/core/device_uds.c
++++ obuspa-10.0.0.1/src/core/device_uds.c
+@@ -183,10 +183,7 @@ int DEVICE_UDS_Start(void)
              USP_SNPRINTF(path, sizeof(path), "%s.%d", device_uds_conn_root, instance);
              USP_LOG_Warning("%s: Deleting %s as it contained invalid parameters.", __FUNCTION__, path);
              err = DATA_MODEL_DeleteInstance(path, 0);

obuspa/patches/0002-fix_e2e_session_init.patch

@@ -1,8 +1,8 @@
-Index: obuspa-9.0.0.25/src/core/device_controller.c
+Index: obuspa-10.0.4.0/src/core/device_controller.c
 ===================================================================
---- obuspa-9.0.0.25.orig/src/core/device_controller.c
-+++ obuspa-9.0.0.25/src/core/device_controller.c
-@@ -4210,6 +4210,14 @@ int ProcessControllerAdded(int cont_inst
+--- obuspa-10.0.4.0.orig/src/core/device_controller.c
++++ obuspa-10.0.4.0/src/core/device_controller.c
+@@ -4214,6 +4214,14 @@ int ProcessControllerAdded(int cont_inst
          goto exit;
      }
  
@@ -17,7 +17,7 @@ Index: obuspa-9.0.0.25/src/core/device_controller.c
      // Exit if unable to get the object instance numbers present in this controller's MTP table
      USP_SNPRINTF(path, sizeof(path), "%s.%d.MTP", device_cont_root, cont_instance);
      err = DATA_MODEL_GetInstances(path, &iv);
-@@ -4251,14 +4259,6 @@ int ProcessControllerAdded(int cont_inst
+@@ -4255,14 +4263,6 @@ int ProcessControllerAdded(int cont_inst
      DEVICE_MQTT_UpdateControllerTopics();
  #endif
  

obuspa/patches/0003-Return-error-when-XSI-compliant-strerror_r-fails-in-.patch

@@ -1,6 +1,8 @@
---- a/src/core/usp_err.c
-+++ b/src/core/usp_err.c
-@@ -189,7 +189,9 @@ char *USP_ERR_ToString(int err, char *bu
+Index: obuspa-10.0.0.1/src/core/usp_err.c
+===================================================================
+--- obuspa-10.0.0.1.orig/src/core/usp_err.c
++++ obuspa-10.0.0.1/src/core/usp_err.c
+@@ -190,7 +190,9 @@ char *USP_ERR_ToString(int err, char *bu
  {
  #if HAVE_STRERROR_R && !STRERROR_R_CHAR_P
      // XSI version of strerror_r

obuspa/patches/0004-bulkdata_extn.patch

@@ -1,8 +1,8 @@
-diff --git a/src/core/bdc_exec.c b/src/core/bdc_exec.c
-index dc30a98..6a2938b 100644
---- a/src/core/bdc_exec.c
-+++ b/src/core/bdc_exec.c
-@@ -548,10 +548,25 @@ int StartSendingReport(bdc_connection_t *bc)
+Index: obuspa-10.0.4.0/src/core/bdc_exec.c
+===================================================================
+--- obuspa-10.0.4.0.orig/src/core/bdc_exec.c
++++ obuspa-10.0.4.0/src/core/bdc_exec.c
+@@ -549,10 +549,25 @@ int StartSendingReport(bdc_connection_t
  
      // Set the list of headers
      bc->headers = NULL;
@@ -30,26 +30,26 @@ index dc30a98..6a2938b 100644
          bc->headers = curl_slist_append(bc->headers, "Content-Encoding: gzip");
      }
  
-diff --git a/src/core/bdc_exec.h b/src/core/bdc_exec.h
-index 8c259c5..6322221 100644
---- a/src/core/bdc_exec.h
-+++ b/src/core/bdc_exec.h
-@@ -53,6 +53,8 @@ void BDC_EXEC_ScheduleExit(void);
+Index: obuspa-10.0.4.0/src/core/bdc_exec.h
+===================================================================
+--- obuspa-10.0.4.0.orig/src/core/bdc_exec.h
++++ obuspa-10.0.4.0/src/core/bdc_exec.h
+@@ -54,6 +54,8 @@ void BDC_EXEC_ScheduleExit(void);
  #define BDC_FLAG_PUT            0x00000001  // If set, HTTP PUT should be used instead of HTTP POST when sending the report to the BDC server
  #define BDC_FLAG_GZIP           0x00000002  // If set, the reports contants are Gzipped
  #define BDC_FLAG_DATE_HEADER    0x00000004  // If set, the date header should be included in the HTTP post.
 -
 -
-+#define BDC_FLAG_HEADER_OBJ_HIER 0x00000008 // If set, report format in header would be json ObjectHierarchy 
++#define BDC_FLAG_HEADER_OBJ_HIER 0x00000008 // If set, report format in header would be json ObjectHierarchy
 +#define BDC_FLAG_HEADER_NAME_VAL 0x00000010 // If set, report format in header would be json NameValuePair
 +#define BDC_FLAG_HEADER_PER_ROW  0x00000020 // If set, report format in header would be csv ParameterPerRow
 +#define BDC_FLAG_HEADER_PER_COL  0x00000040 // If set, report format in header would be csv ParameterPerColumn
  #endif
-diff --git a/src/core/device_bulkdata.c b/src/core/device_bulkdata.c
-index 915b282..f799793 100755
---- a/src/core/device_bulkdata.c
-+++ b/src/core/device_bulkdata.c
-@@ -70,8 +70,12 @@
+Index: obuspa-10.0.4.0/src/core/device_bulkdata.c
+===================================================================
+--- obuspa-10.0.4.0.orig/src/core/device_bulkdata.c
++++ obuspa-10.0.4.0/src/core/device_bulkdata.c
+@@ -71,8 +71,12 @@
  
  //------------------------------------------------------------------------------
  // Definitions for formats that we support
@@ -64,7 +64,7 @@ index 915b282..f799793 100755
  
  
  // Definitions for Device.BulkData.Profile.{i}.JSONEncoding.ReportTimestamp
-@@ -161,6 +165,7 @@ static char *profile_push_event_args[] =
+@@ -162,6 +166,7 @@ static char *profile_push_event_args[] =
  typedef struct
  {
      int num_retained_failed_reports;
@@ -72,7 +72,7 @@ index 915b282..f799793 100755
  #ifdef ENABLE_MQTT
      char mqtt_reference[254];      // relates to Device.BulkData.Profile.{i}.MQTT.Reference
      char mqtt_publish_topic[254];  // relates to Device.BulkData.Profile.{i}.MQTT.PublishTopic
-@@ -171,6 +176,12 @@ typedef struct
+@@ -172,6 +177,12 @@ typedef struct
      char password[257];
      char compression[9];
      char method[9];
@@ -85,7 +85,7 @@ index 915b282..f799793 100755
      bool use_date_header;
  } profile_ctrl_params_t;
  
-@@ -219,6 +230,7 @@ int Validate_BulkDataEncodingType(dm_req_t *req, char *value);
+@@ -220,6 +231,7 @@ int Validate_BulkDataEncodingType(dm_req
  int Validate_BulkDataReportingInterval(dm_req_t *req, char *value);
  int Validate_BulkDataReference(dm_req_t *req, char *value);
  int Validate_BulkDataReportFormat(dm_req_t *req, char *value);
@@ -93,9 +93,9 @@ index 915b282..f799793 100755
  int Validate_BulkDataReportTimestamp(dm_req_t *req, char *value);
  int Validate_BulkDataCompression(dm_req_t *req, char *value);
  int Validate_BulkDataHTTPMethod(dm_req_t *req, char *value);
-@@ -246,7 +258,8 @@ bulkdata_profile_t *bulkdata_find_free_profile(void);
+@@ -247,7 +259,8 @@ bulkdata_profile_t *bulkdata_find_free_p
  bulkdata_profile_t *bulkdata_find_profile(int profile_id);
- int bulkdata_calc_report_map(bulkdata_profile_t *bp, kv_vector_t *report_map);
+ int bulkdata_calc_report_map(bulkdata_profile_t *bp, kv_vector_t *report_map, combined_role_t *combined_role);
  int bulkdata_reduce_to_alt_name(char *spec, char *path, char *alt_name, char *out_buf, int buf_len);
 -char *bulkdata_generate_json_report(bulkdata_profile_t *bp, char *report_timestamp);
 +char *bulkdata_generate_json_report(bulkdata_profile_t *bp, char *report_timestamp, char *report_format);
@@ -103,16 +103,16 @@ index 915b282..f799793 100755
  unsigned char *bulkdata_compress_report(profile_ctrl_params_t *ctrl, char *input_buf, int input_len, int *p_output_len);
  int bulkdata_schedule_sending_http_report(profile_ctrl_params_t *ctrl, bulkdata_profile_t *bp, unsigned char *json_report, int report_len);
  int bulkdata_start_profile(bulkdata_profile_t *bp);
-@@ -261,6 +274,8 @@ char *bulkdata_platform_calc_uri_query_string(kv_vector_t *escaped_map);
- int bulkdata_platform_get_param_refs(int profile_id, param_ref_vector_t *param_refs);
- void bulkdata_expand_param_ref(param_ref_entry_t *pr, group_get_vector_t *ggv);
+@@ -263,6 +276,8 @@ int bulkdata_platform_get_param_refs(int
+ int bulkdata_platform_calc_combined_role(int instance, combined_role_t **bulkdata_role, combined_role_t *combined_role, int *cont_instance);
+ void bulkdata_expand_param_ref(param_ref_entry_t *pr, group_get_vector_t *ggv, combined_role_t *combined_role);
  void bulkdata_append_to_result_map(param_ref_entry_t *pr, group_get_vector_t *ggv, kv_vector_t *report_map);
 +void append_string_to_target(char *str, char **output);
 +char *csv_encode(const char *str);
+ int GetAuto_BulkDataController(dm_req_t *req, char *buf, int len);
  #ifdef ENABLE_MQTT
  int Validate_BulkDataMqttReference(dm_req_t *req, char *value);
- void bulkdata_process_profile_mqtt(bulkdata_profile_t *bp);
-@@ -298,7 +313,7 @@ int DEVICE_BULKDATA_Init(void)
+@@ -301,7 +316,7 @@ int DEVICE_BULKDATA_Init(void)
      err |= USP_REGISTER_VendorParam_ReadOnly("Device.BulkData.Status", Get_BulkDataGlobalStatus, DM_STRING);
      err |= USP_REGISTER_Param_Constant("Device.BulkData.MinReportingInterval", BULKDATA_MINIMUM_REPORTING_INTERVAL_STR, DM_UINT);
      err |= USP_REGISTER_Param_SupportedList("Device.BulkData.Protocols", bdc_protocols, NUM_ELEM(bdc_protocols));
@@ -121,7 +121,7 @@ index 915b282..f799793 100755
      err |= USP_REGISTER_Param_Constant("Device.BulkData.ParameterWildCardSupported", "true", DM_BOOL);
      err |= USP_REGISTER_Param_Constant("Device.BulkData.MaxNumberOfProfiles", BULKDATA_MAX_PROFILES_STR, DM_INT);
      err |= USP_REGISTER_Param_Constant("Device.BulkData.MaxNumberOfParameterReferences", "-1", DM_INT);
-@@ -313,7 +328,7 @@ int DEVICE_BULKDATA_Init(void)
+@@ -316,7 +331,7 @@ int DEVICE_BULKDATA_Init(void)
      err |= USP_REGISTER_DBParam_ReadWrite("Device.BulkData.Profile.{i}.Name", "", NULL, NULL, DM_STRING);
      err |= USP_REGISTER_DBParam_ReadWrite("Device.BulkData.Profile.{i}.NumberOfRetainedFailedReports", "0", Validate_NumberOfRetainedFailedReports, NULL, DM_INT);
      err |= USP_REGISTER_DBParam_ReadWrite("Device.BulkData.Profile.{i}.Protocol", BULKDATA_PROTOCOL_HTTP, Validate_BulkDataProtocol, NULL, DM_STRING);
@@ -129,8 +129,8 @@ index 915b282..f799793 100755
 +    err |= USP_REGISTER_DBParam_ReadWrite("Device.BulkData.Profile.{i}.EncodingType", BULKDATA_ENCODING_TYPE_JSON, Validate_BulkDataEncodingType, NULL, DM_STRING);
      err |= USP_REGISTER_DBParam_ReadWrite("Device.BulkData.Profile.{i}.ReportingInterval", "86400", Validate_BulkDataReportingInterval, NotifyChange_BulkDataReportingInterval, DM_UINT);
      err |= USP_REGISTER_DBParam_ReadWrite("Device.BulkData.Profile.{i}.TimeReference", UNKNOWN_TIME_STR, NULL, NotifyChange_BulkDataTimeReference, DM_DATETIME);
- 
-@@ -325,9 +340,16 @@ int DEVICE_BULKDATA_Init(void)
+     err |= USP_REGISTER_DBParam_ReadOnlyAuto("Device.BulkData.Profile.{i}.Controller", GetAuto_BulkDataController, DM_STRING);
+@@ -329,9 +344,16 @@ int DEVICE_BULKDATA_Init(void)
      err |= USP_REGISTER_DBParam_ReadWrite("Device.BulkData.Profile.{i}.Parameter.{i}.Reference", "", Validate_BulkDataReference, NULL, DM_STRING);
  
      // Device.BulkData.Profile.{i}.JSONEncoding
@@ -148,7 +148,7 @@ index 915b282..f799793 100755
      // Device.BulkData.Profile.{i}.HTTP
      err |= USP_REGISTER_DBParam_ReadWrite("Device.BulkData.Profile.{i}.HTTP.URL", "", NULL, NotifyChange_BulkDataURL, DM_STRING);
      err |= USP_REGISTER_DBParam_ReadWrite("Device.BulkData.Profile.{i}.HTTP.Username", "", NULL, NULL, DM_STRING);
-@@ -613,9 +635,10 @@ int Validate_BulkDataProtocol(dm_req_t *req, char *value)
+@@ -687,9 +709,10 @@ int Validate_BulkDataProtocol(dm_req_t *
  int Validate_BulkDataEncodingType(dm_req_t *req, char *value)
  {
      // Exit if trying to set a value outside of the range we accept
@@ -162,7 +162,7 @@ index 915b282..f799793 100755
          return USP_ERR_INVALID_VALUE;
      }
  
-@@ -719,9 +742,36 @@ int Validate_BulkDataReference(dm_req_t *req, char *value)
+@@ -793,9 +816,36 @@ int Validate_BulkDataReference(dm_req_t
  int Validate_BulkDataReportFormat(dm_req_t *req, char *value)
  {
      // Exit if trying to set a value outside of the range we accept
@@ -201,7 +201,7 @@ index 915b282..f799793 100755
          return USP_ERR_INVALID_VALUE;
      }
  
-@@ -2052,6 +2102,14 @@ int bulkdata_platform_get_profile_control_params(bulkdata_profile_t *bp, profile
+@@ -2151,6 +2201,14 @@ int bulkdata_platform_get_profile_contro
          return err;
      }
  
@@ -216,7 +216,7 @@ index 915b282..f799793 100755
      // Exit if unable to get ReportTimestamp
      USP_SNPRINTF(path, sizeof(path), "Device.BulkData.Profile.%d.JSONEncoding.ReportTimestamp", bp->profile_id);
      err = DATA_MODEL_GetParameterValue(path, ctrl_params->report_timestamp, sizeof(ctrl_params->report_timestamp), 0);
-@@ -2060,6 +2118,54 @@ int bulkdata_platform_get_profile_control_params(bulkdata_profile_t *bp, profile
+@@ -2159,6 +2217,54 @@ int bulkdata_platform_get_profile_contro
          return err;
      }
  
@@ -271,7 +271,7 @@ index 915b282..f799793 100755
  #ifdef ENABLE_MQTT
  {
      char protocol[32];
-@@ -2333,7 +2439,7 @@ void bulkdata_process_profile_http(bulkdata_profile_t *bp)
+@@ -2492,7 +2598,7 @@ void bulkdata_process_profile_http(bulkd
  {
      int err;
      report_t *cur_report;
@@ -280,7 +280,7 @@ index 915b282..f799793 100755
      profile_ctrl_params_t ctrl;
      unsigned char *compressed_report;
      int compressed_len;
-@@ -2372,10 +2478,23 @@ void bulkdata_process_profile_http(bulkdata_profile_t *bp)
+@@ -2541,26 +2647,39 @@ void bulkdata_process_profile_http(bulkd
      }
  
      // Exit if unable to generate the report
@@ -308,7 +308,9 @@ index 915b282..f799793 100755
          return;
      }
  
-@@ -2384,14 +2503,14 @@ void bulkdata_process_profile_http(bulkdata_profile_t *bp)
+     // Print out the JSON report, if debugging is enabled
+-    USP_LOG_Info("\nBULK DATA: %sing at time %s, to url=%s", ctrl.method, iso8601_cur_time(buf, sizeof(buf)), ctrl.url);
++    USP_LOG_Info("BULK DATA: %sing at time %s, to url=%s", ctrl.method, iso8601_cur_time(buf, sizeof(buf)), ctrl.url);
      USP_LOG_Info("BULK DATA: using compression method=%s", ctrl.compression);
      if (enable_protocol_trace)
      {
@@ -327,7 +329,7 @@ index 915b282..f799793 100755
      }
      // NOTE: From this point on, only the compressed_report exists
  
-@@ -2421,8 +2540,15 @@ void bulkdata_process_profile_usp_event(bulkdata_profile_t *bp)
+@@ -2590,8 +2709,15 @@ void bulkdata_process_profile_usp_event(
      kv_vector_t event_args;
      kv_pair_t kv;
      report_t *cur_report;
@@ -341,11 +343,11 @@ index 915b282..f799793 100755
 +    char escape_char[10];
 +    char csv_format[20];
 +    char row_timestamp[33];
- 
-     // Exit if the MTP has not been connected to successfully after bootup
-     // This is to prevent BDC events being enqueued before the Boot! event is sent (the Boot! event is only sent after successfully connecting to the MTP).
-@@ -2431,13 +2557,63 @@ void bulkdata_process_profile_usp_event(bulkdata_profile_t *bp)
-         goto exit;
+     combined_role_t *bulkdata_role;
+     combined_role_t combined_role;
+     int cont_instance;
+@@ -2610,13 +2736,63 @@ void bulkdata_process_profile_usp_event(
+         return;
      }
  
 -    // Exit if unable to get ReportTimestamp
@@ -361,7 +363,7 @@ index 915b282..f799793 100755
 +    if (err != USP_ERR_OK) {
 +         return;
 +     }
-+ 
++
 +    if (strcmp(encoding_type, BULKDATA_ENCODING_TYPE_JSON) == 0) {
 +        // Exit if unable to get ReportTimestamp
 +        USP_SNPRINTF(path, sizeof(path), "Device.BulkData.Profile.%d.JSONEncoding.ReportTimestamp", bp->profile_id);
@@ -415,7 +417,7 @@ index 915b282..f799793 100755
  
      // When sending via USP events, only one report is ever sent in each USP event
      // So ensure all retained reports are removed. NOTE: Clearing the reports here is only necessary when switching protocol from HTTP to USP event, and where HTTP had some unsent reports
-@@ -2455,11 +2631,17 @@ void bulkdata_process_profile_usp_event(bulkdata_profile_t *bp)
+@@ -2634,11 +2810,17 @@ void bulkdata_process_profile_usp_event(
      }
      bp->num_retained_reports = 1;
  
@@ -436,7 +438,7 @@ index 915b282..f799793 100755
          return;
      }
  
-@@ -2467,15 +2649,15 @@ void bulkdata_process_profile_usp_event(bulkdata_profile_t *bp)
+@@ -2646,15 +2828,15 @@ void bulkdata_process_profile_usp_event(
  
      // Construct event_args manually to avoid the overhead of a malloc and copy of the report in KV_VECTOR_Add()
      kv.key = "Data";
@@ -446,7 +448,7 @@ index 915b282..f799793 100755
      event_args.num_entries = 1;
  
      USP_SNPRINTF(path, sizeof(path), "Device.BulkData.Profile.%d.Push!", bp->profile_id);
-     DEVICE_SUBSCRIPTION_ProcessAllEventCompleteSubscriptions(path, &event_args);
+     DEVICE_SUBSCRIPTION_ProcessAllEventCompleteSubscriptions(path, &event_args, cont_instance);
  
 -    // Free the report. No need to free the event_args as json_report is the only thing dynamically allocated in it
 -    free(json_report);      // The report is not allocated via USP_MALLOC
@@ -455,7 +457,7 @@ index 915b282..f799793 100755
  
      // From the point of view of this code, the report(s) have been successfully sent, so don't retain them
      // NOTE: Sending of the reports successfully is delegated to the USP notification retry mechanism
-@@ -2547,11 +2729,24 @@ void bulkdata_process_profile_mqtt(bulkdata_profile_t *bp)
+@@ -2736,15 +2918,28 @@ void bulkdata_process_profile_mqtt(bulkd
      }
  
      // Exit if unable to generate the report
@@ -483,9 +485,23 @@ index 915b282..f799793 100755
 +        USP_ERR_SetMessage("%s: bulkdata invalid report encoding type %s", __FUNCTION__, ctrl.encoding_type);
 +        return;
      }
-
+ 
      // Print out the JSON report, if debugging is enabled
-@@ -2762,7 +2957,7 @@ int bulkdata_reduce_to_alt_name(char *spec, char *path, char *alt_name, char *ou
+-    USP_LOG_Debug("\nBULK DATA: Sending at time %s to MQTT topic %s", iso8601_cur_time(buf, sizeof(buf)), ctrl.mqtt_publish_topic);
++    USP_LOG_Debug("BULK DATA: Sending at time %s to MQTT topic %s", iso8601_cur_time(buf, sizeof(buf)), ctrl.mqtt_publish_topic);
+     if (enable_protocol_trace)
+     {
+         USP_LOG_String(kLogLevel_Info, kLogType_Protocol, report);
+@@ -2939,7 +3134,7 @@ int bulkdata_reduce_to_alt_name(char *sp
+ 
+ /*********************************************************************//**
+ **
+-**  bulkdata_generate_json_report
++**  bulkdata_generate_json_name_value_pair_report
+ **
+ **  Generates a JSON name-value pair format report
+ **  NOTE: The report contains all retained failed reports, as well as the current report
+@@ -2951,7 +3146,7 @@ int bulkdata_reduce_to_alt_name(char *sp
  ** \return  pointer to NULL terminated dynamically allocated buffer containing the serialized report to send
  **
  **************************************************************************/
@@ -494,7 +510,7 @@ index 915b282..f799793 100755
  {
      JsonNode *top;          // top of report
      JsonNode *array;        // array of reports (retained + current)
-@@ -2867,6 +3062,483 @@ char *bulkdata_generate_json_report(bulkdata_profile_t *bp, char *report_timesta
+@@ -3056,6 +3251,483 @@ char *bulkdata_generate_json_report(bulk
      return result;
  }
  
@@ -978,7 +994,7 @@ index 915b282..f799793 100755
  /*********************************************************************//**
  **
  **  bulkdata_compress_report
-@@ -3070,6 +3742,20 @@ int bulkdata_schedule_sending_http_report(profile_ctrl_params_t *ctrl, bulkdata_
+@@ -3259,6 +3931,20 @@ int bulkdata_schedule_sending_http_repor
          flags |= BDC_FLAG_DATE_HEADER;
      }
  

obuspa/patches/0005-CTrust-SecureRoles.patch

@@ -1,562 +0,0 @@
-Index: obuspa-9.0.4.3/src/core/data_model.c
-===================================================================
---- obuspa-9.0.4.3.orig/src/core/data_model.c
-+++ obuspa-9.0.4.3/src/core/data_model.c
-@@ -57,6 +57,7 @@
- #include "iso8601.h"
- #include "group_get_vector.h"
- #include "plugin.h"
-+#include "device_ctrust.h"
- 
- #ifdef ENABLE_COAP
- #include "usp_coap.h"
-@@ -507,6 +508,14 @@ int DATA_MODEL_GetParameterValue(char *p
-         return USP_ERR_INVALID_PATH;
-     }
- 
-+    // Check if the parameter is secured and the controller has a secured role, and if the SHOW_PASSWORD flag is not set
-+    if (!(flags & SHOW_PASSWORD) && node->registered.param_info.type_flags & DM_SECURE && !DEVICE_CTRUST_IsControllerSecured())
-+    {
-+        // Return an empty string for secured parameters when controller doesn't have secured role
-+        *buf = '\0';
-+        return USP_ERR_OK;
-+    }
-+
-     // NOTE: We do not check 'is_qualified_instance' here, because the only time it would be unqualified, is if the
-     //       path represented a multi-instance object. If path does represent this, then it will be caught below (switch statement)
- 
-@@ -537,8 +546,8 @@ int DATA_MODEL_GetParameterValue(char *p
-             break;
- 
-         case kDMNodeType_DBParam_Secure:
--            // Return an empty string, if special flag is not set
--            if ((flags & SHOW_PASSWORD)==0)
-+	    // Return an empty string if the parameter is secured and the controller has a secured role, and if the SHOW_PASSWORD flag is not set
-+            if (!(flags & SHOW_PASSWORD) && node->registered.param_info.type_flags & DM_SECURE && !DEVICE_CTRUST_IsControllerSecured())
-             {
-                 *buf = '\0';
-                 break;
-Index: obuspa-9.0.4.3/src/core/device_ctrust.c
-===================================================================
---- obuspa-9.0.4.3.orig/src/core/device_ctrust.c
-+++ obuspa-9.0.4.3/src/core/device_ctrust.c
-@@ -64,6 +64,7 @@
- #include "text_utils.h"
- #include "dm_inst_vector.h"
- #include "database.h"
-+#include "device_ctrust.h"
- 
- //------------------------------------------------------------------------------
- // Location of the controller trust tables within the data model
-@@ -228,6 +229,7 @@ credential_t *FindCredentialByCertInstan
- int Get_CredentialRole(dm_req_t *req, char *buf, int len);
- int Get_CredentialCertificate(dm_req_t *req, char *buf, int len);
- int Get_CredentialNumEntries(dm_req_t *req, char *buf, int len);
-+int Validate_SecuredRoles(dm_req_t *req, char *value);
- 
- #ifndef REMOVE_DEVICE_SECURITY
- int InitChallengeTable();
-@@ -347,6 +349,10 @@ int DEVICE_CTRUST_Init(void)
-                         challenge_response_input_args, NUM_ELEM(challenge_response_input_args),
-                         NULL, 0);
- #endif
-+
-+    // Register Device.LocalAgent.ControllerTrust.SecuredRoles parameter
-+    err |= USP_REGISTER_DBParam_ReadWrite(DEVICE_CTRUST_ROOT ".SecuredRoles", "", Validate_SecuredRoles, NULL, DM_STRING);
-+
-     // Exit if any errors occurred
-     if (err != USP_ERR_OK)
-     {
-@@ -2793,3 +2799,128 @@ exit:
-     return err;
- }
- #endif // REMOVE_DEVICE_SECURITY
-+
-+
-+/*********************************************************************//**
-+**
-+** Validate_SecuredRoles
-+**
-+** Validates Device.LocalAgent.ControllerTrust.SecuredRoles
-+** Each list item MUST be the Path Name of a row in the Device.LocalAgent.ControllerTrust.Role table
-+**
-+** \param   req - pointer to structure identifying the parameter
-+** \param   value - value that the controller would like to set the parameter to
-+**
-+** \return  USP_ERR_OK if successful
-+**
-+**************************************************************************/
-+int Validate_SecuredRoles(dm_req_t *req, char *value)
-+{
-+    char *role_path;
-+    char *saveptr;
-+    char *str;
-+    char temp[MAX_DM_PATH];
-+    int role_instance;
-+    int err;
-+
-+    // Empty string is valid
-+    if (*value == '\0')
-+    {
-+        return USP_ERR_OK;
-+    }
-+
-+    // Copy the value as strtok_r modifies the string
-+    USP_STRNCPY(temp, value, sizeof(temp));
-+
-+    // Iterate through comma-separated list
-+    str = temp;
-+    role_path = strtok_r(str, ",", &saveptr);
-+    while (role_path != NULL)
-+    {
-+        // Trim whitespace
-+        role_path = TEXT_UTILS_TrimBuffer(role_path);
-+
-+        // Verify that this path exists in the Role table using DM_ACCESS_ValidateReference
-+        err = DM_ACCESS_ValidateReference(role_path, "Device.LocalAgent.ControllerTrust.Role.{i}", &role_instance);
-+        if (err != USP_ERR_OK)
-+        {
-+            USP_ERR_SetMessage("%s: Role path '%s' does not exist in Device.LocalAgent.ControllerTrust.Role table", __FUNCTION__, role_path);
-+            return USP_ERR_INVALID_VALUE;
-+        }
-+
-+        role_path = strtok_r(NULL, ",", &saveptr);
-+    }
-+
-+    return USP_ERR_OK;
-+}
-+
-+/*********************************************************************//**
-+**
-+** DEVICE_CTRUST_IsControllerSecured
-+**
-+** Determines whether the specified controller has a secured role
-+**
-+** \param   combined_role - pointer to structure containing the role indexes for this controller
-+**
-+** \return  true if the controller has a secured role, false otherwise
-+**
-+**************************************************************************/
-+bool DEVICE_CTRUST_IsControllerSecured()
-+{
-+    char secured_roles[MAX_DM_PATH];
-+    char *role_path;
-+    char *saveptr;
-+    char *str;
-+    char temp[MAX_DM_PATH];
-+    int err;
-+    role_t *role;
-+    int role_instance;
-+    combined_role_t combined_role;
-+
-+    // Exit if unable to get the secured roles
-+    err = DATA_MODEL_GetParameterValue("Device.LocalAgent.ControllerTrust.SecuredRoles", secured_roles, sizeof(secured_roles), 0);
-+    if (err != USP_ERR_OK)
-+    {
-+        return false;
-+    }
-+
-+    // Empty string means no secured roles
-+    if (*secured_roles == '\0')
-+    {
-+        return false;
-+    }
-+
-+    MSG_HANDLER_GetMsgRole(&combined_role);
-+    // Copy the value as strtok_r modifies the string
-+    USP_STRNCPY(temp, secured_roles, sizeof(temp));
-+
-+    // Iterate through comma-separated list
-+    str = temp;
-+    role_path = strtok_r(str, ",", &saveptr);
-+    while (role_path != NULL)
-+    {
-+        // Trim whitespace
-+        role_path = TEXT_UTILS_TrimBuffer(role_path);
-+
-+        // Extract the instance number from the role path
-+        err = DM_ACCESS_ValidateReference(role_path, "Device.LocalAgent.ControllerTrust.Role.{i}", &role_instance);
-+        if (err == USP_ERR_OK)
-+        {
-+            // Find the role in our internal array
-+            role = FindRoleByInstance(role_instance);
-+            if (role != NULL)
-+            {
-+                // Check if this role matches either the inherited or assigned role
-+                if ((role - roles == combined_role.inherited_index) ||
-+                    (role - roles == combined_role.assigned_index))
-+                {
-+                    return true;
-+                }
-+            }
-+        }
-+
-+        role_path = strtok_r(NULL, ",", &saveptr);
-+    }
-+
-+    return false;
-+}
-Index: obuspa-9.0.4.3/src/core/device_ctrust.h
-===================================================================
---- /dev/null
-+++ obuspa-9.0.4.3/src/core/device_ctrust.h
-@@ -0,0 +1,48 @@
-+/*
-+ *
-+ * Copyright (C) 2019-2025, Broadband Forum
-+ * Copyright (C) 2016-2025,  CommScope, Inc
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ *
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ *
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ *
-+ * 3. Neither the name of the copyright holder nor the names of its
-+ *    contributors may be used to endorse or promote products derived from
-+ *    this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-+ * THE POSSIBILITY OF SUCH DAMAGE.
-+ *
-+ */
-+
-+/**
-+ * \file device_ctrust.h
-+ *
-+ * Header file containing the API functions provided by Controller Trust component
-+ *
-+ */
-+#ifndef DEVICE_CTRUST_H
-+#define DEVICE_CTRUST_H
-+
-+#include "device.h"
-+
-+bool DEVICE_CTRUST_IsControllerSecured(void);
-+
-+#endif
-Index: obuspa-9.0.4.3/src/include/usp_api.h
-===================================================================
---- obuspa-9.0.4.3.orig/src/include/usp_api.h
-+++ obuspa-9.0.4.3/src/include/usp_api.h
-@@ -418,6 +418,7 @@ typedef struct
- #define DM_DECIMAL      0x00000100      // 64 bit floating point number (double)
- #define DM_LONG         0x00000200      // 64 bit signed integer (long long)
- #define DM_VALUE_CHANGE_WILL_IGNORE  0x00000400 // Do not emit value change notifications for this parameter
-+#define DM_SECURE       0x00000800      // secure parameter
- 
- //-------------------------------------------------------------------------
- // Functions to register the data model
-Index: obuspa-9.0.4.3/src/core/group_get_vector.c
-===================================================================
---- obuspa-9.0.4.3.orig/src/core/group_get_vector.c
-+++ obuspa-9.0.4.3/src/core/group_get_vector.c
-@@ -49,6 +49,16 @@
- #include "group_get_vector.h"
- #include "int_vector.h"
- #include "data_model.h"
-+#include "device_ctrust.h"   // Added to use DEVICE_CTRUST_IsControllerSecured()
-+
-+//------------------------------------------------------------------------------
-+// New function to check secure flag and controller state
-+static int IsSecuredParamNotAccessible(char *path)
-+{
-+    dm_instances_t inst;
-+    dm_node_t *node = DM_PRIV_GetNodeFromPath(path, &inst, NULL, 0);
-+    return (node && (node->registered.param_info.type_flags & DM_SECURE) && !DEVICE_CTRUST_IsControllerSecured());
-+}
- 
- //------------------------------------------------------------------------------
- // Forward declarations. Note these are not static, because we need them in the symbol table for USP_LOG_Callstack() to show them
-@@ -282,14 +292,14 @@ void GROUP_GET_VECTOR_GetValues(group_ge
-     return;
- #endif
- 
--    // Iterate over all parameters, getting them if non grouped, otherwise adding them to the relevant group to get
-+    // Iterate over all parameters, getting them if non-grouped, otherwise adding them to the relevant group to get
-     memset(ggv_indexes, 0, sizeof(ggv_indexes));
-     for (i=0; i < ggv->num_entries; i++)
-     {
-         gge = &ggv->vector[i];
-         if (gge->group_id == NON_GROUPED)
-         {
--            // If the parameter is not grouped, then get its value now.
-+            // For non-grouped parameters, directly call DATA_MODEL_GetParameterValue which handles secure parameters internally
-             gge->err_code = DATA_MODEL_GetParameterValue(gge->path, buf, sizeof(buf), 0);
-             if (gge->err_code != USP_ERR_OK)
-             {
-@@ -320,7 +330,6 @@ void GROUP_GET_VECTOR_GetValues(group_ge
-                 chunk_size = MIN(GROUP_GET_CHUNK_SIZE, iv->num_entries - start_index);
-                 GetParameterGroup(i, ggv, iv, start_index, chunk_size);
-             }
--
-         }
-     }
- 
-@@ -378,88 +387,101 @@ void GetParameterGroup(int group_id, gro
-         return;
-     }
- 
--    // Add all parameters to get in this group to a key value vector
--    // NOTE: We form the key value vector manually to avoid copying the param paths.
--    //       Ownership of the param paths stay with the group get vector
--    params.num_entries = chunk_size;
--    params.vector = USP_MALLOC(sizeof(kv_pair_t) * chunk_size);
-+    // Prepare a mapping for non-secure parameters and process secure ones directly
-+    int non_secure_count = 0;
-+    int *non_secure_map = USP_MALLOC(chunk_size * sizeof(int));
-     for (i=0; i < chunk_size; i++)
-     {
-         index = iv->vector[start_index + i];
-         gge = &ggv->vector[index];
-         USP_ASSERT(gge->path != NULL);
--
--        kv = &params.vector[i];
--        kv->key = gge->path;
--        kv->value = NULL;
-+        if (IsSecuredParamNotAccessible(gge->path))
-+        {
-+            // For secure parameter when controller is not secured, return empty value
-+            gge->value = USP_STRDUP("");
-+            gge->err_code = USP_ERR_OK;
-+        }
-+        else
-+        {
-+            non_secure_map[non_secure_count] = index;
-+            non_secure_count++;
-+        }
-     }
- 
--    // Exit if group callback fails
--    USP_ERR_ClearMessage();
--    err = get_group_cb(group_id, &params);
--    if (err != USP_ERR_OK)
-+    // If there are non-secure parameters, call the group callback for them
-+    if (non_secure_count > 0)
-     {
--        // Mark all results for params in this group with an error
--        usp_err_msg = USP_ERR_GetMessage();
--        for (i=0; i < chunk_size; i++)
-+        params.num_entries = non_secure_count;
-+        params.vector = USP_MALLOC(sizeof(kv_pair_t) * non_secure_count);
-+        for (i=0; i < non_secure_count; i++)
-         {
--            index = iv->vector[start_index + i];
-+            index = non_secure_map[i];
-             gge = &ggv->vector[index];
--            gge->err_code = USP_ERR_INTERNAL_ERROR;
-+            USP_ASSERT(gge->path != NULL);
-+            kv = &params.vector[i];
-+            kv->key = gge->path;
-+            kv->value = NULL;
-+        }
- 
--            // Assign an error message to this param
--            if (usp_err_msg[0] != '\0')
--            {
--                gge->err_msg = USP_STRDUP(usp_err_msg);
--            }
--            else
-+        USP_ERR_ClearMessage();
-+        err = get_group_cb(group_id, &params);
-+        if (err != USP_ERR_OK)
-+        {
-+            // Mark all non-secure results with an error
-+            usp_err_msg = USP_ERR_GetMessage();
-+            for (i=0; i < non_secure_count; i++)
-             {
--                // Form an error message if none was provided
--                USP_SNPRINTF(err_msg, sizeof(err_msg), "%s: Get group callback failed for param %s", __FUNCTION__, gge->path);
--                gge->err_msg = USP_STRDUP(err_msg);
-+                index = non_secure_map[i];
-+                gge = &ggv->vector[index];
-+                gge->err_code = USP_ERR_INTERNAL_ERROR;
-+                if (usp_err_msg[0] != '\0')
-+                {
-+                    gge->err_msg = USP_STRDUP(usp_err_msg);
-+                }
-+                else
-+                {
-+                    USP_SNPRINTF(err_msg, sizeof(err_msg), "%s: Get group callback failed for param %s", __FUNCTION__, gge->path);
-+                    gge->err_msg = USP_STRDUP(err_msg);
-+                }
-+                USP_SAFE_FREE(params.vector[i].value);
-             }
--
--            // NOTE: The group get might have populated a value for some params, so free these values
--            USP_SAFE_FREE(params.vector[i].value);
-+            USP_FREE(params.vector);
-+            USP_FREE(non_secure_map);
-+            return;
-         }
--        goto exit;
--    }
- 
--    // Move all parameter values obtained to the group get vector
--    // NOTE: Ownership of the value string transfers from the params vector to the group get vector
--    usp_err_msg = USP_ERR_GetMessage();
--    empty_count = 0;
--    for (i=0; i < chunk_size; i++)
--    {
--        kv = &params.vector[i];
--        index = iv->vector[start_index + i];
--        gge = &ggv->vector[index];
--
--        if (kv->value != NULL)
--        {
--            gge->value = kv->value;
--        }
--        else
-+        // Move all parameter values obtained to the group get vector for non-secure parameters
-+        usp_err_msg = USP_ERR_GetMessage();
-+        empty_count = 0;
-+        for (i=0; i < non_secure_count; i++)
-         {
--            // If this is the first parameter with no value, and an error message has been set, then use the error message
--            if ((usp_err_msg[0] != '\0') && (empty_count == 0))
-+            index = non_secure_map[i];
-+            gge = &ggv->vector[index];
-+            kv = &params.vector[i];
-+
-+            if (kv->value != NULL)
-             {
--                USP_SNPRINTF(err_msg, sizeof(err_msg), "%s", usp_err_msg);
-+                gge->value = kv->value;
-             }
-             else
-             {
--                USP_SNPRINTF(err_msg, sizeof(err_msg), "%s: Get group callback did not provide a value for param %s", __FUNCTION__, gge->path);
-+                if ((usp_err_msg[0] != '\0') && (empty_count == 0))
-+                {
-+                    USP_SNPRINTF(err_msg, sizeof(err_msg), "%s", usp_err_msg);
-+                }
-+                else
-+                {
-+                    USP_SNPRINTF(err_msg, sizeof(err_msg), "%s: Get group callback did not provide a value for param %s", __FUNCTION__, gge->path);
-+                }
-+                gge->err_code = USP_ERR_INTERNAL_ERROR;
-+                gge->err_msg = USP_STRDUP(err_msg);
-+                empty_count++;
-             }
--            gge->err_code = USP_ERR_INTERNAL_ERROR;
--            gge->err_msg = USP_STRDUP(err_msg);
--            empty_count++;
-         }
-+        USP_FREE(params.vector);
-     }
- 
--exit:
--    // Destroy the key-value vector.
--    // As ownership of all strings in it have transferred to the group get vector, we only have to free the array itself
--    USP_FREE(params.vector);
-+    USP_FREE(non_secure_map);
- }
- 
- /*********************************************************************//**
-@@ -486,9 +508,10 @@ void GetParametersIndividually(group_get
-     for (i=0; i < ggv->num_entries; i++)
-     {
-         gge = &ggv->vector[i];
-+
-         if (gge->group_id == NON_GROUPED)
-         {
--            // Non-grouped parameters can directly call DATA_MODEL_GetParameterValue()
-+            // For non-grouped parameters, directly call DATA_MODEL_GetParameterValue which handles secure parameters internally
-             gge->err_code = DATA_MODEL_GetParameterValue(gge->path, buf, sizeof(buf), 0);
-             if (gge->err_code == USP_ERR_OK)
-             {
-@@ -497,42 +520,51 @@ void GetParametersIndividually(group_get
-         }
-         else
-         {
--            // Grouped parameters cannot call DATA_MODEL_GetParameterValue(), as that would cause infinite recursion
--            get_group_cb = group_vendor_hooks[gge->group_id].get_group_cb;
--            if (get_group_cb == NULL)
-+            // For grouped parameters, check if the parameter is secure and the controller is not secured
-+            if (IsSecuredParamNotAccessible(gge->path))
-             {
--                // Set an error message, if no group callback registered for this parameter
--                USP_ERR_SetMessage("%s: No registered group callback to get param %s", __FUNCTION__, gge->path);
--                gge->err_code = USP_ERR_INTERNAL_ERROR;
-+                gge->value = USP_STRDUP("");
-+                gge->err_code = USP_ERR_OK;
-             }
-             else
-             {
--                // Get this grouped parameter individually using the group get callback
--                pv.num_entries = 1;
--                pv.vector = &param;
--                param.key = gge->path;
--                param.value = NULL;
--
--                USP_ERR_ClearMessage();
--                gge->err_code = get_group_cb(gge->group_id, &pv);
--                if (gge->err_code != USP_ERR_OK)
-+                // Grouped parameters cannot call DATA_MODEL_GetParameterValue(), as that would cause infinite recursion
-+                get_group_cb = group_vendor_hooks[gge->group_id].get_group_cb;
-+                if (get_group_cb == NULL)
-                 {
--                    USP_ERR_ReplaceEmptyMessage("%s: group get failed for '%s' (%s)", __FUNCTION__, gge->path, USP_ERR_UspErrToString(gge->err_code));
--                    USP_SAFE_FREE(param.value)
-+                    // Set an error message, if no group callback registered for this parameter
-+                    USP_ERR_SetMessage("%s: No registered group callback to get param %s", __FUNCTION__, gge->path);
-+                    gge->err_code = USP_ERR_INTERNAL_ERROR;
-                 }
-                 else
-                 {
--                    if (param.value != NULL)
-+                    // Get this grouped parameter individually using the group get callback
-+                    pv.num_entries = 1;
-+                    pv.vector = &param;
-+                    param.key = gge->path;
-+                    param.value = NULL;
-+
-+                    USP_ERR_ClearMessage();
-+                    gge->err_code = get_group_cb(gge->group_id, &pv);
-+                    if (gge->err_code != USP_ERR_OK)
-                     {
--                        // Move ownership of the returned string from param.value to gge->value
--                        gge->value = param.value;
--                        param.value = NULL;  // not strictly necessary
-+                        USP_ERR_ReplaceEmptyMessage("%s: group get failed for '%s' (%s)", __FUNCTION__, gge->path, USP_ERR_UspErrToString(gge->err_code));
-+                        USP_SAFE_FREE(param.value)
-                     }
-                     else
-                     {
--                        // If no value was returned, then this is also reported as an error in the group get array
--                        USP_ERR_ReplaceEmptyMessage("%s: Get group callback did not provide a value for param %s", __FUNCTION__, gge->path);
--                        gge->err_code = USP_ERR_INTERNAL_ERROR;
-+                        if (param.value != NULL)
-+                        {
-+                            // Move ownership of the returned string from param.value to gge->value
-+                            gge->value = param.value;
-+                            param.value = NULL;  // not strictly necessary
-+                        }
-+                        else
-+                        {
-+                            // If no value was returned, then this is also reported as an error in the group get array
-+                            USP_ERR_ReplaceEmptyMessage("%s: Get group callback did not provide a value for param %s", __FUNCTION__, gge->path);
-+                            gge->err_code = USP_ERR_INTERNAL_ERROR;
-+                        }
-                     }
-                 }
-             }
-@@ -545,3 +577,4 @@ void GetParametersIndividually(group_get
-         }
-     }
- }
-+

obuspa/patches/0006-contains-expression.patch

@@ -1,8 +1,8 @@
-Index: obuspa-9.0.4.11/src/core/expr_vector.c
+Index: obuspa-10.0.4.0/src/core/expr_vector.c
 ===================================================================
---- obuspa-9.0.4.11.orig/src/core/expr_vector.c
-+++ obuspa-9.0.4.11/src/core/expr_vector.c
-@@ -58,6 +58,7 @@ char *expr_op_2_str[kExprOp_Max] =
+--- obuspa-10.0.4.0.orig/src/core/expr_vector.c
++++ obuspa-10.0.4.0/src/core/expr_vector.c
+@@ -59,6 +59,7 @@ char *expr_op_2_str[kExprOp_Max] =
      "<",  // kExprOp_LessThan
      ">",  // kExprOp_GreaterThan
      "=",  // kExprOp_Equals
@@ -10,7 +10,7 @@ Index: obuspa-9.0.4.11/src/core/expr_vector.c
  };
  
  
-@@ -482,6 +483,15 @@ char *SplitOnOperator(char *buf, expr_op
+@@ -487,6 +488,15 @@ char *SplitOnOperator(char *buf, expr_op
          *op = '\0';
          return &op[2];
      }
@@ -26,20 +26,20 @@ Index: obuspa-9.0.4.11/src/core/expr_vector.c
  
      // Exit if found the "<" operator
      op = strchr(buf, '<');
-Index: obuspa-9.0.4.11/src/core/path_resolver.c
+Index: obuspa-10.0.4.0/src/core/path_resolver.c
 ===================================================================
---- obuspa-9.0.4.11.orig/src/core/path_resolver.c
-+++ obuspa-9.0.4.11/src/core/path_resolver.c
-@@ -1481,7 +1481,7 @@ int ResolveUniqueKey(char *resolved, cha
+--- obuspa-10.0.4.0.orig/src/core/path_resolver.c
++++ obuspa-10.0.4.0/src/core/path_resolver.c
+@@ -1088,7 +1088,7 @@ int ResolveUniqueKey(char *resolved, cha
      char temp[MAX_DM_PATH];
      bool is_match;
      bool is_ref_match;
 -    expr_op_t valid_ops[] = {kExprOp_Equal, kExprOp_NotEqual, kExprOp_LessThanOrEqual, kExprOp_GreaterThanOrEqual, kExprOp_LessThan, kExprOp_GreaterThan};
 +    expr_op_t valid_ops[] = {kExprOp_Equal, kExprOp_NotEqual, kExprOp_LessThanOrEqual, kExprOp_GreaterThanOrEqual, kExprOp_LessThan, kExprOp_GreaterThan, kExprOp_Contains};
-     unsigned short permission_bitmask;
  
      // Exit if unable to find the end of the unique key
-@@ -1815,6 +1815,67 @@ int DoUniqueKeysMatch(int index, search_
+     p = strchr(unresolved, ']');
+@@ -1754,6 +1754,67 @@ int DoUniqueKeysMatch(int index, search_
          }
          USP_ASSERT(gge->value != NULL);     // GROUP_GET_VECTOR_GetValues() should have set an error message if the vendor hook didn't set a value for the parameter
  
@@ -107,11 +107,11 @@ Index: obuspa-9.0.4.11/src/core/path_resolver.c
          // Determine the function to call to perform the comparison
          if (type_flags & (DM_INT | DM_UINT | DM_ULONG | DM_LONG | DM_DECIMAL))
          {
-Index: obuspa-9.0.4.11/src/include/usp_api.h
+Index: obuspa-10.0.4.0/src/include/usp_api.h
 ===================================================================
---- obuspa-9.0.4.11.orig/src/include/usp_api.h
-+++ obuspa-9.0.4.11/src/include/usp_api.h
-@@ -105,6 +105,7 @@ typedef enum
+--- obuspa-10.0.4.0.orig/src/include/usp_api.h
++++ obuspa-10.0.4.0/src/include/usp_api.h
+@@ -106,6 +106,7 @@ typedef enum
      kExprOp_LessThan,               // '<'
      kExprOp_GreaterThan,            // '>'
      kExprOp_Equals,                 // '='