sulu: use gnx server certificates if available

2025-12-24 19:14:05 +08:00 · 2025-03-12 17:48:47 +05:30
219 changed files with 2109 additions and 5641 deletions
--- a/bbfdm/Makefile
+++ b/bbfdm/Makefile
@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=bbfdm
-PKG_VERSION:=1.16.8
+PKG_VERSION:=1.15.6

 USE_LOCAL:=0
 ifneq ($(USE_LOCAL),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bbfdm.git
-PKG_SOURCE_VERSION:=1615b42e405faceceac825f9c0387a58b90785ae
+PKG_SOURCE_VERSION:=38636715adf891bbf64a45ba54a87582c0c7e134
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -70,15 +70,6 @@ define Package/bbfdmd/config
 	source "$(SOURCE)/Config_bbfdmd.in"
 endef

-# Below config is a hack to force-recompile dependent micro-services
-define Package/libbbfdm-api/config
-	if PACKAGE_bbfdmd
-		config BBF_LIBBBFDM_VERSION
-			string "Internal config variable to force recompile"
-			default "v${PKG_VERSION}"
-	endif
-endef
-
 define Package/libbbfdm-api/description
 Library contains the API(UCI, UBUS, JSON, CLI and Browse) of libbbfdm
 endef
@@ -155,10 +146,6 @@ 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
--- a/bbfdm/bbfdm.mk
+++ b/bbfdm/bbfdm.mk
@@ -6,7 +6,6 @@ BBFDM_BASE_DM_PATH=/usr/share/bbfdm
 BBFDM_INPUT_PATH=/etc/bbfdm/micro_services
 BBFDM_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))

-PKG_CONFIG_DEPENDS += CONFIG_BBF_LIBBBFDM_VERSION
 #BBFDM_VERSION:=$(shell grep -oP '(?<=^PKG_VERSION:=).*' ${BBFDM_DIR}/Makefile)
 #BBFDM_TOOLS:=$(BUILD_DIR)/bbfdm-$(BBFDM_VERSION)/tools

--- a/bbfdm/files/etc/bbfdm/critical_services.json
+++ b/bbfdm/files/etc/bbfdm/critical_services.json
@@ -8,16 +8,15 @@
 			"ieee1905",
 			"mapcontroller",
 			"mosquitto",
-			"nginx",
-			"netmode"
+			"nginx"
 	],
 	"cwmp": [
 			"firewall",
 			"network",
 			"dhcp",
-			"mapcontroller",
+			"stunc",
+			"xmpp",
 			"wireless",
-			"time",
-			"netmode"
+			"time"
 	]
 }
--- a/bbfdm/files/etc/config/bbfdm
+++ b/bbfdm/files/etc/config/bbfdm
@@ -1,7 +1,7 @@
 config bbfdmd 'bbfdmd'
 	option enable '1'
 	option debug '0'
-	option loglevel '3'
+	option loglevel '4'

 config micro_services 'micro_services'
 	option enable '1'
--- a/bbfdm/files/etc/init.d/bbf_configd
+++ b/bbfdm/files/etc/init.d/bbf_configd
@@ -10,10 +10,19 @@ 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

--- a/bbfdm/files/etc/init.d/bbfdm.services
+++ b/bbfdm/files/etc/init.d/bbfdm.services
@@ -5,7 +5,6 @@ STOP=05

 USE_PROCD=1
 PROG=/usr/sbin/dm-service
-DM_AGENT_PROG=/usr/sbin/dm-agent

 BBFDM_MICROSERVICE_DIR="/etc/bbfdm/services"

@@ -25,8 +24,7 @@ validate_bbfdm_micro_service_section()
 _add_microservice()
 {
 	local name path loglevel
-	local enable enable_core unified_daemon dm_framework
-	local daemon_prog
+	local enable enable_core unified_daemon

 	# Check enable from micro-service
 	path="${1}"
@@ -49,25 +47,14 @@ _add_microservice()
 		return 0
 	fi

-	json_get_var dm_framework dm-framework 0
-	if [ "${dm_framework}" -eq "1" ] || [ "${dm_framework}" = "true" ]; then
-		daemon_prog="${DM_AGENT_PROG}"
-	else
-		daemon_prog="${PROG}"
-	fi
-
 	json_select config
 	json_get_var loglevel loglevel 4

 	procd_open_instance "${name}"

-	procd_set_param command ${daemon_prog}
-
-	# Only add parameters for dm-service, not for dm-agent
-	if [ "${daemon_prog}" = "${PROG}" ]; then
-		procd_append_param command -m "${name}"
-		procd_append_param command -l "${loglevel}"
-	fi
+	procd_set_param command ${PROG}
+	procd_append_param command -m "${name}"
+	procd_append_param command -l "${loglevel}"

 	if [ "${enable_core}" -eq "1" ]; then
 		procd_set_param limits core="unlimited"
--- a/bbfdm/files/etc/ruleng/bbfdm.json
+++ b/bbfdm/files/etc/ruleng/bbfdm.json
@@ -1,66 +0,0 @@
-{
-	"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
-			}
-		]
-	}
-}
--- a/bbfdm/files/etc/uci-defaults/ruleng.bbfdm
+++ b/bbfdm/files/etc/uci-defaults/ruleng.bbfdm
@@ -1,2 +0,0 @@
-uci -q set ruleng.bbfdm=rule
-uci -q set ruleng.bbfdm.recipe='/etc/ruleng/bbfdm.json'
--- a/bbfdm/tools/bbfdm.sh
+++ b/bbfdm/tools/bbfdm.sh
@@ -12,7 +12,6 @@ DEST=""
 VENDOR_EXTN=""
 TOOLS="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
 SRC=""
-EXTRA_DATA=""

 while getopts ":mpsdtv:" opt; do
 	case ${opt} in
@@ -47,9 +46,6 @@ shift
 DEST="${1}"
 shift
 DATA="${1}"
-shift
-EXTRA_DATA="${1}"
-

 install_bin() {
 	if ! install -m0755 ${1} ${2}; then
@@ -148,9 +144,8 @@ if [ "${INPUT_FILE}" -eq "1" ]; then
 		exit 1
 	fi

-	service_name="$(cat ${SRC}|jq -r '.daemon.service_name')"
-	if [ -z "${service_name}" ]; then
-		echo "# service_name not defined in service json ...."
+	if [ -z "${DATA}" ]; then
+		echo "# Package name not provided ...."
 		exit 1
 	fi

@@ -161,7 +156,7 @@ if [ "${INPUT_FILE}" -eq "1" ]; then
 	fi

 	install_dir ${DEST}/etc/bbfdm/services
-	install_data ${tempfile} ${DEST}/etc/bbfdm/services/${service_name}.json
+	install_data ${tempfile} ${DEST}/etc/bbfdm/services/${DATA}.json

 	if [ -f "${tempfile}" ]; then
 		rm ${tempfile}
@@ -181,7 +176,7 @@ if [ "${MICRO_SERVICE}" -eq "1" ]; then
 		bbfdm_install_dm ${SRC} ${DEST}/${BBFDM_BASE_DM_PATH}/micro_services/${DATA}.${extn##*.}
 	else
 		install_dir ${DEST}/${BBFDM_BASE_DM_PATH}/micro_services/${DATA}
-		bbfdm_install_dm ${SRC} ${DEST}/${BBFDM_BASE_DM_PATH}/micro_services/${DATA}/$(printf "%02d" ${EXTRA_DATA})$(basename ${SRC})
+		bbfdm_install_dm ${SRC} ${DEST}/${BBFDM_BASE_DM_PATH}/micro_services/${DATA}/$(basename ${SRC})
 	fi
 else
 	if [ "${PLUGIN}" -eq "1" ]; then
--- a/bridgemngr/Config.in
+++ b/bridgemngr/Config.in
@@ -0,0 +1,17 @@
+if PACKAGE_bridgemngr
+
+config BRIDGEMNGR_BRIDGE_VLAN
+	bool "Use bridge-vlan backend"
+	help
+	   Set this option to use bridge-vlan as backend for VLAN objects.
+
+config BRIDGEMNGR_BRIDGE_VENDOR_EXT
+	bool "Use bridge BBF vendor extensions"
+	default y
+	help
+	   Set this option to use bridge BBF vendor extensions.
+
+config BRIDGEMNGR_BRIDGE_VENDOR_PREFIX
+	string "Package specific datamodel Vendor Prefix for TR181 extensions"
+	default ""
+endif
--- a/bridgemngr/Makefile
+++ b/bridgemngr/Makefile
@@ -0,0 +1,76 @@
+#
+# Copyright (C) 2020-2024 iopsys
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=bridgemngr
+PKG_VERSION:=1.0.13
+
+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:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
+endif
+
+PKG_LICENSE:=GPL-2.0-only
+PKG_LICENSE_FILES:=LICENSE
+
+include $(INCLUDE_DIR)/package.mk
+include ../bbfdm/bbfdm.mk
+
+define Package/bridgemngr
+ CATEGORY:=Utilities
+ TITLE:=Bridge Manager
+ DEPENDS:=+libuci +libubox +libubus +libblobmsg-json
+ DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service
+endef
+
+define Package/bridgemngr/description
+	Package to add Device.Bridging. data model support.
+endef
+
+define Package/$(PKG_NAME)/config
+	source "$(SOURCE)/Config.in"
+endef
+
+MAKE_PATH:=src
+
+ifeq ($(CONFIG_BRIDGEMNGR_BRIDGE_VENDOR_PREFIX),"")
+VENDOR_PREFIX = $(CONFIG_BBF_VENDOR_PREFIX)
+else
+VENDOR_PREFIX = $(CONFIG_BRIDGEMNGR_BRIDGE_VENDOR_PREFIX)
+endif
+
+TARGET_CFLAGS += -DBBF_VENDOR_PREFIX=\\\"$(VENDOR_PREFIX)\\\"
+
+ifeq ($(CONFIG_BRIDGEMNGR_BRIDGE_VLAN),y)
+	TARGET_CFLAGS += -DBRIDGE_VLAN_BACKEND
+endif
+
+define Package/bridgemngr/install
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_DIR) $(1)/etc/config
+
+	$(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) $(PKG_NAME)
+	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/libbridgemngr.so $(1) $(PKG_NAME)
+ifeq ($(CONFIG_BRIDGEMNGR_BRIDGE_VENDOR_EXT), y)
+	$(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/src/libbridgeext.so $(1) $(PKG_NAME)
+	$(BBFDM_INSTALL_MS_PLUGIN) -v ${VENDOR_PREFIX} ./files/VLAN_Filtering_Extension.json $(1) $(PKG_NAME)
+endif
+
+	$(INSTALL_BIN) ./files/etc/init.d/bridging $(1)/etc/init.d/
+	$(INSTALL_DATA) ./files/etc/config/bridging $(1)/etc/config/
+endef
+
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+	$(CP) ~/git/bridgemngr/* $(PKG_BUILD_DIR)/
+endef
+endif
+
+$(eval $(call BuildPackage,bridgemngr))
--- a/dm-framework/bbfdm_service.json
+++ b/dm-framework/bbfdm_service.json
@@ -2,7 +2,6 @@
  "daemon": {
    "enable": "1",
    "service_name": "bridgemngr",
-    "dm-framework": true,
    "unified_daemon": false,
    "services": [
      {
--- a/bridgemngr/files/VLAN_Filtering_Extension.json
+++ b/bridgemngr/files/VLAN_Filtering_Extension.json
@@ -0,0 +1,31 @@
+{
+	"json_plugin_version": 2,
+	"Device.Bridging.Bridge.{i}.": {
+		"type": "object",
+		"protocols": [
+			"cwmp",
+			"usp"
+		],
+		"access": true,
+		"array": true,
+		"{BBF_VENDOR_PREFIX}VLANFiltering": {
+			"type": "boolean",
+			"read": true,
+			"write": true,
+			"protocols": [
+				"cwmp",
+				"usp"
+			],
+			"datatype": "boolean",
+			"description": "Enable or disable VLAN Filtering on this bridge.",
+			"mapping": [
+				{
+					"data": "@Parent",
+					"type": "uci_sec",
+					"key": "vlan_filtering"
+				}
+			]
+		}
+	}
+}
+
--- a/dm-framework/files/etc/config/bridging
+++ b/dm-framework/files/etc/config/bridging
--- a/dm-framework/files/etc/init.d/bridging
+++ b/dm-framework/files/etc/init.d/bridging
@@ -77,7 +77,6 @@ handle_ebtables_rule() {
 }

 start_service() {
-	ubus -t 30 wait_for network.device uci
 	config_load bridging
 	config_foreach handle_ebtables_chain chain
 	config_foreach handle_ebtables_rule rule
--- a/bulkdata/Makefile
+++ b/bulkdata/Makefile
@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=bulkdata
-PKG_VERSION:=2.1.20
+PKG_VERSION:=2.1.19

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bulkdata.git
-PKG_SOURCE_VERSION:=a5e57962938ca143ede65d92be90b6e9fce66e15
+PKG_SOURCE_VERSION:=628525b02ae9ccd39f4bc85cf616ed4a102bca48
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
--- a/bulkdata/bbfdm_service.json
+++ b/bulkdata/bbfdm_service.json
@@ -3,11 +3,11 @@
    "enable": "1",
    "service_name": "bulkdata",
    "unified_daemon": true,
-    "proto": "cwmp",
    "services": [
      {
        "parent_dm": "Device.",
-        "object": "BulkData"
+        "object": "BulkData",
+        "proto": "cwmp"
      }
    ],
    "config": {
--- a/ddnsmngr/Makefile
+++ b/ddnsmngr/Makefile
@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=ddnsmngr
-PKG_VERSION:=1.0.12
+PKG_VERSION:=1.0.10

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/ddnsmngr.git
-PKG_SOURCE_VERSION:=44af9a7b3fec3929f8554af9633a5b8068189b48
+PKG_SOURCE_VERSION:=5144e73fad92d23ae706894a4357436c3fe89355
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
--- a/decollector/Makefile
+++ b/decollector/Makefile
@@ -1,23 +1,22 @@
 #
-# Copyright (C) 2021-2024 IOPSYS Software Solutions AB
-# Copyright (C) 2025 Genexis AB
+# Copyright (C) 2021-2023 IOPSYS Software Solutions AB
 #

 include $(TOPDIR)/rules.mk

 PKG_NAME:=decollector
-PKG_VERSION:=6.2.1.7
+PKG_VERSION:=6.2.0.1

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=ca92325ece080389ffb405c95048b64071eda653
+PKG_SOURCE_VERSION:=575ecfff3779aadcea83d890ba975109c0f7d6a3
 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@genexis.eu>
+PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>


 PKG_LICENSE:=BSD-3-Clause
--- a/dectmngr/Makefile
+++ b/dectmngr/Makefile
@@ -2,13 +2,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=dectmngr
 PKG_RELEASE:=3
-PKG_VERSION:=3.7.10
+PKG_VERSION:=3.7.3

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=1f851980a6ba616df54f79930225f8bcd563b711
+PKG_SOURCE_VERSION:=393dfd7637fdeccc24ef286c3daec9a232896b98
 PKG_MIRROR_HASH:=skip
 endif

@@ -61,7 +61,9 @@ define Package/$(PKG_NAME)/install

 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/app/dectmngr $(1)/usr/sbin/
 	$(STRIP) $(1)/usr/sbin/dectmngr
-ifeq ($(CONFIG_TARGET_airoha),)
+ifneq ($(CONFIG_TARGET_airoha),)
+	$(CP) ./firmware/airoha/* $(1)/etc/dspg/
+else
 	$(CP) ./firmware/common/* $(1)/etc/dspg/
 endif
 	$(CP) ./files/etc/* $(1)/etc/
--- a/dectmngr/files/etc/config/dect
+++ b/dectmngr/files/etc/config/dect
@@ -1,6 +1,3 @@
 config dect 'global'
-	option log_dect_cmbs 'syslog'
-	option log_level 'realtime,warning,error'
-
-config dect 'base'
-	option enable '1'
+ 	option log_dect_cmbs 'syslog'
+        option log_level 'realtime,warning,error'
--- a/dectmngr/files/etc/init.d/dectmngr
+++ b/dectmngr/files/etc/init.d/dectmngr
@@ -11,25 +11,6 @@ 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)
@@ -57,53 +38,13 @@ 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" "$(basename $device)"
+			printf "%s" "$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=
@@ -118,13 +59,9 @@ 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="ttyH0"
+		dcx81_uart_device=/dev/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"

@@ -140,27 +77,24 @@ 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" $opt_ext
+		procd_set_param command "$PROG" -comname "$dcx81_uart_device_wo_dev" $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" -log $LOG_PATH/dect-cmbs.log $opt_ext
+		procd_set_param command "$PROG" -comname "$dcx81_uart_device_wo_dev" -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" -syslog $opt_ext
+		procd_set_param command "$PROG" -comname "$dcx81_uart_device_wo_dev" -syslog $opt_ext
 		rm -f $LOG_PATH/*
 		;;
 	esac
--- a/dectmngr/firmware/airoha/04130021.bin
+++ b/dectmngr/firmware/airoha/04130021.bin
--- a/dhcpmngr/Makefile
+++ b/dhcpmngr/Makefile
@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=dhcpmngr
-PKG_VERSION:=1.0.6
+PKG_VERSION:=1.0.5

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/dhcpmngr.git
-PKG_SOURCE_VERSION:=986f66608959f4f589009d580b046e250d8c620d
+PKG_SOURCE_VERSION:=2a517188211849bcc324a9f9727eeb34d076c032
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
--- a/dm-framework/Makefile
+++ b/dm-framework/Makefile
@@ -1,207 +0,0 @@
-#
-# Copyright (c) 2023 Genexis B.V. All rights reserved.
-# This Software and its content are protected by the Dutch Copyright Act
-# ('Auteurswet'). All and any copying and distribution of the software
-# and its content without authorization by Genexis B.V. is
-# prohibited. The prohibition includes every form of reproduction and
-# distribution.
-#
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=dm-framework
-PKG_VERSION:=1.0.0
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/lcm/dm-framework.git
-PKG_SOURCE_VERSION:=e9978675399c5fdc7233645a9192443e41c41904
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-# Build directories for each component
-DATAMODELS_BUILD_DIR:=$(PKG_BUILD_DIR)/datamodels-build
-DMAPI_BUILD_DIR:=$(PKG_BUILD_DIR)/dm-api-build
-DMAGENT_BUILD_DIR:=$(PKG_BUILD_DIR)/dm-agent-build
-
-include $(INCLUDE_DIR)/package.mk
-include $(TOPDIR)/feeds/iopsys/bbfdm/bbfdm.mk
-
-#
-# Datamodels Package Definition
-#
-define Package/datamodels
-  SECTION:=utils
-  CATEGORY:=Genexis
-  TITLE:=dm-framework Datamodel
-  URL:=http://www.genexis.eu
-  PKG_LICENSE:=GENEXIS
-  PKG_LICENSE_URL:=
-endef
-
-define Package/datamodels/description
- This package contains dm-framework datamodel.
-endef
-
-#
-# DM-API Package Definition
-#
-define Package/dm-api
-  CATEGORY:=Genexis
-  TITLE:=dm-api
-  PKG_BUILD_DEPENDS:=datamodels
-  DEPENDS:=+libsqlite3 \
-        +libjson-c +libstdcpp +quickjs \
-        +libubus +libubox +libuci
-  URL:=http://www.genexis.eu
-  PKG_LICENSE:=GENEXIS
-  PKG_LICENSE_URL:=
-endef
-
-define Package/dm-api/description
- This package contains api for the dm-framework
-endef
-
-#
-# DM-Agent Package Definition
-#
-define Package/dm-agent
-  DEPENDS:=+dm-api +datamodels +libubox +libubus +ubus
-  CATEGORY:=Genexis
-  TITLE:=dm-framework agent
-  URL:=http://www.genexis.eu
-  PKG_LICENSE:=GENEXIS
-  PKG_LICENSE_URL:=
-endef
-
-define Package/dm-agent/description
- This package contains dm-framework agent.
-endef
-
-#
-# Build Preparation
-#
-define Build/Prepare
-	$(call Build/Prepare/Default)
-	
-	# Prepare datamodels
-	mkdir -p $(DATAMODELS_BUILD_DIR)
-	$(CP) -rf $(PKG_BUILD_DIR)/datamodels/* $(DATAMODELS_BUILD_DIR)/
-	# Copy scripts from top-level scripts directory
-	mkdir -p $(DATAMODELS_BUILD_DIR)/scripts
-	$(CP) -rf $(PKG_BUILD_DIR)/scripts/* $(DATAMODELS_BUILD_DIR)/scripts/
-	cd $(DATAMODELS_BUILD_DIR); \
-	  npm install better-sqlite3 quickjs && \
-	  node ./scripts/json2code.js && \
-	  node ./scripts/qjs-handlers-validate.js
-
-	# Prepare dm-api
-	mkdir -p $(DMAPI_BUILD_DIR)
-	$(CP) -rf $(PKG_BUILD_DIR)/dm-api/* $(DMAPI_BUILD_DIR)/
-
-	# Prepare dm-agent
-	mkdir -p $(DMAGENT_BUILD_DIR)
-	$(CP) -rf $(PKG_BUILD_DIR)/dm-agent/* $(DMAGENT_BUILD_DIR)/
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-#
-# Build Compilation
-#
-define Build/Compile
-	# Build datamodels first (dependency for others)
-	$(MAKE) -C $(DATAMODELS_BUILD_DIR)\
-		PROJECT_ROOT="$(DATAMODELS_BUILD_DIR)" \
-		CROSS_COMPILE="$(TARGET_CROSS)" \
-		ARCH="$(LINUX_KARCH)" \
-		EXTRA_CFLAGS="$(TARGET_CFLAGS) -I$(DATAMODELS_BUILD_DIR)" \
-		all
-
-	# Build dm-api (depends on datamodels)
-	$(MAKE) -C $(DMAPI_BUILD_DIR)\
-		PROJECT_ROOT="$(DMAPI_BUILD_DIR)" \
-		CROSS_COMPILE="$(TARGET_CROSS)" \
-		ARCH="$(LINUX_KARCH)" \
-		EXTRA_CFLAGS="$(TARGET_CFLAGS) -I$(DMAPI_BUILD_DIR)" \
-		all
-
-	# Build dm-agent (depends on both)
-	$(MAKE) -C $(DMAGENT_BUILD_DIR)\
-		PROJECT_ROOT="$(DMAGENT_BUILD_DIR)" \
-		CROSS_COMPILE="$(TARGET_CROSS)" \
-		ARCH="$(LINUX_KARCH)" \
-		EXTRA_CFLAGS="$(TARGET_CFLAGS) -I$(DMAGENT_BUILD_DIR)" \
-		all
-endef
-
-#
-# Development Installation (headers and libraries)
-#
-define Build/InstallDev
-	# Datamodels development files
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(DATAMODELS_BUILD_DIR)/dm.h $(1)/usr/include/
-	$(CP) $(DATAMODELS_BUILD_DIR)/libdm.so $(1)/usr/lib/
-
-	# DM-API development files - headers are now in dm-api/include/
-	$(CP) $(DMAPI_BUILD_DIR)/include/dm_types.h $(1)/usr/include/
-	$(CP) $(DMAPI_BUILD_DIR)/include/dm_node.h $(1)/usr/include/
-	$(CP) $(DMAPI_BUILD_DIR)/core/dm_api.h $(1)/usr/include/
-	$(CP) $(DMAPI_BUILD_DIR)/core/dm_linker.h $(1)/usr/include/
-	$(CP) $(DMAPI_BUILD_DIR)/core/dbmgr.h $(1)/usr/include/
-	$(CP) $(DMAPI_BUILD_DIR)/include/dm_log.h $(1)/usr/include/
-	$(CP) $(DMAPI_BUILD_DIR)/utils/dm_list.h $(1)/usr/include/
-	$(CP) $(DMAPI_BUILD_DIR)/libdmapi.so $(1)/usr/lib/
-endef
-
-#
-# Package Installation - Datamodels
-#
-define Package/datamodels/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DIR) $(1)/etc/bbfdm
-	$(INSTALL_DIR) $(1)/usr/lib/dmf_handlers
-	$(INSTALL_BIN) $(DATAMODELS_BUILD_DIR)/default.db $(1)/etc/bbfdm/default_dm.db
-	$(INSTALL_BIN) $(DATAMODELS_BUILD_DIR)/libdm.so $(1)/usr/lib/
-	# Copy handler files from datamodels directory (new structure)
-	# Copy .js files from root datamodels directory
-	( cd $(DATAMODELS_BUILD_DIR); \
-	  find . -maxdepth 1 -type f -name '*.js' -not -path './.*' -exec $(INSTALL_BIN) {} $(1)/usr/lib/dmf_handlers/{} \; )
-	# Copy .js files from subdirectories, preserving folder structure (skip hidden files/folders)
-	( cd $(DATAMODELS_BUILD_DIR); \
-	  find . -type d -mindepth 1 -not -path './.*' -not -path './scripts*' -exec $(INSTALL_DIR) $(1)/usr/lib/dmf_handlers/{} \; ; \
-	  find . -type f -name '*.js' -mindepth 2 -not -path './.*' -not -path './scripts*' -exec $(INSTALL_BIN) {} $(1)/usr/lib/dmf_handlers/{} \; )
-endef
-
-#
-# Package Installation - DM-API
-#
-define Package/dm-api/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DIR) $(1)/sbin/
-	$(INSTALL_BIN) $(DMAPI_BUILD_DIR)/libdmapi.so $(1)/usr/lib/
-endef
-
-#
-# Package Installation - DM-Agent
-#
-define Package/dm-agent/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_BIN) ./files/etc/init.d/bridging $(1)/etc/init.d/
-	$(INSTALL_DATA) ./files/etc/config/bridging $(1)/etc/config/
-	$(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) dm-agent
-	$(INSTALL_BIN) $(DMAGENT_BUILD_DIR)/dm-agent $(1)/usr/sbin
-endef
-
-# Register all three packages
-$(eval $(call BuildPackage,datamodels))
-$(eval $(call BuildPackage,dm-api))
-$(eval $(call BuildPackage,dm-agent))
--- a/dnsmngr/Makefile
+++ b/dnsmngr/Makefile
@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=dnsmngr
-PKG_VERSION:=1.0.18
+PKG_VERSION:=1.0.15

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/dnsmngr.git
-PKG_SOURCE_VERSION:=80fa147e6f1f0d9c1a62a62a693ff3adaef45363
+PKG_SOURCE_VERSION:=32bd2501fca8a4f45ba13ee0e4762756c60fe721
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -72,7 +72,7 @@ define Package/dnsmngr/install
 	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/libdnsmngr.so $(1) $(PKG_NAME)
 	$(BBFDM_INSTALL_SCRIPT) -d $(PKG_BUILD_DIR)/scripts/nslookup $(1)
 ifeq ($(CONFIG_DNSMNGR_DNS_SD),y)
-	$(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/src/libdns_sd.so $(1) $(PKG_NAME) 10
+	$(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/src/libdns_sd.so $(1) $(PKG_NAME)
 endif
 endef

--- a/dslmngr/Makefile
+++ b/dslmngr/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=dslmngr
-PKG_VERSION:=1.2.10
+PKG_VERSION:=1.2.9

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/hal/dslmngr.git
-PKG_SOURCE_VERSION:=8fb4093b4d26b3cb06603e110d424005e33cf5d6
+PKG_SOURCE_VERSION:=5340cb31f759301f5aca3fd848fc3a63b0b4663f
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MAINTAINER:=Rahul Thakur <rahul.thakur@iopsys.eu>
 PKG_MIRROR_HASH:=skip
@@ -30,8 +30,6 @@ 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
@@ -43,7 +41,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 +TARGET_airoha:br2684ctl
+  DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service
 endef

 define Package/dslmngr/description
@@ -77,10 +75,7 @@ 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)
--- a/dslmngr/files/airoha/etc/init.d/xdsl_wan
+++ b/dslmngr/files/airoha/etc/init.d/xdsl_wan
@@ -1,26 +0,0 @@
-#!/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"
-}
--- a/dslmngr/files/airoha/lib/dsl/airoha.sh
+++ b/dslmngr/files/airoha/lib/dsl/airoha.sh
@@ -1,28 +0,0 @@
-#!/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"
-}
--- a/dslmngr/files/airoha/sbin/xdsl_wan
+++ b/dslmngr/files/airoha/sbin/xdsl_wan
@@ -1,240 +0,0 @@
-#!/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
--- a/dslmngr/files/common/etc/config/dsl
+++ b/dslmngr/files/common/etc/config/dsl
@@ -25,7 +25,6 @@ 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
--- a/ethmngr/Makefile
+++ b/ethmngr/Makefile
@@ -5,13 +5,14 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=ethmngr
-PKG_VERSION:=3.0.8
+PKG_VERSION:=3.0.5

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/hal/ethmngr.git
-PKG_SOURCE_VERSION:=c73e5b15718ca40b2740bbe6151dfbb2bcca16df
+PKG_SOURCE_VERSION:=01e1c5f6642a8fa79fc445c71558ad02bda40eb5
+PKG_MAINTAINER:=Rahul Thakur <rahul.thakur@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
 endif
--- a/ethmngr/files/etc/hotplug.d/ethernet/ethport-deprecated-ubus-event
+++ b/ethmngr/files/etc/hotplug.d/ethernet/ethport-deprecated-ubus-event
@@ -0,0 +1,23 @@
+#!/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\"}"
--- a/ethmngr/files/etc/ruleng/ethport.json
+++ b/ethmngr/files/etc/ruleng/ethport.json
@@ -1,23 +0,0 @@
-{
-	"ethport_update": {
-		"if" : [
-			{
-				"event": "network.device",
-				"match": {
-					"wireless": false
-				}
-			}
-		],
-		"then" : [
-			{
-				"cli": "/sbin/hotplug-call ethernet",
-				"envs": {
-					"PORT": "&network.device->ifname",
-					"LINK": "&network.device->link"
-				},
-				"timeout": 1
-			}
-		]
-	}
-}
-
--- a/ethmngr/files/etc/uci-defaults/ruleng.ethport
+++ b/ethmngr/files/etc/uci-defaults/ruleng.ethport
@@ -1,2 +0,0 @@
-uci -q set ruleng.ethport=rule
-uci -q set ruleng.ethport.recipe='/etc/ruleng/ethport.json'
--- a/firewallmngr/Makefile
+++ b/firewallmngr/Makefile
@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=firewallmngr
-PKG_VERSION:=1.0.10
+PKG_VERSION:=1.0.9

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/firewallmngr.git
-PKG_SOURCE_VERSION:=05ad0d6f7f21520eecd05429c14d1963de2a8463
+PKG_SOURCE_VERSION:=77ad8425b73a3ac63f6160dc217635394ac87907
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
--- a/firewallmngr/files/firewall.service
+++ b/firewallmngr/files/firewall.service
@@ -2,8 +2,6 @@

 . /lib/functions.sh

-ZONE_NAME_FILE="/tmp/service_fw_zone"
-
 log() {
 	echo "${@}"|logger -t firewall.service -p info
 }
@@ -19,37 +17,6 @@ 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
@@ -168,14 +135,9 @@ add_service() {
 	fi

 	action=$(echo "${target}" | tr a-z A-Z)
-	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"
+	chain_name="zone_${interface}_input"
 	res=0
+
 	count=$(echo "${proto}" | sed -n "/-1/p" | wc -l)

 	if [ "${count}" -eq 0 ]; then
@@ -198,9 +160,4 @@ add_service() {
 }

 config_load firewall
-
-load_zone_names
-
 config_foreach add_service "service"
-
-rm -f "${ZONE_NAME_FILE}"
--- a/firewallmngr/files/port-trigger/etc/init.d/port-trigger
+++ b/firewallmngr/files/port-trigger/etc/init.d/port-trigger
@@ -7,11 +7,7 @@ USE_PROCD=1
 . /lib/port-trigger/port_trigger.sh

 start_service() {
-	port_trigger_add
-}
-
-stop_service() {
-	port_trigger_clean
+	port_trigger_handling
 }

 service_triggers()
@@ -21,6 +17,5 @@ service_triggers()
 }

 reload_service() {
-	stop
 	start
 }
--- a/firewallmngr/files/port-trigger/lib/port-trigger/port_trigger.sh
+++ b/firewallmngr/files/port-trigger/lib/port-trigger/port_trigger.sh
@@ -119,12 +119,18 @@ process_port_trigger() {
 	fi
 }

-port_trigger_add() {
+port_trigger_handling() {
 	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
@@ -133,7 +139,7 @@ port_trigger_add() {
 	[ $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 -A prerouting_wan_rule -j prerouting_wan_porttrigger 2> /dev/null">>/tmp/port_trigger_iptables
+	[ $ret -eq 0 ] && echo "iptables -w -t nat -I 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=$?
@@ -149,21 +155,3 @@ port_trigger_add() {
 	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
-}
--- a/fluent-bit/Makefile
+++ b/fluent-bit/Makefile
@@ -1,20 +1,18 @@
 #
-# Copyright (C) 2024-2025 IOPSYS
+# Copyright (C) 2024 IOPSYS
 #

 include $(TOPDIR)/rules.mk

 PKG_NAME:=fluent-bit
-PKG_VERSION:=4.0.4
+PKG_VERSION:=3.1.0
 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_MIRROR_HASH:=skip
+PKG_SOURCE_URL:=https://github.com/fluent/fluent-bit/archive/v$(PKG_VERSION)
+PKG_HASH:=7a49e110cf3050b6c29c911063494b8081f3c743274d1d95e52562d0476ba1eb
 endif

 PKG_LICENSE:=Apache-2.0
@@ -25,7 +23,7 @@ include $(INCLUDE_DIR)/cmake.mk

 define Package/fluent-bit
 	CATEGORY:=Utilities
-	DEPENDS:= +libyaml +libopenssl +libcurl +libatomic +musl-fts +flex +bison +libstdcpp +@OPENSSL_WITH_NPN
+	DEPENDS:= +libyaml +libopenssl +libcurl +libatomic +musl-fts +flex +bison
 	TITLE:=Fluent-Bit
 	URL:=https://fluentbit.io/
 endef
@@ -47,14 +45,13 @@ CMAKE_OPTIONS+= \
 	-DFLB_RELEASE=Yes \
 	-DFLB_SMALL=No \
 	-DEXCLUDE_FROM_ALL=true \
-	-DFLB_SHARED_LIB=Yes \
+	-DFLB_SHARED_LIBS=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

@@ -66,15 +63,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 \
@@ -103,7 +100,7 @@ CMAKE_OPTIONS += \


 # Filter options
-CMAKE_OPTIONS += \
+CMAKE_OPTIONS += 
 	-DFLB_FILTER_AWS=No \
 	-DFLB_FILTER_ECS=No \
 	-DFLB_FILTER_KUBERNETES=No \
@@ -141,7 +138,6 @@ 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 \
@@ -171,7 +167,6 @@ 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
--- a/fluent-bit/files/fluent-bit.conf
+++ b/fluent-bit/files/fluent-bit.conf
@@ -9,10 +9,6 @@
    tag             syslog
    path            /dev/log

-[INPUT]
-    name            kmsg
-    tag             kernel
-
 [OUTPUT]
    name            null
    match           *
--- a/fluent-bit/patches/0003-prepend_length_in_syslog_output.patch
+++ b/fluent-bit/patches/0003-prepend_length_in_syslog_output.patch
@@ -1,47 +0,0 @@
-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 {
--- a/fluent-bit/patches/0005-kmsg_log.patch
+++ b/fluent-bit/patches/0005-kmsg_log.patch
@@ -1,32 +0,0 @@
-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) {
--- a/gateway-info/files/etc/config/gateway
+++ b/gateway-info/files/etc/config/gateway
@@ -1,4 +1,3 @@
 config global 'global'
-	option enable '1'
 	option wan_interface 'wan'
 	option lan_interface 'lan'
--- a/gateway-info/files/etc/uci-defaults/86-set-gateway-device-info
+++ b/gateway-info/files/etc/uci-defaults/86-set-gateway-device-info
@@ -268,14 +268,9 @@ configure_gateway_device_info() {
 	lan_intf=""

 	config_load gateway
-	config_get_bool enable global enable '1'
 	config_get wan_intf global wan_interface "wan"
 	config_get lan_intf global lan_interface "lan"

-	if [ "${enable}" -eq 0 ]; then
-		return 0
-	fi
-
 	# Set dhcp_option 125 for device info if not already configured
 	enable_dhcp_option125 "${wan_intf}"

--- a/gateway-info/files/etc/udhcpc.user.d/udhcpc_gateway_info.user
+++ b/gateway-info/files/etc/udhcpc.user.d/udhcpc_gateway_info.user
@@ -280,13 +280,8 @@ send_usp_gw_event() {
 }

 config_load gateway
-config_get_bool enable global enable '1'
 config_get wan_intf global wan_interface "wan"

-if [ "${enable}" -eq 0 ]; then
-	return 0
-fi
-
 if [ "${wan_intf}" == "${INTERFACE}" ]; then
 	if [ "${1}" == "deconfig" ]; then
 		rm -rf /var/state/gwinfo
--- a/hostmngr/Makefile
+++ b/hostmngr/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=hostmngr
-PKG_VERSION:=1.3.1
+PKG_VERSION:=1.2.15

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=3663ca4d001508509774115d6797b932f9ed4f69
+PKG_SOURCE_VERSION:=3b50823da3f2904191332634c1e45d46090def1d
 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
@@ -77,7 +77,7 @@ define Package/hostmngr/install
 	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/bbf_plugin/libhostmngr.so $(1) $(PKG_NAME)

 ifeq ($(CONFIG_HOSTMNGR_DATAMODEL_EXT),y)
-	$(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/src/bbf_plugin/libhostext.so $(1) $(PKG_NAME) 10
+	$(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/src/bbf_plugin/libhostext.so $(1) $(PKG_NAME)
 endif

 endef
--- a/icwmp/Config.in
+++ b/icwmp/Config.in
@@ -7,16 +7,4 @@ 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
--- a/icwmp/Makefile
+++ b/icwmp/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=icwmp
-PKG_VERSION:=9.9.10
+PKG_VERSION:=9.8.38

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/icwmp.git
-PKG_SOURCE_VERSION:=1a842e0a3836f616973e6a92f0b0b6ca82ec39bb
+PKG_SOURCE_VERSION:=1e192605446b420c103a08e8a145be114ebdcabc
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -52,21 +52,6 @@ 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)/
@@ -87,15 +72,13 @@ define Package/icwmp/install
 	$(INSTALL_BIN) ./files/etc/uci-defaults/85-cwmp-set-userid $(1)/etc/uci-defaults/
 	$(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
 	$(INSTALL_BIN) ./files/etc/udhcpc.user.d/udhcpc_icwmp_opt43.user $(1)/etc/udhcpc.user.d/udhcpc_icwmp_opt43.user
 	$(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) $(PKG_NAME)
 	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/libcwmpdm.so $(1) $(PKG_NAME)
-	$(BBFDM_INSTALL_MS_PLUGIN) ./files/etc/bbfdm/json/CWMPManagementServer.json $(1) $(PKG_NAME) 20
+	$(BBFDM_INSTALL_MS_PLUGIN) ./files/etc/bbfdm/json/CWMPManagementServer.json $(1) $(PKG_NAME)
 endef

 $(eval $(call BuildPackage,icwmp))
--- a/icwmp/bbfdm_service.json
+++ b/icwmp/bbfdm_service.json
@@ -15,8 +15,7 @@
      },
      {
        "parent_dm": "Device.",
-        "object": "XMPP",
-        "proto": "cwmp"
+        "object": "XMPP"
      }
    ],
    "config": {
--- a/icwmp/files/etc/config/cwmp
+++ b/icwmp/files/etc/config/cwmp
@@ -1,6 +1,6 @@
 config acs 'acs'
 	option userid '' #$OUI-$SER
-	option passwd ''
+	option passwd 'iopsys'
 	option periodic_inform_enable 'true'
 	option periodic_inform_interval '1800'
 	option periodic_inform_time '0001-01-01T00:00:00Z'
@@ -14,7 +14,6 @@ config acs 'acs'
 	option retry_interval_multiplier '2000'
 	option skip_dhcp_boot_options '0'
 	option insecure_enable '0'
-	option get_rpc_methods '0'

 config cpe 'cpe'
 	option enable '1'
@@ -29,7 +28,7 @@ config cpe 'cpe'
 	option log_file_name '/var/log/icwmpd.log'
 	option log_max_size '102400'
 	option userid '' #$OUI-$SER
-	option passwd ''
+	option passwd 'iopsys'
 	option port '7547'
 	option provisioning_code ''
 	option amd_version '5'
@@ -42,10 +41,10 @@ config cpe 'cpe'
 	option periodic_notify_interval '10'
 	option incoming_rule 'Port_Only'
 	option active_notif_throttle '0'
+	option disable_gatewayinfo '0'
 	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'
--- a/icwmp/files/etc/icwmpd/firewall.cwmp
+++ b/icwmp/files/etc/icwmpd/firewall.cwmp
@@ -1,59 +1,24 @@
 #!/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
 }

-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}"
+	zone="$(uci show firewall|grep network|grep -w ${1}|cut -d. -f 2)"
+	zone="${zone:-wan}" # defaults to wan zone
+	echo "$zone"
 }

-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
+cleanup_exiting_rules() {
+        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}";
@@ -61,144 +26,76 @@ cleanup_upstream_rules() {
 	done
 }

-cleanup_downstream_rules() {
-	if [ -z "${1}" ]; then
-		log "Rule can not be cleaned without zone name"
-		return
+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
-
-	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
+	if [ -n "${ip6addr}" ]; then
+		cmd6="${cmd6} -s ${ip6addr}"
 	fi
-
-	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}]"
-
-	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}]"
-}
-
-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
+elif [ "${incoming_rule}" = "port_only" ]; then
+	if [ -n "${port}" ]; then
+		cmd="${cmd} --dport ${port}"
+		cmd6="${cmd6} --dport ${port}"
 	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
-
+else
 	if [ -n "${ipaddr}" ]; then
 		cmd="${cmd} -s ${ipaddr}"
 	fi

+	if [ -n "${ip6addr}" ]; then
+		cmd6="${cmd6} -s ${ip6addr}"
+	fi
+
 	if [ -n "${port}" ]; then
 		cmd="${cmd} --dport ${port}"
+		cmd6="${cmd6} --dport ${port}"
 	fi
+fi

-	if echo "${cmd}"|grep -q "\-\-dport \|\-s "; then
-		cmd="${cmd} -j ACCEPT -m comment --comment=Open_ACS_port"
-		${cmd}
-		log "Applied [${cmd}]"
-	fi
-}
+cleanup_exiting_rules "${zone_name}"

-configure_connection_req_rules() {
-	app="${1}"
+echo "${cmd}"|grep -q "\-\-dport \|\-s "
+if [ "$?" -eq 0 ]; then
+	cmd="${cmd} -j ACCEPT -m comment --comment=Open_ACS_port"
+	${cmd}
+	log "Applied [${cmd}]"
+fi

-	wan="$(uci -q get cwmp.cpe.default_wan_interface)"
-	wan="${wan:-wan}"
+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

-	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}"
+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
--- a/icwmp/files/etc/init.d/icwmpd
+++ b/icwmp/files/etc/init.d/icwmpd
@@ -16,6 +16,79 @@ 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
@@ -138,6 +211,28 @@ 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/
--- a/icwmp/files/etc/uci-defaults/85-cwmp-set-userid
+++ b/icwmp/files/etc/uci-defaults/85-cwmp-set-userid
@@ -4,10 +4,6 @@
 # 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
@@ -42,14 +38,4 @@ 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().
--- a/icwmp/files/etc/uci-defaults/85-migrate-gw-info
+++ b/icwmp/files/etc/uci-defaults/85-migrate-gw-info
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-# Script to migrate gateway-info options to gateway uci
-if [ ! -f "/etc/config/cwmp" ] && [ ! -f "/etc/config/gateway" ]; then
-	exit 0
-fi
-
-val="$(uci -q get cwmp.cpe.disable_gatewayinfo)"
-
-if [ -n "$val" ] && [ "$val" -eq 1 ]; then
-	uci -q set gateway.global.enable=0
-fi
-
-uci -q set cwmp.cpe.disable_gatewayinfo=""
--- a/icwmp/files/etc/uci-defaults/999-cwmp-conn-config
+++ b/icwmp/files/etc/uci-defaults/999-cwmp-conn-config
@@ -1,107 +0,0 @@
-#!/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
--- a/ieee1905/Makefile
+++ b/ieee1905/Makefile
@@ -1,17 +1,16 @@
 #
 # 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.33
+PKG_VERSION:=8.7.3

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=cb5b8f76c854b89607cd1750d3a4052ecd71ac9d
+PKG_SOURCE_VERSION:=f3f4dbaac6b2ff6cfd38852e8625625d24996a53
 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
@@ -106,7 +105,6 @@ 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 += \
@@ -116,7 +114,7 @@ MAKE_PATH:=src


 define Package/ieee1905/install
-	$(CP) ./files/etc $(1)/
+	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/lib/ieee1905
 	$(INSTALL_DIR) $(1)/usr/sbin
--- a/ieee1905/files/datamodel_description.json
+++ b/ieee1905/files/datamodel_description.json
@@ -1,23 +0,0 @@
-{
-	"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"
-		}
-	}
-}
-
--- a/ieee1905/files/etc/config/ieee1905
+++ b/ieee1905/files/etc/config/ieee1905
@@ -12,7 +12,6 @@ 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
--- a/ieee1905/files/etc/uci-defaults/30-set-ieee1905-al-macaddr
+++ b/ieee1905/files/etc/uci-defaults/30-set-ieee1905-al-macaddr
@@ -1,9 +1,10 @@
 #!/bin/sh

-. /lib/functions/system.sh

-BMAC=$(get_mac_label)
+BMAC=$(db -q get hw.board.basemac)
 BMAC=${BMAC//:/}
+BMAC=${BMAC// /}
+BMAC=$(printf "%12.12X" $((0x$BMAC)))

 [ "$BMAC" == "" ] && exit 1

--- a/ieee1905/files/etc/uci-defaults/32-ieee1905-device-info
+++ b/ieee1905/files/etc/uci-defaults/32-ieee1905-device-info
@@ -1,13 +0,0 @@
-#!/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
--- a/iopsys-analytics/Makefile
+++ b/iopsys-analytics/Makefile
@@ -4,7 +4,7 @@ PKG_NAME:=iopsys-analytics
 PKG_RELEASE:=$(COMMITCOUNT)
 PKG_LICENSE:=PROPRIETARY
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=25e32ac5a860aec6e53e3449565b71595073e014
+PKG_SOURCE_VERSION:=00189cea0a78b7a30dbfdd363b6d8e836437d1bc
 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+=                                             \
-    +@PACKAGE_syslog-ng:SYSLOGNG_LOGROTATE              \
-    +PACKAGE_fluent-bit:logrotate                       \
+    +syslog-ng                                          \
+    +@SYSLOGNG_LOGROTATE                                \

 endef

@@ -44,13 +44,7 @@ endef
 Build/Compile=

 define Package/$(PKG_NAME)/install
-	$(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
+	$(CP) -r $(PKG_BUILD_DIR)/files/*  $(1)/
 endef

 $(eval $(call BuildPackage,$(PKG_NAME)))
--- a/ipt-trigger/Makefile
+++ b/ipt-trigger/Makefile
@@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk

 PKG_NAME:=ipt-trigger
-PKG_VERSION:=1.0.3
+PKG_VERSION:=1.0.2
 PKG_LICENSE:=GPL-2.0

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=ac1beae4794f99533b28db7d0e6e80f4c268a3e8
+PKG_SOURCE_VERSION:=4f3d4427403e0a9be7653c1b92907ae8ae5f21ae
 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
--- a/json-schema-validator/Makefile
+++ b/json-schema-validator/Makefile
@@ -1,55 +0,0 @@
-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))
--- a/jsonval/Makefile
+++ b/jsonval/Makefile
@@ -1,44 +0,0 @@
-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))
--- a/jsonval/src/main.cpp
+++ b/jsonval/src/main.cpp
@@ -1,64 +0,0 @@
-#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;
-}
--- a/libdsl/Makefile
+++ b/libdsl/Makefile
@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=libdsl
-PKG_VERSION:=7.3.0
+PKG_VERSION:=7.2.100

 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,9 +37,6 @@ 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 += \
@@ -60,7 +57,7 @@ define Package/libdsl
  SUBMENU:=IOPSYS HAL libs
  MENU:=1
  TITLE:= xDSL library (libdsl)
-  DEPENDS+=TARGET_brcmbca:bcm963xx-bsp +TARGET_airoha:libeasy
+  DEPENDS+=TARGET_brcmbca:bcm963xx-bsp
 endef

 define Package/libdsl/description
--- a/libeasy/Makefile
+++ b/libeasy/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=libeasy
-PKG_VERSION:=7.4.6
+PKG_VERSION:=7.4.5

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=ca7b20068c9d373e41045a2e899a9c697576262c
+PKG_SOURCE_VERSION:=67e6b91b8aca4c068a71f097f5f0576b47ec1d2e
 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
--- a/libvoice-airoha/Makefile
+++ b/libvoice-airoha/Makefile
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=libvoice-airoha
 PKG_RELEASE:=1
-PKG_VERSION:=1.1.7
+PKG_VERSION:=1.1.2
 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:=3a30086a68a3409f0396acb01380f91daabf7a2f
+PKG_SOURCE_VERSION:=1ded9a4bb0f2f8a5f3989799b5500e328e086c99
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
--- a/libvoice-airoha/files/etc/uci-defaults/991-libvoice-airoha
+++ b/libvoice-airoha/files/etc/uci-defaults/991-libvoice-airoha
@@ -1,30 +1,16 @@
 #!/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}" ] && {
-    echo Configure TxGain and RxGain for MXL SLIC $SLIC
+SLIC=`cat /proc/device-tree/airoha-voice/slic-type`
+[ "${SLIC#pef}" != "${SLIC}" ] || exit 0

-    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
-}
+echo Configure TxGain and RxGain for MXL SLIC $SLIC

-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'
-}
+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
--- a/libwifi/Makefile
+++ b/libwifi/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=libwifi
-PKG_VERSION:=7.13.7
+PKG_VERSION:=7.10.6

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=65a7cd643c07e3f0a11d5b20225d4d87b8646513
+PKG_SOURCE_VERSION:=2b76a71eb99f41523ad86592e7efefa0a3682bba
 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
--- a/logmngr/Makefile
+++ b/logmngr/Makefile
@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=logmngr
-PKG_VERSION:=1.0.17
+PKG_VERSION:=1.0.9

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/system/logmngr.git
-PKG_SOURCE_VERSION:=ad2636c642d56967e78c0c84bf82cb0e2b6311f2
+PKG_SOURCE_VERSION:=e2ffe2b9e7722ce19dff7db6e47e62a305dc568b
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -28,11 +28,9 @@ define Package/logmngr
 SECTION:=utils
 CATEGORY:=Utilities
 TITLE:=Logging Manager
- DEPENDS:=+LOGMNGR_BACKEND_FLUENTBIT:fluent-bit
+ DEPENDS:=+LOGMNGR_BACKEND_FLUENTBIT:fluent-bit +LOGMNGR_LOGROTATE:logrotate
 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
@@ -54,26 +52,27 @@ define Package/logmngr/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/logmngr.init $(1)/etc/init.d/logmngr

+	$(INSTALL_DIR) $(1)/usr/sbin
+
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_BIN) ./files/10-logmngr_config_generate $(1)/etc/uci-defaults/

 	$(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)/sbin
-	$(INSTALL_BIN) ./files/logread $(1)/sbin/
+	$(INSTALL_BIN) ./files/logread $(1)/usr/sbin
 endif
 ifeq ($(CONFIG_LOGMNGR_BACKEND_SYSLOG_NG),y)
 	$(INSTALL_DATA) ./files/lib/logmngr/syslog-ng.sh $(1)/lib/logmngr/
 endif
-	$(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/bbf_plugin/libbbfsyslog.so $(1) core 10
+	$(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/bbf_plugin/libbbfsyslog.so $(1) core
 ifeq ($(CONFIG_LOGMNGR_LOGROTATE),y)
 	$(INSTALL_BIN) ./files/11-logmngr_logrotate_config_generate $(1)/etc/uci-defaults/
 	$(INSTALL_DATA) ./files/lib/logmngr/logrotate.sh $(1)/lib/logmngr/
-	$(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/bbf_plugin/libbbflogrotate.so $(1) sysmngr 11
+	$(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/bbf_plugin/libbbflogrotate.so $(1) sysmngr
 endif
 ifeq ($(CONFIG_LOGMNGR_VENDOR_LOG_FILE),y)
-	$(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/bbf_plugin/libbbfvendorlog.so $(1) sysmngr 12
+	$(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/bbf_plugin/libbbfvendorlog.so $(1) sysmngr
 endif
 endef

--- a/logmngr/files/10-logmngr_config_generate
+++ b/logmngr/files/10-logmngr_config_generate
@@ -1,12 +1,13 @@
 #!/bin/sh

-if uci -q get logmngr.@globals[0] >/dev/null; then
-	# return if there is any valid content
-	exit 0
-else
-	rm -f /etc/config/logmngr
+if [ -s "/etc/config/logmngr" ]; then
+	if uci -q get logmngr.@globals[0] >/dev/null; then
+		# return if there is any valid content
+		exit
+	else
+		rm -f /etc/config/logmngr
+	fi
 fi
-
 touch /etc/config/logmngr

 uci set logmngr.globals=globals
--- a/logmngr/files/11-logmngr_logrotate_config_generate
+++ b/logmngr/files/11-logmngr_logrotate_config_generate
@@ -1,13 +1,13 @@
 #!/bin/sh

-# Adds a default log rotate policy if none exists
-if uci -q get logmngr.@log_rotate[0] >/dev/null; then
-	# return if there is any valid content
-	exit 0
+if [ -s "/etc/config/logmngr" ]; then
+	if uci -q get logmngr.@log_rotate[0] >/dev/null; then
+		# return if there is any valid content
+		exit
+	fi
+	uci set logmngr.lro1=log_rotate
+	uci set logmngr.lro1.enable=1
+	uci set logmngr.lro1.file_name="/var/log/messages"
+	uci set logmngr.lro1.file_count=1
+	uci set logmngr.lro1.max_file_size=1000000
 fi
-
-uci set logmngr.lro1=log_rotate
-uci set logmngr.lro1.enable=1
-uci set logmngr.lro1.file_name="/var/log/messages"
-uci set logmngr.lro1.file_count=1
-uci set logmngr.lro1.max_file_size=1000000
--- a/logmngr/files/lib/logmngr/fluent-bit.sh
+++ b/logmngr/files/lib/logmngr/fluent-bit.sh
@@ -5,24 +5,11 @@

 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}
-}

 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() {
@@ -32,29 +19,11 @@ 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}
 }

 create_input_section() {
 	local tag="$1"
-
 	# the input in our case is always syslog, hence, this section of the
 	# fluent-bit.conf file has hardcoded values as well that do not depend
 	# on any uci value
@@ -62,7 +31,6 @@ create_input_section() {
 	echo "    name        syslog" >> ${TMP_CONF_FILE}
 	echo "    tag         $tag" >> ${TMP_CONF_FILE}
 	echo "    path        /dev/log" >> ${TMP_CONF_FILE}
-	echo "" >> ${TMP_CONF_FILE}
 }

 generate_facility_regex() {
@@ -87,6 +55,7 @@ generate_facility_regex() {
 			echo "    regex        pri $pri" >> ${TMP_CONF_FILE}
 		done
 	done
+
 }

 generate_severity_regex() {
@@ -236,6 +205,7 @@ handle_log_remote() {
 		return
 	fi

+
 	local address
 	config_get address $section log_ip
 	if [ -z "$address" ]; then
@@ -246,17 +216,9 @@ handle_log_remote() {
 	echo "    name         syslog" >> ${TMP_CONF_FILE}
 	echo "    match        $match" >> ${TMP_CONF_FILE}
 	echo "    host         $address" >> ${TMP_CONF_FILE}
-	append_conf "    syslog_appname_key   ident"
-	append_conf "    syslog_procid_key    pid"
-	append_conf "    syslog_message_key   message"
-
-	local hostname="$(uci -q get 'system.@system[0].hostname')"
-	if [ -n "${hostname}" ]; then
-		append_conf "    syslog_hostname_preset    ${hostname}"
-	fi

 	local proto # holds value tcp or udp
-	config_get proto ${section} proto
+	config_get proto $section proto
 	if [ -n "$proto" ]; then
 		if [ "$proto" == "tls" ]; then
 			echo "    mode         tcp" >> ${TMP_CONF_FILE}
@@ -319,39 +281,41 @@ handle_action() {
 	# with this and action and setup output accordingly.
 	config_foreach handle_log_file log_file "$tag"
 	config_foreach handle_log_remote log_remote "$tag"
+
+
 }

 handle_action_section() {
 	config_foreach handle_action action
 }

+apply_config_file() {
+	cp ${TMP_CONF_FILE} ${CONF_FILE}
+}
+
 PROG=/usr/sbin/fluent-bit
 logmngr_init() {
-	local enabled
+	create_config_file

 	config_load logmngr
-	config_get_bool enabled globals enable "1"
-
-	create_config_file
-	create_service_section
-	handle_action_section
-
-	if [ -f /lib/logmngr/logrotate.sh ]; then
-		logrotate_init
-	fi
+	local enabled
+	config_get enabled globals enable

 	if [ "$enabled" == "0" ]; then
 		return
 	fi

-	procd_open_instance logmngr
-	if [ -s "${TMP_CONF_FILE}" ]; then
-		procd_set_param command $PROG -c ${TMP_CONF_FILE}
-		procd_set_param file ${TMP_CONF_FILE}
-	elif [ -s "${CONF_FILE}" ]; then
-		procd_set_param command $PROG -c ${CONF_FILE}
-		procd_set_param file ${CONF_FILE}
+	create_service_section
+	handle_action_section
+	apply_config_file
+
+	if [ -f /lib/logmngr/logrotate.sh ]; then
+		logrotate_init
 	fi
+
+	procd_open_instance logmngr
+	procd_set_param command $PROG -c $CONF_FILE
+	procd_set_param file $CONF_FILE
 	procd_set_param respawn
 	procd_close_instance
 }
--- a/logmngr/files/lib/logmngr/logrotate.sh
+++ b/logmngr/files/lib/logmngr/logrotate.sh
@@ -4,16 +4,14 @@

 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_TMP_FILE}
-	echo -e "include ${CONF_DIR}" >> ${LOGROTATE_TMP_FILE}
-	echo -e "" >> ${LOGROTATE_TMP_FILE}
+	touch ${LOGROTATE_FILE}
 }

+
 handle_logrotate() {
 	local section="$1"

--- a/logmngr/files/logread
+++ b/logmngr/files/logread
@@ -89,13 +89,13 @@ else
 				exit 0
 				;;
 			-f)
-				tail -F "${logfile}"
+				tail -f "${logfile}"
 				exit 0
 				;;
 			-fe)
 				shift
 				pattern="${1}"
-				tail -F "${logfile}" | grep -E "${pattern}"
+				tail -f "${logfile}" | grep -E "${pattern}"
 				exit 0
 				;;
 			-h|*)
--- a/ltq-nand/Makefile
+++ b/ltq-nand/Makefile
@@ -0,0 +1,36 @@
+#
+# 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))
+
--- a/map-agent/Config.in
+++ b/map-agent/Config.in
@@ -62,9 +62,5 @@ config AGENT_CHECK_PARTIAL_WIFI_RELOAD
 config DYNBHD_DYNAMICALLY_PERSIST_CONTROLLER
 	bool "Let dynbhd through AP-Autoconfiguration Search and DHCP Discovery determine the controller or agent role"

-config AGENT_UNASSOC_STA_CONT_MONITOR
-	bool "Enable continuos monitoring of unassociated clients"
-	default n
-
 endmenu
 endif
--- a/map-agent/Makefile
+++ b/map-agent/Makefile
@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=map-agent
-PKG_VERSION:=6.3.6.7
+PKG_VERSION:=6.3.3.6
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=f611be0c05e3f4fb3d35a5a1ad51f5a4ad6406ca
+PKG_SOURCE_VERSION:=0d084ae70917e109c9e929464b170521e0547c3c
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>

 PKG_LICENSE:=BSD-3-Clause
@@ -115,10 +115,6 @@ ifeq ($(CONFIG_DYNBHD_DYNAMICALLY_PERSIST_CONTROLLER),y)
 TARGET_CFLAGS += -DPERSIST_CONTROLLER
 endif

-ifeq ($(CONFIG_AGENT_UNASSOC_STA_CONT_MONITOR),y)
-TARGET_CFLAGS += -DUNASSOC_STA_CONT_MONITOR
-endif
-
 MAKE_PATH:=src

 define Package/map-agent/install
--- a/map-agent/files/etc/hotplug.d/ethernet/map-dynamic-backhaul
+++ b/map-agent/files/etc/hotplug.d/ethernet/map-dynamic-backhaul
@@ -1,26 +1,15 @@
 #!/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
 al_bridge="$(uci -q get mapagent.agent.al_bridge)"
 [ "${al_bridge:0:3}" = "br-" ] || exit 0

-# Get all sections where the port appears in 'ports' list
-port_bridge_sec_list="$(uci show network | grep -w $PORT | grep '\.ports' | cut -d'.' -f2)"
-
-# Find the first section with type='bridge' and get its name
-for port_bridge_sec in $port_bridge_sec_list; do
-	if [ "$(uci -q get network.$port_bridge_sec.type)" = "bridge" ]; then
-		port_bridge_name="$(uci -q get network.$port_bridge_sec.name)"
-		break
-	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_sec="$(uci show network | grep -w $PORT | grep '\.ports' | cut -d'.' -f2)"
+port_bridge_name="$(uci -q get network.$port_bridge_sec.name)"
 [ "$port_bridge_name" = "$al_bridge" ] || exit 0

 # Exit if the device is not operating in extender/repeater mode
@@ -29,6 +18,30 @@ al_brnet="${al_bridge:3}"

 ############## 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,14 +74,6 @@ 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"
@@ -76,15 +81,14 @@ 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 $network_id  > /dev/null 2>&1
+		wpa_cli -i "$ifname" disable_network 0  > /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 $network_id  > /dev/null 2>&1
+		wpa_cli -i "$ifname" enable_network 0  > /dev/null 2>&1
 #		wpa_cli -i "$ifname" save_config  > /dev/null 2>&1
 	fi
 }
--- a/map-agent/files/etc/init.d/mapagent
+++ b/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" "-o" "/tmp/mapagent.log" "-f"
+	procd_set_param command "/usr/sbin/mapagent" "-d"
 	procd_set_param respawn
 #	procd_set_param stdout 1
 #	procd_set_param stderr 1
--- a/map-controller/Config.in
+++ b/map-controller/Config.in
@@ -15,11 +15,6 @@ 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
--- a/map-controller/Makefile
+++ b/map-controller/Makefile
@@ -6,9 +6,9 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=map-controller
-PKG_VERSION:=6.4.0.12
+PKG_VERSION:=6.3.0.2
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=ae10f447f8d83ed6b98d2b82da2dda64be2c3183
+PKG_SOURCE_VERSION:=1498bb5d84fa7134b0fca3a038daf6d8e72cdc04
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@genexis.eu>

 LOCAL_DEV=0
@@ -65,38 +65,18 @@ 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

--- a/map-controller/files/etc/config/mapcontroller
+++ b/map-controller/files/etc/config/mapcontroller
@@ -8,7 +8,9 @@ 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
@@ -24,10 +26,6 @@ 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
@@ -35,27 +33,27 @@ config channel_plan

 config ap
 	option band '2'
-	option ssid '$WIFI_FH_2G_SSID'
-	option encryption '$WIFI_FH_2G_ENCRYPTION'
-	option key '$WIFI_FH_2G_KEY'
+	option ssid '$DEVICE_MANUFACTURER-$BASEMAC_ADDR'
+	option encryption 'sae-mixed'
+	option key '$WIFI_FH_KEY'
 	option vid '1'
 	option type 'fronthaul'
 	option mld_id '1'

 config ap
 	option band '5'
-	option ssid '$WIFI_FH_5G_SSID'
-	option encryption '$WIFI_FH_5G_ENCRYPTION'
-	option key '$WIFI_FH_5G_KEY'
+	option ssid '$DEVICE_MANUFACTURER-$BASEMAC_ADDR'
+	option encryption 'sae-mixed'
+	option key '$WIFI_FH_KEY'
 	option vid '1'
 	option type 'fronthaul'
 	option mld_id '1'

 config ap
 	option band '6'
-	option ssid '$WIFI_FH_6G_SSID'
-	option encryption '$WIFI_FH_6G_ENCRYPTION'
-	option key '$WIFI_FH_6G_KEY'
+	option ssid '$DEVICE_MANUFACTURER-$BASEMAC_ADDR'
+	option encryption 'sae'
+	option key '$WIFI_FH_KEY'
 	option vid '1'
 	option type 'fronthaul'
 	option mld_id '1'
@@ -89,8 +87,8 @@ config ap

 config mld
 	option id '1'
-	option ssid '$WIFI_FH_ALL_SSID'
-	option key '$WIFI_FH_ALL_KEY'
+	option ssid '$DEVICE_MANUFACTURER-$BASEMAC_ADDR'
+	option key '$WIFI_FH_KEY'
 #	option vid '1'
 	option type 'fronthaul'

--- a/map-controller/files/etc/init.d/mapcontroller
+++ b/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", "wpa", "wpa2", "wpa-mixed")' \
+				"psk", "psk+aes")' \
 			'key:string' \
 			'vid:range(1,65535):1' \
 			'type:or("backhaul", "fronthaul", "combined")' \
--- a/map-controller/files/etc/uci-defaults/99-mapcntlr
+++ b/map-controller/files/etc/uci-defaults/99-mapcntlr
@@ -1,95 +1,18 @@
 #!/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="$(get_mac_label | tr -d ':' | tr 'a-z' 'A-Z')"
+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 ':')"

-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
+WIFI_FH_KEY="$(db get hw.board.wpa_key)"
+WIFI_FH_KEY="${WIFI_FH_KEY:-1234567890}"

 sed -i  -e "s/\$BASEMAC_ADDR/$BASEMAC_ADDR/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_FH_KEY/$WIFI_FH_KEY/g" \
 	-e "s/\$WIFI_BH_KEY/$WIFI_BH_KEY/g" \
+	-e "s/\$DEVICE_MANUFACTURER/$DEVICE_MANUFACTURER/g" \
 	/etc/config/mapcontroller	2>/dev/null
--- a/map-controller/files/etc/uci-defaults/99-mapcontroller-sta-steering
+++ b/map-controller/files/etc/uci-defaults/99-mapcontroller-sta-steering
@@ -1,46 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-cfg=mapcontroller
-
-config_load $cfg
-
-adapt_sta_steering() {
-	steer_module=$(uci -q get $cfg.@sta_steering[0].steer_module)
-	bandsteer=$(uci -q get $cfg.@sta_steering[0].bandsteer)
-	enabled=$(uci -q get $cfg.@sta_steering[0].enabled)
-	diffsnr=$(uci -q get $cfg.@sta_steering[0].diffsnr)
-	stri=$(uci -q get $cfg.@sta_steering[0].steer_retry_int)
-	sti=$(uci -q get $cfg.@sta_steering[0].steer_int)
-	stdi=$(uci -q get $cfg.@sta_steering[0].steer_disable_int)
-
-	uci -q del $cfg.@sta_steering[0].enabled
-	uci -q del $cfg.@sta_steering[0].steer_module
-	uci -q del $cfg.@sta_steering[0].use_bcn_metrics
-	uci -q del $cfg.@sta_steering[0].use_usta_metrics
-	uci -q del $cfg.@sta_steering[0].bandsteer
-	uci -q del $cfg.@sta_steering[0].diffsnr
-
-	uci del_list $cfg.@sta_steering[0].plugins="rcpi"
-	uci add_list $cfg.@sta_steering[0].plugins="rcpi"
-	uci -q set $cfg.@sta_steering[0].plugins_enabled="1"
-	uci -q set $cfg.@sta_steering[0].plugins_policy="any"
-
-	# re-apply any custom legacy value(s) in 'sta-steer' section
-	if [ -n "${enabled}" -o -n "${bandsteer}" -o -n "${diffsnr}" -o -n "${sti}" -o -n "${stri}" -o -n "${stdi}" ]; then
-		# create 'rcpi' named 'sta-steer' section if there is none
-		[ $(uci -q get mapcontroller.rcpi) ] || uci set $cfg.rcpi=sta-steer
-
-		# set custom value(s)
-		[ -z "${enabled}" ] || uci -q set $cfg.rcpi.enabled="${enabled}"
-		[ -z "${bandsteer}" ] || uci -q set $cfg.rcpi.bandsteer="${bandsteer}"
-		[ -z "${diffsnr}" ] || uci -q set $cfg.rcpi.diffsnr="${diffsnr}"
-		[ -z "${sti}" ] || uci -q set $cfg.rcpi.steer_int="${sti}"
-		[ -z "${stri}" ] || uci -q set $cfg.rcpi.steer_retry_int="${stri}"
-		[ -z "${stdi}" ] || uci -q set $cfg.rcpi.steer_disable_int="${stdi}"
-		uci reorder $cfg.rcpi=2
-	fi
-}
-
-adapt_sta_steering
--- a/map-plugins/Config.in
+++ b/map-plugins/Config.in
@@ -1,11 +0,0 @@
-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
--- a/map-plugins/Makefile
+++ b/map-plugins/Makefile
@@ -1,68 +0,0 @@
-#
-# 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))))
--- a/map-plugins/plugins/steer-rate.mk
+++ b/map-plugins/plugins/steer-rate.mk
@@ -1,20 +0,0 @@
-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
--- a/mcastmngr/Makefile
+++ b/mcastmngr/Makefile
@@ -32,7 +32,7 @@ define Package/mcastmngr
 DEPENDS:=+libuci +libubox +libubus +libblobmsg-json
 DEPENDS+=+!TARGET_brcmbca:mcproxy +!TARGET_brcmbca:sipcalc
 DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service +!TARGET_brcmbca:kmod-ebt-igmpsnooping +!TARGET_brcmbca:kmod-ebt-mldsnooping
- DEPENDS+=+!TARGET_brcmbca:ebtables-legacy +dm-agent
+ DEPENDS+=+!TARGET_brcmbca:ebtables-legacy +bridgemngr
 endef

 define Package/mcastmngr/description
--- a/mcastmngr/files/common/etc/uci-defaults/61-mcast_config_generate
+++ b/mcastmngr/files/common/etc/uci-defaults/61-mcast_config_generate
@@ -65,69 +65,12 @@ 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

-	config_load network
-	config_foreach check_wan_bridge device "$up_itf"
+	up_itf="$(uci -q get network.wan.device)"

-	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
+	generate_igmp_proxy_config "$up_itf"
+	generate_mld_proxy_config "$up_itf"
 }

 interfaces_ok(){
--- a/mcastmngr/files/linux/etc/firewall.mcast
+++ b/mcastmngr/files/linux/etc/firewall.mcast
@@ -1,140 +1,2 @@
-#!/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}"
+# 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
--- a/netmngr/Makefile
+++ b/netmngr/Makefile
@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=netmngr
-PKG_VERSION:=1.1.8
+PKG_VERSION:=1.1.5

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/netmngr.git
-PKG_SOURCE_VERSION:=6310f32b80f8abeccbf99ad55ce88792b19342d6
+PKG_SOURCE_VERSION:=77158d2ee3ac2d144681f6352d6d18dde0db4b22
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
--- a/netmode/Makefile
+++ b/netmode/Makefile
@@ -8,12 +8,11 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=netmode
-PKG_VERSION:=1.1.5
+PKG_VERSION:=1.0.1
 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
@@ -24,29 +23,11 @@ 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
-	$(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)
+	$(CP) ./files/* $(1)/
 endef

 $(eval $(call BuildPackage,netmode))
--- a/netmode/bbfdm_service.json
+++ b/netmode/bbfdm_service.json
@@ -1,16 +0,0 @@
-{
-  "daemon": {
-    "enable": "1",
-    "service_name": "netmode",
-    "unified_daemon": false,
-    "services": [
-      {
-        "parent_dm": "Device.",
-        "object": "{BBF_VENDOR_PREFIX}NetMode"
-      }
-    ],
-    "config": {
-      "loglevel": "3"
-    }
-  }
-}
--- a/netmode/files/datamodel.json
+++ b/netmode/files/datamodel.json
@@ -1,284 +0,0 @@
-{
-	"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"
-						}
-					]
-				}
-			}
-		}
-	}
-}
--- a/netmode/files/etc/config/netmode
+++ b/netmode/files/etc/config/netmode
@@ -1,2 +1,3 @@
 config netmode global
 	option enabled 0
+#	option mode 'router'
--- a/netmode/files/etc/init.d/netmode
+++ b/netmode/files/etc/init.d/netmode
@@ -6,119 +6,28 @@ 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
-		_log "Executing /lib/netmode/$when scripts"
+		logger -s -p user.info -t "netmode" "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
@@ -129,16 +38,18 @@ start_service() {
 	# Return if desired mode is same as last saved mode
 	[ "$mode" == "$lastmode" ] && return

-	_log "Switching to [${mode}] Mode" >/dev/console
+	# 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

-	# 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
-		_log "Copying $MODEDIR/$mode/uci/* to /etc/config/"
+		logger -s -p user.info -t "netmode" "Copying $MODEDIR/$mode/uci/* to /etc/config/"
 		cp $MODEDIR/$mode/uci/* /etc/config/ 2>/dev/null
 	fi

@@ -147,7 +58,7 @@ start_service() {

 	# Execute mode specific scripts
 	if [ -d $MODEDIR/$mode/scripts ]; then
-		_log "Executing $MODEDIR/$mode/scripts/* scripts"
+		logger -s -p user.info -t "netmode" "Executing $MODEDIR/$mode/scripts/* scripts"
 		for script in $(ls $MODEDIR/$mode/scripts/); do
 			sh $MODEDIR/$mode/scripts/$script
 		done
@@ -155,12 +66,6 @@ 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()
--- a/Show More
+++ b/Show More