sulu: use gnx server certificates if available

Patch for the obuspa:
- Add DM_SECURE flag in usp_api.h.
- Register Device.LocalAgent.ControllerTrust.SecuredRoles with Validate_SecuredRoles().
- Implement DEVICE_CTRUST_IsControllerSecured() to check controller trust.
- Update DATA_MODEL_GetParameterValue() and group_get_vector functions to return
  an empty string for secure parameters when the controller is not secured.

Updated usp_utils.sh to to add SecuredRole from role ACL files

bbfdm/Config_bbfdmd.in

@@ -2,13 +2,9 @@ if PACKAGE_bbfdmd
 
 config BBF_VENDOR_PREFIX
 	string "Vendor Prefix"
-	default "X_IOPSYS_EU_"
+	default "X_IOWRT_EU_"
 
 config BBF_OBFUSCATION_KEY
 	string "Obfuscation key"
 	default "371d530c95a17d1ca223a29b7a6cdc97e1135c1e0959b51106cca91a0b148b5e42742d372a359760742803f2a44bd88fca67ccdcfaeed26d02ce3b6049cb1e04"
-
-config BBF_MAX_OBJECT_INSTANCES
-	int "Maximum number of instances per object"
-	default 255
 endif

bbfdm/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bbfdm
-PKG_VERSION:=1.12.26
+PKG_VERSION:=1.15.6
 
 USE_LOCAL:=0
 ifneq ($(USE_LOCAL),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bbfdm.git
-PKG_SOURCE_VERSION:=811f0616c6a861c9b78d5a079a0f79f3eb0b23b2
+PKG_SOURCE_VERSION:=38636715adf891bbf64a45ba54a87582c0c7e134
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -19,6 +19,8 @@ endif
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
 
+RSTRIP:=true
+
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 include bbfdm.mk
@@ -68,10 +70,6 @@ define Package/bbfdmd/config
 	source "$(SOURCE)/Config_bbfdmd.in"
 endef
 
-define Package/bbf_configmngr/config
-	source "$(SOURCE)/bbf_configmngr.in"
-endef
-
 define Package/libbbfdm-api/description
  Library contains the API(UCI, UBUS, JSON, CLI and Browse) of libbbfdm
 endef
@@ -100,12 +98,14 @@ endif
 
 CMAKE_OPTIONS += \
 	-DBBF_VENDOR_PREFIX:String="$(CONFIG_BBF_VENDOR_PREFIX)" \
-	-DBBF_MAX_OBJECT_INSTANCES:Integer=$(CONFIG_BBF_MAX_OBJECT_INSTANCES) \
-	-DBBFDMD_MAX_MSG_LEN:Integer=10485760
+	-DBBFDMD_MAX_MSG_LEN:Integer=10485760 \
+	-DCMAKE_BUILD_TYPE:String="Debug" \
+
 
 define Package/libbbfdm-api/install
 	$(INSTALL_DIR) $(1)/lib
-	$(CP) $(PKG_BUILD_DIR)/libbbfdm-api/libbbfdm-api.so $(1)/lib/
+	$(CP) $(PKG_BUILD_DIR)/libbbfdm-api/legacy/libbbfdm-api.so $(1)/lib/
+	$(CP) $(PKG_BUILD_DIR)/libbbfdm-api/version-2/libbbfdm-api-v2.so $(1)/lib/
 
 	$(INSTALL_DIR) $(1)/usr/libexec/rpcd
 	$(CP) $(PKG_BUILD_DIR)/utilities/files/usr/libexec/rpcd/bbf.secure $(1)/usr/libexec/rpcd/bbf.secure
@@ -133,6 +133,7 @@ define Package/bbfdmd/install
 
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbfdmd/ubus/bbfdmd $(1)/usr/sbin/
+	$(STRIP) $(1)/usr/sbin/bbfdmd
 
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/etc/init.d/bbfdmd $(1)/etc/init.d/bbfdmd
@@ -153,22 +154,22 @@ 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
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/bbfdm/
-ifeq ($(CONFIG_BBF_CONFIGMNGR_C_BACKEND),y)
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/utilities/bbf_configd $(1)/usr/sbin/
-	$(INSTALL_BIN) ./files/etc/init.d/bbf_configd $(1)/etc/init.d/bbf_configd
 	$(INSTALL_DIR) $(1)/usr/share/bbfdm/scripts
-	$(CP) $(PKG_BUILD_DIR)/utilities/files/usr/share/bbfdm/scripts/bbf_config_notify.sh $(1)/usr/share/bbfdm/scripts/
-endif
-ifeq ($(CONFIG_BBF_CONFIGMNGR_SCRIPT_BACKEND),y)
-	$(INSTALL_DIR) $(1)/usr/libexec/rpcd
-	$(CP) $(PKG_BUILD_DIR)/utilities/files/usr/libexec/rpcd/bbf.config $(1)/usr/libexec/rpcd/bbf.config
-endif
+
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/utilities/bbf_configd $(1)/usr/sbin/
+	$(STRIP) $(1)/usr/sbin/bbf_configd
+
+	$(INSTALL_BIN) ./files/etc/init.d/bbf_configd $(1)/etc/init.d/bbf_configd
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/utilities/files/usr/share/bbfdm/scripts/bbf_config_notify.sh $(1)/usr/share/bbfdm/scripts/
 	$(INSTALL_DATA) ./files/etc/bbfdm/critical_services.json $(1)/etc/bbfdm/
 endef
 
@@ -182,11 +183,17 @@ define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/include
 	$(INSTALL_DIR) $(1)/usr/include/libbbfdm-api
+	$(INSTALL_DIR) $(1)/usr/include/libbbfdm-api/legacy
+	$(INSTALL_DIR) $(1)/usr/include/libbbfdm-api/version-2
 	$(INSTALL_DIR) $(1)/usr/include/libbbfdm-ubus
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-api/*.h $(1)/usr/include/libbbfdm-api/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-api/legacy/*.h $(1)/usr/include/libbbfdm-api/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-api/legacy/*.h $(1)/usr/include/libbbfdm-api/legacy/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-api/version-2/*.h $(1)/usr/include/libbbfdm-api/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-api/version-2/*.h $(1)/usr/include/libbbfdm-api/version-2/
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-ubus/bbfdm-ubus.h $(1)/usr/include/libbbfdm-ubus/
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-api/include/*.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/libbbfdm-api/libbbfdm-api.so $(1)/usr/lib
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-api/legacy/include/*.h $(1)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/libbbfdm-api/legacy/libbbfdm-api.so $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libbbfdm-api/version-2/libbbfdm-api-v2.so $(1)/usr/lib
 	$(CP) $(PKG_BUILD_DIR)/libbbfdm-ubus/libbbfdm-ubus.so $(1)/usr/lib
 endef
 

bbfdm/bbf_configmngr.in

@@ -1,19 +0,0 @@
-if PACKAGE_bbf_configmngr
-choice
-	prompt "Select backend daemon for bbf.config"
-	default BBF_CONFIGMNGR_C_BACKEND
-	help
-		Select which backend daemon should be used for ubus bbf.config
-
-config BBF_CONFIGMNGR_SCRIPT_BACKEND
-	bool "Use shell script backend"
-	help
-		Enable this option to use shell script as the backend for bbf.config. This can be useful for quick and easy scripting of configuration tasks.
-
-config BBF_CONFIGMNGR_C_BACKEND
-	bool "Use C code backend"
-	help
-		Enable this option to use a C code implementation as the backend for bbf.config. This option is generally preferred for performance-critical tasks and scenarios requiring more robust and efficient handling.
-
-endchoice
-endif

bbfdm/bbfdm.mk

@@ -47,7 +47,6 @@ BBFDM_INSTALL_CORE_PLUGIN:=$(BBFDM_DIR)/tools/bbfdm.sh -p
 # Note:
 # - There could be only one main plugin file, so its bind to PKG_NAME
 # - Micro-service input.json will be auto generated with this call
-# - Use -u (optional argument) to overwrite ubus object name
 #
 # Example:
 #  BBFDM_INSTALL_MS_DM $(PKG_BUILD_DIR)/libcwmp.so $(1) $(PKG_NAME)
@@ -88,27 +87,5 @@ BBFDM_INSTALL_MS_PLUGIN:=$(BBFDM_DIR)/tools/bbfdm.sh -m -p
 #
 BBFDM_INSTALL_SCRIPT:=$(BBFDM_DIR)/tools/bbfdm.sh -s
 
-# 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_REGISTER_SERVICES:=$(BBFDM_DIR)/tools/bbfdm.sh -t

bbfdm/bbfdm_service.json

@@ -0,0 +1,54 @@
+{
+  "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,8 +3,12 @@
 			"firewall",
 			"network",
 			"dhcp",
+			"time",
 			"wireless",
-			"time"
+			"ieee1905",
+			"mapcontroller",
+			"mosquitto",
+			"nginx"
 	],
 	"cwmp": [
 			"firewall",

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/init.d/bbf_configd

@@ -1,7 +1,7 @@
 #!/bin/sh /etc/rc.common
 
 START=80
-STOP=10
+STOP=07
 
 USE_PROCD=1
 PROG=/usr/sbin/bbf_configd

bbfdm/files/etc/init.d/bbfdm.services

@@ -1,12 +1,12 @@
 #!/bin/sh /etc/rc.common
 
 START=60
-STOP=8
+STOP=05
 
 USE_PROCD=1
 PROG=/usr/sbin/dm-service
 
-BBFDM_MICROSERVICE_DIR="/etc/bbfdm/micro_services"
+BBFDM_MICROSERVICE_DIR="/etc/bbfdm/services"
 
 . /usr/share/libubox/jshn.sh
 
@@ -24,7 +24,7 @@ validate_bbfdm_micro_service_section()
 _add_microservice()
 {
 	local name path loglevel
-	local enable enable_core
+	local enable enable_core unified_daemon
 
 	# Check enable from micro-service
 	path="${1}"
@@ -41,9 +41,14 @@ _add_microservice()
 		log "datamodel micro-service ${name} not enabled"
 		return 0
 	fi
-	
+
+	json_get_var unified_daemon unified_daemon 0
+	if [ "${unified_daemon}" -eq "1" ]; then
+		return 0
+	fi
+
 	json_select config
-	json_get_var loglevel loglevel 3
+	json_get_var loglevel loglevel 4
 
 	procd_open_instance "${name}"
 

bbfdm/files/etc/init.d/bbfdmd

@@ -1,7 +1,7 @@
 #!/bin/sh /etc/rc.common
 
 START=97
-STOP=10
+STOP=06
 
 USE_PROCD=1
 PROG=/usr/sbin/bbfdmd
@@ -17,7 +17,7 @@ validate_bbfdm_bbfdmd_section()
 	uci_validate_section bbfdm bbfdmd "bbfdmd" \
 		'enable:bool:true' \
 		'debug:bool:false' \
-		'loglevel:uinteger:3'
+		'loglevel:uinteger:4'
 }
 
 configure_bbfdmd()

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

@@ -51,10 +51,6 @@ 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/tools/bbfdm.sh

@@ -2,18 +2,18 @@
 
 BBFDM_BASE_DM_PATH="usr/share/bbfdm"
 BBFDM_INPUT_PATH="etc/bbfdm/micro_services"
-INPUT_TEMPLATE='{"daemon":{"enable":"1","service_name":"template","config":{"loglevel":"3"}}}'
-OUT_NAME=""
+INPUT_FILE="0"
 
 MICRO_SERVICE=0
 SCRIPT=0
 DIAG=0
 PLUGIN=0
 DEST=""
+VENDOR_EXTN=""
 TOOLS="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
 SRC=""
 
-while getopts ":mpsdu:" opt; do
+while getopts ":mpsdtv:" opt; do
 	case ${opt} in
 	  m)
 	  	MICRO_SERVICE=1
@@ -27,8 +27,11 @@ while getopts ":mpsdu:" opt; do
 	  d)
 	  	DIAG=1
 		;;
-	  u)
-	  	OUT_NAME="${OPTARG}"
+	  t)
+	  	INPUT_FILE=1
+		;;
+	  v)
+	  	VENDOR_EXTN=${OPTARG}
 		;;
 	  ?)
 	  	echo "Invalid option: ${OPTARG}"
@@ -89,6 +92,10 @@ bbfdm_install_dm()
 		minfile=$(mktemp)
 		jq -c 'del(..|.description?)' ${src} > ${minfile}
 
+		if [ -n "${VENDOR_EXTN}" ]; then
+			sed -i "s/{BBF_VENDOR_PREFIX}/${VENDOR_EXTN}/g" ${minfile}
+		fi
+
 		src=${minfile}
 		if dpkg -s python3-jsonschema >/dev/null 2>&1; then
 			echo "Verifying bbfdm Datamodel JSON file"
@@ -108,23 +115,6 @@ bbfdm_install_dm()
 	fi
 }
 
-bbfdm_generate_input()
-{
-	local dest ser
-
-	dest_dir=${1}
-	ser=${2}
-	dest=${dest_dir}/${ser}.json
-
-	if [ -n "${OUT_NAME}" ]; then
-		echo ${INPUT_TEMPLATE} | jq --arg service "${ser}" --arg OUT "${OUT_NAME}" '.daemon |= (.service_name = $service |.output.name = $OUT)' > ${dest}
-	else
-		echo ${INPUT_TEMPLATE} | jq --arg service "${ser}" '.daemon.service_name = $service' > ${dest}
-	fi
-
-	chmod 466 ${dest}
-}
-
 if [ -z "$SRC" ] || [ -z "${DEST}" ] ; then
 	echo "# BBFDM Null value in src[${SRC}], dest[${DEST}]"
 	exit 1
@@ -141,6 +131,39 @@ if [ "${SCRIPT}" -eq "1" ]; then
 	exit 0
 fi
 
+if [ "${INPUT_FILE}" -eq "1" ]; then
+
+	tempfile=""
+	if [ ! -f "${SRC}" ]; then
+		echo "# Datamodel Input file ${SRC} not available"
+		exit 1
+	fi
+
+	if ! cat ${SRC} |jq >/dev/null 2>&1; then
+		echo "# Invalid datamodel json input file"
+		exit 1
+	fi
+
+	if [ -z "${DATA}" ]; then
+		echo "# Package name not provided ...."
+		exit 1
+	fi
+
+	tempfile=$(mktemp)
+	cp ${SRC} ${tempfile}
+	if [ -n "${VENDOR_EXTN}" ]; then
+		sed -i "s/{BBF_VENDOR_PREFIX}/${VENDOR_EXTN}/g" ${tempfile}
+	fi
+
+	install_dir ${DEST}/etc/bbfdm/services
+	install_data ${tempfile} ${DEST}/etc/bbfdm/services/${DATA}.json
+
+	if [ -f "${tempfile}" ]; then
+		rm ${tempfile}
+	fi
+	exit 0
+fi
+
 if [ "${MICRO_SERVICE}" -eq "1" ]; then
 	if [ -z "${DATA}" ]; then
 		echo "# service_name[${DATA}] not provided"
@@ -151,24 +174,21 @@ if [ "${MICRO_SERVICE}" -eq "1" ]; then
 		extn="$(basename ${SRC})"
 		install_dir ${DEST}/${BBFDM_BASE_DM_PATH}/micro_services
 		bbfdm_install_dm ${SRC} ${DEST}/${BBFDM_BASE_DM_PATH}/micro_services/${DATA}.${extn##*.}
-
-		# main micro-service datamodel plugin, create an input file as well
-		install_dir ${DEST}/${BBFDM_INPUT_PATH}
-		bbfdm_generate_input ${DEST}/${BBFDM_INPUT_PATH}/ ${DATA}
 	else
 		install_dir ${DEST}/${BBFDM_BASE_DM_PATH}/micro_services/${DATA}
 		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}/plugins
+		install_dir ${DEST}/${BBFDM_BASE_DM_PATH}/micro_services/core
 
 		if [ "${priority}" -gt "0" ]; then
 			# install with priority if defined
-			bbfdm_install_dm ${SRC} ${DEST}/${BBFDM_BASE_DM_PATH}/plugins/${priority}_$(basename ${SRC})
+			bbfdm_install_dm ${SRC} ${DEST}/${BBFDM_BASE_DM_PATH}/micro_services/core/${priority}_$(basename ${SRC})
 		elif [ "${priority}" -eq "0" ]; then
-			bbfdm_install_dm ${SRC} ${DEST}/${BBFDM_BASE_DM_PATH}/plugins/$(basename ${SRC})
+			bbfdm_install_dm ${SRC} ${DEST}/${BBFDM_BASE_DM_PATH}/micro_services/core/$(basename ${SRC})
 		else
 			echo "# Priority should be an unsigned integer"
 			exit 1

blkpg-part/Makefile

@@ -0,0 +1,45 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2025 IOPSYS Software Solutions AB
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=blkpg-part
+PKG_VERSION:=1
+PKG_RELEASE:=1
+PKG_SOURCE_VERSION:=5a4ec5f53ed904b37fba03f3797fbe2af3077f8d
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/gportay/blkpg-part.git
+PKG_MIRROR_HASH:=skip
+
+PKG_MAINTAINER:=Andreas Gnau <andreas.gnau@iopsys.eu>
+PKG_LICENSE:=LGPL-2.1-or-later
+PKG_LICENSE_FILES:=LICENSE
+
+PKG_BUILD_PARALLEL:=1
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+MAKE_INSTALL_FLAGS += PREFIX=/usr
+
+define Package/$(PKG_NAME)
+  SECTION:=utils
+  CATEGORY:=Utilities
+  SUBMENU:=Disc
+  TITLE:=User space partition table and disk geometry handling utility
+  URL:=https://www.portay.io/blkpg-part/
+endef
+
+define Package/$(PKG_NAME)/description
+  blkpg-part creates temporary partitions that are not part of the GPT/MBR.
+  It makes a partition block device from any consecutive blocks that are
+  not partitioned. It creates, resizes and deletes partitions on the fly
+  without writing back the changes to the partition table.
+endef
+
+define Package/$(PKG_NAME)/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/blkpg-part $(1)/usr/sbin/
+endef
+
+$(eval $(call BuildPackage,$(PKG_NAME)))

bridgemngr/Config.in

@@ -1,7 +1,5 @@
 if PACKAGE_bridgemngr
 
-menu "Configuration"
-
 config BRIDGEMNGR_BRIDGE_VLAN
 	bool "Use bridge-vlan backend"
 	help
@@ -13,5 +11,7 @@ config BRIDGEMNGR_BRIDGE_VENDOR_EXT
 	help
 	   Set this option to use bridge BBF vendor extensions.
 
-endmenu
+config BRIDGEMNGR_BRIDGE_VENDOR_PREFIX
+	string "Package specific datamodel Vendor Prefix for TR181 extensions"
+	default ""
 endif

bridgemngr/Makefile

@@ -5,14 +5,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bridgemngr
-PKG_VERSION:=1.0.7
+PKG_VERSION:=1.0.13
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/bridgemngr
-PKG_SOURCE_VERSION:=4f22b4a4270c8d9b94b9de6f5cbe2a1dd86a3027
+PKG_SOURCE_VERSION:=99bc3a3a0a2571917eda7085c21952f779fdb471
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -40,18 +40,31 @@ endef
 
 MAKE_PATH:=src
 
-TARGET_CFLAGS += -DBBF_VENDOR_PREFIX=\\\"$(CONFIG_BBF_VENDOR_PREFIX)\\\"
+ifeq ($(CONFIG_BRIDGEMNGR_BRIDGE_VENDOR_PREFIX),"")
+VENDOR_PREFIX = $(CONFIG_BBF_VENDOR_PREFIX)
+else
+VENDOR_PREFIX = $(CONFIG_BRIDGEMNGR_BRIDGE_VENDOR_PREFIX)
+endif
+
+TARGET_CFLAGS += -DBBF_VENDOR_PREFIX=\\\"$(VENDOR_PREFIX)\\\"
 
 ifeq ($(CONFIG_BRIDGEMNGR_BRIDGE_VLAN),y)
 	TARGET_CFLAGS += -DBRIDGE_VLAN_BACKEND
 endif
 
 define Package/bridgemngr/install
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_DIR) $(1)/etc/config
+
+	$(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) $(PKG_NAME)
 	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/libbridgemngr.so $(1) $(PKG_NAME)
 ifeq ($(CONFIG_BRIDGEMNGR_BRIDGE_VENDOR_EXT), y)
 	$(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/src/libbridgeext.so $(1) $(PKG_NAME)
-	$(BBFDM_INSTALL_MS_PLUGIN) ./files/VLAN_Filtering_Extension.json $(1) $(PKG_NAME)
+	$(BBFDM_INSTALL_MS_PLUGIN) -v ${VENDOR_PREFIX} ./files/VLAN_Filtering_Extension.json $(1) $(PKG_NAME)
 endif
+
+	$(INSTALL_BIN) ./files/etc/init.d/bridging $(1)/etc/init.d/
+	$(INSTALL_DATA) ./files/etc/config/bridging $(1)/etc/config/
 endef
 
 ifeq ($(LOCAL_DEV),1)

bridgemngr/bbfdm_service.json

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

bridgemngr/files/etc/config/bridging

@@ -0,0 +1,33 @@
+#L2 filter UCI file
+
+config chain 'qos_output'
+	option target 'qos_output'
+	option table 'nat'
+	option chain 'OUTPUT'
+	option policy 'RETURN'
+
+config chain 'dscp2pbits'
+	option target 'dscp2pbits'
+	option table 'broute'
+	option chain 'BROUTING'
+	option policy 'RETURN'
+
+config chain 'qos'
+	option target 'qos'
+	option table 'broute'
+	option chain 'BROUTING'
+	option policy 'RETURN'
+
+config chain 'prevlanxlate'
+	option target 'prevlanxlate'
+	option table 'broute'
+	option chain 'BROUTING'
+	option policy 'RETURN'
+	option append 'false'
+
+config chain 'mcsnooping'
+	option target 'mcsnooping'
+	option table 'broute'
+	option chain 'BROUTING'
+	option policy 'RETURN'
+	option append 'false'

bridgemngr/files/etc/init.d/bridging

@@ -0,0 +1,93 @@
+#!/bin/sh /etc/rc.common
+
+# Start after bdmf shell, wanconf, and switch-script but before the network-script
+START=20
+STOP=10
+
+USE_PROCD=1
+
+. /lib/functions.sh
+
+handle_ebtables_chain() {
+	local sid="$1"
+	local table
+	local chain
+	local target
+	local policy
+	local append
+	local enabled
+	local ret
+
+	config_get table "$sid" table filter
+	config_get chain "$sid" chain
+	config_get policy "$sid" policy RETURN
+	config_get target "$sid" target
+	config_get_bool append "$sid" append 1
+	config_get_bool enabled "$sid" enabled 1
+
+	[ "$enabled" = "0" ] && return
+	[ -z "${chain}" -o -z "${target}" ] && return
+
+	if [ "$append" != "0" ]; then
+		append="-A"
+	else
+		append="-I"
+	fi
+
+	ebtables --concurrent -t "$table" -N "$target" -P "$policy" 2> /dev/null
+	ret=$?
+
+	if [ $ret -eq 0 ]; then
+		ebtables --concurrent -t "$table" ${append} "$chain" -j "$target"
+	else
+		ebtables --concurrent -t "$table" -D "$chain" -j "$target"
+		ebtables --concurrent -t "$table" ${append} "$chain" -j "$target"
+	fi
+}
+
+handle_ebtables_rule() {
+	local sid="$1"
+	local table
+	local chain
+	local target
+	local match
+	local value
+	local enabled
+	local ret
+
+	config_get table "$sid" table filter
+	config_get chain "$sid" chain
+	config_get match "$sid" match
+	config_get value "$sid" value
+	config_get target "$sid" target RETURN
+	config_get_bool append "$sid" append 1
+	config_get_bool enabled "$sid" enabled 1
+
+	[ "$enabled" = "0" ] && return
+	[ -z "${chain}" -o -z "${target}" ] && return
+
+	if [ "$append" != "0" ]; then
+		append="-A"
+	else
+		append="-I"
+	fi
+
+	ebtables --concurrent -t "$table" -D "$chain" ${match} -j "$target" ${value} 2> /dev/null
+	ebtables --concurrent -t "$table" ${append} "$chain" ${match} -j "$target" ${value}
+}
+
+start_service() {
+	config_load bridging
+	config_foreach handle_ebtables_chain chain
+	config_foreach handle_ebtables_rule rule
+}
+
+reload_service() {
+	stop
+	start
+}
+
+
+service_triggers() {
+	procd_add_reload_trigger bridging
+}

bulkdata/Makefile

@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bulkdata
-PKG_VERSION:=2.1.14
+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:=93c9e87cb9f8f635cece1473cff6f67cff9ff7c0
+PKG_SOURCE_VERSION:=628525b02ae9ccd39f4bc85cf616ed4a102bca48
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -54,6 +54,8 @@ define Package/bulkdata/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bulkdatad $(1)/usr/sbin/
 	$(INSTALL_DATA) ./files/etc/config/bulkdata $(1)/etc/config/
 	$(INSTALL_BIN) ./files/etc/init.d/bulkdatad $(1)/etc/init.d/
+
+	$(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) $(PKG_NAME)
 endef
 
 $(eval $(call BuildPackage,bulkdata))

bulkdata/bbfdm_service.json

@@ -0,0 +1,17 @@
+{
+  "daemon": {
+    "enable": "1",
+    "service_name": "bulkdata",
+    "unified_daemon": true,
+    "services": [
+      {
+        "parent_dm": "Device.",
+        "object": "BulkData",
+        "proto": "cwmp"
+      }
+    ],
+    "config": {
+      "loglevel": "3"
+    }
+  }
+}

bulkdata/files/etc/config/bulkdata

@@ -1,6 +1,6 @@
 
 config bulkdata 'bulkdata'
 	option enable '0'
-	#Log levels: Error=1, Warning=2, Info=3, Debug=4
-	option log_level '3'
+	#Log levels: As per syslog 0-7, default 6=>LOG_INFO
+	option loglevel '3'
 

bulkdata/files/etc/init.d/bulkdatad

@@ -6,9 +6,20 @@ STOP=10
 USE_PROCD=1
 PROG="/usr/sbin/bulkdatad"
 
+validate_global_section() {
+	uci_validate_section bulkdata bulkdata bulkdata \
+	    'enable:bool:1' \
+	    'loglevel:uinteger:3'
+}
+
 start_service() {
+	local enable loglevel
+
+	validate_global_section
+
 	procd_open_instance "bulkdata"
 	procd_set_param command "$PROG"
+	procd_append_param command -l ${loglevel}
 	procd_set_param respawn
 	procd_close_instance "bulkdata"
 }

ddnsmngr/Makefile

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ddnsmngr
-PKG_VERSION:=1.0.9
+PKG_VERSION:=1.0.10
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
@@ -71,6 +71,7 @@ ifeq ($(CONFIG_DDNSMNGR_BACKEND_INADYN),y)
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/files/inadyn/server/* $(1)/etc/ddnsmngr/servers
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/inadyn/usr/libexec/rpcd/ddnsmngr $(1)/usr/libexec/rpcd/ddnsmngr
 endif
+	$(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) $(PKG_NAME)
 	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/libddnsmngr.so $(1) $(PKG_NAME)
 endef
 

ddnsmngr/bbfdm_service.json

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

decollector/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=decollector
-PKG_VERSION:=6.1.0.6
+PKG_VERSION:=6.2.0.1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=37669ed8365397d65656f11a04f6af8cae57607c
+PKG_SOURCE_VERSION:=575ecfff3779aadcea83d890ba975109c0f7d6a3
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/decollector.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

dectmngr/Makefile

@@ -56,11 +56,16 @@ endif
 
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/etc
+	$(INSTALL_DIR) $(1)/etc/dspg
 	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
 
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/app/dectmngr $(1)/usr/sbin/
 	$(STRIP) $(1)/usr/sbin/dectmngr
+ifneq ($(CONFIG_TARGET_airoha),)
+	$(CP) ./firmware/airoha/* $(1)/etc/dspg/
+else
+	$(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

dhcpmngr/Makefile

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dhcpmngr
-PKG_VERSION:=1.0.4
+PKG_VERSION:=1.0.5
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
@@ -52,6 +52,7 @@ ifeq ($(CONFIG_DNSMNGR_BACKEND_UNBOUND),y)
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_DATA) ./files/etc/uci-defaults/unbound.odhcpd.uci_default $(1)/etc/uci-defaults/16-set-unbound-as-odhcpd-leasetrigger
 endif
+	$(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) $(PKG_NAME)
 	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/libdhcpmngr.so $(1) $(PKG_NAME)
 endef
 

dhcpmngr/bbfdm_service.json

@@ -0,0 +1,20 @@
+{
+  "daemon": {
+    "enable": "1",
+    "service_name": "dhcpmngr",
+    "unified_daemon": false,
+    "services": [
+      {
+        "parent_dm": "Device.",
+        "object": "DHCPv4"
+      },
+      {
+        "parent_dm": "Device.",
+        "object": "DHCPv6"
+      }
+    ],
+    "config": {
+      "loglevel": "3"
+    }
+  }
+}

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

@@ -10,7 +10,6 @@ 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.12
+PKG_VERSION:=1.0.15
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/dnsmngr.git
-PKG_SOURCE_VERSION:=fb49088ddb498980e2c91f03aea10bd502caeca1
+PKG_SOURCE_VERSION:=32bd2501fca8a4f45ba13ee0e4762756c60fe721
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -64,6 +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)

dnsmngr/bbfdm_service.json

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

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

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

dslmngr/Makefile

@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dslmngr
-PKG_VERSION:=1.2.8
+PKG_VERSION:=1.2.9
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
@@ -78,6 +78,7 @@ ifeq ($(CONFIG_TARGET_brcmbca),y)
 endif
 	$(INSTALL_DIR) $(1)/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/dslmngr $(1)/sbin/
+	$(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) $(PKG_NAME)
 	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/libbbfdsl.so $(1) $(PKG_NAME)
 endef
 

dslmngr/bbfdm_service.json

@@ -0,0 +1,28 @@
+{
+  "daemon": {
+    "enable": "1",
+    "service_name": "dslmngr",
+    "unified_daemon": false,
+    "services": [
+      {
+        "parent_dm": "Device.",
+        "object": "DSL"
+      },
+      {
+        "parent_dm": "Device.",
+        "object": "FAST"
+      },
+      {
+        "parent_dm": "Device.",
+        "object": "ATM"
+      },
+      {
+        "parent_dm": "Device.",
+        "object": "PTM"
+      }
+    ],
+    "config": {
+      "loglevel": "3"
+    }
+  }
+}

ebtables-extensions/Makefile

@@ -6,21 +6,21 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ebtables-extensions
-PKG_VERSION:=2.0.1
+PKG_VERSION:=2.0.5
 PKG_LICENSE:=GPL-2.0
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=5ef3a5b057f6b59a4b90bd5ca15a852b0c27f3b3
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/ebtables-extensions.git
+PKG_SOURCE_VERSION:=7357622d806833d93d317164dc6673fbf5fd1629
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 
 include $(INCLUDE_DIR)/package.mk
 
-define KernelPackage/vlantranslation
+define KernelPackage/ebt-vlantranslation
   SUBMENU:=Other modules
   TITLE:=Kernel module for ebtables VLAN translation
   FILES:=$(PKG_BUILD_DIR)/src/ebt_vlantranslation.ko
@@ -29,7 +29,7 @@ define KernelPackage/vlantranslation
   KCONFIG:=
 endef
 
-define KernelPackage/dscp2pbit
+define KernelPackage/ebt-dscp2pbit
   SUBMENU:=Other modules
   TITLE:=Kernel module for DSCP-to-Pbit mapping
   DEPENDS+=+kmod-ebtables
@@ -38,7 +38,7 @@ define KernelPackage/dscp2pbit
   KCONFIG:=
 endef
 
-define KernelPackage/dhcp
+define KernelPackage/ebt-dhcp
   SUBMENU:=Other modules
   TITLE:=Kernel module for ebtables DHCP snooping
   FILES:=$(PKG_BUILD_DIR)/src/ebt_dhcp.ko
@@ -47,7 +47,7 @@ define KernelPackage/dhcp
   KCONFIG:=
 endef
 
-define KernelPackage/dhcpv6
+define KernelPackage/ebt-dhcpv6
   SUBMENU:=Other modules
   TITLE:=Kernel module for ebtables DHCPv6 snooping
   FILES:=$(PKG_BUILD_DIR)/src/ebt_dhcpv6.ko
@@ -56,7 +56,7 @@ define KernelPackage/dhcpv6
   KCONFIG:=
 endef
 
-define KernelPackage/ra
+define KernelPackage/ebt-ra
   SUBMENU:=Other modules
   TITLE:=Kernel module for ebtables NDP/RA snooping
   FILES:=$(PKG_BUILD_DIR)/src/ebt_ra.ko
@@ -65,7 +65,7 @@ define KernelPackage/ra
   KCONFIG:=
 endef
 
-define KernelPackage/dns
+define KernelPackage/ebt-dns
   SUBMENU:=Other modules
   TITLE:=Kernel module for ebtables DNS manipulation
   FILES:=$(PKG_BUILD_DIR)/src/ebt_dns.ko
@@ -74,7 +74,7 @@ define KernelPackage/dns
   KCONFIG:=
 endef
 
-define KernelPackage/pppoe_disc
+define KernelPackage/ebt-pppoe_disc
   SUBMENU:=Other modules
   TITLE:=Kernel module for ebtables PPPoE manipulation
   FILES:=$(PKG_BUILD_DIR)/src/ebt_pppoe_disc.ko
@@ -83,7 +83,7 @@ define KernelPackage/pppoe_disc
   KCONFIG:=
 endef
 
-define KernelPackage/l2pt
+define KernelPackage/ebt-l2pt
   SUBMENU:=Other modules
   TITLE:=Kernel module for ebtables L2CP tunneling
   FILES:=$(PKG_BUILD_DIR)/src/ebt_l2pt.ko
@@ -92,7 +92,7 @@ define KernelPackage/l2pt
   KCONFIG:=
 endef
 
-define KernelPackage/xtarp
+define KernelPackage/ebt-xtarp
   SUBMENU:=Other modules
   TITLE:=Kernel module for ebtables extended ARP matching
   FILES:=$(PKG_BUILD_DIR)/src/ebt_xtarp.ko
@@ -101,7 +101,7 @@ define KernelPackage/xtarp
   KCONFIG:=
 endef
 
-define KernelPackage/xtip
+define KernelPackage/ebt-xtip
   SUBMENU:=Other modules
   TITLE:=Kernel module for ebtables extended IPv4 matching
   FILES:=$(PKG_BUILD_DIR)/src/ebt_xtip.ko
@@ -110,7 +110,7 @@ define KernelPackage/xtip
   KCONFIG:=
 endef
 
-define KernelPackage/xtip6
+define KernelPackage/ebt-xtip6
   SUBMENU:=Other modules
   TITLE:=Kernel module for ebtables extended IPv6 matching
   FILES:=$(PKG_BUILD_DIR)/src/ebt_xtip6.ko
@@ -119,53 +119,77 @@ define KernelPackage/xtip6
   KCONFIG:=
 endef
 
-define KernelPackage/dhcp/description
+define KernelPackage/ebt-igmpsnooping
+  SUBMENU:=Other modules
+  TITLE:=Kernel module for ebtables IGMP snooping
+  FILES:=$(PKG_BUILD_DIR)/src/ebt_igmpsnooping.ko
+  DEPENDS+=+kmod-ebtables
+  # AUTOLOAD:=$(call AutoLoad,30,ebt_igmpsnooping) - Will be loaded on demand
+  KCONFIG:=
+endef
+
+define KernelPackage/ebt-mldsnooping
+  SUBMENU:=Other modules
+  TITLE:=Kernel module for ebtables MLD snooping
+  FILES:=$(PKG_BUILD_DIR)/src/ebt_mldsnooping.ko
+  DEPENDS+=+kmod-ebtables
+  # AUTOLOAD:=$(call AutoLoad,30,ebt_mldsnooping) - Will be loaded on demand
+  KCONFIG:=
+endef
+
+define KernelPackage/ebt-dhcp/description
 	Kernel module to enable DHCP snooping for ebtables
 endef
 
-define KernelPackage/dhcpv6/description
+define KernelPackage/ebt-dhcpv6/description
 	Kernel module to enable DHCPv6 snooping for ebtables
 endef
 
-define KernelPackage/ra/description
+define KernelPackage/ebt-ra/description
 	Kernel module to enable NDP/RA snooping for ebtables
 endef
 
-define KernelPackage/dns/description
+define KernelPackage/ebt-dns/description
 	Kernel module to enable DNS manipulation for ebtables
 endef
 
-define KernelPackage/pppoe_disc/description
+define KernelPackage/ebt-pppoe_disc/description
 	Kernel module to enable PPPoE manipulation for ebtables
 endef
 
-define KernelPackage/l2pt/description
+define KernelPackage/ebt-l2pt/description
 	Kernel module to enable L2CP tunneling for ebtables
 endef
 
-define KernelPackage/xtarp/description
+define KernelPackage/ebt-xtarp/description
 	Kernel module to enable extended ARP matching for ebtables
 endef
 
-define KernelPackage/xtip/description
+define KernelPackage/ebt-xtip/description
 	Kernel module to enable extended IPv4 matching for ebtables
 endef
 
-define KernelPackage/xtip6/description
+define KernelPackage/ebt-xtip6/description
 	Kernel module to enable extended IPv6 matching for ebtables
 endef
 
-define KernelPackage/vlantranslation/description
+define KernelPackage/ebt-vlantranslation/description
 	Kernel module to enable VLAN translation for ebtables
 endef
 
-define KernelPackage/dscp2pbit/description
+define KernelPackage/ebt-dscp2pbit/description
 	Kernel module to enable DSCP-to-Pbit mapping for ebtables
 endef
 
-ifeq ($(CONFIG_TARGET_brcmbca),y)
-	include ../../broadcom/bcmkernel/bcm-kernel-toolchain.mk
-endif
+define KernelPackage/ebt-igmpsnooping/description
+	Kernel module to enable IGMP snooping for ebtables
+endef
+
+define KernelPackage/ebt-mldsnooping/description
+	Kernel module to enable MLD snooping for ebtables
+endef
+
+-include ../../broadcom/bcmkernel/bcm-kernel-toolchain.mk
 
 define Build/Prepare
 
@@ -187,6 +211,8 @@ endif
 	$(CP) $(PKG_BUILD_DIR)/src/ebt_xtarp.h $(LINUX_DIR)/include/uapi/linux/netfilter_bridge/
 	$(CP) $(PKG_BUILD_DIR)/src/ebt_xtip.h $(LINUX_DIR)/include/uapi/linux/netfilter_bridge/
 	$(CP) $(PKG_BUILD_DIR)/src/ebt_xtip6.h $(LINUX_DIR)/include/uapi/linux/netfilter_bridge/
+	$(CP) $(PKG_BUILD_DIR)/src/ebt_igmpsnooping.h $(LINUX_DIR)/include/uapi/linux/netfilter_bridge/
+	$(CP) $(PKG_BUILD_DIR)/src/ebt_mldsnooping.h $(LINUX_DIR)/include/uapi/linux/netfilter_bridge/
 endef
 
 define Build/InstallDev
@@ -204,9 +230,10 @@ endif
 	$(CP) $(PKG_BUILD_DIR)/src/ebt_xtarp.h $(1)/include/uapi/linux/netfilter_bridge/
 	$(CP) $(PKG_BUILD_DIR)/src/ebt_xtip.h $(1)/include/uapi/linux/netfilter_bridge/
 	$(CP) $(PKG_BUILD_DIR)/src/ebt_xtip6.h $(1)/include/uapi/linux/netfilter_bridge/
+	$(CP) $(PKG_BUILD_DIR)/src/ebt_igmpsnooping.h $(1)/include/uapi/linux/netfilter_bridge/
+	$(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
@@ -215,14 +242,16 @@ define Build/Compile
 	$(KERNEL_MAKE) M="$(PKG_BUILD_DIR)/src" modules
 endef
 
-$(eval $(call KernelPackage,vlantranslation))
-$(eval $(call KernelPackage,dscp2pbit))
-$(eval $(call KernelPackage,dhcp))
-$(eval $(call KernelPackage,dhcpv6))
-$(eval $(call KernelPackage,ra))
-$(eval $(call KernelPackage,dns))
-$(eval $(call KernelPackage,pppoe_disc))
-$(eval $(call KernelPackage,l2pt))
-$(eval $(call KernelPackage,xtarp))
-$(eval $(call KernelPackage,xtip))
-$(eval $(call KernelPackage,xtip6))
+$(eval $(call KernelPackage,ebt-vlantranslation))
+$(eval $(call KernelPackage,ebt-dscp2pbit))
+$(eval $(call KernelPackage,ebt-dhcp))
+$(eval $(call KernelPackage,ebt-dhcpv6))
+$(eval $(call KernelPackage,ebt-ra))
+$(eval $(call KernelPackage,ebt-dns))
+$(eval $(call KernelPackage,ebt-pppoe_disc))
+$(eval $(call KernelPackage,ebt-l2pt))
+$(eval $(call KernelPackage,ebt-xtarp))
+$(eval $(call KernelPackage,ebt-xtip))
+$(eval $(call KernelPackage,ebt-xtip6))
+$(eval $(call KernelPackage,ebt-igmpsnooping))
+$(eval $(call KernelPackage,ebt-mldsnooping))

ethmngr/Config.in

@@ -2,8 +2,16 @@ if (PACKAGE_ethmngr)
 
 menu "Configurations"
 
-config TR181_VENDOR_EXTENSIONS_MACVLAN
-	bool "Use TR181 vendor extension MACVLAN"
+config ETHMNGR_MACVLAN_EXTENSION
+	bool "Enable datamodel MACVLAN vendor extension"
 	default y
+
+config ETHMNGR_EXPOSE_ETHERNET_OBJECT
+	bool "Expose ethernet ubus object to fetch and clear interface stats"
+	default y
+
+config ETHMNGR_VENDOR_PREFIX
+	string "Package specific datamodel Vendor Prefix for TR181 extensions"
+	default ""
 endmenu
 endif

ethmngr/Makefile

@@ -5,30 +5,30 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ethmngr
-PKG_VERSION:=2.1.9
+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:=2d35e86cc8dfd7ef4e0d8579f5d314e90faadc90
+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
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
-include ../bbfdm/bbfdm.mk
+include $(TOPDIR)/feeds/iopsys/bbfdm/bbfdm.mk
 
 define Package/ethmngr
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=Ethernet status and configration utility
-  DEPENDS:=+(TARGET_brcmbca||TARGET_airoha||TARGET_ipq95xx||TARGET_ipq53xx||TARGET_mediatek):libethernet +libuci +libubox +ubus +libpthread +libnl-genl +libeasy
-  DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service
+  DEPENDS:=+libethernet +libuci +libubox +ubus +libpthread +libnl-genl +libeasy
+  DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service +libblobmsg-json +libjson-c +libc +libubus
 endef
 
 define Package/ethmngr/description
@@ -41,39 +41,39 @@ define Package/$(PKG_NAME)/config
        source "$(SOURCE)/Config.in"
 endef
 
-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-        $(CP) -rf ./ethmngr/* $(PKG_BUILD_DIR)/
-endef
-endif
-
 TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include \
 	-I$(STAGING_DIR)/usr/include/libnl3 \
-	-D_GNU_SOURCE \
-	-DBBF_VENDOR_PREFIX=\\\"$(CONFIG_BBF_VENDOR_PREFIX)\\\"
+	-D_GNU_SOURCE
 
-ifeq ($(CONFIG_TR181_VENDOR_EXTENSIONS_MACVLAN),y)
-TARGET_CFLAGS += -DTR181_VENDOR_EXTENSIONS_MACVLAN
+ifeq ($(CONFIG_ETHMNGR_VENDOR_PREFIX),"")
+VENDOR_PREFIX = $(CONFIG_BBF_VENDOR_PREFIX)
+else
+VENDOR_PREFIX = $(CONFIG_ETHMNGR_VENDOR_PREFIX)
 endif
 
-ifeq ($(CONFIG_TARGET_brcmbca)$(CONFIG_TARGET_airoha)$(CONFIG_TARGET_ipq95xx)$(CONFIG_TARGET_ipq53xx)$(CONFIG_TARGET_mediatek),)
-define Build/Compile
+TARGET_CFLAGS += -DBBF_VENDOR_PREFIX=\\\"$(VENDOR_PREFIX)\\\"
+
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+        $(CP) -rf ~/git/ethmngr/* $(PKG_BUILD_DIR)/
 endef
 endif
 
+
+ifeq ($(CONFIG_ETHMNGR_MACVLAN_EXTENSION),y)
+TARGET_CFLAGS += -DETHMNGR_MACVLAN_EXTENSION
+endif
+
+ifeq ($(CONFIG_ETHMNGR_EXPOSE_ETHERNET_OBJECT),y)
+TARGET_CFLAGS += -DETHMNGR_EXPOSE_ETHERNET_OBJECT
+endif
+
 define Package/ethmngr/install
 	$(CP) ./files/* $(1)/
-	$(INSTALL_DIR) $(1)/etc/ethmngr
-	$(INSTALL_DIR) $(1)/etc/ethmngr/plugins
-ifneq ($(CONFIG_TARGET_brcmbca)$(CONFIG_TARGET_airoha)$(CONFIG_TARGET_ipq95xx)$(CONFIG_TARGET_ipq53xx)$(CONFIG_TARGET_mediatek),)
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ethmngr $(1)/usr/sbin/
-endif
-	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/libbbfethernet.so $(1) $(PKG_NAME)
-ifeq ($(CONFIG_TR181_VENDOR_EXTENSIONS_MACVLAN),y)
-	$(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/libbbfethernetmacvlan.so $(1) $(PKG_NAME)
-endif
+	$(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) $(PKG_NAME)
 endef
 
 $(eval $(call BuildPackage,ethmngr))

ethmngr/bbfdm_service.json

@@ -0,0 +1,16 @@
+{
+  "daemon": {
+    "enable": "1",
+    "service_name": "ethmngr",
+    "unified_daemon": true,
+    "services": [
+      {
+        "parent_dm": "Device.",
+        "object": "Ethernet"
+      }
+    ],
+    "config": {
+      "loglevel": "3"
+    }
+  }
+}

ethmngr/files/etc/init.d/ethmngr

@@ -1,28 +1,17 @@
 #!/bin/sh /etc/rc.common
 
-START=15
+START=80
 STOP=90
 
 USE_PROCD=1
 PROG=/usr/sbin/ethmngr
 
-. /lib/functions.sh
-include /lib/ethernet
-
 start_service() {
 	if [ -f $PROG ]; then
-		procd_open_instance
+		procd_open_instance "ethmngr"
 		procd_set_param command ${PROG}
+		procd_append_param command -l 3
 		procd_set_param respawn
-		procd_close_instance
+		procd_close_instance "ethmngr"
 	fi
 }
-
-reload_service() {
-        stop
-        start
-}
-
-service_triggers() {
-	procd_add_reload_trigger network
-}

ethmngr/files/etc/ruleng/ethport.json

@@ -1,20 +0,0 @@
-{
-	"ethport_update": {
-		"if" : [
-			{
-				"event": "network.device"
-			}
-		],
-		"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

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=firewallmngr
-PKG_VERSION:=1.0.6
+PKG_VERSION:=1.0.9
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/firewallmngr.git
-PKG_SOURCE_VERSION:=2cac05871f7a8d93c144157c5f3f129deecf1a29
+PKG_SOURCE_VERSION:=77ad8425b73a3ac63f6160dc217635394ac87907
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -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:kmod-ipt-trigger +FIREWALLMNGR_PORT_TRIGGER:kmod-ip6t-trigger
+  DEPENDS+=+FIREWALLMNGR_PORT_TRIGGER:iptables-mod-trigger
   DEPENDS+=+FIREWALLMNGR_PORT_TRIGGER:iptables-mod-nfqueue
   DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service
 endef
@@ -69,6 +69,7 @@ endif
 	$(INSTALL_BIN) ./files/firewall.service $(1)/etc/
 	$(INSTALL_DATA) ./files/etc/uci-defaults/97-firewall-service $(1)/etc/uci-defaults/
 
+	$(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) $(PKG_NAME)
 	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/libfirewallmngr.so $(1) $(PKG_NAME)
 endef
 

firewallmngr/bbfdm_service.json

@@ -0,0 +1,20 @@
+{
+  "daemon": {
+    "enable": "1",
+    "service_name": "firewallmngr",
+    "unified_daemon": false,
+    "services": [
+      {
+        "parent_dm": "Device.",
+        "object": "Firewall"
+      },
+      {
+        "parent_dm": "Device.",
+        "object": "NAT"
+      }
+    ],
+    "config": {
+      "loglevel": "3"
+    }
+  }
+}

firewallmngr/files/firewall.portmap

@@ -2,71 +2,40 @@
 
 . /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 -t nat -S | grep -E "^-N zone[a-zA-Z0-9_]+prerouting$" | cut -d' ' -f 2)
+	nat_chains=$(iptables -w -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 -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
+		EMPTY_HOST_PORT=$(iptables -w -t nat -S ${chain} | grep -E "REDIRECT|DNAT" | grep -v "\-\-dport" | grep -v "\-s ")
 
 		# Collect empty remote host but non empty dport rules
-		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
+		EMPTY_HOST=$(iptables -w -t nat -S ${chain} | grep -E "REDIRECT|DNAT" | grep "\-\-dport" | grep -v "\-s ")
 
 		# Collect non empty remote host but empty dport rules
-		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
+		EMPTY_PORT=$(iptables -w -t nat -S ${chain} | grep -E "REDIRECT|DNAT" | grep -v "\-\-dport" | grep "\-s ")
 
-		# 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
+		# Skip this chain if no matching rules were found
+		[ -n "${EMPTY_HOST_PORT}" -o -n "${EMPTY_HOST}" -o -n "${EMPTY_PORT}" ] || continue
 
-		if [ -n "${EMPTY_HOST}" ]; then
-			echo "${EMPTY_HOST}" | while read cmd; do
-				cmd1="iptables -t nat $(echo $cmd)"
-				exec_cmd $cmd1
-			done
-		fi
+		(
+			echo '*nat'
 
-		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
+			# 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
 	done
 }
 

firewallmngr/files/firewall.service

@@ -7,7 +7,7 @@ log() {
 }
 
 exec_cmd() {
-	if ! eval "$*"; then
+	if ! "$@"; then
 		log "Failed to run [$*]"
 		echo "-1"
 		return 0
@@ -73,7 +73,7 @@ add_iptable_rule() {
 		fi
 
 		if [ -z "${src_prefix}" ]; then
-			res=$(exec_cmd "iptables ${cmd} -m comment --comment IPtables_service_rule -j ${action}")
+			res=$(exec_cmd iptables -w ${cmd} -m comment --comment IPtables_service_rule -j "${action}")
 		else
 			#Add ipv4 sources if any
 			src_list=""
@@ -86,7 +86,7 @@ add_iptable_rule() {
 
 			if [ -n "$src_list" ]; then
 				src_list=$(echo "${src_list}" | sed "s/,$//")
-				res=$(exec_cmd "iptables -s $src_list ${cmd} -m comment --comment IPtables_service_rule -j ${action}")
+				res=$(exec_cmd iptables -w -s "$src_list" ${cmd} -m comment --comment IPtables_service_rule -j "${action}")
 			fi
 		fi
 	fi
@@ -97,7 +97,7 @@ add_iptable_rule() {
 		fi
 
 		if [ -z "${src_prefix}" ]; then
-			res=$(exec_cmd "ip6tables ${cmd} -m comment --comment IP6tables_service_rule -j ${action}")
+			res=$(exec_cmd ip6tables -w ${cmd} -m comment --comment IP6tables_service_rule -j "${action}")
 		else
 			#Add ipv6 sources if any
 			src_list=""
@@ -110,7 +110,7 @@ add_iptable_rule() {
 
 			if [ -n "$src_list" ]; then
 				src_list=$(echo "${src_list}" | sed "s/,$//")
-				res=$(exec_cmd "ip6tables -s $src_list ${cmd} -m comment --comment IP6tables_service_rule -j ${action}")
+				res=$(exec_cmd ip6tables -w -s "$src_list" ${cmd} -m comment --comment IP6tables_service_rule -j "${action}")
 			fi
 		fi
 	fi

gateway-info/Makefile

@@ -0,0 +1,60 @@
+#
+# 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/bbfdm_service.json

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

gateway-info/files/etc/config/gateway

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

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

@@ -0,0 +1,283 @@
+#!/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 wan_intf global wan_interface "wan"
+	config_get lan_intf global lan_interface "lan"
+
+	# 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

@@ -0,0 +1,362 @@
+#!/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 wan_intf global wan_interface "wan"
+
+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,7 +18,8 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=gryphon-led-kernel-module
-PKG_RELEASE:=1
+PKG_VERSION:=1.0.0
+PKG_LICENSE:=GPL-2.0
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -26,41 +27,18 @@ 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
-
-define Build/Prepare
-	mkdir -p $(PKG_BUILD_DIR)/kdevlinks/
-	$(CP) -s `pwd`/src/* $(PKG_BUILD_DIR)/kdevlinks/
-	$(CP) src/* $(PKG_BUILD_DIR)
-endef
+-include ../../broadcom/bcmkernel/bcm-kernel-toolchain.mk
 
 define Build/Compile
-	$(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
+	$(KERNEL_MAKE) M="$(PKG_BUILD_DIR)" modules
 endef
 
 $(eval $(call KernelPackage,$(PKG_NAME)))

gryphon-led-module/src/main.c

@@ -28,6 +28,7 @@
 #include <linux/gpio/consumer.h>
 #include <linux/of.h>
 #include <linux/version.h>
+#include <linux/string.h>
 
 #include "sk9822.h"
 
@@ -46,11 +47,6 @@ 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);
@@ -73,11 +69,6 @@ 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--;
@@ -111,11 +102,6 @@ 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);
@@ -138,11 +124,6 @@ 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;
 	}
@@ -209,49 +190,33 @@ static int canyon_led_probe(struct platform_device *pdev)
 
 	platform_set_drvdata(pdev, leds);
 
-#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
+	leds->clock_gpio = devm_gpiod_get_index(&pdev->dev, "led", 0, GPIOD_OUT_HIGH);
 	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);
 	}
 
-	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);
+	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;
 	} else {
 		printk(KERN_INFO "Got clock gpio\n");
 		gpiod_set_value(leds->clock_gpio, 0);
 	}
 
-#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
+	leds->data_gpio = devm_gpiod_get_index(&pdev->dev, "led", 1, GPIOD_OUT_HIGH);
 	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);
 	}
 
-	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);
+	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;
 	} else {
 		printk(KERN_INFO "Got data gpio\n");
 		gpiod_set_value(leds->data_gpio, 0);
@@ -264,45 +229,31 @@ 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);
-
-	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");
+	canyon_led_off(platform_get_drvdata(pdev));
 
 	return 0;
 }
 
+static void canyon_led_shutdown(struct platform_device *pdev)
+{
+	canyon_led_off(platform_get_drvdata(pdev));
+}
+
 /**
  * platform driver metadata
  */
@@ -315,6 +266,7 @@ 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/Config.in

@@ -10,6 +10,15 @@ config HOSTMNGR_PLATFORM_HAS_WIFI
 	bool "Platform has WiFi"
 	default y if PACKAGE_libwifi
 
+config HOSTMNGR_DATAMODEL_EXT
+	bool "Keep vendor specific datamodel parameters"
+	default n
+
+config HOSTMNGR_VENDOR_PREFIX
+	depends on HOSTMNGR_DATAMODEL_EXT
+	string "Vendor Prefix for hostmngr datamodel extension"
+	default ""
+
 endmenu
 
 endif

hostmngr/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hostmngr
-PKG_VERSION:=1.2.11
+PKG_VERSION:=1.2.15
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=431b122a051a28a16b430c9dcc83d26f73030f79
+PKG_SOURCE_VERSION:=3b50823da3f2904191332634c1e45d46090def1d
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/hostmngr.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
@@ -24,6 +24,7 @@ PKG_LICENSE_FILES:=LICENSE
 include $(INCLUDE_DIR)/package.mk
 include $(TOPDIR)/feeds/iopsys/bbfdm/bbfdm.mk
 
+
 define Package/hostmngr
   SECTION:=utils
   CATEGORY:=Utilities
@@ -54,6 +55,15 @@ ifeq ($(CONFIG_HOSTMNGR_PLATFORM_HAS_WIFI),y)
 TARGET_CFLAGS += -DHAS_WIFI
 endif
 
+ifeq ($(CONFIG_HOSTMNGR_DATAMODEL_EXT),y)
+TARGET_CFLAGS += -DHAS_VENDOR_EXT
+ifeq ($(CONFIG_HOSTMNGR_VENDOR_PREFIX),"")
+TARGET_CFLAGS += -DCUSTOM_PREFIX=\\\"$(CONFIG_BBF_VENDOR_PREFIX)\\\"
+else
+TARGET_CFLAGS += -DCUSTOM_PREFIX=\\\"$(CONFIG_HOSTMNGR_VENDOR_PREFIX)\\\"
+endif
+endif
+
 MAKE_PATH:=src
 
 define Package/hostmngr/install
@@ -62,7 +72,14 @@ define Package/hostmngr/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/hostmngr $(1)/usr/sbin/
 	$(INSTALL_DIR) $(1)/usr/share/hostmngr
 	$(INSTALL_DATA) ./files/scripts/hosts_acl.sh $(1)/usr/share/hostmngr/
+
+	$(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) $(PKG_NAME)
 	$(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)
+endif
+
 endef
 
 ifeq ($(LOCAL_DEV),1)

hostmngr/bbfdm_service.json

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

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 -t filter --list -n | grep hosts_forward)
+hosts_ipv4_forward=$(iptables -w -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 -t filter --list -n | grep hosts_forward)
+hosts_ipv6_forward=$(ip6tables -w -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/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020-2023 IOPSYS Software Solutions AB
+# Copyright (C) 2020-2025 IOPSYS Software Solutions AB
 #
 # This is free software, licensed under the BSD-3-Clause
 # See /LICENSE for more information.
@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=9.8.24
+PKG_VERSION:=9.8.38
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/icwmp.git
-PKG_SOURCE_VERSION:=868abeb86c2974b3647c7f66e085808c0f296721
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE_VERSION:=1e192605446b420c103a08e8a145be114ebdcabc
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 
@@ -75,8 +75,8 @@ define Package/icwmp/install
 	$(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)
 endef

icwmp/bbfdm_service.json

@@ -0,0 +1,25 @@
+{
+  "daemon": {
+    "enable": "1",
+    "service_name": "icwmp",
+    "unified_daemon": false,
+    "services": [
+      {
+        "parent_dm": "Device.",
+        "object": "ManagementServer"
+      },
+      {
+        "parent_dm": "Device.",
+        "object": "CWMPManagementServer",
+        "proto": "usp"
+      },
+      {
+        "parent_dm": "Device.",
+        "object": "XMPP"
+      }
+    ],
+    "config": {
+      "loglevel": "3"
+    }
+  }
+}

icwmp/files/etc/config/cwmp

@@ -13,16 +13,18 @@ config acs 'acs'
 	#­ possible configs interval :[1000:65535]
 	option retry_interval_multiplier '2000'
 	option skip_dhcp_boot_options '0'
+	option insecure_enable '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: INFO (Default)	
 	# log_severity possible configs: EMERG, ALERT, CRITIC ,ERROR, WARNING, NOTICE, INFO, DEBUG
-	option log_severity 'ERROR'
+	option log_severity 'WARNING'
 	option log_file_name '/var/log/icwmpd.log'
 	option log_max_size '102400'
 	option userid '' #$OUI-$SER
@@ -42,6 +44,7 @@ config cpe 'cpe'
 	option disable_gatewayinfo '0'
 	option fw_upgrade_keep_settings '1'
 	option clock_sync_timeout '128'
+	option disable_datatype_check '0'
 	
 config lwn 'lwn'
 	option enable '0'

icwmp/files/etc/init.d/icwmpd

@@ -73,231 +73,6 @@ 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)"
@@ -314,51 +89,6 @@ 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
@@ -481,13 +211,10 @@ validate_defaults() {
 }
 
 boot() {
-	local dhcp_discovery wan_interface skip_dhcp_boot_options disable_gatewayinfo
+	local dhcp_discovery wan_interface skip_dhcp_boot_options
 
 	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"
 
@@ -500,15 +227,6 @@ 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
@@ -545,7 +263,14 @@ 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/udhcpc.user.d/udhcpc_icwmp_opt125.user

@@ -1,139 +0,0 @@
-#!/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/Config.in

@@ -23,6 +23,7 @@ config IEEE1905_CMDU_FRAGMENT_TLV_BOUNDARY
 
 config IEEE1905_BUILD_TR181_PLUGIN
 	bool "Build TR-181 mapping module (responsible for Device.IEEE1905.)"
+	default y
 
 endmenu
 

ieee1905/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=8.6.1
+PKG_VERSION:=8.7.3
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=5f7e6e30cbda36e431ecb7150d7494bce0c26f6f
+PKG_SOURCE_VERSION:=f3f4dbaac6b2ff6cfd38852e8625625d24996a53
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/ieee1905.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
@@ -22,8 +22,10 @@ PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
-include $(TOPDIR)/feeds/iopsys/bbfdm/bbfdm.mk
 
+ifeq ($(CONFIG_IEEE1905_BUILD_TR181_PLUGIN),y)
+include $(TOPDIR)/feeds/iopsys/bbfdm/bbfdm.mk
+endif
 
 define Package/ieee1905/Default
   SECTION:=utils
@@ -39,7 +41,8 @@ define Package/libieee1905
   $(call Package/ieee1905/Default)
   TITLE:=libieee1905.so (library for CMDU and TLV handling)
   DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
-	   +libjson-c +libblobmsg-json +libwifiutils
+	   +libjson-c +libblobmsg-json +libwifiutils \
+	   +iputils-arping
 endef
 
 define Package/ieee1905
@@ -48,8 +51,10 @@ define Package/ieee1905
   DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
 	   +libjson-c +libblobmsg-json +ubus +libpthread \
 	   +libieee1905 +IEEE1905_PLATFORM_HAS_WIFI:libwifi \
-	   +libwifiutils
-  DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service
+	   +libwifiutils +iputils-arping
+  DEPENDS+=+IEEE1905_BUILD_TR181_PLUGIN:libbbfdm-api \
+	   +IEEE1905_BUILD_TR181_PLUGIN:libbbfdm-ubus \
+	   +IEEE1905_BUILD_TR181_PLUGIN:dm-service
 endef
 
 include $(wildcard plugins/*.mk)
@@ -97,7 +102,10 @@ TARGET_CFLAGS += -DEXTENSION_ALLOWED
 endif
 
 TARGET_CFLAGS += -DHAS_UBUS
+
+ifeq ($(CONFIG_IEEE1905_BUILD_TR181_PLUGIN),y)
 TARGET_CFLAGS += -DBUILD_TR181_PLUGIN
+endif
 
 MAKE_FLAGS += \
 	extmod_subdirs="$(patsubst %,extensions/%,$(plugins))"
@@ -111,7 +119,10 @@ define Package/ieee1905/install
 	$(INSTALL_DIR) $(1)/usr/lib/ieee1905
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/ieee1905d $(1)/usr/sbin/
+ifeq ($(CONFIG_IEEE1905_BUILD_TR181_PLUGIN),y)
+	$(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) $(PKG_NAME)
 	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/tr181/ieee1905dm.so $(1) $(PKG_NAME)
+endif
 endef
 
 define Package/libieee1905/install

ieee1905/bbfdm_service.json

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

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

@@ -18,5 +18,3 @@ mac=$(uci -q get ieee1905.ieee1905.macaddress)
 [ "$mac" != "" ] && exit 0
 
 uci set ieee1905.ieee1905.macaddress="$LMAC"
-uci commit ieee1905
-

iop/Config.in

@@ -1,7 +0,0 @@
-config TARGET_VERSION
-	string
-	prompt "Software Version"
-
-config TARGET_CUSTOMER
-	string
-	prompt "Customer ID"

iop/Makefile

@@ -24,10 +24,6 @@ define Package/iop/description
 	This package contains iopsysWrt SDK utilities
 endef
 
-define Package/iop/config
-	source "$(SOURCE)/Config.in"
-endef
-
 define Build/Compile
 	true
 endef

iop/scripts/feeds_update.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-function feeds_update {
-
-	# always return true
-	exit 0
-}
-
-register_command "feeds_update" "Compatibility function only"

ipt-trigger/Makefile

@@ -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 +xtables-legacy
+  DEPENDS+=+kmod-nf-nat +kmod-ipt-core
   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 +xtables-legacy
+  DEPENDS+=+kmod-nf-nat +kmod-ipt-core
   FILES:=$(PKG_BUILD_DIR)/src/ipv6/ip6t_TRIGGER.ko
   AUTOLOAD:=$(call AutoLoad,30,ip6t_TRIGGER,1)
   KCONFIG:=
@@ -46,9 +46,7 @@ define KernelPackage/ip6t-trigger/description
 	Kernel module to enable port trigger for ip6tables
 endef
 
-ifeq ($(CONFIG_TARGET_brcmbca),y)
-	include ../../broadcom/bcmkernel/bcm-kernel-toolchain.mk
-endif
+-include ../../broadcom/bcmkernel/bcm-kernel-toolchain.mk
 
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
@@ -67,8 +65,6 @@ 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

libethernet/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libethernet
-PKG_VERSION:=7.2.111
+PKG_VERSION:=7.2.117
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=6e7216e657dfb59e869e393ef58e6b4593c16fc7
+PKG_SOURCE_VERSION:=e917cdcfa0beb15a452f204521bea3d3571190b3
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libethernet.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
@@ -66,7 +66,8 @@ define Package/libethernet
   SUBMENU:=IOPSYS HAL libs
   MENU:=1
   TITLE:= Ethernet library (libethernet)
-  DEPENDS+=+libnl +libnl-route +libeasy +TARGET_airoha:ecnt_api +TARGET_brcmbca:bcm963xx-bsp
+  DEPENDS+=+libnl +libnl-route +libeasy +TARGET_brcmbca:bcm963xx-bsp
+  DEPENDS+=+TARGET_airoha:ecnt_api +TARGET_airoha:kmod-npu +MODULE_DEFAULT_xpon_bsp:xpon_bsp
 endef
 
 define Package/libethernet/description
@@ -83,7 +84,7 @@ endef
 
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
-        $(CP) -rf ./libethernet/* $(PKG_BUILD_DIR)/
+        $(CP) -rf ~/git/libethernet/* $(PKG_BUILD_DIR)/
 endef
 endif
 

libqos/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libqos
-PKG_VERSION:=7.2.108
+PKG_VERSION:=7.2.109
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=6a72e35e1a662e2f707e4901679676a9c09b3bc2
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libqos.git
+PKG_SOURCE_VERSION:=4948d372c3d7e43a0ba9aee517dbb83b94bba3dc
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
 endif
@@ -78,7 +78,7 @@ endef
 
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
-        $(CP) -rf ./libqos/* $(PKG_BUILD_DIR)/
+        $(CP) -rf ~/git/libqos/* $(PKG_BUILD_DIR)/
 endef
 endif
 

libvoice-airoha/Makefile

@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libvoice-airoha
 PKG_RELEASE:=1
-PKG_VERSION:=1.0.12
+PKG_VERSION:=1.1.2
 PKG_LICENSE:=PROPRIETARY
 PKG_LICENSE_FILES:=LICENSE
 
@@ -17,7 +17,7 @@ LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/$(PKG_NAME).git
-PKG_SOURCE_VERSION:=68f0b4f3edecea9b8f05e72b6bbf3952d3946b7c
+PKG_SOURCE_VERSION:=1ded9a4bb0f2f8a5f3989799b5500e328e086c99
 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

@@ -0,0 +1,16 @@
+#!/bin/sh
+
+hasVoice=$(db -q get hw.board.hasVoice)
+
+[ "$hasVoice" = "1" ] || exit 0
+
+SLIC=`cat /proc/device-tree/airoha-voice/slic-type`
+[ "${SLIC#pef}" != "${SLIC}" ] || exit 0
+
+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

libwifi/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libwifi
-PKG_VERSION:=7.7.8
+PKG_VERSION:=7.10.6
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=b12d933e1cdd3b84eefbb45b0ecf2d1927f5d5dc
+PKG_SOURCE_VERSION:=2b76a71eb99f41523ad86592e7efefa0a3682bba
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libwifi.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
@@ -41,31 +41,30 @@ else ifeq ($(CONFIG_TARGET_armvirt),y)
   TARGET_CFLAGS +=-DIOPSYS_TEST
 else ifeq ($(CONFIG_TARGET_airoha),y)
   TARGET_PLATFORM=ECONET
-  TARGET_WIFI_TYPE=MEDIATEK MAC80211
+  TARGET_WIFI_TYPE=MEDIATEK
   TARGET_CFLAGS +=-DIOPSYS_ECONET
   ifeq ($(CONFIG_TARGET_airoha_an7581),y)
     TARGET_CFLAGS +=-DCONFIG_MTK
   endif
 else ifeq ($(CONFIG_TARGET_ipq95xx),y)
   TARGET_PLATFORM=IPQ95XX
-  TARGET_WIFI_TYPE=QUALCOMM MAC80211
+  TARGET_WIFI_TYPE=QUALCOMM
   TARGET_CFLAGS +=-DIPQ95XX
 else ifeq ($(CONFIG_TARGET_ipq53xx),y)
   TARGET_PLATFORM=IPQ53XX
-  TARGET_WIFI_TYPE=QUALCOMM MAC80211
+  TARGET_WIFI_TYPE=QUALCOMM
   TARGET_CFLAGS +=-DIPQ53XX
 else
   $(info Unexpected CONFIG_TARGET, use default MAC80211)
   TARGET_PLATFORM=MAC80211
-  TARGET_WIFI_TYPE=MAC80211
   TARGET_CFLAGS +=-DIOPSYS_MAC80211
 endif
 
-ifneq ($(CONFIG_PACKAGE_kmod-mt7915e),)
+ifneq ($(CONFIG_PACKAGE_kmod-mt7915e_en7523),)
   TARGET_CFLAGS=-DMT7915_VENDOR_EXT
 endif
 
-PKG_BUILD_DEPENDS:=PACKAGE_kmod-mt7915e:mt76
+PKG_BUILD_DEPENDS:=PACKAGE_kmod-mt7915e_en7523:mt76_en7523
 
 ifneq ($(CONFIG_PACKAGE_libwifi),)
 TARGET_CFLAGS +=-DHAS_WIFI

linux-pam/Makefile

@@ -0,0 +1,38 @@
+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

@@ -0,0 +1,43 @@
+#!/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,12 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=logmngr
-PKG_VERSION:=1.0.6
+PKG_VERSION:=1.0.9
+
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/system/logmngr.git
-PKG_SOURCE_VERSION:=37f9eef6ad92ab4835893c6c8ee65338917071b6
+PKG_SOURCE_VERSION:=e2ffe2b9e7722ce19dff7db6e47e62a305dc568b
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -43,7 +44,7 @@ endef
 
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
-	$(CP) -rf ./logmngr/* $(PKG_BUILD_DIR)/
+	$(CP) -rf ~/git/logmngr/* $(PKG_BUILD_DIR)/
 endef
 endif
 
@@ -64,7 +65,7 @@ endif
 ifeq ($(CONFIG_LOGMNGR_BACKEND_SYSLOG_NG),y)
 	$(INSTALL_DATA) ./files/lib/logmngr/syslog-ng.sh $(1)/lib/logmngr/
 endif
-	$(BBFDM_INSTALL_CORE_PLUGIN) $(PKG_BUILD_DIR)/bbf_plugin/libbbfsyslog.so $(1)
+	$(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/bbf_plugin/libbbfsyslog.so $(1) core
 ifeq ($(CONFIG_LOGMNGR_LOGROTATE),y)
 	$(INSTALL_BIN) ./files/11-logmngr_logrotate_config_generate $(1)/etc/uci-defaults/
 	$(INSTALL_DATA) ./files/lib/logmngr/logrotate.sh $(1)/lib/logmngr/

logmngr/files/10-logmngr_config_generate

@@ -25,4 +25,3 @@ 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

@@ -10,5 +10,4 @@ if [ -s "/etc/config/logmngr" ]; then
 	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

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

@@ -16,7 +16,7 @@ create_service_section() {
 	# the service section of the fluent-bit.conf file has hardcoded values,
 	# no need to lookup any uci section to configure this section
 	echo "[SERVICE]" >> ${TMP_CONF_FILE}
-	echo "    flush        3" >> ${TMP_CONF_FILE}
+	echo "    flush        1" >> ${TMP_CONF_FILE}
 	echo "    daemon       off" >> ${TMP_CONF_FILE}
 	echo "    log_level    info" >> ${TMP_CONF_FILE}
 	echo "    parsers_file /etc/fluent-bit/parsers.conf" >> ${TMP_CONF_FILE}

logmngr/files/lib/logmngr/syslog-ng.sh

@@ -15,7 +15,14 @@ create_config_file() {
 create_option_section() {
 	# the option section of the syslog-ng.conf file has hardcoded values,
 	# no need to lookup any uci section to configure this section
-	echo -e "@version: 4.4" >> ${TMP_CONF_FILE}
+	local syslog_version=$(syslog-ng -V | grep -i "Installer-Version" | awk -F': ' '{print $2}' | cut -d '.' -f1,2)
+
+	if [ -n "$syslog_version" ]; then
+		echo -e "@version: $syslog_version" >> ${TMP_CONF_FILE}
+	else
+		echo -e "@version: 4.7" >> ${TMP_CONF_FILE}
+	fi
+
 	echo -e '@include "scl.conf"' >> ${TMP_CONF_FILE}
 	echo -e "options {" >> ${TMP_CONF_FILE}
 	echo -e "\tchain_hostnames(no);" >> ${TMP_CONF_FILE}
@@ -37,7 +44,8 @@ create_input_section() {
 	# on any uci value
 	echo -e "source $tag {" >> ${TMP_CONF_FILE}
 	echo -e "\tinternal();" >> ${TMP_CONF_FILE}
-	echo -e "\tunix-dgram("/dev/log");" >> ${TMP_CONF_FILE}
+	echo -e "\tunix-dgram(\"/dev/log\");" >> ${TMP_CONF_FILE}
+	echo -e "\tfile(\"/proc/kmsg\" program_override(\"kernel\"));" >> ${TMP_CONF_FILE}
 	echo "};" >> ${TMP_CONF_FILE}
 }
 
@@ -315,11 +323,10 @@ handle_action_section() {
 }
 
 apply_config_file() {
+	echo -e '@include "/etc/syslog-ng.d/"' >> ${TMP_CONF_FILE}
 	cp ${TMP_CONF_FILE} ${CONF_FILE}
 }
 
-PROG=/usr/sbin/syslog-ng-ctl
-
 logmngr_init() {
 	create_config_file
 
@@ -339,7 +346,9 @@ logmngr_init() {
 		logrotate_init
 	fi
 
-	procd_open_instance logmngr
-	procd_set_param command $PROG reload
-	procd_close_instance
+	if procd_running 'syslog-ng'; then
+		/etc/init.d/syslog-ng reload
+	else
+		/etc/init.d/syslog-ng start
+	fi
 }

logmngr/files/logmngr.init

@@ -1,7 +1,7 @@
 #!/bin/sh /etc/rc.common
 
 START=12
-STOP=89
+
 USE_PROCD=1
 
 . /lib/functions.sh

map-agent/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=6.2.2.2
+PKG_VERSION:=6.3.3.6
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=8554576cc8a68b89faba1b13a7be0386325da26a
+PKG_SOURCE_VERSION:=0d084ae70917e109c9e929464b170521e0547c3c
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>
 
 PKG_LICENSE:=BSD-3-Clause
@@ -28,7 +28,9 @@ define Package/map-agent
   CATEGORY:=Utilities
   TITLE:=WiFi multi-AP Agent (EasyMesh R2)
   DEPENDS:=+libwifi +libuci +libubox +ubus +libeasy +libieee1905 +ieee1905 \
-	   +ieee1905-map-plugin +ip-bridge +AGENT_USE_LIBDPP:libdpp
+	   +ieee1905-map-plugin +ip-bridge +AGENT_USE_LIBDPP:libdpp \
+	   +uuidgen +openssl-util +!TARGET_brcmbca:ebtables-legacy \
+	   +!TARGET_brcmbca:ebtables-legacy-utils
 endef
 
 ifeq ($(CONFIG_AGENT_USE_LIBDPP),y)

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

@@ -63,7 +63,7 @@ else
 		[ $dhcp -eq 1 ] || exit 0
 	else
 		[ -f $map_bh_file ] || exit 0
-		cur_bh="$(cat $map_bh_file  | jsonfilter -e @.ifname)"
+		cur_bh="$(jsonfilter -e @.ifname < "$map_bh_file" 2>/dev/null)" || exit 0
 		[ "$cur_bh" = "$PORT" ] || exit 0
 	fi
 ########################################################

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

@@ -15,13 +15,13 @@ rc="$?"
 issue_discovery() {
 	local iface="$1"
 
-	res=$(ubus -t5 call ieee1905 buildcmdu "{\"type\":0, \"ifname\":\"${iface}\"}")
+	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
 
 	[ "$data" == "" ] && return
 
-	ubus call ieee1905 cmdu "{\"dst\":\"01:80:c2:00:00:13\", \"type\":0, \"data\":\"${data}\"}"
+	ubus call ieee1905 cmdu "{\"dst\":\"01:80:c2:00:00:13\", \"type\":0, \"data\":\"${data}\"}" > /dev/null 2>&1
 }
 
 process_vlans() {

map-agent/files/lib/multiap/map_genconfig

@@ -73,6 +73,7 @@ generate_multiap_config() {
 				ifname="wlan${devidx}_0"
 				ifname_bh="wlan${devidx}_1"
 			else
+				uci set mapagent.agent.mld_prefix="bss"
 				ifname_sta=""
 				case "$band" in
 					2g)
@@ -98,6 +99,11 @@ generate_multiap_config() {
 				if [ "${network_mode}" == "extender" ]; then
 					ifname="${ifname_sta}"
 				fi
+
+				[ "$disable_mlo" == "1" ] || {
+					uci set wireless.$dev.mlo="1"
+					uci set wireless.$dev.mlo_capable="1"
+				}
 			fi
 
 			uci set wireless.$dev.channels="$channels"

map-controller/Config.in

@@ -10,6 +10,11 @@ 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_EASYMESH_VENDOR_EXT_OUI_DEFAULT
 	hex "Vendor OUI default"
 	default 0xB456FA

map-controller/Makefile

@@ -1,14 +1,15 @@
 #
-# Copyright (C) 2020-2023 IOPSYS Software Solutions AB
+# Copyright (C) 2020-2024 IOPSYS Software Solutions AB
+# Copyright (C) 2025 Genexis AB
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=6.1.2.9
+PKG_VERSION:=6.3.0.2
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=94b30d021b13e9488f9c76e7ceece48c9a567321
-PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>
+PKG_SOURCE_VERSION:=1498bb5d84fa7134b0fca3a038daf6d8e72cdc04
+PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@genexis.eu>
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
@@ -26,7 +27,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/map-controller
   SECTION:=utils
   CATEGORY:=Utilities
-  TITLE:=WiFi Multi-AP Controller (EasyMesh R2)
+  TITLE:=WiFi Multi-AP Controller (supporting EasyMesh R6)
   DEPENDS:=+libuci +libubox +ubus +libeasy +libwifiutils +libieee1905 +ieee1905 +ieee1905-map-plugin \
 	   +CONTROLLER_USE_LIBDPP:libdpp
 endef
@@ -61,6 +62,9 @@ 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
 endif
 
 ifeq ($(CONFIG_CONTROLLER_PROPAGATE_PROBE_REQ),y)

map-controller/files/etc/config/mapcontroller

@@ -9,27 +9,22 @@ config controller 'controller'
 	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 steer_module 'rcpi'
-	option enabled '1'
-	option enable_sta_steer '0'
+	option enable_sta_steer '1'
 	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 steer_retry_int '30'
-	option steer_int '180'
-	option steer_disable_int '600'
+	option plugins_enabled '1'
+	option plugins_policy 'any'
+	list plugins 'rcpi'
 
 ###################
 # Default AP sections credentials will by updated

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

@@ -23,6 +23,7 @@ validate_controller_section() {
 		'initial_channel_scan:bool:true' \
 		'resend_num:uinteger:0' \
 		'allow_bgdfs:range(0,2629744)' \
+		'stale_sta_timeout:string' \
 		'channel_plan:range(0,2629744)' \
 		'enable_ts:bool:false'
 
@@ -171,7 +172,7 @@ start_service() {
 	create_dir
 
 	procd_open_instance
-	procd_set_param command "/usr/sbin/mapcontroller" "-d"
+	procd_set_param command "/usr/sbin/mapcontroller" "-d" "-o" "/tmp/mapcontroller.log" "-f"
 
 	if [ -f /etc/config/mapagent ]; then
 	        local local_ctrl=0

map-topology/Config.in

@@ -1,26 +0,0 @@
-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

@@ -1,71 +0,0 @@
-#
-# 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

@@ -1,7 +0,0 @@
-
-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

@@ -1,93 +0,0 @@
-#!/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/Config.in

@@ -0,0 +1,5 @@
+if PACKAGE_mcastmngr
+config MCASTMNGR_VENDOR_PREFIX
+	string "Package specific datamodel Vendor Prefix for TR181 extensions"
+	default ""
+endif

mcastmngr/Makefile

@@ -6,14 +6,14 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=mcastmngr
-PKG_VERSION:=1.2.7
+PKG_VERSION:=1.2.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/hal/mcastmngr.git
-PKG_SOURCE_VERSION:=275d7e5448333e53f8bc980344b39f7f577d4664
+PKG_SOURCE_VERSION:=17d73b8f1947823a0d32ed589a240a2642904fe1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -29,21 +29,33 @@ MAKE_PATH:=bbf_plugin
 define Package/mcastmngr
  CATEGORY:=Utilities
  TITLE:=Multicast Proxy/Snooping Manager
- DEPENDS:=+!TARGET_brcmbca:mcproxy +libuci +libubox +libubus +libblobmsg-json
- DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service
+ DEPENDS:=+libuci +libubox +libubus +libblobmsg-json
+ DEPENDS+=+!TARGET_brcmbca:mcproxy +!TARGET_brcmbca:sipcalc
+ DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service +!TARGET_brcmbca:kmod-ebt-igmpsnooping +!TARGET_brcmbca:kmod-ebt-mldsnooping
+ DEPENDS+=+!TARGET_brcmbca:ebtables-legacy +bridgemngr
 endef
 
 define Package/mcastmngr/description
 	Configures IGMP and MLD snooping and proxy
 endef
 
+define Package/$(PKG_NAME)/config
+	source "$(SOURCE)/Config.in"
+endef
+
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
 	$(CP) -rf ~/git/mcastmngr/* $(PKG_BUILD_DIR)/
 endef
 endif
 
-TARGET_CFLAGS += -DBBF_VENDOR_PREFIX=\\\"$(CONFIG_BBF_VENDOR_PREFIX)\\\"
+ifeq ($(CONFIG_MCASTMNGR_VENDOR_PREFIX),"")
+VENDOR_PREFIX = $(CONFIG_BBF_VENDOR_PREFIX)
+else
+VENDOR_PREFIX = $(CONFIG_MCASTMNGR_VENDOR_PREFIX)
+endif
+
+TARGET_CFLAGS += -DBBF_VENDOR_PREFIX=\\\"$(VENDOR_PREFIX)\\\"
 
 define Package/mcastmngr/install
 	$(CP) ./files/common/* $(1)/
@@ -52,6 +64,7 @@ ifneq ($(CONFIG_TARGET_brcmbca),)
 else
 	$(CP) ./files/linux/* $(1)/
 endif
+	$(BBFDM_REGISTER_SERVICES) -v ${VENDOR_PREFIX} ./bbfdm_service.json $(1) $(PKG_NAME)
 	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/bbf_plugin/libmcast_bbf.so $(1) $(PKG_NAME)
 endef
 

mcastmngr/bbfdm_service.json

@@ -0,0 +1,20 @@
+{
+  "daemon": {
+    "enable": "1",
+    "service_name": "mcastmngr",
+    "unified_daemon": false,
+    "services": [
+      {
+        "parent_dm": "Device.",
+        "object": "{BBF_VENDOR_PREFIX}IGMP"
+      },
+      {
+        "parent_dm": "Device.",
+        "object": "{BBF_VENDOR_PREFIX}MLD"
+      }
+    ],
+    "config": {
+      "loglevel": "3"
+    }
+  }
+}

mcastmngr/files/broadcom/lib/mcast/broadcom.sh

@@ -251,3 +251,7 @@ configure_mcast() {
 
 	configure_mcpd
 }
+
+validate_params() {
+	return 0
+}