passwdqc: v2.0.3

bbfdm/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bbfdm
-PKG_VERSION:=1.16.4
+PKG_VERSION:=1.14.4
 
 USE_LOCAL:=0
 ifneq ($(USE_LOCAL),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bbfdm.git
-PKG_SOURCE_VERSION:=928443c5c89803e7d1ca95dfc2db1b0acaeb9380
+PKG_SOURCE_VERSION:=c8967d6bf47c8bc96cf8df94236b4edfc95aabea
 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
@@ -167,9 +154,6 @@ define Package/dm-service/install
 
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/dm-service/dm-service $(1)/usr/sbin/
-
-	$(BBFDM_REGISTER_SERVICES) -v ${CONFIG_BBF_VENDOR_PREFIX} ./bbfdm_service.json $(1) core
-	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/libbbfdm/libcore.so $(1) core
 endef
 
 define Package/bbf_configmngr/install

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
 
@@ -90,3 +89,28 @@ BBFDM_INSTALL_SCRIPT:=$(BBFDM_DIR)/tools/bbfdm.sh -s
 
 
 BBFDM_REGISTER_SERVICES:=$(BBFDM_DIR)/tools/bbfdm.sh -t
+
+# Deprecated functions errors
+define BbfdmInstallPluginInMicroservice
+	$(warning # BbfdmInstallPluginInMicroservice function is deprecated, use BBFDM_INSTALL_MS_PLUGIN macro #)
+	$(INSTALL_DIR) $(1)
+	$(INSTALL_DATA) $(2) $(1)/
+endef
+
+define BbfdmInstallMicroServiceInputFile
+	$(warning # function BbfdmInstallMicroServiceInputFile deprecated, input file auto generated with BBFDM_INSTALL_MS_DM #)
+	$(INSTALL_DIR) $(1)/etc/bbfdm/micro_services
+	$(INSTALL_DATA) $(2) $(1)/etc/bbfdm/micro_services/$(PKG_NAME).json
+endef
+
+define BbfdmInstallPlugin
+	$(warning # function BbfdmInstallPlugin deprecated, use BBFDM_INSTALL_CORE_PLUGIN macro #)
+	$(INSTALL_DIR) $(1)/etc/bbfdm/plugins
+	$(INSTALL_DATA) $(2) $(1)/etc/bbfdm/plugins/
+endef
+
+define BbfdmInstallPluginWithPriority
+	$(warning # fucntion BbfdmInstallPluginWithPriority deprecated, use BBFDM_INSTALL_CORE_PLUGIN #)
+	$(INSTALL_DIR) $(1)/etc/bbfdm/plugins
+	$(INSTALL_DATA) $(3) $(1)/etc/bbfdm/plugins/$(2)_$(shell basename ${3})
+endef

bbfdm/bbfdm_service.json

@@ -1,54 +0,0 @@
-{
-  "daemon": {
-    "enable": "1",
-    "service_name": "core",
-    "unified_daemon": false,
-    "services": [
-      {
-        "parent_dm": "Device.",
-        "object": "LANConfigSecurity"
-      },
-      {
-        "parent_dm": "Device.",
-        "object": "Schedules"
-      },
-      {
-        "parent_dm": "Device.",
-        "object": "Security",
-        "proto": "cwmp"
-      },
-      {
-        "parent_dm": "Device.",
-        "object": "PacketCaptureDiagnostics"
-      },
-      {
-        "parent_dm": "Device.",
-        "object": "SelfTestDiagnostics"
-      },
-      {
-        "parent_dm": "Device.",
-        "object": "Syslog"
-      },
-      {
-        "parent_dm": "Device.",
-        "object": "{BBF_VENDOR_PREFIX}OpenVPN",
-        "proto": "usp"
-      },	  
-      {
-        "parent_dm": "Device.",
-        "object": "RootDataModelVersion"
-      },
-      {
-        "parent_dm": "Device.",
-        "object": "Reboot()"
-      },
-      {
-        "parent_dm": "Device.",
-        "object": "FactoryReset()"
-      }
-    ],
-    "config": {
-      "loglevel": "3"
-    }
-  }
-}

bbfdm/files/etc/bbfdm/critical_services.json

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

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'

bbfdm/files/etc/ruleng/bbfdm.json

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

bbfdm/files/etc/uci-defaults/96-sysctl-translation

@@ -51,6 +51,10 @@ parse_bbfdm_sysctl_conf_file() {
 
 	# Replace the original file with the modified content
 	mv "$tmpfile" "${bbfdm_sysctl_conf}"
+
+	# Apply the changes
+	uci commit network
+	sysctl -e -p "${bbfdm_sysctl_conf}" >&-
 }
 
 parse_bbfdm_sysctl_conf_file

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'

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,19 +176,18 @@ 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
-		echo "# WARNING: BBFDM_INSTALL_CORE_PLUGIN macro will be deprecated soon. Please use BBFDM_INSTALL_MS_PLUGIN macro instead, specifying 'core' as micro-service name #"
 		priority="${DATA:-0}"
-		install_dir ${DEST}/${BBFDM_BASE_DM_PATH}/micro_services/core
+		install_dir ${DEST}/${BBFDM_BASE_DM_PATH}/plugins
 
 		if [ "${priority}" -gt "0" ]; then
 			# install with priority if defined
-			bbfdm_install_dm ${SRC} ${DEST}/${BBFDM_BASE_DM_PATH}/micro_services/core/${priority}_$(basename ${SRC})
+			bbfdm_install_dm ${SRC} ${DEST}/${BBFDM_BASE_DM_PATH}/plugins/${priority}_$(basename ${SRC})
 		elif [ "${priority}" -eq "0" ]; then
-			bbfdm_install_dm ${SRC} ${DEST}/${BBFDM_BASE_DM_PATH}/micro_services/core/$(basename ${SRC})
+			bbfdm_install_dm ${SRC} ${DEST}/${BBFDM_BASE_DM_PATH}/plugins/$(basename ${SRC})
 		else
 			echo "# Priority should be an unsigned integer"
 			exit 1

bridgemngr/Makefile

@@ -5,14 +5,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bridgemngr
-PKG_VERSION:=1.0.17
+PKG_VERSION:=1.0.11
 
 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:=36e6e8319a95dad3bccfe9f2d8a298b39c6ce86b
+PKG_SOURCE_VERSION:=18c2921a1cf5bfa027c11c5e6ca605ef69fd1168
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -59,8 +59,8 @@ define Package/bridgemngr/install
 	$(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) 10
-	$(BBFDM_INSTALL_MS_PLUGIN) -v ${VENDOR_PREFIX} ./files/VLAN_Filtering_Extension.json $(1) $(PKG_NAME) 11
+	$(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/

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

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": {

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

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.1.0.7
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=ca92325ece080389ffb405c95048b64071eda653
+PKG_SOURCE_VERSION:=db4eae19a3f716eec5a37aa2786b9bbbe3160b54
 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

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
 
@@ -56,14 +56,11 @@ endif
 
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/etc/dspg
+	$(INSTALL_DIR) $(1)/etc
 	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
 
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/app/dectmngr $(1)/usr/sbin/
 	$(STRIP) $(1)/usr/sbin/dectmngr
-ifeq ($(CONFIG_TARGET_airoha),)
-	$(CP) ./firmware/common/* $(1)/etc/dspg/
-endif
 	$(CP) ./files/etc/* $(1)/etc/
 	$(INSTALL_DATA) ./files/lib/upgrade/keep.d/dect $(1)/lib/upgrade/keep.d/dect
 endef

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'

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

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

dhcpmngr/files/etc/uci-defaults/unbound.odhcpd.uci_default

@@ -10,6 +10,7 @@ uci -q get dhcp.odhcpd >/dev/null 2>&1 && {
 		[ -e /usr/lib/unbound/odhcpd.sh ] && [ -e /usr/sbin/unbound ] && {
 			# then set unbound script as leasetrigger in dhcp UCI
 			uci -q set dhcp.odhcpd.leasetrigger='/usr/lib/unbound/odhcpd.sh'
+			uci commit dhcp
 		}
 	}
 }

dnsmngr/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dnsmngr
-PKG_VERSION:=1.0.18
+PKG_VERSION:=1.0.14
 
 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:=e64ec01b57d8b32e5230b34f6a3866250b1a8faf
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -64,15 +64,11 @@ ifeq ($(CONFIG_DNSMNGR_BACKEND_DNSMASQ),y)
 endif
 
 define Package/dnsmngr/install
-	$(INSTALL_DIR) $(1)/etc/umdns
-	$(INSTALL_DIR) $(1)/etc/umdns/tmp
-	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
-	$(INSTALL_DATA) ./files/lib/upgrade/keep.d/dnsmngr $(1)/lib/upgrade/keep.d/dnsmngr
 	$(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) $(PKG_NAME)
 	$(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
 

dnsmngr/files/lib/upgrade/keep.d/dnsmngr

@@ -1 +0,0 @@
-/etc/umdns/*

dslmngr/Makefile

@@ -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)

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

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

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

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

ebtables-extensions/Makefile

@@ -6,14 +6,14 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ebtables-extensions
-PKG_VERSION:=2.0.5
+PKG_VERSION:=2.0.4
 PKG_LICENSE:=GPL-2.0
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/ebtables-extensions.git
-PKG_SOURCE_VERSION:=7357622d806833d93d317164dc6673fbf5fd1629
+PKG_SOURCE_VERSION:=9a2af49b455ee25ca0694274e004ced7c09855a0
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -189,7 +189,9 @@ define KernelPackage/ebt-mldsnooping/description
 	Kernel module to enable MLD snooping for ebtables
 endef
 
--include ../../broadcom/bcmkernel/bcm-kernel-toolchain.mk
+ifeq ($(CONFIG_TARGET_brcmbca),y)
+	include ../../broadcom/bcmkernel/bcm-kernel-toolchain.mk
+endif
 
 define Build/Prepare
 
@@ -234,6 +236,7 @@ endif
 	$(CP) $(PKG_BUILD_DIR)/src/ebt_mldsnooping.h $(1)/include/uapi/linux/netfilter_bridge/
 endef
 
+KERNEL_MAKE_FLAGS += -I$(LINUX_DIR)/include
 ifeq ($(CONFIG_TARGET_airoha),y)
   KERNEL_MAKE_FLAGS += PLATFORM="ECONET"
 endif

ethmngr/Makefile

@@ -5,13 +5,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ethmngr
-PKG_VERSION:=3.0.7
+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:=171cf63d972c6fa81b97281531e457a0967c16c7
+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

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

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

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'

firewallmngr/Makefile

@@ -29,7 +29,7 @@ define Package/firewallmngr
   CATEGORY:=Network
   TITLE:=Package to add Device.Firewall and Device.NAT. data model support.
   DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +firewall
-  DEPENDS+=+FIREWALLMNGR_PORT_TRIGGER:iptables-mod-trigger
+  DEPENDS+=+FIREWALLMNGR_PORT_TRIGGER:kmod-ipt-trigger +FIREWALLMNGR_PORT_TRIGGER:kmod-ip6t-trigger
   DEPENDS+=+FIREWALLMNGR_PORT_TRIGGER:iptables-mod-nfqueue
   DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service
 endef

firewallmngr/files/firewall.portmap

@@ -2,40 +2,71 @@
 
 . /lib/functions.sh
 
+log() {
+	echo "${@}"|logger -t firewall.dnat -p info
+}
+
+exec_cmd() {
+	if ! eval "$*"; then
+		log "Failed to run [$*]"
+	fi
+}
+
 reorder_dnat_rules() {
-	nat_chains=$(iptables -w -t nat -S | grep -E "^-N zone[a-zA-Z0-9_]+prerouting$" | cut -d' ' -f 2)
+	nat_chains=$(iptables -t nat -S | grep -E "^-N zone[a-zA-Z0-9_]+prerouting$" | cut -d' ' -f 2)
 
 	for chain in ${nat_chains}; do
 		# Collect empty remote host & empty dport rules
-		EMPTY_HOST_PORT=$(iptables -w -t nat -S ${chain} | grep -E "REDIRECT|DNAT" | grep -v "\-\-dport" | grep -v "\-s ")
+		EMPTY_HOST_PORT=$(iptables -t nat -S ${chain} | grep -E "REDIRECT|DNAT" | grep -v "\-\-dport" | grep -v "\-s ")
+		if [ -n "${EMPTY_HOST_PORT}" ]; then
+			echo "${EMPTY_HOST_PORT}" | while read cmd; do
+				cmd1="iptables -t nat $(echo $cmd | sed 's/-A /-D /g')"
+				exec_cmd $cmd1
+			done
+		fi
 
 		# Collect empty remote host but non empty dport rules
-		EMPTY_HOST=$(iptables -w -t nat -S ${chain} | grep -E "REDIRECT|DNAT" | grep "\-\-dport" | grep -v "\-s ")
+		EMPTY_HOST=$(iptables -t nat -S ${chain} | grep -E "REDIRECT|DNAT" | grep "\-\-dport" | grep -v "\-s ")
+		if [ -n "${EMPTY_HOST}" ]; then
+			echo "${EMPTY_HOST}" | while read cmd; do
+				cmd1="iptables -t nat $(echo $cmd | sed 's/-A /-D /g')"
+				exec_cmd $cmd1
+			done
+		fi
 
 		# Collect non empty remote host but empty dport rules
-		EMPTY_PORT=$(iptables -w -t nat -S ${chain} | grep -E "REDIRECT|DNAT" | grep -v "\-\-dport" | grep "\-s ")
+		EMPTY_PORT=$(iptables -t nat -S ${chain} | grep -E "REDIRECT|DNAT" | grep -v "\-\-dport" | grep "\-s ")
+		if [ -n "${EMPTY_PORT}" ]; then
+			echo "${EMPTY_PORT}" | while read cmd; do
+				cmd1="iptables -t nat $(echo $cmd | sed 's/-A /-D /g')"
+				exec_cmd $cmd1
+			done
+		fi
 
-		# Skip this chain if no matching rules were found
-		[ -n "${EMPTY_HOST_PORT}" -o -n "${EMPTY_HOST}" -o -n "${EMPTY_PORT}" ] || continue
+		# Now add rules as per datamodel precedence shown below
+		## Non empty remote host, empty dport
+		## empty remote host, non empty dport
+		## empty remote host, empty dport
+		if [ -n "${EMPTY_PORT}" ]; then
+			echo "${EMPTY_PORT}" | while read cmd; do
+				cmd1="iptables -t nat $(echo $cmd)"
+				exec_cmd $cmd1
+			done
+		fi
 
-		(
-			echo '*nat'
+		if [ -n "${EMPTY_HOST}" ]; then
+			echo "${EMPTY_HOST}" | while read cmd; do
+				cmd1="iptables -t nat $(echo $cmd)"
+				exec_cmd $cmd1
+			done
+		fi
 
-			# Delete collected rules
-			[ -n "${EMPTY_HOST_PORT}" ] && echo "${EMPTY_HOST_PORT}" | sed 's/^-A /-D /'
-			[ -n "${EMPTY_HOST}" ] && echo "${EMPTY_HOST}" | sed 's/^-A /-D /'
-			[ -n "${EMPTY_PORT}" ] && echo "${EMPTY_PORT}" | sed 's/^-A /-D /'
-
-			# Now add rules as per datamodel precedence shown below
-			## Non empty remote host, empty dport
-			## empty remote host, non empty dport
-			## empty remote host, empty dport
-			[ -n "${EMPTY_PORT}" ] && echo "${EMPTY_PORT}"
-			[ -n "${EMPTY_HOST}" ] && echo "${EMPTY_HOST}"
-			[ -n "${EMPTY_HOST_PORT}" ] && echo "${EMPTY_HOST_PORT}"
-
-			echo 'COMMIT'
-		) | iptables-restore -w -n
+		if [ -n "${EMPTY_HOST_PORT}" ]; then
+			echo "${EMPTY_HOST_PORT}" | while read cmd; do
+				cmd1="iptables -t nat $(echo $cmd)"
+				exec_cmd $cmd1
+			done
+		fi
 	done
 }
 

firewallmngr/files/firewall.service

@@ -2,14 +2,12 @@
 
 . /lib/functions.sh
 
-ZONE_NAME_FILE="/tmp/service_fw_zone"
-
 log() {
 	echo "${@}"|logger -t firewall.service -p info
 }
 
 exec_cmd() {
-	if ! "$@"; then
+	if ! eval "$*"; then
 		log "Failed to run [$*]"
 		echo "-1"
 		return 0
@@ -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
@@ -106,7 +73,7 @@ add_iptable_rule() {
 		fi
 
 		if [ -z "${src_prefix}" ]; then
-			res=$(exec_cmd iptables -w ${cmd} -m comment --comment IPtables_service_rule -j "${action}")
+			res=$(exec_cmd "iptables ${cmd} -m comment --comment IPtables_service_rule -j ${action}")
 		else
 			#Add ipv4 sources if any
 			src_list=""
@@ -119,7 +86,7 @@ add_iptable_rule() {
 
 			if [ -n "$src_list" ]; then
 				src_list=$(echo "${src_list}" | sed "s/,$//")
-				res=$(exec_cmd iptables -w -s "$src_list" ${cmd} -m comment --comment IPtables_service_rule -j "${action}")
+				res=$(exec_cmd "iptables -s $src_list ${cmd} -m comment --comment IPtables_service_rule -j ${action}")
 			fi
 		fi
 	fi
@@ -130,7 +97,7 @@ add_iptable_rule() {
 		fi
 
 		if [ -z "${src_prefix}" ]; then
-			res=$(exec_cmd ip6tables -w ${cmd} -m comment --comment IP6tables_service_rule -j "${action}")
+			res=$(exec_cmd "ip6tables ${cmd} -m comment --comment IP6tables_service_rule -j ${action}")
 		else
 			#Add ipv6 sources if any
 			src_list=""
@@ -143,7 +110,7 @@ add_iptable_rule() {
 
 			if [ -n "$src_list" ]; then
 				src_list=$(echo "${src_list}" | sed "s/,$//")
-				res=$(exec_cmd ip6tables -w -s "$src_list" ${cmd} -m comment --comment IP6tables_service_rule -j "${action}")
+				res=$(exec_cmd "ip6tables -s $src_list ${cmd} -m comment --comment IP6tables_service_rule -j ${action}")
 			fi
 		fi
 	fi
@@ -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}"

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
 }

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

fluent-bit/Makefile

@@ -1,19 +1,18 @@
 #
-# Copyright (C) 2024-2025 IOPSYS
+# Copyright (C) 2024 IOPSYS
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fluent-bit
-PKG_VERSION:=4.0.2
+PKG_VERSION:=3.1.0
 PKG_RELEASE:=$(AUTORELEASE)
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL_FILE:=v$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://github.com/fluent/fluent-bit/archive/refs/tags/
-PKG_HASH:=aa0577ba7251081c8d5398b2a905b5b0585bb657ca13b39a5e12931437516f08
+PKG_SOURCE_URL:=https://github.com/fluent/fluent-bit/archive/v$(PKG_VERSION)
+PKG_HASH:=7a49e110cf3050b6c29c911063494b8081f3c743274d1d95e52562d0476ba1eb
 endif
 
 PKG_LICENSE:=Apache-2.0
@@ -24,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
@@ -46,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
 
@@ -65,7 +63,6 @@ CMAKE_OPTIONS += \
 	-DFLB_IN_DISK=Yes \
 	-DFLB_IN_EXEC=Yes \
 	-DFLB_IN_HEAD=Yes \
-	-DFLB_IN_TAIL=Yes \
 	-DFLB_IN_FORWARD=No \
 	-DFLB_IN_KMSG=No \
 	-DFLB_IN_PROC=No \
@@ -74,6 +71,7 @@ CMAKE_OPTIONS += \
 	-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 \
@@ -102,7 +100,7 @@ CMAKE_OPTIONS += \
 
 
 # Filter options
-CMAKE_OPTIONS += \
+CMAKE_OPTIONS += 
 	-DFLB_FILTER_AWS=No \
 	-DFLB_FILTER_ECS=No \
 	-DFLB_FILTER_KUBERNETES=No \
@@ -140,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 \
@@ -170,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

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 {

gateway-info/Makefile

@@ -1,60 +0,0 @@
-#
-# Copyright (C) 2025 IOPSYS Software Solutions AB
-#
-# This is free software, licensed under the BSD-3-Clause
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=gateway-info
-PKG_VERSION:=1.0.2
-
-LOCAL_DEV:=0
-ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/gateway-info.git
-PKG_SOURCE_VERSION:=dd15893a8291e556a8c49ff9e143c763db0379b5
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
-endif
-
-PKG_LICENSE:=BSD-3-Clause
-PKG_LICENSE_FILES:=LICENSE
-
-include $(INCLUDE_DIR)/package.mk
-include ../bbfdm/bbfdm.mk
-
-define Package/gateway-info
-  CATEGORY:=Utilities
-  TITLE:=GatewayInfo Data Model Support
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +umdns
-  DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service +iputils-arping
-endef
-
-define Package/gateway-info/description
-	Package to add Device.GatewayInfo. data model support.
-endef
-
-MAKE_PATH:=src
-
-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-	$(CP) ~/git/gateway-info/* $(PKG_BUILD_DIR)/
-endef
-endif
-
-define Package/gateway-info/install
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
-	$(INSTALL_DIR) $(1)/etc/udhcpc.user.d
-	$(INSTALL_DIR) $(1)/etc/bbfdm/services
-	$(INSTALL_DIR) $(1)/usr/share/bbfdm/micro_services
-	$(INSTALL_DATA) ./files/etc/config/gateway $(1)/etc/config/gateway
-	$(INSTALL_BIN) ./files/etc/udhcpc.user.d/udhcpc_gateway_info.user $(1)/etc/udhcpc.user.d/udhcpc_gateway_info.user
-	$(INSTALL_BIN) ./files/etc/uci-defaults/86-set-gateway-device-info $(1)/etc/uci-defaults/
-	$(BBFDM_REGISTER_SERVICES) ./files/bbfdm_service.json $(1) $(PKG_NAME)
-	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/libgwinfo.so $(1) $(PKG_NAME)
-endef
-
-$(eval $(call BuildPackage,gateway-info))

gateway-info/files/etc/config/gateway

@@ -1,4 +0,0 @@
-config global 'global'
-	option enable '1'
-	option wan_interface 'wan'
-	option lan_interface 'lan'

gateway-info/files/etc/uci-defaults/86-set-gateway-device-info

@@ -1,288 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-convert_to_hex() {
-	local val=""
-	local optval="${1}"
-	OPTIND=1
-	while getopts ":" opt "-$optval"
-	do
-		temp=$(printf "%02X" "'${OPTARG:-:}")
-		val="${val}:${temp}"
-	done
-
-	echo "${val}"
-}
-
-configure_send_op125() {
-	local sendopt="${1}"
-	local intf="${2}"
-	local uci="${3}"
-	local hex_oui=""
-	local hex_serial=""
-	local hex_class=""
-	local oui_len=0
-	local serial_len=0
-	local class_len=0
-
-	if [ "${uci}" = "network" ]; then
-		local opt125="125:00:00:0D:E9"
-	else
-		if [ -z "${sendopt}" ]; then
-			local opt125="125,00:00:0D:E9"
-		else
-			local opt125=":00:00:0D:E9"
-		fi
-	fi
-
-	config_get oui cpe manufacturer_oui ""
-	if [ -z "${oui}" ]; then
-		oui=$(db -q get device.deviceinfo.ManufacturerOUI)
-	fi
-
-	oui=$(echo "${oui}" | tr 'a-f' 'A-F')
-
-	config_get serial cpe serial_number ""
-	if [ -z "${serial}" ]; then
-		serial=$(db -q get device.deviceinfo.SerialNumber)
-	fi
-
-	config_get class cpe product_class ""
-	if [ -z "${class}" ]; then
-		class=$(db -q get device.deviceinfo.ProductClass)
-	fi
-
-	oui_len=$(echo -n "${oui}" | wc -m)
-	serial_len=$(echo -n "${serial}" | wc -m)
-	class_len=$(echo -n "${class}" | wc -m)
-
-	if [ "${oui_len}" -eq 0 ] || [ "${serial_len}" -eq 0 ]; then
-		return 0
-	fi
-
-	opt125_len=$((oui_len + serial_len + class_len))
-	if [ "${class_len}" -gt 0 ]; then
-		opt125_len=$((opt125_len + 6))
-	else
-		opt125_len=$((opt125_len + 4))
-	fi
-
-	hex_opt125_len=$(printf "%02X" "${opt125_len}")
-	opt125="${opt125}:${hex_opt125_len}"
-	hex_oui=$(convert_to_hex "${oui}")
-	if [ -z "${hex_oui}" ]; then
-		return 0
-	fi
-
-	hex_oui_len=$(printf "%02X" "${oui_len}")
-	if [ "${uci}" = "network" ]; then
-		opt125="${opt125}:01:${hex_oui_len}${hex_oui}"
-	else
-		opt125="${opt125}:04:${hex_oui_len}${hex_oui}"
-	fi
-
-	hex_serial=$(convert_to_hex "${serial}")
-	if [ -z "${hex_serial}" ]; then
-		return 0
-	fi
-
-	hex_serial_len=$(printf "%02X" "${serial_len}")
-	if [ "${uci}" = "network" ]; then
-		opt125="${opt125}:02:${hex_serial_len}${hex_serial}"
-	else
-		opt125="${opt125}:05:${hex_serial_len}${hex_serial}"
-	fi
-
-	if [ "${class_len}" -gt 0 ]; then
-		hex_class=$(convert_to_hex "${class}")
-		if [ -z "${hex_class}" ]; then
-			return 0
-		fi
-
-		hex_class_len=$(printf "%02X" "${class_len}")
-		if [ "${uci}" = "network" ]; then
-			opt125="${opt125}:03:${hex_class_len}${hex_class}"
-		else
-			opt125="${opt125}:06:${hex_class_len}${hex_class}"
-		fi
-	fi
-
-
-	if [ "${uci}" = "network" ]; then
-		new_send_opt="$sendopt $opt125"
-		uci -q set network."${intf}".sendopts="$new_send_opt"
-	else
-		new_send_opt="$sendopt$opt125"
-		uci -q add_list dhcp."${intf}".dhcp_option="$new_send_opt"
-	fi
-}
-
-check_for_suboptions() {
-	# Check if option 4 and 5 present inside enterprise id 3561
-	data=$(echo "${1}" | sed 's/://g')
-	len=$(printf "${data}"|wc -c)
-
-	rem_len="${len}"
-	while [ $rem_len -gt 8 ]; do
-		subopt_present=0
-
-		ent_id="${data:0:8}"
-		ent_id=$(printf "%d\n" "0x$ent_id")
-		if [ $ent_id -ne 3561 ]; then
-			len_val=${data:8:2}
-			data_len=$(printf "%d\n" "0x$len_val")
-			# add 4 byte for ent_id and 1 byte for len
-			data_len=$(( data_len * 2 + 10 ))
-			# move ahead data to next enterprise id
-			data=${data:"${data_len}":"${rem_len}"}
-			rem_len=$(( rem_len - data_len ))
-			continue
-		fi
-
-		# read the length of enterprise data
-		len_val=${data:8:2}
-		data_len=$(printf "%d\n" "0x$len_val")
-		# add 4 byte for ent_id and 1 byte for len
-		data_len=$(( data_len * 2 + 10 ))
-
-		len_val=${data:8:2}
-		opt_len=$(printf "%d\n" "0x$len_val")
-		if [ $opt_len -eq 0 ]; then
-			echo ${subopt_present}
-			return 0
-		fi
-
-		# populate the option data of enterprise id
-		sub_data_len=$(( opt_len * 2))
-		# starting 10 means ahead of length field
-		sub_data=${data:10:"${sub_data_len}"}
-
-		# parsing of suboption of option 125
-		while [ $sub_data_len -gt 0 ]; do
-			# get the suboption id
-			sub_opt_id=${sub_data:0:2}
-			sub_opt_id=$(printf "%d\n" "0x$sub_opt_id")
-			case "${sub_opt_id}" in
-			"4") subopt_present=1
-			;;
-			"5") subopt_present=1
-			;;
-			esac
-
-			if [ ${subopt_present} -eq 1 ]; then
-				break;
-			fi
-
-			# get the length of suboption
-			sub_opt_len=${sub_data:2:2}
-			sub_opt_len=$(printf "%d\n" "0x$sub_opt_len")
-			sub_opt_len=$(( sub_opt_len * 2 ))
-
-			# add 2 bytes for sub_opt id and sub_opt len field
-			sub_opt_end=$(( sub_opt_len + 4 ))
-
-			# update the remaining sub option hex string length
-			sub_data_len=$((sub_data_len - sub_opt_end))
-
-			# fetch next sub option hex string
-			sub_data=${sub_data:${sub_opt_end}:${sub_data_len}}
-		done
-
-		if [ ${subopt_present} -eq 1 ]; then
-			break;
-		else
-			# move ahead data to next enterprise id
-			rem_len=$(( rem_len - $data_len ))
-			data=${data:"${data_len}":"${rem_len}"}
-		fi
-	done
-
-	echo ${subopt_present}
-}
-
-enable_dhcp_option125() {
-	local wan="${1}"
-	local reqopts="$(uci -q get network."${wan}".reqopts)"
-	local sendopts="$(uci -q get network."${wan}".sendopts)"
-	local proto="$(uci -q get network."${wan}".proto)"
-	local newreqopts=""
-	local newsendopts=""
-	local req125_present=0
-	local send125_present=0
-	local opt125="125:"
-
-	for ropt in $reqopts; do
-		case $ropt in
-			125) req125_present=1 ;;
-			*) ;;
-		esac
-	done
-
-	for sopt in $sendopts; do
-		if [[ "$sopt" == "$opt125"* ]]; then
-			send125_present=1
-			break
-		fi
-	done
-
-	if [ "${proto}" = "dhcp" ]; then
-		if [ ${req125_present} -eq 0 ]; then
-			newreqopts="$reqopts 125"
-			uci -q set network."${wan}".reqopts="$newreqopts"
-		fi
-
-		if [ ${send125_present} -eq 0 ]; then
-			configure_send_op125 "${sendopts}" "${wan}" "network"
-		fi
-	fi
-}
-
-enable_dnsmasq_option125() {
-	local lan="${1}"
-	local send125_present=0
-	local opt125="125,"
-
-	local proto="$(uci -q get dhcp."${lan}".dhcpv4)"
-	if [ "${proto}" = "server" ]; then
-		opt_list="$(uci -q get dhcp."${lan}".dhcp_option)"
-		base_opt=""
-
-		for sopt in $opt_list; do
-			if [[ "$sopt" == "$opt125"* ]]; then
-				send125_present=$(check_for_suboptions "${sopt:4}")
-				base_opt="${sopt}"
-				break
-			fi
-		done
-
-		if [ ${send125_present} -eq 0 ]; then
-			uci -q del_list dhcp."${lan}".dhcp_option="${base_opt}"
-			configure_send_op125 "${base_opt}" "${lan}" "dhcp"
-		fi
-	fi
-}
-
-configure_gateway_device_info() {
-	wan_intf=""
-	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}"
-
-	if [ "${wan_intf}" != "${lan_intf}" ]; then
-		# This is extender no need to configure gateway info
-		enable_dnsmasq_option125 "${lan_intf}"
-	fi
-}
-
-configure_gateway_device_info

gateway-info/files/etc/udhcpc.user.d/udhcpc_gateway_info.user

@@ -1,367 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-. /usr/share/libubox/jshn.sh
-
-CLASS=""
-OUI=""
-SERIAL=""
-GW_DISCOVERED=0
-_json_no_warning=1
-
-get_vivsoi() {
-	# opt125 environment variable has data in below format
-	# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-	# |	 enterprise-number1	  |
-	# |				  |
-	# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-	# |   data-len1   |		  |
-	# +-+-+-+-+-+-+-+-+ option-data1  |
-	# /				  /
-	# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ -----
-	# |	 enterprise-number2	  |   ^
-	# |				  |   |
-	# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+   |
-	# |   data-len2   |		  | optional
-	# +-+-+-+-+-+-+-+-+ option-data2  |   |
-	# /				  /   |
-	# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+   |
-	# ~	       ...		  ~   V
-	# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ -----
-
-	#  Enterprise Id  Len  Sub Op  SLen  Data Sub Op  SLen Data	  Sub Op  SLen Data
-	# +-------------+-----+------+------+----+------+-----+----+-----+------+-----+----+
-	# |	id    |  n  |	1  |  n1  | D1 |   2  |  n2 | D2 | ... |   6  |  n6 | D6 |
-	# +-------------+-----+------+------+----+------+-----+----+-----+------+-----+----+
-
-	local opt125="$1"
-	local len="$2"
-	local ent_id
-
-	#hex-string 2 character=1 Byte
-	# length in hex string will be twice of actual Byte length
-	[ "$len" -gt "8" ] || return
-
-	data="${opt125}"
-	rem_len="${len}"
-	while [ $rem_len -gt 0 ]; do
-		ent_id=${data:0:8}
-		ent_id=$(printf "%d\n" "0x$ent_id")
-
-		if [ $ent_id -ne  3561 ]; then
-			len_val=${data:8:2}
-			data_len=$(printf "%d\n" "0x$len_val")
-			# add 4 byte for ent_id and 1 byte for len
-			data_len=$(( data_len * 2 + 10 ))
-			# move ahead data to next enterprise id
-			data=${data:"${data_len}":"${rem_len}"}
-			rem_len=$(( rem_len - $data_len ))
-			continue
-		fi
-
-		# read the length of enterprise data
-		len_val=${data:8:2}
-		data_len=$(printf "%d\n" "0x$len_val")
-		# add 4 byte for ent_id and 1 byte for len
-		data_len=$(( data_len * 2 + 10 ))
-
-		opt_len=$(printf "%d\n" "0x$len_val")
-		[ $opt_len -eq 0 ] && return
-
-		# populate the option data of enterprise id
-		sub_data_len=$(( opt_len * 2))
-		# starting 10 means ahead of length field
-		sub_data=${data:10:"${sub_data_len}"}
-
-		# parsing of suboption of option 125
-		while [ $sub_data_len -gt 0 ]; do
-			# get the suboption id
-			sub_opt_id=${sub_data:0:2}
-			sub_opt_id=$(printf "%d\n" "0x$sub_opt_id")
-
-			# get the length of suboption
-			sub_opt_len=${sub_data:2:2}
-			sub_opt_len=$(printf "%d\n" "0x$sub_opt_len")
-			sub_opt_len=$(( sub_opt_len * 2 ))
-
-			# get the value of sub option starting 4 means starting after length
-			sub_opt_val=${sub_data:4:${sub_opt_len}}
-
-			# assign the value found in sub option
-			case "${sub_opt_id}" in
-				"4")
-				OUI=$(echo -n $sub_opt_val | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
-				GW_DISCOVERED=1
-				;;
-				"5")
-				SERIAL=$(echo -n $sub_opt_val | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
-				GW_DISCOVERED=1
-				;;
-				"6")
-				CLASS=$(echo -n $sub_opt_val | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
-				GW_DISCOVERED=1
-				;;
-			esac
-
-			# add 2 bytes for sub_opt id and sub_opt len field
-			sub_opt_end=$(( sub_opt_len + 4 ))
-
-			# update the remaining sub option hex string length
-			sub_data_len=$((sub_data_len - sub_opt_end))
-
-			# fetch next sub option hex string
-			sub_data=${sub_data:${sub_opt_end}:${sub_data_len}}
-		done
-
-		# move ahead data to next enterprise id
-		data=${data:"${data_len}":"${rem_len}"}
-		rem_len=$(( rem_len - data_len ))
-	done
-}
-
-send_host_query() {
-	intf="${1}"
-	resp=1
-	loop=3
-	usp_serv_found=0
-	sent_host=" "
-
-	ubus call umdns update
-	while [ "${loop}" -ne 0 ]; do
-		sleep 5
-
-		json_load "$(ubus call umdns browse)"
-		json_select discovered_services
-		if [ "${?}" -ne 0 ]; then
-			json_cleanup
-			loop=$(( loop - 1 ))
-			continue
-		fi
-
-		json_select _usp-agt-mqtt._tcp
-		if [ "${?}" -ne 0 ]; then
-			json_cleanup
-			loop=$(( loop - 1 ))
-			continue
-		fi
-
-		usp_serv_found=1
-		break
-	done
-
-	if [ "${usp_serv_found}" -eq 0 ]; then
-		echo "${resp}"
-		return 0
-	fi
-
-	json_get_keys keys
-	for key in $keys; do
-		json_select $key
-		json_get_var _host host ""
-
-		if [ -z "${_host}" ] || [[ "${sent_host}" =~ " ${_host}" ]]; then
-			json_select ..
-			continue
-		fi
-
-		sent_host="${sent_host} ${_host}"
-		cmd="ubus call umdns query '{\"question\":\"$_host\",\"interface\":\"$intf\"}'"
-		eval $cmd
-		resp=0
-		json_select ..
-	done
-
-	json_cleanup
-	echo "${resp}"
-}
-
-get_usp_agent_id() {
-	dhcp_ip="${1}"
-	family="ipv4"
-	ID=""
-
-	if [[ "${dhcp_ip}" =~ ":" ]]; then
-		family="ipv6"
-	fi
-
-	json_load "$(ubus call umdns browse)"
-	json_select discovered_services
-	if [ "${?}" -ne 0 ]; then
-		json_cleanup
-		echo ${ID}
-		return 0
-	fi
-
-	json_select _usp-agt-mqtt._tcp
-	if [ "${?}" -ne 0 ]; then
-		json_cleanup
-		echo ${ID}
-		return 0
-	fi
-
-	json_get_keys keys
-	for key in $keys; do
-		json_select $key
-		json_select $family
-		if [ "${?}" -ne 0 ]; then
-			json_select ..
-			continue
-		fi
-
-		json_get_keys ips
-		for ip in $ips; do
-			json_get_var ip_val $ip
-			if [ "${ip_val}" != "${dhcp_ip}" ]; then
-				continue
-			fi
-
-			json_select ..
-			json_select txt
-			json_get_keys txts
-			for _txt in $txts; do
-				json_get_var text_val $_txt
-				if [[ "${text_val:0:3}" == "ID=" ]]; then
-					ID="${text_val:3}"
-					break
-				fi
-			done
-
-			break
-		done
-
-		json_select ..
-		json_select ..
-
-		if [ -n "${ID}" ]; then
-			break
-		fi
-	done
-
-	json_cleanup
-	echo ${ID}
-}
-
-get_mac_address() {
-	ip="${1}"
-	device="${2}"
-
-	mac="$(cat /proc/net/arp | grep $ip | awk '{print $4}')"
-	if [ -z "${mac}" ]; then
-		arp_resp="$(arping -b -f -c 5 -I $device $ip | grep 'Unicast reply from' | awk '{print $5}')"
-		if [ -n "${arp_resp}" ]; then
-			mac=${arp_resp:1:-1}
-		fi
-	fi
-
-	echo "${mac}"
-}
-
-send_unknown_gw_event() {
-	mac="${1}"
-
-	cmd="ubus -t 5 send gateway-info.gateway.unknown '{\"hwaddr\":\"$mac\"}'"
-	eval $cmd
-}
-
-send_cwmp_gw_event() {
-	oui="${1}"
-	class="${2}"
-	serial="${3}"
-
-	cmd="ubus -t 5 send gateway-info.gateway.cwmp '{\"oui\":\"$oui\",\"class\":\"$class\",\"serial\":\"$serial\"}'"
-	eval $cmd
-}
-
-send_usp_gw_event() {
-	endpoint="${1}"
-
-	cmd="ubus -t 5 send gateway-info.gateway.usp '{\"endpoint\":\"$endpoint\"}'"
-	eval $cmd
-}
-
-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
-		return 0
-	fi
-
-	json_load "$(ifstatus ${INTERFACE})"
-	json_get_var dev_name device ""
-	json_select data
-	json_get_var dhcp_ip dhcpserver ""
-	json_cleanup
-
-	if [ -z "${dhcp_ip}" ] || [ -z "${dev_name}" ]; then
-		return 0
-	fi
-
-	MAC="$(get_mac_address $dhcp_ip $dev_name)"
-
-	mkdir -p /var/state
-	touch /var/state/gwinfo
-	sec=$(uci -q -c /var/state get gwinfo.gatewayinfo)
-	if [ -z "${sec}" ]; then
-		sec=$(uci -q -c /var/state add gwinfo gatewayinfo)
-		uci -q -c /var/state rename gwinfo."${sec}"="gatewayinfo"
-	fi
-
-	uci -q -c /var/state set gwinfo.gatewayinfo.hwaddr="$MAC"
-	uci -q -c /var/state set gwinfo.gatewayinfo.endpoint=""
-	uci -q -c /var/state set gwinfo.gatewayinfo.class=""
-	uci -q -c /var/state set gwinfo.gatewayinfo.oui=""
-	uci -q -c /var/state set gwinfo.gatewayinfo.serial=""
-	uci -q -c /var/state set gwinfo.gatewayinfo.proto=""
-	uci -q -c /var/state commit gwinfo
-
-	if [ -z "$opt125" ]; then
-		send_unknown_gw_event "${MAC}"
-		return 0
-	fi
-
-	len=$(printf "$opt125"|wc -c)
-	get_vivsoi "$opt125" "$len"
-
-	if [ "${GW_DISCOVERED}" -eq 0 ]; then
-		send_unknown_gw_event "${MAC}"
-		return 0
-	fi
-
-	uci -q -c /var/state set gwinfo.gatewayinfo.class="$CLASS"
-	uci -q -c /var/state set gwinfo.gatewayinfo.oui="$OUI"
-	uci -q -c /var/state set gwinfo.gatewayinfo.serial="$SERIAL"
-	uci -q -c /var/state set gwinfo.gatewayinfo.proto="CWMP"
-	uci -q -c /var/state commit gwinfo
-
-	# Check for USP parameters
-	ubus -t 15 wait_for umdns
-	if [ "${?}" -ne 0 ]; then
-		send_cwmp_gw_event "${OUI}" "${CLASS}" "${SERIAL}"
-		return 0
-	fi
-
-	resp=$(send_host_query $dev_name)
-	if [ "${resp}" -ne 0 ]; then
-		send_cwmp_gw_event "${OUI}" "${CLASS}" "${SERIAL}"
-		return 0
-	fi
-
-	ID="$(get_usp_agent_id $dhcp_ip)"
-	if [ -z "${ID}" ]; then
-		send_cwmp_gw_event "${OUI}" "${CLASS}" "${SERIAL}"
-		return 0
-	fi
-
-	uci -q -c /var/state set gwinfo.gatewayinfo.endpoint="$ID"
-	uci -q -c /var/state set gwinfo.gatewayinfo.proto="USP"
-	uci -q -c /var/state commit gwinfo
-
-	send_usp_gw_event "${ID}"
-fi

gryphon-led-module/Makefile

@@ -18,8 +18,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=gryphon-led-kernel-module
-PKG_VERSION:=1.0.0
-PKG_LICENSE:=GPL-2.0
+PKG_RELEASE:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -27,18 +26,41 @@ define KernelPackage/$(PKG_NAME)
   SUBMENU:=LED modules
   TITLE:=LED driver for Gryphon
   FILES:=$(PKG_BUILD_DIR)/$(PKG_NAME).$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_PACKAGE_kmod-gryphon-led-kernel-module=y
   AUTOLOAD:=$(call AutoLoad,60,$(PKG_NAME))
+  DEPENDS:= +(TARGET_brcmbca):bcm963xx-bsp
+  PKG_LICENSE:=GPLv2
+  PKG_LICENSE_URL:=
 endef
 
 define KernelPackage/$(PKG_NAME)/description
   This package contains the LED driver for Gryphon devices.
 endef
 
+EXTRA_KCONFIG:= CONFIG_RGB_LED=m
+
+MODULE_INCLUDE=-I$(PKG_BUILD_DIR)
+
 # support compilation against BCM SDK kernel
--include ../../broadcom/bcmkernel/bcm-kernel-toolchain.mk
+include ../../broadcom/bcmkernel/bcm-kernel-toolchain.mk
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)/kdevlinks/
+	$(CP) -s `pwd`/src/* $(PKG_BUILD_DIR)/kdevlinks/
+	$(CP) src/* $(PKG_BUILD_DIR)
+endef
 
 define Build/Compile
-	$(KERNEL_MAKE) M="$(PKG_BUILD_DIR)" modules
+	$(MAKE) -C "$(LINUX_DIR)" \
+		CROSS_COMPILE="$(TARGET_CROSS)" \
+		ARCH="$(LINUX_KARCH)" \
+		SUBDIRS="$(PKG_BUILD_DIR)" \
+		EXTRA_CFLAGS="-DKERNEL_MODULE $(BUILDFLAGS) -I$(LINUX_DIR)/include -include generated/autoconf.h $(MODULE_INCLUDE)" \
+		modules
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
 endef
 
 $(eval $(call KernelPackage,$(PKG_NAME)))

gryphon-led-module/src/main.c

@@ -28,7 +28,6 @@
 #include <linux/gpio/consumer.h>
 #include <linux/of.h>
 #include <linux/version.h>
-#include <linux/string.h>
 
 #include "sk9822.h"
 
@@ -47,6 +46,11 @@ static ssize_t get_led_color(struct device *dev,
 	int len;
 	struct sk9822_leds *sk9822 = dev_get_drvdata(dev);
 
+	if (IS_ERR(sk9822)) {
+		printk(KERN_ERR "Platform get drvdata returned NULL\n");
+		return -EIO;
+	}
+
 	len = scnprintf(buf, PAGE_SIZE, "%02x%02x%02x\n", sk9822->led_colors[0].r, sk9822->led_colors[0].g, sk9822->led_colors[0].b);
 	if (len <= 0) {
 		dev_err(dev, "sk9822: Invalid sprintf len: %d\n", len);
@@ -69,6 +73,11 @@ static ssize_t set_led_color(struct device *dev,
 	size_t buflen = count;
 	struct sk9822_leds *sk9822 = dev_get_drvdata(dev);
 
+	if (IS_ERR(sk9822)) {
+		printk(KERN_ERR "Platform get drvdata returned NULL\n");
+		return -EIO;
+	}
+
 	/* strip newline */
 	if ((count > 0) && (buf[count-1] == '\n')) {
 		buflen--;
@@ -102,6 +111,11 @@ static ssize_t get_led_brightness(struct device *dev,
 	int len;
 	struct sk9822_leds *sk9822 = dev_get_drvdata(dev);
 
+	if (IS_ERR(sk9822)) {
+		printk(KERN_ERR "Platform get drvdata returned NULL\n");
+		return -EIO;
+	}
+
 	len = scnprintf(buf, PAGE_SIZE, "%x\n", sk9822->led_brightness);
 	if (len <= 0) {
 		dev_err(dev, "sk9822: Invalid sprintf len: %d\n", len);
@@ -124,6 +138,11 @@ static ssize_t set_led_brightness(struct device *dev,
 	struct sk9822_leds *sk9822 = dev_get_drvdata(dev);
 	unsigned long val = SK9822_DEFAULT_BRIGHTNESS;
 
+	if (IS_ERR(sk9822)) {
+		printk(KERN_ERR "Platform get drvdata returned NULL\n");
+		return -EIO;
+	}
+
 	if (kstrtoul(buf, 16, &val)) {
 		return -EINVAL;
 	}
@@ -190,33 +209,49 @@ static int canyon_led_probe(struct platform_device *pdev)
 
 	platform_set_drvdata(pdev, leds);
 
-	leds->clock_gpio = devm_gpiod_get_index(&pdev->dev, "led", 0, GPIOD_OUT_HIGH);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0)
+	leds->clock_gpio = gpiod_get_index(&pdev->dev, "led", 0);
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0)
+	leds->clock_gpio = gpiod_get_index(&pdev->dev, "led", 0, GPIOD_OUT_HIGH);
+#else
+	dev_warn(&pdev->dev, "Kernel version Not supported\n");
+	exit(1);
+#endif
 	if (IS_ERR(leds->clock_gpio)) {
 		dev_err(&pdev->dev, "Failed to acquire clock GPIO %ld\n",
 				PTR_ERR(leds->clock_gpio));
 		return PTR_ERR(leds->clock_gpio);
 	}
 
-	ret = gpiod_direction_output(leds->clock_gpio, 1);
-	if (ret) {
-		dev_err(&pdev->dev, "Failed to set clock GPIO output %d\n", ret);
-		return ret;
+	gpiod_direction_output(leds->clock_gpio, 1);
+	if (IS_ERR(leds->clock_gpio)) {
+		dev_err(&pdev->dev, "Failed to acquire clock GPIO %ld\n",
+				PTR_ERR(leds->clock_gpio));
+		return PTR_ERR(leds->clock_gpio);
 	} else {
 		printk(KERN_INFO "Got clock gpio\n");
 		gpiod_set_value(leds->clock_gpio, 0);
 	}
 
-	leds->data_gpio = devm_gpiod_get_index(&pdev->dev, "led", 1, GPIOD_OUT_HIGH);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0)
+	leds->data_gpio = gpiod_get_index(&pdev->dev, "led", 1);
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0)
+	leds->data_gpio = gpiod_get_index(&pdev->dev, "led", 1, GPIOD_OUT_HIGH);
+#else
+	dev_warn(&pdev->dev, "Kernel version Not supported\n");
+	exit(1);
+#endif
 	if (IS_ERR(leds->data_gpio)) {
 		dev_err(&pdev->dev, "Failed to acquire data GPIO %ld\n",
 				PTR_ERR(leds->data_gpio));
 		return PTR_ERR(leds->data_gpio);
 	}
 
-	ret = gpiod_direction_output(leds->data_gpio, 1);
-	if (ret) {
-		dev_err(&pdev->dev, "Failed to set data GPIO output %d\n", ret);
-		return ret;
+	gpiod_direction_output(leds->data_gpio, 1);
+	if (IS_ERR(leds->data_gpio)) {
+		dev_err(&pdev->dev, "Failed to acquire data GPIO %ld\n",
+				PTR_ERR(leds->data_gpio));
+		return PTR_ERR(leds->data_gpio);
 	} else {
 		printk(KERN_INFO "Got data gpio\n");
 		gpiod_set_value(leds->data_gpio, 0);
@@ -229,31 +264,45 @@ static int canyon_led_probe(struct platform_device *pdev)
 		return ret;
 	}
 
+#if 0
+	printk(KERN_INFO "Flash LEDs to verify they work\n");
+	sk9822_set_color_str(leds, "00FF00");
+	sk9822_update(leds);
+	msleep(200);
+	sk9822_set_color_str(leds, "000000");
+	sk9822_update(leds);
+#endif
+
 	printk(KERN_INFO "canyon led successfully probed\n");
 
 	return 0;
 }
 
-static void canyon_led_off(struct sk9822_leds *leds)
-{
-	leds->led_brightness = 0;
-	memset(leds->led_colors, 0, sizeof(cRGB) * leds->led_count);
-	sk9822_update(leds);
-}
-
 static int canyon_led_remove(struct platform_device *pdev)
 {
+	struct sk9822_leds *leds;
+
 	sysfs_remove_group(&pdev->dev.kobj, &sk9822_dev_attr_group);
-	canyon_led_off(platform_get_drvdata(pdev));
+
+	leds = platform_get_drvdata(pdev);
+	if (IS_ERR(leds)) {
+		printk(KERN_ERR "Platform get drvdata returned NULL\n");
+		return -1;
+	}
+
+	if (leds->clock_gpio) {
+		gpiod_put(leds->clock_gpio);
+	}
+
+	if (leds->data_gpio) {
+		gpiod_put(leds->data_gpio);
+	}
+
+	printk(KERN_NOTICE "Bye, bye\n");
 
 	return 0;
 }
 
-static void canyon_led_shutdown(struct platform_device *pdev)
-{
-	canyon_led_off(platform_get_drvdata(pdev));
-}
-
 /**
  * platform driver metadata
  */
@@ -266,7 +315,6 @@ static const struct of_device_id canyon_led_of_ids[] = {
 static struct platform_driver canyon_led = {
 	.probe = &canyon_led_probe,
 	.remove = &canyon_led_remove,
-	.shutdown = &canyon_led_shutdown,
 	.driver = {
 		.name = DRIVER_NAME,
 		.owner = THIS_MODULE,

hostmngr/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hostmngr
-PKG_VERSION:=1.3.0
+PKG_VERSION:=1.2.14
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=91fb6b7857d6cb4fc6fd9a0ee26c4a055fb9d7c8
+PKG_SOURCE_VERSION:=6ea9fdb38a8e067b850841d6e7f7266bf76c363a
 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

hostmngr/files/scripts/hosts_acl.sh

@@ -271,14 +271,14 @@ touch $ACL_FILE
 echo "iptables -w -F hosts_forward" >> $ACL_FILE
 echo "ip6tables -w -F hosts_forward" >> $ACL_FILE
 
-hosts_ipv4_forward=$(iptables -w -t filter --list -n | grep hosts_forward)
+hosts_ipv4_forward=$(iptables -t filter --list -n | grep hosts_forward)
 if [ -z "$hosts_ipv4_forward" ]; then
 	echo "iptables -w -t filter -N hosts_forward" >> $ACL_FILE
 	ret=$?
 	[ $ret -eq 0 ] && echo "iptables -w -t filter -I FORWARD -j hosts_forward" >> $ACL_FILE
 fi
 
-hosts_ipv6_forward=$(ip6tables -w -t filter --list -n | grep hosts_forward)
+hosts_ipv6_forward=$(ip6tables -t filter --list -n | grep hosts_forward)
 if [ -z "$hosts_ipv6_forward" ]; then
 	echo "ip6tables -w -t filter -N hosts_forward" >> $ACL_FILE
 	ret=$?

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

icwmp/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020-2025 IOPSYS Software Solutions AB
+# Copyright (C) 2020-2023 IOPSYS Software Solutions AB
 #
 # This is free software, licensed under the BSD-3-Clause
 # See /LICENSE for more information.
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=9.9.9
+PKG_VERSION:=9.8.29
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/icwmp.git
-PKG_SOURCE_VERSION:=070e812e1bfb81a35a95a9c16cc20e8ffa6e30e4
+PKG_SOURCE_VERSION:=4075ec2c530fb1590aa484f98ed37c9dda5216f5
 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,14 +72,14 @@ 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/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_opt125.user $(1)/etc/udhcpc.user.d/udhcpc_icwmp_opt125.user
 	$(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))

icwmp/bbfdm_service.json

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

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'
@@ -13,15 +13,11 @@ config acs 'acs'
 	#­ possible configs interval :[1000:65535]
 	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'
 	option default_wan_interface 'wan'
 	option default_lan_interface 'lan'
-	#option client_cert_path '/etc/icwmpd/client.pem'
-	#option client_key_path '/etc/icwmpd/client.key'
 	option log_to_console 'disable'
 	option log_to_file 'disable'
 	# log_severity possible configs: EMERG, ALERT, CRITIC ,ERROR, WARNING, NOTICE, INFO, DEBUG
@@ -29,7 +25,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 +38,9 @@ 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'

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

icwmp/files/etc/init.d/icwmpd

@@ -73,6 +73,231 @@ enable_dhcp_option43() {
 	fi
 }
 
+convert_to_hex() {
+	local val=""
+	local optval="${1}"
+	OPTIND=1
+	while getopts ":" opt "-$optval"
+	do
+		temp=$(printf "%02X" "'${OPTARG:-:}")
+		val="${val}:${temp}"
+	done
+
+	echo "${val}"
+}
+
+configure_send_op125() {
+	local sendopt="${1}"
+	local intf="${2}"
+	local uci="${3}"
+	local hex_oui=""
+	local hex_serial=""
+	local hex_class=""
+	local oui_len=0
+	local serial_len=0
+	local class_len=0
+
+	if [ "${uci}" = "network" ]; then
+		local opt125="125:00:00:0D:E9"
+	else
+		if [ -z "${sendopt}" ]; then
+			local opt125="125,00:00:0D:E9"
+		else
+			local opt125=":00:00:0D:E9"
+		fi
+	fi
+
+	config_get oui cpe manufacturer_oui ""
+	if [ -z "${oui}" ]; then
+		oui=$(db -q get device.deviceinfo.ManufacturerOUI)
+	fi
+
+	oui=$(echo "${oui}" | tr 'a-f' 'A-F')
+
+	config_get serial cpe serial_number ""
+	if [ -z "${serial}" ]; then
+		serial=$(db -q get device.deviceinfo.SerialNumber)
+	fi
+
+	config_get class cpe product_class ""
+	if [ -z "${class}" ]; then
+		class=$(db -q get device.deviceinfo.ProductClass)
+	fi
+
+	oui_len=$(echo -n "${oui}" | wc -m)
+	serial_len=$(echo -n "${serial}" | wc -m)
+	class_len=$(echo -n "${class}" | wc -m)
+
+	if [ "${oui_len}" -eq 0 ] || [ "${serial_len}" -eq 0 ]; then
+		return 0
+	fi
+
+	opt125_len=$((oui_len + serial_len + class_len))
+	if [ "${class_len}" -gt 0 ]; then
+		opt125_len=$((opt125_len + 6))
+	else
+		opt125_len=$((opt125_len + 4))
+	fi
+
+	hex_opt125_len=$(printf "%02X" "${opt125_len}")
+	opt125="${opt125}:${hex_opt125_len}"
+	hex_oui=$(convert_to_hex "${oui}")
+	if [ -z "${hex_oui}" ]; then
+		return 0
+	fi
+
+	hex_oui_len=$(printf "%02X" "${oui_len}")
+	if [ "${uci}" = "network" ]; then
+		opt125="${opt125}:01:${hex_oui_len}${hex_oui}"
+	else
+		opt125="${opt125}:04:${hex_oui_len}${hex_oui}"
+	fi
+
+	hex_serial=$(convert_to_hex "${serial}")
+	if [ -z "${hex_serial}" ]; then
+		return 0
+	fi
+
+	hex_serial_len=$(printf "%02X" "${serial_len}")
+	if [ "${uci}" = "network" ]; then
+		opt125="${opt125}:02:${hex_serial_len}${hex_serial}"
+	else
+		opt125="${opt125}:05:${hex_serial_len}${hex_serial}"
+	fi
+
+	if [ "${class_len}" -gt 0 ]; then
+		hex_class=$(convert_to_hex "${class}")
+		if [ -z "${hex_class}" ]; then
+			return 0
+		fi
+
+		hex_class_len=$(printf "%02X" "${class_len}")
+		if [ "${uci}" = "network" ]; then
+			opt125="${opt125}:03:${hex_class_len}${hex_class}"
+		else
+			opt125="${opt125}:06:${hex_class_len}${hex_class}"
+		fi
+	fi
+
+
+	if [ "${uci}" = "network" ]; then
+		new_send_opt="$sendopt $opt125"
+		uci -q set network."${intf}".sendopts="$new_send_opt"
+	else
+		new_send_opt="$sendopt$opt125"
+		uci -q add_list dhcp."${intf}".dhcp_option="$new_send_opt"
+	fi
+}
+
+check_for_suboptions() {
+	# Check if option 4 and 5 present inside enterprise id 3561
+	data=$(echo "${1}" | sed 's/://g')
+	len=$(printf "${data}"|wc -c)
+
+	rem_len="${len}"
+	while [ $rem_len -gt 8 ]; do
+		subopt_present=0
+
+		ent_id="${data:0:8}"
+		ent_id=$(printf "%d\n" "0x$ent_id")
+		if [ $ent_id -ne 3561 ]; then
+			len_val=${data:8:2}
+			data_len=$(printf "%d\n" "0x$len_val")
+			# add 4 byte for ent_id and 1 byte for len
+			data_len=$(( data_len * 2 + 10 ))
+			# move ahead data to next enterprise id
+			data=${data:"${data_len}":"${rem_len}"}
+			rem_len=$(( rem_len - data_len ))
+			continue
+		fi
+
+		# read the length of enterprise data
+		len_val=${data:8:2}
+		data_len=$(printf "%d\n" "0x$len_val")
+		# add 4 byte for ent_id and 1 byte for len
+		data_len=$(( data_len * 2 + 10 ))
+
+		len_val=${data:8:2}
+		opt_len=$(printf "%d\n" "0x$len_val")
+		if [ $opt_len -eq 0 ]; then
+			echo ${subopt_present}
+			return 0
+		fi
+
+		# populate the option data of enterprise id
+		sub_data_len=$(( opt_len * 2))
+		# starting 10 means ahead of length field
+		sub_data=${data:10:"${sub_data_len}"}
+
+		# parsing of suboption of option 125
+		while [ $sub_data_len -gt 0 ]; do
+			# get the suboption id
+			sub_opt_id=${sub_data:0:2}
+			sub_opt_id=$(printf "%d\n" "0x$sub_opt_id")
+			case "${sub_opt_id}" in
+			"4") subopt_present=1
+			;;
+			"5") subopt_present=1
+			;;
+			esac
+
+			if [ ${subopt_present} -eq 1 ]; then
+				break;
+			fi
+
+			# get the length of suboption
+			sub_opt_len=${sub_data:2:2}
+			sub_opt_len=$(printf "%d\n" "0x$sub_opt_len")
+			sub_opt_len=$(( sub_opt_len * 2 ))
+
+			# add 2 bytes for sub_opt id and sub_opt len field
+			sub_opt_end=$(( sub_opt_len + 4 ))
+
+			# update the remaining sub option hex string length
+			sub_data_len=$((sub_data_len - sub_opt_end))
+
+			# fetch next sub option hex string
+			sub_data=${sub_data:${sub_opt_end}:${sub_data_len}}
+		done
+
+		if [ ${subopt_present} -eq 1 ]; then
+			break;
+		else
+			# move ahead data to next enterprise id
+			rem_len=$(( rem_len - $data_len ))
+			data=${data:"${data_len}":"${rem_len}"}
+		fi
+	done
+
+	echo ${subopt_present}
+}
+
+enable_dnsmasq_option125() {
+	local lan="${1}"
+	local send125_present=0
+	local opt125="125,"
+
+	local proto="$(uci -q get dhcp."${lan}".dhcpv4)"
+	if [ "${proto}" = "server" ]; then
+		opt_list="$(uci -q get dhcp."${lan}".dhcp_option)"
+		base_opt=""
+
+		for sopt in $opt_list; do
+			if [[ "$sopt" == "$opt125"* ]]; then
+				send125_present=$(check_for_suboptions "${sopt:4}")
+				base_opt="${sopt}"
+				break
+			fi
+		done
+
+		if [ ${send125_present} -eq 0 ]; then
+			uci -q del_list dhcp."${lan}".dhcp_option="${base_opt}"
+			configure_send_op125 "${base_opt}" "${lan}" "dhcp"
+			ubus call uci commit '{"config":"dhcp"}'
+		fi
+	fi
+}
+
 set_vendor_id() {
 	local wan="${1}"
 	local proto="$(uci -q get network."${wan}".proto)"
@@ -89,6 +314,51 @@ set_vendor_id() {
 	fi
 }
 
+enable_dhcp_option125() {
+	local wan="${1}"
+	local reqopts="$(uci -q get network."${wan}".reqopts)"
+	local sendopts="$(uci -q get network."${wan}".sendopts)"
+	local proto="$(uci -q get network."${wan}".proto)"
+	local newreqopts=""
+	local newsendopts=""
+	local req125_present=0
+	local send125_present=0
+	local network_uci_update=0
+	local opt125="125:"
+
+	for ropt in $reqopts; do
+		case $ropt in
+			125) req125_present=1 ;;
+			*) ;;
+		esac
+	done
+
+	for sopt in $sendopts; do
+		if [[ "$sopt" == "$opt125"* ]]; then
+			send125_present=1
+			break
+		fi
+	done
+
+	if [ "${proto}" = "dhcp" ]; then
+		if [ ${req125_present} -eq 0 ]; then
+			newreqopts="$reqopts 125"
+			uci -q set network."${wan}".reqopts="$newreqopts"
+			network_uci_update=1
+		fi
+
+		if [ ${send125_present} -eq 0 ]; then
+			configure_send_op125 "${sendopts}" "${wan}" "network"
+			network_uci_update=1
+		fi
+	fi
+
+	if [ ${network_uci_update} -eq 1 ]; then
+		uci commit network
+		ubus call network reload
+	fi
+}
+
 wait_for_resolvfile() {
 	local time=$1
 	local tm=1
@@ -211,10 +481,13 @@ validate_defaults() {
 }
 
 boot() {
-	local dhcp_discovery wan_interface skip_dhcp_boot_options
+	local dhcp_discovery wan_interface skip_dhcp_boot_options disable_gatewayinfo
 
 	config_load cwmp
 	config_get wan_interface cpe default_wan_interface "wan"
+	config_get disable_gatewayinfo cpe disable_gatewayinfo "0"
+
+	config_get dhcp_discovery acs dhcp_discovery "0"
 	config_get dhcp_discovery acs dhcp_discovery "0"
 	config_get skip_dhcp_boot_options acs skip_dhcp_boot_options "0"
 
@@ -227,6 +500,15 @@ boot() {
 		fi
 	fi
 
+	config_get lan_interface cpe default_lan_interface ""
+	if [ -n "${lan_interface}" ]; then
+		if [ "${disable_gatewayinfo}" -ne 1 ]; then
+			# Set dhcp_option 125 if not already configured
+			enable_dhcp_option125 "${wan_interface}"
+			enable_dnsmasq_option125 "${lan_interface}"
+		fi
+	fi
+	
 	config_get ssl_capath acs ssl_capath
 
 	if [ -n "${ssl_capath}" ]; then
@@ -263,14 +545,7 @@ start_service() {
 
 stop_service()
 {
-	local switch_bank
-
 	copy_cwmp_varstate_files_to_etc
-	
-	switch_bank=$(uci -q -c /var/state/ get icwmp.cpe.switch_bank)
-	if [ -n "$switch_bank" ] && [ "$switch_bank" = "1" ]; then
-		[ -x /etc/sysmngr/fwbank ] && /etc/sysmngr/fwbank call copy_config
-	fi
 }
 
 reload_service() {

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().

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=""

icwmp/files/etc/udhcpc.user.d/udhcpc_icwmp_opt125.user

@@ -0,0 +1,139 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+CLASS=""
+OUI=""
+SERIAL=""
+
+get_vivsoi() {
+	# opt125 environment variable has data in below format
+	# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+	# |	 enterprise-number1	  |
+	# |				  |
+	# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+	# |   data-len1   |		  |
+	# +-+-+-+-+-+-+-+-+ option-data1  |
+	# /				  /
+	# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ -----
+	# |	 enterprise-number2	  |   ^
+	# |				  |   |
+	# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+   |
+	# |   data-len2   |		  | optional
+	# +-+-+-+-+-+-+-+-+ option-data2  |   |
+	# /				  /   |
+	# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+   |
+	# ~	       ...		  ~   V
+	# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ -----
+
+	#  Enterprise Id  Len  Sub Op  SLen  Data Sub Op  SLen Data	  Sub Op  SLen Data
+	# +-------------+-----+------+------+----+------+-----+----+-----+------+-----+----+
+	# |	id    |  n  |	1  |  n1  | D1 |   2  |  n2 | D2 | ... |   6  |  n6 | D6 |
+	# +-------------+-----+------+------+----+------+-----+----+-----+------+-----+----+
+
+	local opt125="$1"
+	local len="$2"
+	local ent_id
+
+	#hex-string 2 character=1 Byte
+	# length in hex string will be twice of actual Byte length
+	[ "$len" -gt "8" ] || return
+
+	data="${opt125}"
+	rem_len="${len}"
+	while [ $rem_len -gt 0 ]; do
+		ent_id=${data:0:8}
+		ent_id=$(printf "%d\n" "0x$ent_id")
+
+		if [ $ent_id -ne  3561 ]; then
+			len_val=${data:8:2}
+			data_len=$(printf "%d\n" "0x$len_val")
+			# add 4 byte for ent_id and 1 byte for len
+			data_len=$(( data_len * 2 + 10 ))
+			# move ahead data to next enterprise id
+			data=${data:"${data_len}":"${rem_len}"}
+			rem_len=$(( rem_len - $data_len ))
+			continue
+		fi
+
+		# read the length of enterprise data
+		len_val=${data:8:2}
+		data_len=$(printf "%d\n" "0x$len_val")
+		# add 4 byte for ent_id and 1 byte for len
+		data_len=$(( data_len * 2 + 10 ))
+
+		opt_len=$(printf "%d\n" "0x$len_val")
+		[ $opt_len -eq 0 ] && return
+
+		# populate the option data of enterprise id
+		sub_data_len=$(( opt_len * 2))
+		# starting 10 means ahead of length field
+		sub_data=${data:10:"${sub_data_len}"}
+
+		# parsing of suboption of option 125
+		while [ $sub_data_len -gt 0 ]; do
+			# get the suboption id
+			sub_opt_id=${sub_data:0:2}
+			sub_opt_id=$(printf "%d\n" "0x$sub_opt_id")
+
+			# get the length of suboption
+			sub_opt_len=${sub_data:2:2}
+			sub_opt_len=$(printf "%d\n" "0x$sub_opt_len")
+			sub_opt_len=$(( sub_opt_len * 2 ))
+
+			# get the value of sub option starting 4 means starting after length
+			sub_opt_val=${sub_data:4:${sub_opt_len}}
+
+			# assign the value found in sub option
+			case "${sub_opt_id}" in
+				"4") OUI=$(echo -n $sub_opt_val | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
+				;;
+				"5") SERIAL=$(echo -n $sub_opt_val | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
+				;;
+				"6") CLASS=$(echo -n $sub_opt_val | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
+				;;
+			esac
+
+			# add 2 bytes for sub_opt id and sub_opt len field
+			sub_opt_end=$(( sub_opt_len + 4 ))
+
+			# update the remaining sub option hex string length
+			sub_data_len=$((sub_data_len - sub_opt_end))
+
+			# fetch next sub option hex string
+			sub_data=${sub_data:${sub_opt_end}:${sub_data_len}}
+		done
+
+		# move ahead data to next enterprise id
+		data=${data:"${data_len}":"${rem_len}"}
+		rem_len=$(( rem_len - data_len ))
+	done
+}
+
+config_load cwmp
+config_get_bool enable_cwmp cpe enable 1
+config_get wan_intf cpe default_wan_interface "wan"
+
+if [ "$enable_cwmp" = "0" ]; then
+	return 0
+fi
+
+if [ "${wan_intf}" == "${INTERFACE}" ]; then
+	if [ -n "$opt125" ]; then
+		len=$(printf "$opt125"|wc -c)
+		get_vivsoi "$opt125" "$len"
+	fi
+
+	mkdir -p /var/state
+	touch /var/state/icwmp
+	sec=$(uci -q -c /var/state get icwmp.gatewayinfo)
+	if [ -z "${sec}" ]; then
+		sec=$(uci -q -c /var/state add icwmp gatewayinfo)
+		uci -q -c /var/state rename icwmp."${sec}"="gatewayinfo"
+	fi
+
+	uci -q -c /var/state set icwmp.gatewayinfo.class="$CLASS"
+	uci -q -c /var/state set icwmp.gatewayinfo.oui="$OUI"
+	uci -q -c /var/state set icwmp.gatewayinfo.serial="$SERIAL"
+	uci -q -c /var/state commit icwmp
+fi

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.26
+PKG_VERSION:=8.7.0
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=253c232ad892b1aaf8e7a7c007869d4287c26cdf
+PKG_SOURCE_VERSION:=e65188bb2a05cf83f50ecf2ef8042cf75abe94a0
 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 += \

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
 
@@ -17,3 +18,5 @@ mac=$(uci -q get ieee1905.ieee1905.macaddress)
 [ "$mac" != "" ] && exit 0
 
 uci set ieee1905.ieee1905.macaddress="$LMAC"
+uci commit ieee1905
+

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

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

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
@@ -24,7 +24,7 @@ define KernelPackage/ipt-trigger
   SUBMENU:=Other modules
   TITLE:=Kernel module for iptables port trigger
   FILES:=$(PKG_BUILD_DIR)/src/ipv4/ipt_TRIGGER.ko
-  DEPENDS+=+kmod-nf-nat +kmod-ipt-core
+  DEPENDS+=+kmod-nf-nat +xtables-legacy
   AUTOLOAD:=$(call AutoLoad,30,ipt_TRIGGER,1)
   KCONFIG:=
 endef
@@ -32,7 +32,7 @@ endef
 define KernelPackage/ip6t-trigger
   SUBMENU:=Other modules
   TITLE:=Kernel module for ip6tables port trigger
-  DEPENDS+=+kmod-nf-nat +kmod-ipt-core
+  DEPENDS+=+kmod-nf-nat +xtables-legacy
   FILES:=$(PKG_BUILD_DIR)/src/ipv6/ip6t_TRIGGER.ko
   AUTOLOAD:=$(call AutoLoad,30,ip6t_TRIGGER,1)
   KCONFIG:=
@@ -46,7 +46,9 @@ define KernelPackage/ip6t-trigger/description
 	Kernel module to enable port trigger for ip6tables
 endef
 
--include ../../broadcom/bcmkernel/bcm-kernel-toolchain.mk
+ifeq ($(CONFIG_TARGET_brcmbca),y)
+	include ../../broadcom/bcmkernel/bcm-kernel-toolchain.mk
+endif
 
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
@@ -65,6 +67,8 @@ define Build/InstallDev
 	$(CP) $(PKG_BUILD_DIR)/include/ipt_TRIGGER.h $(1)/include/linux/netfilter_ipv4/
 endef
 
+KERNEL_MAKE_FLAGS += -I$(LINUX_DIR)/include
+
 define Build/Compile
 	$(KERNEL_MAKE) M="$(PKG_BUILD_DIR)/src/ipv4/" modules
 	$(KERNEL_MAKE) M="$(PKG_BUILD_DIR)/src/ipv6/" modules

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

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

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

libdsl/Makefile

@@ -37,11 +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=TEST
-  TARGET_CFLAGS +=-DIOPSYS_TEST
-#  TARGET_PLATFORM=AIROHA
-#  TARGET_CFLAGS +=-DIOPSYS_AIROHA
 endif
 
 TARGET_CFLAGS += \
@@ -62,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

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

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.0.12
 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:=68f0b4f3edecea9b8f05e72b6bbf3952d3946b7c
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

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

@@ -1,30 +0,0 @@
-#!/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
-
-    ports=$(db -q get hw.board.VoicePorts)
-    for p in $(seq 0 $((ports-1))); do
-        uci set asterisk.extension${p}.txgain='10'
-        uci set asterisk.extension${p}.rxgain='-15'
-    done
-}
-
-hasDect=$(db -q get hw.board.hasDect)
-[ "$hasDect" = "1" ] || exit 0
-
-# Set the DECT RFPI
-. /lib/functions/iopsys-environment.sh
-db set hw.board.dect_rfpi=$(get_dect_rfpi)
-db commit
-
-# configure the PCM for DECT/DCX81
-[ -f "/proc/device-tree/aliases/dcx81-uart" ] && {
-    uci set dect.global.pcm_fsync='SHORT_LF'
-    uci set dect.global.pcm_slot_start='8'
-    uci set dect.global.dect_channel_start='3'
-}

libwifi/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libwifi
-PKG_VERSION:=7.13.3
+PKG_VERSION:=7.9.0
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=afa18ea6a47d8f518cacccf040623398da3abafd
+PKG_SOURCE_VERSION:=b4d974c213eb2ad0b98165241b83bbda013ba452
 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
@@ -60,11 +60,11 @@ else
   TARGET_CFLAGS +=-DIOPSYS_MAC80211
 endif
 
-ifneq ($(CONFIG_PACKAGE_kmod-mt7915e_en7523),)
+ifneq ($(CONFIG_PACKAGE_kmod-mt7915e),)
   TARGET_CFLAGS=-DMT7915_VENDOR_EXT
 endif
 
-PKG_BUILD_DEPENDS:=PACKAGE_kmod-mt7915e_en7523:mt76_en7523
+PKG_BUILD_DEPENDS:=PACKAGE_kmod-mt7915e:mt76
 
 ifneq ($(CONFIG_PACKAGE_libwifi),)
 TARGET_CFLAGS +=-DHAS_WIFI

linux-pam/Makefile

@@ -1,38 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=linux-pam
-PKG_VERSION:=1.7.0
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/linux-pam/linux-pam.git
-PKG_SOURCE_VERSION:=v$(PKG_VERSION)
-PKG_MIRROR_HASH:=skip
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/meson.mk
-
-define Package/linux-pam
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Linux PAM Module
-  DEPENDS:=+libpam
-endef
-
-MESON_ARGS += \
-	-Dprefix=/usr \
-	-Ddefault_library=shared \
-	-Ddocs=disabled \
-	-Deconf=disabled \
-	-Dselinux=disabled \
-	-Dnis=disabled \
-	-Dexamples=false \
-	-Dxtests=false
-
-define Package/linux-pam/install
-	$(INSTALL_DIR) $(1)/usr/lib/security
-	$(INSTALL_DIR) $(1)/etc/uci-defaults/
-	$(INSTALL_BIN) ./files/pam_faillock.uci_default $(1)/etc/uci-defaults/99-add_pam_faillock
-endef
-
-$(eval $(call BuildPackage,linux-pam))

linux-pam/files/pam_faillock.uci_default

@@ -1,43 +0,0 @@
-#!/bin/sh
-
-create_faillock_files()
-{
-	# also create files needed by pam_faillock
-	touch /var/log/faillock
-	chmod 700 /var/log/faillock
-	touch /var/log/btmp
-	chmod 700 /var/log/btmp
-}
-
-update_pam_common_auth()
-{
-	local file="/etc/pam.d/common-auth"
-	local deny=6
-	local unlock_time=300
-
-	# update pam_unix.so line
-	sed -i -E 's|^.*pam_unix\.so.*|auth\t sufficient\tpam_unix.so nullok_secure|' "$file"
-
-	# Insert pam_faillock lines before and after pam_unix.so
-	sed -i -E "/pam_unix.so nullok_secure/i auth     required       pam_faillock.so preauth deny=$deny even_deny_root unlock_time=$unlock_time" "$file"
-	sed -i -E "/pam_unix.so nullok_secure/a auth     [default=die]  pam_faillock.so authfail audit deny=$deny even_deny_root unlock_time=$unlock_time" "$file"
-}
-
-update_pam_common_account()
-{
-	# update account file
-	sed -i "/pam_unix.so/ i account  required       pam_faillock.so" /etc/pam.d/common-account
-}
-
-if [ -f "/usr/lib/security/pam_faillock.so" ]; then
-	update_pam_common_auth
-	update_pam_common_account
-	create_faillock_files
-fi
-
-if [ -f /etc/config/sshd ]; then
-	uci -q set sshd.@sshd[0].UsePAM=1
-	uci commit sshd
-fi
-
-exit 0

logmngr/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=logmngr
-PKG_VERSION:=1.0.17
+PKG_VERSION:=1.0.8
 
 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:=7c2056c9f5dc23fd1260846c72210365ec69c882
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -28,12 +28,9 @@ define Package/logmngr
  SECTION:=utils
  CATEGORY:=Utilities
  TITLE:=Logging Manager
- DEPENDS:=+LOGMNGR_BACKEND_FLUENTBIT:fluent-bit
- DEPENDS+=+@LOGMNGR_BACKEND_FLUENTBIT:BUSYBOX_CONFIG_KLOGD
+ 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
@@ -55,28 +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)/usr/libexec
-	$(INSTALL_BIN) ./files/logmngr-klogd $(1)/usr/libexec/
-	$(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_CORE_PLUGIN) $(PKG_BUILD_DIR)/bbf_plugin/libbbfsyslog.so $(1)
 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
 

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
@@ -24,3 +25,4 @@ uci set logmngr.lr1=log_remote
 uci set logmngr.lr1.enable=0
 uci set logmngr.lr1.action="ac1"
 uci set logmngr.lr1.port="514"
+uci commit logmngr

logmngr/files/11-logmngr_logrotate_config_generate

@@ -1,13 +1,14 @@
 #!/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
+	uci commit logmngr
 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

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,15 +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}
 }
 
 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
@@ -48,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() {
@@ -73,6 +55,7 @@ generate_facility_regex() {
 			echo "    regex        pri $pri" >> ${TMP_CONF_FILE}
 		done
 	done
+
 }
 
 generate_severity_regex() {
@@ -222,6 +205,7 @@ handle_log_remote() {
 		return
 	fi
 
+
 	local address
 	config_get address $section log_ip
 	if [ -z "$address" ]; then
@@ -232,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}
@@ -305,44 +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}
-	fi
-	procd_set_param respawn
-	procd_close_instance
+	create_service_section
+	handle_action_section
+	apply_config_file
 
-	procd_open_instance klogd
-	procd_set_param command /usr/libexec/logmngr-klogd
+	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
 }

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"
 

logmngr/files/logmngr-klogd

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

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|*)

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))
+

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

map-agent/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=6.3.6.4
+PKG_VERSION:=6.3.1.2
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=2b64909e930546007400d74cc2fefbab3a709cd0
+PKG_SOURCE_VERSION:=4547277f0637a4e7f18ff676350400efb4e37138
 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

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

map-agent/files/etc/hotplug.d/ethernet/map-topology-discovery

@@ -15,7 +15,7 @@ rc="$?"
 issue_discovery() {
 	local iface="$1"
 
-	res=$(ubus -t5 call ieee1905 buildcmdu "{\"type\":0, \"ifname\":\"${iface}\"}") > /dev/null 2>&1
+	res=$(ubus -t5 call ieee1905 buildcmdu "{\"type\":0, \"ifname\":\"${iface}\"}" > /dev/null 2>&1)
 	json_load "$res" > /dev/null 2>&1
 	json_get_var data data
 

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

map-controller/Config.in

@@ -10,16 +10,6 @@ config CONTROLLER_EASYMESH_VENDOR_EXT
 	bool "Enable extra features through Easymesh vendor extension"
 	default y
 
-config CONTROLLER_PROVISION_DISABLED_AP
-	depends on CONTROLLER_EASYMESH_VENDOR_EXT
-	bool "Enable vendor extension that provisions disabled APs to agents"
-	default n
-
-config CONTROLLER_PROVISION_BRIDGE
-	depends on CONTROLLER_EASYMESH_VENDOR_EXT
-	bool "Enable vendor extension that provisions custom bridge for APs to agents, if configured"
-	default n
-
 config CONTROLLER_EASYMESH_VENDOR_EXT_OUI_DEFAULT
 	hex "Vendor OUI default"
 	default 0xB456FA

map-controller/Makefile

@@ -1,15 +1,14 @@
 #
-# Copyright (C) 2020-2024 IOPSYS Software Solutions AB
-# Copyright (C) 2025 Genexis AB
+# Copyright (C) 2020-2023 IOPSYS Software Solutions AB
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=6.4.0.11
+PKG_VERSION:=6.2.2.1
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=db314c0fb388a3de47a9e6db5d944d7fabc832c6
-PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@genexis.eu>
+PKG_SOURCE_VERSION:=f3d3ef332678f6417d78529323119a71ba715337
+PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
@@ -27,7 +26,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/map-controller
   SECTION:=utils
   CATEGORY:=Utilities
-  TITLE:=WiFi Multi-AP Controller (supporting EasyMesh R6)
+  TITLE:=WiFi Multi-AP Controller (EasyMesh R2)
   DEPENDS:=+libuci +libubox +ubus +libeasy +libwifiutils +libieee1905 +ieee1905 +ieee1905-map-plugin \
 	   +CONTROLLER_USE_LIBDPP:libdpp
 endef
@@ -62,41 +61,18 @@ endif
 ifeq ($(CONFIG_CONTROLLER_EASYMESH_VENDOR_EXT),y)
 TARGET_CFLAGS += -DEASYMESH_VENDOR_EXT_OUI=$(CONFIG_CONTROLLER_EASYMESH_VENDOR_EXT_OUI)
 TARGET_CFLAGS += -DEASYMESH_VENDOR_EXT
-ifeq ($(CONFIG_CONTROLLER_PROVISION_DISABLED_AP),y)
-TARGET_CFLAGS += -DPROVISION_DISABLED_AP
-endif
-ifeq ($(CONFIG_CONTROLLER_PROVISION_BRIDGE),y)
-TARGET_CFLAGS += -DPROVISION_BRIDGE
-endif
 endif
 
 ifeq ($(CONFIG_CONTROLLER_PROPAGATE_PROBE_REQ),y)
 TARGET_CFLAGS += -DPROPAGATE_PROBE_REQ
 endif
 
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/map-controller
-	$(INSTALL_DIR) $(1)/usr/include/map-controller/utils
-	$(CP) $(PKG_BUILD_DIR)/src/wifi_dataelements.h $(1)/usr/include/map-controller
-	$(CP) $(PKG_BUILD_DIR)/src/cntlr_commands_impl.h $(1)/usr/include/map-controller
-	$(CP) $(PKG_BUILD_DIR)/src/cntlr_commands.h $(1)/usr/include/map-controller
-	$(CP) $(PKG_BUILD_DIR)/src/cntlr_apis.h $(1)/usr/include/map-controller
-	$(CP) $(PKG_BUILD_DIR)/src/wifi_opclass.h $(1)/usr/include/map-controller
-	$(CP) $(PKG_BUILD_DIR)/src/steer_module.h $(1)/usr/include/map-controller
-	$(CP) $(PKG_BUILD_DIR)/src/timer.h $(1)/usr/include/map-controller
-	$(CP) $(PKG_BUILD_DIR)/src/timer_impl.h $(1)/usr/include/map-controller
-	$(CP) $(PKG_BUILD_DIR)/src/utils/debug.h $(1)/usr/include/map-controller/utils
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/src/libcntlr-apis.so $(1)/usr/lib
-endef
-
 define Package/map-controller/install
 	$(INSTALL_DIR) $(1)/etc
 	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mapcontroller $(1)/usr/sbin/
 	$(INSTALL_DIR) $(1)/usr/lib/mapcontroller
-	$(CP) $(PKG_BUILD_DIR)/src/libcntlr-apis.so $(1)/usr/lib
 	$(CP) $(PKG_BUILD_DIR)/src/plugins/steer/rcpi/rcpi.so $(1)/usr/lib/mapcontroller/rcpi.so
 endef
 

map-controller/files/etc/config/mapcontroller

@@ -8,25 +8,29 @@ 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
-	option enable_sta_steer '1'
+	option steer_module 'rcpi'
+	option enabled '1'
+	option enable_sta_steer '0'
 	option enable_bsta_steer '0'
+	option use_bcn_metrics '0'
+	option use_usta_metrics '0'
+	option bandsteer '0'
+	option diffsnr '8'
 	option rcpi_threshold_2g '70'
 	option rcpi_threshold_5g '86'
 	option rcpi_threshold_6g '86'
 	option report_rcpi_threshold_2g '80'
 	option report_rcpi_threshold_5g '96'
 	option report_rcpi_threshold_6g '96'
-	option plugins_enabled '1'
-	option plugins_policy 'any'
-	list plugins 'rcpi'
-
-config channel_plan
-	option preclear_dfs '0'
-	option acs '0'
+	option steer_retry_int '30'
+	option steer_int '180'
+	option steer_disable_int '600'
 
 ###################
 # Default AP sections credentials will by updated
@@ -35,27 +39,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 +93,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'
 

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")' \
@@ -172,7 +172,7 @@ start_service() {
 	create_dir
 
 	procd_open_instance
-	procd_set_param command "/usr/sbin/mapcontroller" "-d" "-o" "/tmp/mapcontroller.log" "-f"
+	procd_set_param command "/usr/sbin/mapcontroller" "-d"
 
 	if [ -f /etc/config/mapagent ]; then
 	        local local_ctrl=0

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

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

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

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

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

map-topology/Config.in

@@ -0,0 +1,26 @@
+if (PACKAGE_map-topology)
+
+menu "Configurations"
+
+config TOPOLOGYD_EASYMESH_VENDOR_EXT
+	bool "Enable extra features through Easymesh vendor extension"
+	default y
+
+config TOPOLOGYD_EASYMESH_VENDOR_EXT_OUI_DEFAULT
+	hex "Vendor OUI default"
+	default 0xB456FA
+
+config TOPOLOGYD_EASYMESH_VENDOR_EXT_OUI
+	hex "Vendor OUI in 0xAABBCC format"
+	default TOPOLOGYD_EASYMESH_VENDOR_EXT_OUI_DEFAULT
+	help
+	Extra features not covered by the base EasyMesh specification can be
+	enabled through TOPOLOGYD_EASYMESH_VENDOR_EXT. Please provide the Vendor's OUI
+	through which such features would be exposed.
+
+config TOPOLOGYD_HOST_WAN_STATS
+	bool "Enable wan statistics collection per hosts"
+	default y
+
+endmenu
+endif

map-topology/Makefile

@@ -0,0 +1,71 @@
+#
+# Copyright (C) 2020-22 IOPSYS Software Solutions AB
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=map-topology
+PKG_VERSION:=2.5.2.1
+
+LOCAL_DEV:=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_VERSION:=914f1ead2e65c1e24ed2d8786aa883730db2208f
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/map-topology.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_BUILD_DEPENDS:=ieee1905
+
+PKG_LICENSE:=BSD-3-Clause
+PKG_LICENSE_FILES:=LICENSE
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/map-topology
+	CATEGORY:=Utilities
+	DEPENDS:=+libubox +ubus +libpthread +libuci +libeasy \
+		 +libavahi-nodbus-support +libnetfilter-conntrack +libnfnetlink +libmnl
+	TITLE:=Utility to build topology of a multi-AP network
+endef
+
+define Package/map-topology/config
+	source "$(SOURCE)/Config.in"
+endef
+
+TARGET_CFLAGS += \
+	-Wno-error=deprecated-declarations \
+	-I$(STAGING_DIR)/usr/include \
+	-I$(STAGING_DIR)/usr/include/libnl3 \
+	-I$(STAGING_DIR)/usr/include/libnetfilter_conntrack \
+	-D_GNU_SOURCE
+
+define Package/map-topology/description
+	Constructs network topology and show it as json structure over UBUS
+endef
+
+MAKE_PATH:=src
+
+ifeq ($(CONFIG_TOPOLOGYD_EASYMESH_VENDOR_EXT),y)
+TARGET_CFLAGS += -DEASYMESH_VENDOR_EXT_OUI=$(CONFIG_TOPOLOGYD_EASYMESH_VENDOR_EXT_OUI)
+endif
+
+ifeq ($(CONFIG_TOPOLOGYD_HOST_WAN_STATS),y)
+TARGET_CFLAGS += -DHOST_WAN_STATS
+endif
+
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+        $(CP) -rf ~/git/map-topology/* $(PKG_BUILD_DIR)/
+endef
+endif
+
+define Package/map-topology/install
+	$(CP) ./files/* $(1)/
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/topologyd $(1)/usr/sbin/
+endef
+
+$(eval $(call BuildPackage,map-topology))

map-topology/files/etc/config/topology

@@ -0,0 +1,7 @@
+
+config topology 'topology'
+	option enabled '1'
+	option depth '8'
+	option interval '60'
+	option maxlog '32'
+	option profile '4'

map-topology/files/etc/init.d/topologyd

@@ -0,0 +1,93 @@
+#!/bin/sh /etc/rc.common
+
+START=97
+STOP=21
+
+USE_PROCD=1
+
+IS_CFG_VALID=1
+
+validate_topology_config() {
+	uci_validate_section topology topology "topology" \
+			'enabled:bool:true' \
+			'depth:range(0,16)' \
+			'interval:range(0,65535)' \
+			'maxlog:range(0,128)' \
+
+	[ "$?" -ne 0 ] && {
+		logger -s -t "topology" "Validation of topology UCI file failed"
+		return 1
+	}
+	return 0
+}
+
+validate_global_section() {
+	uci_validate_section hosts global "global" \
+		'ageing_timer:uinteger' \
+		'reboot_persistent:bool'
+
+	[ "$?" -ne 0 ] && {
+		logger -s -t "hosts" "Validation of global section failed"
+		IS_CFG_VALID=0
+		return 1
+	}
+	return 0
+}
+
+validate_host_section() {
+	local section="$1"
+
+	uci_validate_section hosts $section "${1}" \
+			'macaddr:macaddr' \
+			'interface_type:or("wifi","eth")' \
+			'active:bool' \
+			'active_last_change:string'
+
+	[ "$?" -ne 0 ] && {
+		logger -s -t "hosts" "Validation of host section $section failed"
+		IS_CFG_VALID=0
+		return 1
+	}
+	return 0
+}
+
+validate_hosts_config() {
+	IS_CFG_VALID=1
+
+	validate_global_section &&
+		config_foreach validate_host_section host
+
+	[ "$IS_CFG_VALID" -ne 1 ] && {
+		logger -s -t "topology" "Validation of hosts UCI file failed"
+		return 1
+	}
+	return 0
+}
+
+start_service() {
+	config_load "topology"
+	validate_topology_config || return 1;
+
+	config_load "hosts"
+	validate_hosts_config || return 1;
+
+	if [ -f "/proc/sys/net/netfilter/nf_conntrack_timestamp" ]; then
+		echo 1 >/proc/sys/net/netfilter/nf_conntrack_timestamp
+	fi
+
+	procd_open_instance
+        procd_set_param command "/usr/sbin/topologyd"
+	procd_set_param respawn
+#	procd_set_param stdout 1
+	procd_set_param stderr 1
+	procd_close_instance
+}
+
+service_triggers()
+{
+	procd_add_reload_trigger "network"
+}
+
+reload_service() {
+	procd_send_signal "topologyd"
+}

mcastmngr/Makefile

@@ -6,14 +6,14 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=mcastmngr
-PKG_VERSION:=1.2.11
+PKG_VERSION:=1.2.10
 
 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/hal/mcastmngr.git
-PKG_SOURCE_VERSION:=17d73b8f1947823a0d32ed589a240a2642904fe1
+PKG_SOURCE_VERSION:=275d7e5448333e53f8bc980344b39f7f577d4664
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

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

@@ -16,6 +16,8 @@ generate_igmp_global_params(){
 	uci set mcast.@mld[-1].mldv2_unsolicited_report_interval="1"
 	uci set mcast.@mld[-1].qrv="2"
 	uci set mcast.@mld[-1].force_version="0"
+
+	uci commit mcast
 }
 
 generate_mld_proxy_config(){
@@ -65,69 +67,14 @@ 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"
+
+	uci commit mcast
 }
 
 interfaces_ok(){

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