map-controller: 4.6.0.5.2

map-agent: 4.5.1.15.1
map-controller: 4.6.0.5.1
2025-12-26 20:14:11 +08:00 · 2024-03-21 16:30:47 +05:30 · 2024-03-14 15:54:39 +00:00 · 2024-03-14 15:53:14 +00:00 · 2024-03-14 13:31:14 +00:00
99 changed files with 376 additions and 2004 deletions
--- a/bbfdm/Config_bbfdm.in
+++ b/bbfdm/Config_bbfdm.in
@@ -6,10 +6,6 @@ config BBF_VENDOR_PREFIX
 	string "Vendor Prefix"
 	default "X_IOPSYS_EU_"

-config BBF_OBFUSCATION_KEY
-	string "Obfuscation key"
-	default "371d530c95a17d1ca223a29b7a6cdc97e1135c1e0959b51106cca91a0b148b5e42742d372a359760742803f2a44bd88fca67ccdcfaeed26d02ce3b6049cb1e04"
-
 config BBF_TR143
 	bool "Enable TR-143 Data Model Support"
 	default y
--- a/bbfdm/Makefile
+++ b/bbfdm/Makefile
@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=bbfdm
-PKG_VERSION:=1.7.20
+PKG_VERSION:=1.7.4

 USE_LOCAL:=0
 ifneq ($(USE_LOCAL),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bbfdm.git
-PKG_SOURCE_VERSION:=2b62491910498d68055891b552c6d7078ce2dbc7
+PKG_SOURCE_VERSION:=57a3aedb8f6dea2a951d3edf1da0c868e252b27c
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -94,11 +94,6 @@ endif
 define Package/libbbfdm-api/install
 	$(INSTALL_DIR) $(1)/lib
 	$(CP) $(PKG_BUILD_DIR)/libbbfdm-api/libbbfdm-api.so $(1)/lib/
-	$(INSTALL_DIR) $(1)/usr/libexec/rpcd
-	$(CP) $(PKG_BUILD_DIR)/libbbfdm-api/scripts/bbf.secure $(1)/usr/libexec/rpcd/bbf.secure
-	$(INSTALL_DIR) $(1)/etc/bbfdm
-	echo "$(CONFIG_BBF_OBFUSCATION_KEY)" > $(1)/etc/bbfdm/.secure_hash
-	$(INSTALL_DIR) $(1)/etc/bbfdm/certificates
 endef

 define Package/libbbfdm/install
@@ -112,8 +107,6 @@ define Package/libbbfdm/install
 	$(INSTALL_BIN) ./files/etc/uci-defaults/95-portmap-firewall $(1)/etc/uci-defaults/95-portmap-firewall
 	$(INSTALL_BIN) ./files/etc/uci-defaults/97-firewall-service $(1)/etc/uci-defaults/97-firewall-service
 	$(INSTALL_BIN) ./files/etc/uci-defaults/99-link-core-plugins $(1)/etc/uci-defaults/99-link-core-plugins
-	$(INSTALL_BIN) ./files/etc/uci-defaults/90-remove-nonexisting-microservices $(1)/etc/uci-defaults/
-	$(INSTALL_BIN) ./files/etc/uci-defaults/91-fix-bbfdmd-enabled-option $(1)/etc/uci-defaults/
 	$(INSTALL_BIN) ./files/etc/firewall.portmap $(1)/etc/firewall.portmap
 	$(INSTALL_BIN) ./files/etc/firewall.service $(1)/etc/firewall.service
 ifeq ($(findstring iopsys,$(CONFIG_BBF_VENDOR_LIST)),iopsys)
--- a/bbfdm/README.md
+++ b/bbfdm/README.md
@@ -1,114 +0,0 @@
-# BBFDM configuration options and utilities
-
-bbfdm provides few compile time configuration options and compile time help utility called [bbfdm.mk](./bbfdm.mk), this document aimed to explain the available usages and best practices.
-
-## Compilation options
-
-|  Configuration option    | Description   | Default Value |
-| -----------------------  | ------------- | ----------- |
-| CONFIG_BBF_VENDOR_LIST   | List of vendor extension directories | iopsys        |
-| CONFIG_BBF_VENDOR_PREFIX | Prefix for Vendor extension datamodel objects/parameters | X_IOPSYS_EU_  |
-| CONFIG_BBF_TR143         | Enable/Add TR-143 Data Model Support | y             |
-| CONFIG_BBF_TR471         | Enable/Add TR-471 Data Model Support | y             |
-| CONFIG_BBF_MAX_OBJECT_INSTANCES | Maximum number of instances per object | 255    |
-| BBF_OBFUSCATION_KEY      | Hash used to encode/decode in `bbf.secure` object | 371d530c95a17d1ca223a29b7a6cdc97e1135c1e0959b51106cca91a0b148b5e42742d372a359760742803f2a44bd88fca67ccdcfaeed26d02ce3b6049cb1e04 |
-
-
-#### BBF_OBFUSCATION_KEY
-
-`bbfdm` provides an ubus object called `bbf.secure` to allow encoding/decoding the values, `bbf.secure` currently support following methods internally to encode/decode
-
-  - Encode/Decode using a predefined SHA512 Hash key
-  - Encode/Decode using a private/public RSA key pair
-
-The `BBF_OBFUSCATION_KEY` compile time configuration option used to defined the SHA512 HASH, if this option is undefined, then it usages a default value as mention in the above table.
-
-User must override this parameter with their own hash value, to generate a hash user can run below command and copy the hash value to this option.
-
-ex: User wants to use 'Sup3rS3cur3Passw0rd' as passkey, then can get the SHA512 sum with
-
-```bash
-$ echo -n "Sup3rS3cur3Passw0rd" | sha512sum
-371d530c95a17d1ca223a29b7a6cdc97e1135c1e0959b51106cca91a0b148b5e42742d372a359760742803f2a44bd88fca67ccdcfaeed26d02ce3b6049cb1e04  -
-```
-
-> Note: Additionally, user can install RSA private key in '/etc/bbfdm/certificates/private_key.pem' path, if private key is present `bbf.secure` shall use rsa private certificate for encrypt/decrypt function. In case of key not present in the pre-defined path, hash will be used for the same.
-
-## Helper utility (bbfdm.mk)
-
-bbfdm provides a helper utility [bbfdm.mk](./bbfdm.mk) to install datamodel plugins in bbfdm core or in microservice directory.
-
-### Install datamodel DotSO/JSON plugin in bbfdm core
-
-Utility to install the DotSO/JSON plugin in bbfdm core plugin path
-
-```bash
-# inputs:
-#  $1 => package install directory
-#  $2 => Plugin artifact
-```
-
-Example:
-
-```make
-define Package/$(PKG_NAME)/install
-	$(call BbfdmInstallPlugin,$(1),./files/etc/bbfdm/json/CWMPManagementServer.json)
-endef
-```
-
-### Install datamodel DotSO/JSON plugin in bbfdm core with priority
-
-Its now possible to overwrite/remove core datamodel with plugin, so, if some datamodel objects/parameters are present in more than one plugin, order in which they loaded into memory becomes crucial, this Utility help to configure a priority order in which they gets loaded in memory.
-
-```bash
-# inputs:
-#  $1 => package install directory
-#  $2 => Priority of the installed plugin
-#  $3 => Plugin artifact
-```
-
-Example:
-```make
-define Package/$(PKG_NAME)/install
-	$(call BbfdmInstallPluginWithPriority,$(1),01,$(PKG_BUILD_DIR)/bbf_plugin/bulkdata.json)
-endef
-```
-
-> Note: Last loaded plugin gets the highest priority
-
-### Install plugin into micro-service directory
-
-Utility to install the plugin in datamodel microservice directory, ex. user wants to run a datamodel micro-service, it required to install the DotSO/JSON plugin into a non bbf core directory, this utility helps in installing the DotSO/JSON plugin in mentioned directory.
-
-```bash
-# inputs:
-#  $1 => package install directory with micro-service directory
-#  $2 => Plugin artifact
-```
-
-Example:
-
-```make
-define Package/$(PKG_NAME)/install
-	$(call BbfdmInstallPluginInMicroservice,$(1)/etc/bulkdata,$(PKG_BUILD_DIR)/bbf_plugin/bulkdata.json)
-endef
-```
-
-### Install datamodel micro-service input file
-
-Utility to install the datamodel plugin input file into the bbfdm micro-service directory, so that bbfdm auto start the datamodel micro-service before main bbfdm process.
-
-```bash
-# inputs:
-#  $1 => package install directory
-#  $2 => Microservice input.json path
-```
-
-Example:
-
-```make
-define Package/$(PKG_NAME)/install
-	$(call BbfdmInstallMicroServiceInputFile,$(1),./files/etc/bulkdata/input.json)
-endef
-```
-
--- a/bbfdm/bbfdm.mk
+++ b/bbfdm/bbfdm.mk
@@ -2,56 +2,8 @@
 # Copyright (C) 2023 IOPSYS
 #

-# Utility to install the plugin in bbfdm core path
-# inputs:
-#  $1 => package install directory
-#  $2 => Plugin artifact
-#
-# Example:
-#  $(call BbfdmInstallPlugin,$(1),./files/etc/bbfdm/json/CWMPManagementServer.json)
-#
+
 define BbfdmInstallPlugin
 	$(INSTALL_DIR) $(1)/etc/bbfdm/plugins
 	$(INSTALL_DATA) $(2) $(1)/etc/bbfdm/plugins/
 endef
-
-# Utility to install the plugin in bbfdm core path with priority
-# inputs:
-#  $1 => package install directory
-#  $2 => Priority of the installed plugin
-#  $3 => Plugin artifact
-#
-# Example:
-#   $(call BbfdmInstallPluginWithPriority,$(1),01,$(PKG_BUILD_DIR)/bbf_plugin/bulkdata.json)
-#
-define BbfdmInstallPluginWithPriority
-	$(INSTALL_DIR) $(1)/etc/bbfdm/plugins
-	$(INSTALL_DATA) $(3) $(1)/etc/bbfdm/plugins/$(2)_$(shell basename ${3})
-endef
-
-# Utility to install the plugin in datamodel microservice directory
-# inputs:
-#  $1 => package install directory with micro-service directory
-#  $2 => Plugin artifact
-#
-# Example:
-#  $(call BbfdmInstallPluginInMicroservice,$(1)/etc/bulkdata,$(PKG_BUILD_DIR)/bbf_plugin/bulkdata.json)
-#
-define BbfdmInstallPluginInMicroservice
-	$(INSTALL_DIR) $(1)
-	$(INSTALL_DATA) $(2) $(1)/
-endef
-
-# Utility to install the datamodel plugin input file
-# inputs:
-#  $1 => package install directory
-#  $2 => Microservice input.json path
-#
-# Example:
-#  $(call BbfdmInstallMicroServiceInputFile,$(1),./files/etc/bulkdata/input.json)
-#
-define BbfdmInstallMicroServiceInputFile
-	$(INSTALL_DIR) $(1)/etc/bbfdm/micro_services
-	$(INSTALL_DATA) $(2) $(1)/etc/bbfdm/micro_services/$(PKG_NAME).json
-endef
-
--- a/bbfdm/files/etc/bbfdm/bbfdm_services.sh
+++ b/bbfdm/files/etc/bbfdm/bbfdm_services.sh
@@ -14,7 +14,6 @@ bbfdm_add_service()
 	fi

 	ubus call service add "{'name':'bbfdm.services','instances':{'$name':{'command':['$BBFDMD','-m','$path']}}}"
-	echo "Use of bbfdm_add_service deprecated, please use bbfdm micro_service uci"
 }

 bbfdm_stop_service()
--- a/bbfdm/files/etc/config/bbfdm
+++ b/bbfdm/files/etc/config/bbfdm
@@ -1,11 +1,8 @@
+
 config bbfdmd 'bbfdmd'
-	option enable '1'
+	option enabled '1'
 	option loglevel '1'
-	option refresh_time '120'
+	option refresh_time '10'
 	option transaction_timeout '30'
 	option subprocess_level '2'

-config micro_services 'micro_services'
-	option enable '1'
-	option enable_core '0'
-	option enable_respawn '1'
--- a/bbfdm/files/etc/init.d/bbfdmd
+++ b/bbfdm/files/etc/init.d/bbfdmd
@@ -7,10 +7,7 @@ USE_PROCD=1
 PROG=/usr/sbin/bbfdmd

 BBFDM_JSON_INPUT="/etc/bbfdm/input.json"
-BBFDM_MICROSERVICE_DIR="/etc/bbfdm/micro_services"
-BBFDM_TEMP_DIR="/tmp/bbfdm"
-
-. /usr/share/libubox/jshn.sh
+BBFDM_TEMP_JSON="/tmp/bbfdm/input.json"

 log() {
 	echo "${@}"|logger -t bbfdmd.init -p info
@@ -19,7 +16,7 @@ log() {
 validate_bbfdm_bbfdmd_section()
 {
 	uci_validate_section bbfdm bbfdmd "bbfdmd" \
-		'enable:bool:true' \
+		'enabled:bool:true' \
 		'sock:string' \
 		'debug:bool:false' \
 		'loglevel:uinteger:1' \
@@ -28,106 +25,22 @@ validate_bbfdm_bbfdmd_section()
 		'subprocess_level:uinteger'
 }

-validate_bbfdm_micro_service_section()
-{
-	uci_validate_section bbfdm micro_services "micro_services" \
-		'enable:bool:true' \
-		'enable_core:bool:false' \
-		'enable_respawn:bool:true'
-}
-
-bbfdm_add_micro_service()
-{
-	local name path cmd
-	local enable enable_core enable_respawn
-
-	validate_bbfdm_micro_service_section || {
-		log "Validation of micro_service section failed"
-		return 1;
-	}
-
-	[ "${enable}" -eq "0" ] && return 0
-
-	path="${1}"
-	name="$(basename ${path})"
-	name="${name//.json}"
-
-	json_init
-	json_add_string name "bbfdm.services"
-	json_add_object "instances"
-		json_add_object "${name}"
-			json_add_array "command"
-				json_add_string "" "${PROG}"
-				json_add_string "" "-m"
-				json_add_string "" "${path}"
-			json_close_array
-
-			if [ "${enable_core}" -eq "1" ]; then
-				json_add_object "limits"
-					json_add_string "core" "unlimited"
-				json_close_object
-				json_add_boolean "stdout" 1
-				json_add_boolean "stderr" 1
-			fi
-
-			if [ "${enable_respawn}" -eq "1" ]; then
-				json_add_array "respawn"
-					json_add_string "" "3600"
-					json_add_string "" "5"
-					json_add_string "" "5"
-				json_close_array
-			fi
-		json_close_object
-	json_close_object
-
-	cmd="$(json_dump)"
-	ubus call service add "${cmd}"
-}
-
-_add_microservice()
-{
-	local enable loglevel input_json name
-
-	name="${1}"
-	input_json="$(jq -r '.daemon.input.name' ${name})"
-
-	if [ -f "${input_json}" ]; then
-		bbfdm_add_micro_service "${name}"
-	else
-		log "Input json [${input_json}] does not defined/present"
-	fi
-
-}
-
-configure_bbfdm_micro_services()
-{
-	if [ -d "${BBFDM_MICROSERVICE_DIR}" ]; then
-		FILES="$(ls -1 ${BBFDM_MICROSERVICE_DIR}/*.json)"
-
-		for service in $FILES;
-		do
-			[ -e "$service" ] || continue
-			_add_microservice $service
-		done
-	fi
-	ubus call service state '{"name":"bbfdm.services", "spawn":true}'
-}
-
 configure_bbfdmd()
 {
-	local enable debug sock
+	local enabled debug sock update
 	local jlog jrefresh jtimeout jlevel

+	update=0
 	config_load bbfdm
 	validate_bbfdm_bbfdmd_section || {
 		log "Validation of bbfdmd section failed"
 		return 1;
 	}

-	[ "${enable}" -eq 0 ] && return 0
+	[ "${enabled}" -eq 0 ] && return 0

 	if [ -f "${BBFDM_JSON_INPUT}" ]; then
-		echo "$(jq --arg log ${loglevel} --arg tran ${transaction_timeout} --arg refresh ${refresh_time} --arg level ${subprocess_level} '.daemon.config += {"loglevel": $log, "refresh_time": $refresh, "transaction_timeout": $tran, "subprocess_level": $level}' ${BBFDM_JSON_INPUT})" > "${BBFDM_TEMP_DIR}/input.json"
+		echo "$(jq --arg log ${loglevel} --arg tran ${transaction_timeout} --arg refresh ${refresh_time} --arg level ${subprocess_level} '.daemon.config += {"loglevel": $log, "refresh_time": $refresh, "transaction_timeout": $tran, "subprocess_level": $level}' ${BBFDM_JSON_INPUT})" > ${BBFDM_TEMP_JSON}
 	fi

 	procd_set_param command ${PROG}
@@ -143,19 +56,18 @@ configure_bbfdmd()

 start_service()
 {
-	mkdir -p ${BBFDM_TEMP_DIR}
-
-	configure_bbfdm_micro_services
-
+	mkdir -p /tmp/bbfdm
 	procd_open_instance "bbfdm"
 	configure_bbfdmd
 	procd_set_param respawn
 	procd_close_instance "bbfdm"
+
+	ubus call service state '{"name":"bbfdm.services", "spawn":true}'
 }

 stop_service()
 {
-	ubus call service delete '{"name":"bbfdm.services"}'
+	ubus call service state '{"name":"bbfdm.services", "spawn":false}'
 }

 service_triggers()
--- a/bbfdm/files/etc/uci-defaults/90-remove-nonexisting-microservices
+++ b/bbfdm/files/etc/uci-defaults/90-remove-nonexisting-microservices
@@ -1,18 +0,0 @@
-#!/bin/sh
-. /lib/functions.sh
-
-remove_nonexisting_microservice() {
-	local input_json
-
-	config_get input_json "$1" input_json ""
-
-	if [ -z "${input_json}" ]; then
-		uci_remove bbfdm "${1}"
-	fi
-}
-
-config_load bbfdm
-config_foreach remove_nonexisting_microservice "micro_service"
-
-exit 0
-
--- a/bbfdm/files/etc/uci-defaults/91-fix-bbfdmd-enabled-option
+++ b/bbfdm/files/etc/uci-defaults/91-fix-bbfdmd-enabled-option
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-# rename bbfdmd enabled option to enable
-val="$(uci -q get bbfdm.bbfdmd.enabled)"
-if [ -n "${val}" ]; then
-	uci -q set bbfdm.bbfdmd.enabled=""
-	uci -q set bbfdm.bbfdmd.enable="${val}"
-fi
-
-exit 0
-
--- a/bulkdata/Makefile
+++ b/bulkdata/Makefile
@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=bulkdata
-PKG_VERSION:=2.1.8
+PKG_VERSION:=2.1.5

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bulkdata.git
-PKG_SOURCE_VERSION:=e472e90feec31d9f318ea8c732ab564002e25db1
+PKG_SOURCE_VERSION:=f03fb8682aa7efe760294e54c422f2eab856e08c
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -22,7 +22,6 @@ PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE

 include $(INCLUDE_DIR)/package.mk
-include $(TOPDIR)/feeds/iopsys/bbfdm/bbfdm.mk

 define Package/$(PKG_NAME)
  SECTION:=utils
@@ -44,16 +43,10 @@ endif

 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bulkdatad $(1)/usr/sbin/	
 	$(INSTALL_DIR) $(1)/etc/bulkdata
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bulkdatad $(1)/usr/sbin/
-	$(INSTALL_DATA) ./files/etc/config/bulkdata $(1)/etc/config/
-	$(INSTALL_DATA) ./files/etc/init.d/bulkdatad $(1)/etc/init.d/
-	$(INSTALL_DATA) ./files/etc/uci-defaults/95-bulkdata-translation-options $(1)/etc/uci-defaults/
-	$(call BbfdmInstallPluginInMicroservice,$(1)/etc/bulkdata,$(PKG_BUILD_DIR)/bbf_plugin/bulkdata.json)
-	$(call BbfdmInstallMicroServiceInputFile,$(1),./files/etc/bulkdata/input.json)
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbf_plugin/*.json $(1)/etc/bulkdata
+	$(CP) ./files/* $(1)/
 endef

 $(eval $(call BuildPackage,$(PKG_NAME)))
--- a/bulkdata/files/etc/bulkdata/input.json
+++ b/bulkdata/files/etc/bulkdata/input.json
@@ -1,17 +1,15 @@
 {
 	"daemon": {
-		"config": {
-			"loglevel": "1"
-		},
 		"input": {
 			"type": "JSON",
 			"name": "/etc/bulkdata/bulkdata.json"
 		},
 		"output": {
 			"type": "UBUS",
+			"name": "bbfdm.bulkdata",
 			"parent_dm": "Device.",
 			"object": "BulkData",
 			"root_obj": "bbfdm"
 		}
 	}
-}
+}
--- a/bulkdata/files/etc/init.d/bulkdatad
+++ b/bulkdata/files/etc/init.d/bulkdatad
@@ -3,8 +3,11 @@
 START=60
 STOP=10

+. /etc/bbfdm/bbfdm_services.sh
+
 USE_PROCD=1
 PROG="/usr/sbin/bulkdatad"
+BULKDATA_JSON_INPUT="/etc/bulkdata/input.json"

 start_service() {
 	local enable
@@ -18,6 +21,8 @@ start_service() {
 		procd_set_param respawn
 		procd_close_instance "bulkdata"
 	}
+
+	bbfdm_add_service "bbfdm.bulkdata" "${BULKDATA_JSON_INPUT}"
 }

 reload_service() {
--- a/ddnsmngr/Makefile
+++ b/ddnsmngr/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=ddnsmngr
-PKG_VERSION:=1.0.3
+PKG_VERSION:=1.0.0

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/network/ddnsmngr.git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/ddnsmngr.git
 PKG_SOURCE_VERSION:=d0d37df44644ef2c1a0b11d3a4f92dc694ae1010
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -21,7 +21,6 @@ PKG_LICENSE_FILES:=LICENSE
 PKG_CONFIG_DEPENDS:=CONFIG_DDNSMNGR_BACKEND_DDNSSCRIPT CONFIG_DDNSMNGR_BACKEND_INADYN

 include $(INCLUDE_DIR)/package.mk
-include $(TOPDIR)/feeds/iopsys/bbfdm/bbfdm.mk

 define Package/$(PKG_NAME)
  SECTION:=utils
@@ -58,8 +57,8 @@ define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_DIR) $(1)/usr/libexec/rpcd
-	$(call BbfdmInstallPluginInMicroservice,$(1)/etc/ddnsmngr,$(PKG_BUILD_DIR)/src/libddnsmngr.so)
-	$(call BbfdmInstallMicroServiceInputFile,$(1),./files/etc/ddnsmngr/input.json)
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/libddnsmngr.so $(1)/etc/ddnsmngr/
+	$(INSTALL_DATA) ./files/etc/ddnsmngr/input.json $(1)/etc/ddnsmngr/
 	$(INSTALL_DATA) ./files/etc/config/ddnsmngr $(1)/etc/config/ddnsmngr
 	$(INSTALL_BIN) ./files/etc/uci-defaults/01-ddns-config-migrate $(1)/etc/uci-defaults/
 	$(INSTALL_BIN) ./files/etc/init.d/ddnsmngr $(1)/etc/init.d/ddnsmngr
--- a/ddnsmngr/files/etc/ddnsmngr/input.json
+++ b/ddnsmngr/files/etc/ddnsmngr/input.json
@@ -1,14 +1,12 @@
 {
 	"daemon": {
-		"config": {
-			"loglevel": "1"
-		},
 		"input": {
 			"type": "DotSo",
 			"name": "/etc/ddnsmngr/libddnsmngr.so"
 		},
 		"output": {
 			"type": "UBUS",
+			"name": "bbfdm.ddnsmngr",
 			"parent_dm": "Device.",
 			"object": "DynamicDNS",
 			"root_obj": "bbfdm"
--- a/ddnsmngr/files/etc/init.d/ddnsmngr
+++ b/ddnsmngr/files/etc/init.d/ddnsmngr
@@ -3,11 +3,14 @@
 START=80
 STOP=10
 USE_PROCD=1
+DM_INPUT="/etc/ddnsmngr/input.json"

+. /etc/bbfdm/bbfdm_services.sh
 . /usr/lib/ddnsmngr/ddnsmngr_service.sh

 start_service() {
 	start_ddnsmngr_service
+	bbfdm_add_service "bbfdm.ddnsmngr" "${DM_INPUT}"
 }

 stop_service() {
--- a/decollector/Makefile
+++ b/decollector/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=decollector
-PKG_VERSION:=4.2.1.4
+PKG_VERSION:=4.2.1.3

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=c18d0f411eea6974fc99dd9e717269087e75e874
+PKG_SOURCE_VERSION:=0fe317cbe2b2e37c25a6d6d4e6f5c1d6964f9e50
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/decollector.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
--- a/dnsmngr/Makefile
+++ b/dnsmngr/Makefile
@@ -1,50 +0,0 @@
-#
-# Copyright (C) 2022-2024 IOPSYS Software Solutions AB
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=dnsmngr
-PKG_VERSION:=1.0.3
-
-LOCAL_DEV:=0
-ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/network/dnsmngr.git
-PKG_SOURCE_VERSION:=347070e096b98946ba660791e3c78d1646adc54a
-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
-
-MAKE_PATH:=src
-
-define Package/dnsmngr
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbfdm-api +dnsmasq +umdns
-  TITLE:=Package to add Device.DNS. datamodel support
-endef
-
-define Package/dnsmngr/description
-  Package to add Device.DNS. datamodel support.
-endef
-
-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-	$(CP) -rf ~/git/dnsmngr/* $(PKG_BUILD_DIR)/
-endef
-endif
-
-define Package/dnsmngr/install
-	$(INSTALL_DIR) $(1)/etc/dnsmngr
-	$(CP) $(PKG_BUILD_DIR)/src/libdnsmngr.so $(1)/etc/dnsmngr
-	$(call BbfdmInstallMicroServiceInputFile,$(1),./files/etc/dnsmngr/input.json)
-endef
-
-$(eval $(call BuildPackage,dnsmngr))
--- a/dnsmngr/files/etc/dnsmngr/input.json
+++ b/dnsmngr/files/etc/dnsmngr/input.json
@@ -1,17 +0,0 @@
-{
-	"daemon": {
-		"config": {
-			"loglevel": "1"
-		},
-		"input": {
-			"type": "DotSo",
-			"name": "/etc/dnsmngr/libdnsmngr.so"
-		},
-		"output": {
-			"type": "UBUS",
-			"parent_dm": "Device.",
-			"object": "DNS",
-			"root_obj": "bbfdm"
-		}
-	}
-}
--- a/dslmngr/Makefile
+++ b/dslmngr/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=dslmngr
-PKG_VERSION:=1.2.3
+PKG_VERSION:=1.2.1

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=6009d4cdabc2fb6827a1dd6096a96e720e97750b
+PKG_SOURCE_VERSION:=cb8b8fd2549751bcd38808391b76a1a9a908c4de
 PKG_SOURCE_URL:=https://dev.iopsys.eu/hal/dslmngr.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MAINTAINER:=Rahul Thakur <rahul.thakur@iopsys.eu>
@@ -26,7 +26,6 @@ PKG_LICENSE_FILES:=LICENSE


 include $(INCLUDE_DIR)/package.mk
-include ../bbfdm/bbfdm.mk

 ifeq ($(CONFIG_TARGET_brcmbca),y)
  TARGET_PLATFORM=BROADCOM
@@ -40,7 +39,7 @@ define Package/dslmngr
  SECTION:=utils
  CATEGORY:=Utilities
  TITLE:=XDSL status and configration utility
-  DEPENDS:=+libdsl +libuci +libubox +ubus +libpthread +libnl-genl +libeasy +libbbfdm-api
+  DEPENDS:=+libdsl +libuci +libubox +ubus +libpthread +libnl-genl +libeasy
 endef

 define Package/dslmngr/description
@@ -70,14 +69,12 @@ define Build/Compile
 endef

 define Package/dslmngr/install
-	$(INSTALL_DIR) $(1)/etc/dsl
 	$(CP) ./files/common/* $(1)/
 ifeq ($(CONFIG_TARGET_brcmbca),y)
 	$(CP) ./files/broadcom/* $(1)/
 endif
 	$(INSTALL_DIR) $(1)/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/dslmngr $(1)/sbin/
-	$(CP) $(PKG_BUILD_DIR)/libbbfdsl.so $(1)/etc/dsl/
 endef

 $(eval $(call BuildPackage,dslmngr))
--- a/dslmngr/files/common/etc/bbfdm/micro_services/dsl.json
+++ b/dslmngr/files/common/etc/bbfdm/micro_services/dsl.json
@@ -1,17 +0,0 @@
-{
-	"daemon": {
-		"config": {
-			"loglevel": "1"
-		},
-		"input": {
-			"type": "DotSo",
-			"name": "/etc/dsl/libbbfdsl.so"
-		},
-		"output": {
-			"type": "UBUS",
-			"parent_dm": "Device.",
-			"root_obj": "bbfdm",
-			"multiple_objects": ["DSL","PTM","ATM","FAST"]
-		}
-	}
-}
--- a/ethmngr/Config.in
+++ b/ethmngr/Config.in
@@ -1,9 +0,0 @@
-if (PACKAGE_ethmngr)
-
-menu "Configurations"
-
-config TR181_VENDOR_EXTENSIONS_MACVLAN
-	bool "Use TR181 vendor extension MACVLAN"
-	default y
-endmenu
-endif
--- a/ethmngr/Makefile
+++ b/ethmngr/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=ethmngr
-PKG_VERSION:=2.1.5
+PKG_VERSION:=2.1.2

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=53d31f7027f759a36f47c026c50eaee2888619cc
+PKG_SOURCE_VERSION:=e5cccdd45a93d969d51c4085cb52b543df544811
 PKG_SOURCE_URL:=https://dev.iopsys.eu/hal/ethmngr.git
 PKG_MAINTAINER:=Rahul Thakur <rahul.thakur@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
@@ -21,13 +21,12 @@ PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE

 include $(INCLUDE_DIR)/package.mk
-include ../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 +libbbfdm-api
+  DEPENDS:=+(TARGET_brcmbca||TARGET_airoha||TARGET_ipq95xx||TARGET_ipq53xx||TARGET_mediatek):libethernet +libuci +libubox +ubus +libpthread +libnl-genl +libeasy
 endef

 define Package/ethmngr/description
@@ -36,10 +35,6 @@ define Package/ethmngr/description
 It uses APIs from the libethernet.so library.
 endef

-define Package/$(PKG_NAME)/config
-       source "$(SOURCE)/Config.in"
-endef
-
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
        $(CP) -rf ./ethmngr/* $(PKG_BUILD_DIR)/
@@ -49,12 +44,7 @@ endif
 TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include \
 	-I$(STAGING_DIR)/usr/include/libnl3 \
-	-D_GNU_SOURCE \
-	-DBBF_VENDOR_PREFIX=\\\"$(CONFIG_BBF_VENDOR_PREFIX)\\\"
-
-ifeq ($(CONFIG_TR181_VENDOR_EXTENSIONS_MACVLAN),y)
-TARGET_CFLAGS += -DTR181_VENDOR_EXTENSIONS_MACVLAN
-endif
+	-D_GNU_SOURCE

 ifeq ($(CONFIG_TARGET_brcmbca)$(CONFIG_TARGET_airoha)$(CONFIG_TARGET_ipq95xx)$(CONFIG_TARGET_ipq53xx)$(CONFIG_TARGET_mediatek),)
 define Build/Compile
@@ -63,15 +53,10 @@ 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
-	$(CP) $(PKG_BUILD_DIR)/libbbfethernet.so $(1)/etc/ethmngr
-	$(CP) $(PKG_BUILD_DIR)/libbbfethernetmacvlan.so $(1)/etc/ethmngr/plugins
-	$(call BbfdmInstallMicroServiceInputFile,$(1),./files/etc/bbfdm/micro_services/ethernet.json)
 endef

 $(eval $(call BuildPackage,ethmngr))
--- a/ethmngr/files/etc/bbfdm/micro_services/ethernet.json
+++ b/ethmngr/files/etc/bbfdm/micro_services/ethernet.json
@@ -1,18 +0,0 @@
-{
-	"daemon": {
-		"config": {
-			"loglevel": "1"
-		},
-		"input": {
-			"type": "DotSo",
-			"name": "/etc/ethmngr/libbbfethernet.so",
-			"plugin_dir": "/etc/ethmngr/plugins"
-		},
-		"output": {
-			"type": "UBUS",
-			"parent_dm": "Device.",
-			"object": "Ethernet",
-			"root_obj": "bbfdm"
-		}
-	}
-}
--- a/ethmngr/files/etc/ruleng/ethport.json
+++ b/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
-			}
-		]
-	}
-}
-
--- a/hostmngr/Makefile
+++ b/hostmngr/Makefile
@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=hostmngr
-PKG_VERSION:=1.2.3
+PKG_VERSION:=1.2.2

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
@@ -58,11 +58,12 @@ endif
 MAKE_PATH:=src

 define Package/hostmngr/install
-	$(CP) ./files/etc $(1)/
+	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/etc/hostmngr/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/hostmngr $(1)/usr/sbin/
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/bbf_plugin/libhostmngr.so $(1)/etc/hostmngr/
+	$(INSTALL_DATA) ./files/etc/hostmngr/input.json $(1)/etc/hostmngr/	
 	$(INSTALL_DIR) $(1)/usr/share/hostmngr
 	$(INSTALL_DATA) ./files/scripts/hosts_acl.sh $(1)/usr/share/hostmngr/
 endef
--- a/hostmngr/files/etc/bbfdm/micro_services/hostmngr.json
+++ b/hostmngr/files/etc/bbfdm/micro_services/hostmngr.json
@@ -1,14 +1,12 @@
 {
 	"daemon": {
-		"config": {
-			"loglevel": "1"
-		},
 		"input": {
 			"type": "DotSo",
 			"name": "/etc/hostmngr/libhostmngr.so"
 		},
 		"output": {
 			"type": "UBUS",
+			"name": "bbfdm.hosts",
 			"parent_dm": "Device.",
 			"object": "Hosts",
 			"root_obj": "bbfdm"
--- a/hostmngr/files/etc/init.d/hostmngr
+++ b/hostmngr/files/etc/init.d/hostmngr
@@ -3,8 +3,12 @@
 START=65
 STOP=20

+. /etc/bbfdm/bbfdm_services.sh
+
 USE_PROCD=1

+HOSTS_JSON_INPUT="/etc/hostmngr/input.json"
+
 start_service() {
 	procd_open_instance
 	procd_set_param command "/usr/sbin/hostmngr" "--config hosts" "-o"  "/tmp/hostmngr.log" "-f"
@@ -14,6 +18,7 @@ start_service() {
 #	procd_set_param stderr 1
 	procd_close_instance
 	
+	bbfdm_add_service "bbfdm.hosts" "${HOSTS_JSON_INPUT}"
 	sh /usr/share/hostmngr/hosts_acl.sh
 }

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

 PKG_NAME:=icwmp
-PKG_VERSION:=9.7.4
+PKG_VERSION:=9.6.8

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/icwmp.git
-PKG_SOURCE_VERSION:=1a5ed79a014ff3e9633b70b310bf3f21dea6f036
+PKG_SOURCE_VERSION:=7ff419cefc314156a0ac518972096ef0dfb87162
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -48,7 +48,6 @@ define Package/icwmp/install
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
 	$(INSTALL_DIR) $(1)/etc/udhcpc.user.d
-	$(INSTALL_DIR) $(1)/etc/icwmpd/plugins
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/icwmpd $(1)/usr/sbin/icwmpd
 	$(INSTALL_DATA) ./files/etc/config/cwmp $(1)/etc/config/cwmp
 	$(INSTALL_BIN) ./files/etc/firewall.cwmp $(1)/etc/firewall.cwmp
@@ -59,9 +58,8 @@ define Package/icwmp/install
 	$(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
-	$(call BbfdmInstallPluginInMicroservice,$(1)/etc/icwmpd,$(PKG_BUILD_DIR)/libcwmpdm.so)
-	$(call BbfdmInstallPluginInMicroservice,$(1)/etc/icwmpd/plugins,./files/etc/bbfdm/json/CWMPManagementServer.json)
-	$(call BbfdmInstallMicroServiceInputFile,$(1),./files/etc/icwmpd/input.json)
+	$(call BbfdmInstallPlugin,$(1),./files/etc/bbfdm/json/CWMPManagementServer.json)
+	$(call BbfdmInstallPlugin,$(1),$(PKG_BUILD_DIR)/libcwmpdm.so)
 endef

 $(eval $(call BuildPackage,icwmp))
--- a/icwmp/files/etc/bbfdm/json/CWMPManagementServer.json
+++ b/icwmp/files/etc/bbfdm/json/CWMPManagementServer.json
@@ -1,7 +1,8 @@
 {
-	"json_plugin_version": 2,
+	"json_plugin_version": 1,
 	"Device.CWMPManagementServer.": {
 		"type": "object",
+		"version": "2.15",
 		"protocols": [
 			"usp"
 		],
@@ -10,6 +11,7 @@
 		"dependency": "file:/etc/config/cwmp",
 		"EnableCWMP": {
 			"type": "boolean",
+			"version": "2.15",
 			"read": true,
 			"write": true,
 			"protocols": [
--- a/icwmp/files/etc/icwmpd/input.json
+++ b/icwmp/files/etc/icwmpd/input.json
@@ -1,18 +0,0 @@
-{
-	"daemon": {
-		"config": {
-			"loglevel": "1"
-		},
-		"input": {
-			"type": "DotSo",
-			"name": "/etc/icwmpd/libcwmpdm.so",
-			"plugin_dir": "/etc/icwmpd/plugins/"
-		},
-		"output": {
-			"type": "UBUS",
-			"parent_dm": "Device.",
-			"multiple_objects": [ "ManagementServer", "XMPP" , "CWMPManagementServer"],
-			"root_obj": "bbfdm"
-		}
-	}
-}
--- a/icwmp/files/etc/init.d/icwmpd
+++ b/icwmp/files/etc/init.d/icwmpd
@@ -9,7 +9,6 @@ PROG="/usr/sbin/icwmpd"

 . /lib/functions.sh
 . /usr/share/libubox/jshn.sh
-
 include /lib/network

 log() {
--- a/ieee1905/Makefile
+++ b/ieee1905/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=ieee1905
-PKG_VERSION:=8.3.10
+PKG_VERSION:=8.3.7.1

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=dc1f5af80bbea7bd03b8f87184636efd5373cd7e
+PKG_SOURCE_VERSION:=490979bd8ec0395795801f3bfb9dc47af1eb4ade
 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
--- a/iop/scripts/update_package.sh
+++ b/iop/scripts/update_package.sh
@@ -1,6 +1,9 @@
+# Exported interface
 update_package() {
 	echo "update_package is no longer supported." >&2
-	echo "Its replacement is ./iop set-feed-rev." >&2
+	echo "Its replacement will come soon." >&2
+	echo >&2
+	echo "For now update references in profiles/include/*.yml and feeds.conf.io manually." >&2
 	return 1
 }

--- a/iopsys-analytics/Makefile
+++ b/iopsys-analytics/Makefile
@@ -4,7 +4,7 @@ PKG_NAME:=iopsys-analytics
 PKG_RELEASE:=$(COMMITCOUNT)
 PKG_LICENSE:=PROPRIETARY
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=1a749bdebd142a83ba0733f1644a6241403c9097
+PKG_SOURCE_VERSION:=88dd7997ed78b1ab02c2904ed90518c46a8fa26b
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/iopsys-analytics.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
--- a/ipt-trigger/Makefile
+++ b/ipt-trigger/Makefile
@@ -1,62 +0,0 @@
-#
-# Copyright (C) 2024 IOPSYS Software Solutions AB
-#
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=ipt-trigger
-PKG_VERSION:=1.0.0
-PKG_LICENSE:=GPL-2.0
-
-include $(INCLUDE_DIR)/package.mk
-
-define KernelPackage/ipt-trigger
-  SUBMENU:=Other modules
-  TITLE:=Kernel module for iptables port trigger
-  FILES:=$(PKG_BUILD_DIR)/ipv4/ipt_TRIGGER.ko
-  DEPENDS+=+kmod-nf-nat +xtables-legacy
-  AUTOLOAD:=$(call AutoLoad,30,ipt_TRIGGER,1)
-  KCONFIG:=
-endef
-
-define KernelPackage/ip6t-trigger
-  SUBMENU:=Other modules
-  TITLE:=Kernel module for ip6tables port trigger
-  DEPENDS+=+kmod-nf-nat +xtables-legacy
-  FILES:=$(PKG_BUILD_DIR)/ipv6/ip6t_TRIGGER.ko
-  AUTOLOAD:=$(call AutoLoad,30,ip6t_TRIGGER,1)
-  KCONFIG:=
-endef
-
-define KernelPackage/ipt-trigger/description
-	Kernel module to enable port trigger for iptables
-endef
-
-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
-
-define Build/Prepare
-	$(CP) -rf ./src/* $(PKG_BUILD_DIR)/
-	$(CP) $(PKG_BUILD_DIR)/ipt_TRIGGER.h $(LINUX_DIR)/include/linux/netfilter_ipv4/
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/include/linux/netfilter_ipv4
-	$(CP) $(PKG_BUILD_DIR)/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)/ipv4/" modules
-	$(KERNEL_MAKE) M="$(PKG_BUILD_DIR)/ipv6/" modules
-endef
-
-$(eval $(call KernelPackage,ipt-trigger))
-$(eval $(call KernelPackage,ip6t-trigger))
--- a/ipt-trigger/src/ipt_TRIGGER.h
+++ b/ipt-trigger/src/ipt_TRIGGER.h
@@ -1,26 +0,0 @@
-#ifndef _IPT_TRIGGER_H_target
-#define _IPT_TRIGGER_H_target
-
-#define TRIGGER_TIMEOUT 600	/* 600 secs */
-
-enum ipt_trigger_type
-{
-	IPT_TRIGGER_DNAT = 1,
-	IPT_TRIGGER_IN = 2,
-	IPT_TRIGGER_OUT = 3,
-	IPT_TRIGGER_REFRESH = 4
-};
-
-struct ipt_trigger_ports {
-	u_int16_t mport[2];	/* Related destination port range */
-	u_int16_t rport[2];	/* Port range to map related destination port range to */
-};
-
-struct ipt_trigger_info {
-	enum ipt_trigger_type type;
-	u_int16_t proto;		/* Related protocol */
-	u_int16_t trigger_timeout;	/* Auto disable duration */
-	struct ipt_trigger_ports ports;
-};
-
-#endif /*_IPT_TRIGGER_H_target*/
--- a/ipt-trigger/src/ipv4/Makefile
+++ b/ipt-trigger/src/ipv4/Makefile
@@ -1 +0,0 @@
-obj-m +=ipt_TRIGGER.o
--- a/ipt-trigger/src/ipv4/ipt_TRIGGER.c
+++ b/ipt-trigger/src/ipv4/ipt_TRIGGER.c
@@ -1,407 +0,0 @@
-/* Kernel module to match the port-ranges, trigger related port-ranges,
- * and alters the destination to a local IP address.
- *
- * Copyright (C) 2003, CyberTAN Corporation
- * All Rights Reserved.
- *
- * Description:
- *   This is kernel module for port-triggering.
- *
- *   The module follows the Netfilter framework, called extended packet
- *   matching modules.
- */
-
-#include <linux/types.h>
-#include <linux/ip.h>
-#include <linux/tcp.h>
-#include <linux/timer.h>
-#include <linux/module.h>
-#include <linux/netfilter.h>
-#include <linux/netdevice.h>
-#include <linux/if.h>
-#include <linux/inetdevice.h>
-#include <linux/list.h>
-#include <net/protocol.h>
-#include <net/checksum.h>
-#include <linux/spinlock.h>
-
-#include <linux/netfilter_ipv4.h>
-#include <linux/netfilter_ipv4/ip_tables.h>
-#include <net/netfilter/nf_conntrack.h>
-#include <net/netfilter/nf_conntrack_core.h>
-#include <net/netfilter/nf_conntrack_tuple.h>
-#include <net/netfilter/nf_nat.h>
-#include <linux/netfilter_ipv4/ipt_TRIGGER.h>
-
-/* This rwlock protects the main hash table, protocol/helper/expected
- *    registrations, conntrack timers*/
-
-
-static DEFINE_SPINLOCK(nf_trigger_lock);
-
-
-
-#define NF_IP_PRE_ROUTING	0
-#define NF_IP_FORWARD		2
-#define IPT_CONTINUE XT_CONTINUE
-
-
-
-/***********************lock help**********************/
-#define MUST_BE_READ_LOCKED(l)
-#define MUST_BE_WRITE_LOCKED(l)
-
-
-#define LOCK_BH(l) spin_lock_bh(l)
-#define UNLOCK_BH(l) spin_unlock_bh(l)
-
-#define ASSERT_READ_LOCK(x) MUST_BE_READ_LOCKED(&nf_trigger_lock)
-#define ASSERT_WRITE_LOCK(x) MUST_BE_WRITE_LOCKED(&nf_trigger_lock)
-
-
-
-
-/***********************list help**********************/
-#define LIST_FIND(head, cmpfn, type, args...)           \
-({                                                      \
-        const struct list_head *__i, *__j = NULL;       \
-                                                        \
-        ASSERT_READ_LOCK(head);                         \
-        list_for_each(__i, (head))                      \
-                if (cmpfn((const type)__i , ## args)) { \
-                        __j = __i;                      \
-                        break;                          \
-                }                                       \
-        (type)__j;                                      \
-})
-
-static inline int
-__list_cmp_same(const void *p1, const void *p2) { return p1 == p2; }
-
-static inline void
-list_prepend(struct list_head *head, void *new)
-{
-	ASSERT_WRITE_LOCK(head);
-	list_add(new, head);
-}
-
-#define list_named_find(head, name)                     \
-LIST_FIND(head, __list_cmp_name, void *, name)
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Netfilter Core Team <coreteam@netfilter.org>");
-MODULE_DESCRIPTION("iptables trigger target module");
-
-#if 0
-#define DEBUGP printk
-#else
-#define DEBUGP(format, args...)
-#endif
-
-struct ipt_trigger {
-        struct list_head list;          /* Trigger list */
-        struct timer_list timeout;      /* Timer for list destroying */
-        u_int32_t srcip;                /* Outgoing source address */
-        u_int32_t dstip;                /* Outgoing destination address */
-        u_int16_t mproto;               /* Trigger protocol */
-        u_int16_t rproto;               /* Related protocol */
-        u_int16_t trigger_timeout;      /* Auto disable duration */
-        struct ipt_trigger_ports ports; /* Trigger and related ports */
-        u_int8_t reply;                 /* Confirm a reply connection */
-};
-
-LIST_HEAD(ipt_trigger_list);
-
-static void trigger_refresh(struct ipt_trigger *trig, unsigned long extra_jiffies)
-{
-	DEBUGP("%s: \n", __FUNCTION__);
-	LOCK_BH(&nf_trigger_lock);
-	/* Need del_timer for race avoidance (may already be dying). */
-	if (del_timer(&trig->timeout)) {
-		trig->timeout.expires = jiffies + extra_jiffies;
-		add_timer(&trig->timeout);
-	}
-
-	UNLOCK_BH(&nf_trigger_lock);
-}
-
-static void __del_trigger(struct ipt_trigger *trig)
-{
-	DEBUGP("%s: \n", __FUNCTION__);
-	MUST_BE_WRITE_LOCKED(&nf_trigger_lock);
-
-	/* delete from 'ipt_trigger_list' */
-	list_del(&trig->list);
-	kfree(trig);
-}
-
-static void trigger_timeout(struct timer_list *t)
-{
-	struct ipt_trigger *trig = from_timer(trig, t, timeout);
-
-	DEBUGP("trigger list %p timed out\n", trig);
-	LOCK_BH(&nf_trigger_lock);
-	__del_trigger(trig);
-	UNLOCK_BH(&nf_trigger_lock);
-}
-
-static unsigned int
-add_new_trigger(struct ipt_trigger *trig)
-{
-	struct ipt_trigger *new = NULL;
-
-	DEBUGP("!!!!!!!!!!!! %s !!!!!!!!!!!\n", __FUNCTION__);
-
-	LOCK_BH(&nf_trigger_lock);
-	new = (struct ipt_trigger *)
-		kmalloc(sizeof(struct ipt_trigger), GFP_ATOMIC);
-
-	if (!new) {
-		UNLOCK_BH(&nf_trigger_lock);
-		DEBUGP("%s: OOM allocating trigger list\n", __FUNCTION__);
-		return -ENOMEM;
-	}
-
-	memset(new, 0, sizeof(*trig));
-	INIT_LIST_HEAD(&new->list);
-	memcpy(new, trig, sizeof(*trig));
-
-	/* add to global table of trigger */
-	list_prepend(&ipt_trigger_list, &new->list);
-
-	/* add and start timer if required */
-	timer_setup(&new->timeout, trigger_timeout, 0);
-	mod_timer(&new->timeout, jiffies + (trig->trigger_timeout * HZ));
-
-	UNLOCK_BH(&nf_trigger_lock);
-
-	return 0;
-}
-
-/*
- *      Service-Name    OutBound        InBound
- * 1.   TMD             UDP:1000        TCP/UDP:2000..2010
- * 2.   WOKAO           UDP:1000        TCP/UDP:3000..3010
- * 3.   net2phone-1     UDP:6801        TCP:30000..30000
- * 4.   net2phone-2     UDP:6801        UDP:30000..30000
- *
- * For supporting to use the same outgoing port to trigger different port rules,
- * it should check the inbound protocol and port range value. If all conditions
- * are matched, it is a same trigger item, else it needs to create a new one.
- */
-static inline int trigger_out_matched(const struct ipt_trigger *i,
-        const u_int16_t proto, const u_int16_t dport, const struct ipt_trigger_info *info)
-{
-	DEBUGP("%s: i=%p, proto= %d, dport=%d.\n", __FUNCTION__, i, proto, dport);
-	DEBUGP("%s: Got one, mproto= %d, mport[0..1]=%d, %d, ", __FUNCTION__,
-			i->mproto, i->ports.mport[0], i->ports.mport[1]);
-	DEBUGP("rproto= %d, rport[0..1]=%d, %d.\n",
-			i->rproto, i->ports.rport[0], i->ports.rport[1]);
-
-	return ((i->mproto == proto) &&
-			(i->ports.mport[0] <= dport)  &&
-			(i->ports.mport[1] >= dport) &&
-			(i->rproto == info->proto) &&
-			(i->ports.rport[0] == info->ports.rport[0]) &&
-			(i->ports.rport[1] == info->ports.rport[1]));
-}
-
-static unsigned int
-trigger_out(struct sk_buff *skb,
-                unsigned int hooknum,
-                const void *targinfo)
-{
-	const struct ipt_trigger_info *info = targinfo;
-	struct ipt_trigger trig, *found;
-	const struct iphdr *iph = ip_hdr(skb);
-	struct tcphdr *tcph = (void *)iph + iph->ihl*4;     /* Might be TCP, UDP */
-
-	DEBUGP("############# %s ############\n", __FUNCTION__);
-	/* Check if the trigger range has already existed in 'ipt_trigger_list'. */
-	found = LIST_FIND(&ipt_trigger_list, trigger_out_matched,
-			struct ipt_trigger *, iph->protocol, ntohs(tcph->dest), info);
-
-
-	if (found) {
-		/* Yeah, it exists. We need to update(delay) the destroying timer. */
-		trigger_refresh(found, info->trigger_timeout * HZ);
-		/* In order to allow multiple hosts use the same port range, we update
-		   the 'saddr' after previous trigger has a reply connection. */
-		if (found->reply)
-			found->srcip = iph->saddr;
-	}
-	else {
-		/* Create new trigger */
-		memset(&trig, 0, sizeof(trig));
-		trig.srcip = iph->saddr;
-		trig.mproto = iph->protocol;
-		trig.rproto = info->proto;
-		trig.trigger_timeout = info->trigger_timeout;
-		memcpy(&trig.ports, &info->ports, sizeof(struct ipt_trigger_ports));
-		add_new_trigger(&trig); /* Add the new 'trig' to list 'ipt_trigger_list'. */
-	}
-
-	return IPT_CONTINUE;        /* We don't block any packet. */
-}
-
-static inline int trigger_in_matched(const struct ipt_trigger *i,
-        const u_int16_t proto, const u_int16_t dport)
-{
-	u_int16_t rproto = i->rproto;
-
-	DEBUGP("%s: i=%p, proto= %d, dport=%d.\n", __FUNCTION__, i, proto, dport);
-	DEBUGP("%s: Got one, rproto= %d, rport[0..1]=%d, %d.\n", __FUNCTION__,
-			i->rproto, i->ports.rport[0], i->ports.rport[1]);
-
-	if (!rproto)
-		rproto = proto;
-
-	return ((rproto == proto) && (i->ports.rport[0] <= dport)
-			&& (i->ports.rport[1] >= dport));
-}
-
-static unsigned int
-trigger_in(struct sk_buff *skb,
-                unsigned int hooknum,
-                const void *targinfo)
-{
-	const struct ipt_trigger_info *info = targinfo;
-	struct ipt_trigger *found;
-	const struct iphdr *iph = ip_hdr(skb);
-	struct tcphdr *tcph = (void *)iph + iph->ihl*4;     /* Might be TCP, UDP */
-	/* Check if the trigger-ed range has already existed in 'ipt_trigger_list'. */
-	found = LIST_FIND(&ipt_trigger_list, trigger_in_matched,
-			struct ipt_trigger *, iph->protocol, ntohs(tcph->dest));
-	if (found) {
-		DEBUGP("############# %s ############\n", __FUNCTION__);
-		/* Yeah, it exists. We need to update(delay) the destroying timer. */
-		trigger_refresh(found, info->trigger_timeout * HZ);
-		return NF_ACCEPT;       /* Accept it, or the imcoming packet could be
-					   dropped in the FORWARD chain */
-	}
-
-	return IPT_CONTINUE;        /* Our job is the interception. */
-}
-
-static unsigned int
-trigger_dnat(struct sk_buff *skb,
-                unsigned int hooknum,
-                const void *targinfo)
-{
-	struct ipt_trigger *found = NULL;
-	const struct iphdr *iph = ip_hdr(skb);
-	struct tcphdr *tcph = (void *)iph + iph->ihl*4;     /* Might be TCP, UDP */
-	struct nf_conn *ct = NULL;
-	enum ip_conntrack_info ctinfo;
-	struct nf_nat_range2 newrange;
-
-	DEBUGP("############# %s ############%d\n", __FUNCTION__, __LINE__);
-	/* Check if the trigger-ed range has already existed in 'ipt_trigger_list'. */
-	found = LIST_FIND(&ipt_trigger_list, trigger_in_matched,
-			struct ipt_trigger *, iph->protocol, ntohs(tcph->dest));
-	if (found) {
-		DEBUGP("############# %s ############%d srcip:%d\n", __FUNCTION__, __LINE__, found->srcip);
-	}
-
-	if (!found || !found->srcip)
-		return IPT_CONTINUE;    /* We don't block any packet. */
-
-	DEBUGP("############# %s ############\n", __FUNCTION__);
-	found->reply = 1;   /* Confirm there has been a reply connection. */
-	ct = nf_ct_get(skb, &ctinfo);
-
-	DEBUGP("%s: got ", __FUNCTION__);
-
-
-	/* Alter the destination of imcoming packet. */
-	/* Transfer from original range. */
-	memset(&newrange.min_addr, 0, sizeof(newrange.min_addr));
-	memset(&newrange.max_addr, 0, sizeof(newrange.max_addr));
-	memset(&newrange.min_proto, 0, sizeof(newrange.min_proto));
-	memset(&newrange.max_proto, 0, sizeof(newrange.max_proto));
-	newrange.flags	     = NF_NAT_RANGE_MAP_IPS;
-	newrange.min_addr.ip = found->srcip;
-	newrange.max_addr.ip = found->srcip;
-	DEBUGP("%s: found->srcip = %x\n", __FUNCTION__,  found->srcip);
-
-	/* Hand modified range to generic setup. */
-	return nf_nat_setup_info(ct, &newrange, NF_NAT_MANIP_DST);
-}
-
-static unsigned int
-trigger_target(struct sk_buff *skb,
-			       const struct xt_action_param *par)
-{
-	const struct ipt_trigger_info *info = par->targinfo;
-	const struct iphdr *iph = ip_hdr(skb);
-	unsigned int hooknum = xt_hooknum(par);
-
-	DEBUGP("%s: type = %s\n", __FUNCTION__,
-			(info->type == IPT_TRIGGER_DNAT) ? "dnat" :
-			(info->type == IPT_TRIGGER_IN) ? "in" : "out");
-
-	/* The Port-trigger only supports TCP and UDP. */
-	if ((iph->protocol != IPPROTO_TCP) && (iph->protocol != IPPROTO_UDP))
-		return IPT_CONTINUE;
-
-	if (info->type == IPT_TRIGGER_OUT)
-		return trigger_out(skb, hooknum, info);
-	else if (info->type == IPT_TRIGGER_IN)
-		return trigger_in(skb, hooknum, info);
-	else if (info->type == IPT_TRIGGER_DNAT)
-		return trigger_dnat(skb, hooknum, info);
-
-	return IPT_CONTINUE;
-}
-static int
-trigger_check(const struct xt_tgchk_param *par)
-{
-	const struct ipt_trigger_info *info = par->targinfo;
-
-	if ((strcmp(par->table, "mangle") == 0)) {
-		DEBUGP("trigger_check: bad table `%s'.\n", par->table);
-		return -EINVAL;
-	}
-	if (par->hook_mask & ~((1 << NF_IP_PRE_ROUTING) | (1 << NF_IP_FORWARD))) {
-		DEBUGP("trigger_check: bad hooks %x.\n", par->hook_mask);
-		return -EINVAL;
-	}
-
-	if (info->proto) {
-		if (info->proto != IPPROTO_TCP && info->proto != IPPROTO_UDP) {
-			DEBUGP("trigger_check: bad proto %d.\n", info->proto);
-			return -EINVAL;
-		}
-	}
-	if (info->type == IPT_TRIGGER_OUT) {
-		if (!info->ports.mport[0] || !info->ports.rport[0]) {
-			DEBUGP("trigger_check: Try 'iptbles -j TRIGGER -h' for help.\n");
-			return -EINVAL;
-		}
-	}
-
-	return 0;
-}
-
-
-static struct xt_target redirect_reg = {
-        .name           = "TRIGGER",
-        .family         = NFPROTO_IPV4,
-        .target         = trigger_target,
-        .targetsize     = sizeof(struct ipt_trigger_info),
-        .checkentry     = trigger_check,
-        .me             = THIS_MODULE,
-};
-
-static int __init init(void)
-{
-	return xt_register_target(&redirect_reg);
-}
-
-static void __exit fini(void)
-{
-	xt_unregister_target(&redirect_reg);
-}
-
-module_init(init);
-module_exit(fini);
--- a/ipt-trigger/src/ipv6/Makefile
+++ b/ipt-trigger/src/ipv6/Makefile
@@ -1 +0,0 @@
-obj-m +=ip6t_TRIGGER.o
--- a/ipt-trigger/src/ipv6/ip6t_TRIGGER.c
+++ b/ipt-trigger/src/ipv6/ip6t_TRIGGER.c
@@ -1,429 +0,0 @@
-/* Kernel module to match the port-ranges, trigger related port-ranges,
- * and alters the destination to a local IPv6 address.
- *
- * Copyright (C) 2024, IOPSYS
- * All Rights Reserved.
- *
- * Description:
- *   This is kernel module for port-triggering.
- *
- *   The module follows the Netfilter framework, called extended packet
- *   matching modules.
- */
-
-#include <linux/types.h>
-#include <linux/tcp.h>
-#include <linux/timer.h>
-#include <linux/module.h>
-#include <linux/netfilter.h>
-#include <linux/netdevice.h>
-#include <linux/if.h>
-#include <linux/inetdevice.h>
-#include <linux/list.h>
-#include <net/protocol.h>
-#include <net/checksum.h>
-#include <linux/spinlock.h>
-
-#include <linux/netfilter_ipv6.h>
-#include <linux/netfilter_ipv6/ip6_tables.h>
-#include <net/netfilter/nf_conntrack.h>
-#include <net/netfilter/nf_conntrack_core.h>
-#include <net/netfilter/nf_conntrack_tuple.h>
-#include <net/netfilter/nf_nat.h>
-#include <linux/netfilter_ipv4/ipt_TRIGGER.h>
-
-/* This rwlock protects the main hash table, protocol/helper/expected
- *    registrations, conntrack timers*/
-
-
-static DEFINE_SPINLOCK(nf_trigger_lock);
-
-
-
-#define NF_IP_PRE_ROUTING	0
-#define NF_IP_FORWARD		2
-#define IPT_CONTINUE XT_CONTINUE
-
-
-
-/***********************lock help**********************/
-#define MUST_BE_READ_LOCKED(l)
-#define MUST_BE_WRITE_LOCKED(l)
-
-
-#define LOCK_BH(l) spin_lock_bh(l)
-#define UNLOCK_BH(l) spin_unlock_bh(l)
-
-#define ASSERT_READ_LOCK(x) MUST_BE_READ_LOCKED(&nf_trigger_lock)
-#define ASSERT_WRITE_LOCK(x) MUST_BE_WRITE_LOCKED(&nf_trigger_lock)
-
-
-
-
-/***********************list help**********************/
-#define LIST_FIND(head, cmpfn, type, args...)           \
-({                                                      \
-        const struct list_head *__i, *__j = NULL;       \
-                                                        \
-        ASSERT_READ_LOCK(head);                         \
-        list_for_each(__i, (head))                      \
-                if (cmpfn((const type)__i , ## args)) { \
-                        __j = __i;                      \
-                        break;                          \
-                }                                       \
-        (type)__j;                                      \
-})
-
-static inline int
-__list_cmp_same(const void *p1, const void *p2) { return p1 == p2; }
-
-static inline void
-list_prepend(struct list_head *head, void *new)
-{
-	ASSERT_WRITE_LOCK(head);
-	list_add(new, head);
-}
-
-#define list_named_find(head, name)                     \
-LIST_FIND(head, __list_cmp_name, void *, name)
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("IOPSYS Network Team");
-MODULE_DESCRIPTION("iptables trigger target module");
-
-#if 0
-#define DEBUGP printk
-#else
-#define DEBUGP(format, args...)
-#endif
-
-struct ipt_trigger {
-        struct list_head list;          /* Trigger list */
-        struct timer_list timeout;      /* Timer for list destroying */
-        struct in6_addr srcip;                /* Outgoing source address */
-        struct in6_addr dstip;                /* Outgoing destination address */
-        u_int16_t mproto;               /* Trigger protocol */
-        u_int16_t rproto;               /* Related protocol */
-	u_int16_t trigger_timeout;      /* Auto disable duration */
-        struct ipt_trigger_ports ports; /* Trigger and related ports */
-        u_int8_t reply;                 /* Confirm a reply connection */
-};
-
-LIST_HEAD(ipt_trigger_list);
-
-static unsigned char *ipv6_header_get_L4_header_offset(const struct ipv6hdr *ip6h_p)
-{
-        unsigned int ext_head_count = 8;
-        const struct ipv6_opt_hdr *ip_ext_p;
-        unsigned int payload_offset = 0;
-	char *tcpudp_hdr = NULL;
-	uint8_t nextHdr_p;
-
-        nextHdr_p = ip6h_p->nexthdr;
-        ip_ext_p = (const struct ipv6_opt_hdr *)(ip6h_p + 1);
-        payload_offset = sizeof(struct ipv6hdr);
-
-        do {
-                if ((nextHdr_p == IPPROTO_TCP) || (nextHdr_p == IPPROTO_UDP)) {
-			tcpudp_hdr = (unsigned char *)ip6h_p + payload_offset;
-                        break;
-		}
-
-                payload_offset += (ip_ext_p->hdrlen + 1U) << 3U;
-                nextHdr_p = ip_ext_p->nexthdr;
-                ip_ext_p = (struct ipv6_opt_hdr *)((uint8_t *)ip6h_p + payload_offset);
-                ext_head_count--; /* at most 8 extension headers */
-        } while (ext_head_count);
-
-        return tcpudp_hdr;
-}
-
-static void trigger_refresh(struct ipt_trigger *trig, unsigned long extra_jiffies)
-{
-	DEBUGP("%s: \n", __FUNCTION__);
-	LOCK_BH(&nf_trigger_lock);
-	/* Need del_timer for race avoidance (may already be dying). */
-	if (del_timer(&trig->timeout)) {
-		trig->timeout.expires = jiffies + extra_jiffies;
-		add_timer(&trig->timeout);
-	}
-
-	UNLOCK_BH(&nf_trigger_lock);
-}
-
-static void __del_trigger(struct ipt_trigger *trig)
-{
-	DEBUGP("%s: \n", __FUNCTION__);
-	MUST_BE_WRITE_LOCKED(&nf_trigger_lock);
-
-	/* delete from 'ipt_trigger_list' */
-	list_del(&trig->list);
-	kfree(trig);
-}
-
-static void trigger_timeout(struct timer_list *t)
-{
-	struct ipt_trigger *trig = from_timer(trig, t, timeout);
-
-	DEBUGP("trigger list %p timed out\n", trig);
-	LOCK_BH(&nf_trigger_lock);
-	__del_trigger(trig);
-	UNLOCK_BH(&nf_trigger_lock);
-}
-
-static unsigned int
-add_new_trigger(struct ipt_trigger *trig)
-{
-	struct ipt_trigger *new = NULL;
-
-	DEBUGP("!!!!!!!!!!!! %s !!!!!!!!!!!\n", __FUNCTION__);
-
-	LOCK_BH(&nf_trigger_lock);
-	new = (struct ipt_trigger *)
-		kmalloc(sizeof(struct ipt_trigger), GFP_ATOMIC);
-
-	if (!new) {
-		UNLOCK_BH(&nf_trigger_lock);
-		DEBUGP("%s: OOM allocating trigger list\n", __FUNCTION__);
-		return -ENOMEM;
-	}
-
-	memset(new, 0, sizeof(*trig));
-	INIT_LIST_HEAD(&new->list);
-	memcpy(new, trig, sizeof(*trig));
-
-	/* add to global table of trigger */
-	list_prepend(&ipt_trigger_list, &new->list);
-
-	/* add and start timer if required */
-	timer_setup(&new->timeout, trigger_timeout, 0);
-	mod_timer(&new->timeout, jiffies + (trig->trigger_timeout * HZ));
-
-	UNLOCK_BH(&nf_trigger_lock);
-
-	return 0;
-}
-
-/*
- *      Service-Name    OutBound        InBound
- * 1.   TMD             UDP:1000        TCP/UDP:2000..2010
- * 2.   WOKAO           UDP:1000        TCP/UDP:3000..3010
- * 3.   net2phone-1     UDP:6801        TCP:30000..30000
- * 4.   net2phone-2     UDP:6801        UDP:30000..30000
- *
- * For supporting to use the same outgoing port to trigger different port rules,
- * it should check the inbound protocol and port range value. If all conditions
- * are matched, it is a same trigger item, else it needs to create a new one.
- */
-static inline int trigger_out_matched(const struct ipt_trigger *i,
-        const u_int16_t proto, const u_int16_t dport, const struct ipt_trigger_info *info)
-{
-	DEBUGP("%s: i=%p, proto= %d, dport=%d.\n", __FUNCTION__, i, proto, dport);
-	DEBUGP("%s: Got one, mproto= %d, mport[0..1]=%d, %d, ", __FUNCTION__,
-			i->mproto, i->ports.mport[0], i->ports.mport[1]);
-	DEBUGP("rproto= %d, rport[0..1]=%d, %d.\n",
-			i->rproto, i->ports.rport[0], i->ports.rport[1]);
-
-	return ((i->mproto == proto) &&
-			(i->ports.mport[0] <= dport)  &&
-			(i->ports.mport[1] >= dport) &&
-			(i->rproto == info->proto) &&
-			(i->ports.rport[0] == info->ports.rport[0]) &&
-			(i->ports.rport[1] == info->ports.rport[1]));
-}
-
-static unsigned int
-trigger_out(struct sk_buff *skb,
-                unsigned int hooknum,
-                const void *targinfo)
-{
-	const struct ipt_trigger_info *info = targinfo;
-	struct ipt_trigger trig, *found;
-	const struct ipv6hdr *ip6h = ipv6_hdr(skb);
-	struct tcphdr *tcph = (struct tcphdr*)ipv6_header_get_L4_header_offset(ip6h);     /* Might be TCP, UDP */
-
-	DEBUGP("############# %s ############\n", __FUNCTION__);
-	/* Check if the trigger range has already existed in 'ipt_trigger_list'. */
-	found = LIST_FIND(&ipt_trigger_list, trigger_out_matched,
-			struct ipt_trigger *, ip6h->nexthdr, ntohs(tcph->dest), info);
-
-
-	if (found) {
-		/* Yeah, it exists. We need to update(delay) the destroying timer. */
-		trigger_refresh(found, info->trigger_timeout * HZ);
-		/* In order to allow multiple hosts use the same port range, we update
-		   the 'saddr' after previous trigger has a reply connection. */
-		if (found->reply)
-			found->srcip = ip6h->saddr;
-	}
-	else {
-		/* Create new trigger */
-		memset(&trig, 0, sizeof(trig));
-		memcpy(&trig.srcip, &ip6h->saddr, sizeof(trig.srcip));
-		trig.mproto = ip6h->nexthdr;
-		trig.rproto = info->proto;
-		trig.trigger_timeout = info->trigger_timeout;
-		memcpy(&trig.ports, &info->ports, sizeof(struct ipt_trigger_ports));
-		add_new_trigger(&trig); /* Add the new 'trig' to list 'ipt_trigger_list'. */
-	}
-
-	return IPT_CONTINUE;        /* We don't block any packet. */
-}
-
-static inline int trigger_in_matched(const struct ipt_trigger *i,
-        const u_int16_t proto, const u_int16_t dport)
-{
-	u_int16_t rproto = i->rproto;
-
-	DEBUGP("%s: i=%p, proto= %d, dport=%d.\n", __FUNCTION__, i, proto, dport);
-	DEBUGP("%s: Got one, rproto= %d, rport[0..1]=%d, %d.\n", __FUNCTION__,
-			i->rproto, i->ports.rport[0], i->ports.rport[1]);
-
-	if (!rproto)
-		rproto = proto;
-
-	return ((rproto == proto) && (i->ports.rport[0] <= dport)
-			&& (i->ports.rport[1] >= dport));
-}
-
-static unsigned int
-trigger_in(struct sk_buff *skb,
-                unsigned int hooknum,
-                const void *targinfo)
-{
-	const struct ipt_trigger_info *info = targinfo;
-	struct ipt_trigger *found;
-	const struct ipv6hdr *ip6h = ipv6_hdr(skb);
-	struct tcphdr *tcph =(struct tcphdr*)ipv6_header_get_L4_header_offset(ip6h);     /* Might be TCP, UDP */
-	/* Check if the trigger-ed range has already existed in 'ipt_trigger_list'. */
-	found = LIST_FIND(&ipt_trigger_list, trigger_in_matched,
-			struct ipt_trigger *, ip6h->nexthdr, ntohs(tcph->dest));
-	if (found) {
-		DEBUGP("############# %s ############\n", __FUNCTION__);
-		/* Yeah, it exists. We need to update(delay) the destroying timer. */
-		trigger_refresh(found, info->trigger_timeout * HZ);
-		return NF_ACCEPT;       /* Accept it, or the imcoming packet could be
-					   dropped in the FORWARD chain */
-	}
-
-	return IPT_CONTINUE;        /* Our job is the interception. */
-}
-
-static unsigned int
-trigger_dnat(struct sk_buff *skb,
-                unsigned int hooknum,
-                const void *targinfo)
-{
-	struct ipt_trigger *found = NULL;
-	const struct ipv6hdr *ip6h = ipv6_hdr(skb);
-	struct tcphdr *tcph =(struct tcphdr*)ipv6_header_get_L4_header_offset(ip6h);     /* Might be TCP, UDP */
-	struct nf_conn *ct = NULL;
-	enum ip_conntrack_info ctinfo;
-	struct nf_nat_range2 newrange;
-
-	/* Check if the trigger-ed range has already existed in 'ipt_trigger_list'. */
-	found = LIST_FIND(&ipt_trigger_list, trigger_in_matched,
-			struct ipt_trigger *, ip6h->nexthdr, ntohs(tcph->dest));
-
-	if (!found)
-		return IPT_CONTINUE;    /* We don't block any packet. */
-
-	DEBUGP("############# %s ############\n", __FUNCTION__);
-	found->reply = 1;   /* Confirm there has been a reply connection. */
-	ct = nf_ct_get(skb, &ctinfo);
-
-	DEBUGP("%s: got ", __FUNCTION__);
-
-
-	/* Alter the destination of imcoming packet. */
-	/* Transfer from original range. */
-	memset(&newrange.min_addr, 0, sizeof(newrange.min_addr));
-	memset(&newrange.max_addr, 0, sizeof(newrange.max_addr));
-	memset(&newrange.min_proto, 0, sizeof(newrange.min_proto));
-	memset(&newrange.max_proto, 0, sizeof(newrange.max_proto));
-	newrange.flags	     = NF_NAT_RANGE_MAP_IPS;
-	memcpy(&newrange.min_addr.ip, &found->srcip, sizeof(newrange.min_addr.ip));
-	memcpy(&newrange.max_addr.ip, &found->srcip, sizeof(newrange.max_addr.ip));
-	DEBUGP("%s: found->srcip = %x\n", __FUNCTION__,  found->srcip);
-
-	/* Hand modified range to generic setup. */
-	return nf_nat_setup_info(ct, &newrange, NF_NAT_MANIP_DST);
-}
-
-static unsigned int
-trigger_target(struct sk_buff *skb,
-			       const struct xt_action_param *par)
-{
-	const struct ipt_trigger_info *info = par->targinfo;
-	const struct ipv6hdr *ip6h = ipv6_hdr(skb);
-	unsigned int hooknum = xt_hooknum(par);
-
-	DEBUGP("%s: type = %s\n", __FUNCTION__,
-			(info->type == IPT_TRIGGER_DNAT) ? "dnat" :
-			(info->type == IPT_TRIGGER_IN) ? "in" : "out");
-
-	/* The Port-trigger only supports TCP and UDP. */
-	if ((ip6h->nexthdr != IPPROTO_TCP) && (ip6h->nexthdr != IPPROTO_UDP))
-		return IPT_CONTINUE;
-
-	if (info->type == IPT_TRIGGER_OUT)
-		return trigger_out(skb, hooknum, info);
-	else if (info->type == IPT_TRIGGER_IN)
-		return trigger_in(skb, hooknum, info);
-	else if (info->type == IPT_TRIGGER_DNAT)
-		return trigger_dnat(skb, hooknum, info);
-
-	return IPT_CONTINUE;
-}
-static int
-trigger_check(const struct xt_tgchk_param *par)
-{
-	const struct ipt_trigger_info *info = par->targinfo;
-
-	if ((strcmp(par->table, "mangle") == 0)) {
-		DEBUGP("trigger_check: bad table `%s'.\n", par->table);
-		return -EINVAL;
-	}
-	if (par->hook_mask & ~((1 << NF_IP_PRE_ROUTING) | (1 << NF_IP_FORWARD))) {
-		DEBUGP("trigger_check: bad hooks %x.\n", par->hook_mask);
-		return -EINVAL;
-	}
-
-	if (info->proto) {
-		if (info->proto != IPPROTO_TCP && info->proto != IPPROTO_UDP) {
-			DEBUGP("trigger_check: bad proto %d.\n", info->proto);
-			return -EINVAL;
-		}
-	}
-	if (info->type == IPT_TRIGGER_OUT) {
-		if (!info->ports.mport[0] || !info->ports.rport[0]) {
-			DEBUGP("trigger_check: Try 'iptbles -j TRIGGER -h' for help.\n");
-			return -EINVAL;
-		}
-	}
-
-	return 0;
-}
-
-
-static struct xt_target redirect_reg = {
-        .name           = "TRIGGER",
-        .family         = NFPROTO_IPV6,
-        .target         = trigger_target,
-        .targetsize     = sizeof(struct ipt_trigger_info),
-        .checkentry     = trigger_check,
-        .me             = THIS_MODULE,
-};
-
-static int __init init(void)
-{
-	return xt_register_target(&redirect_reg);
-}
-
-static void __exit fini(void)
-{
-	xt_unregister_target(&redirect_reg);
-}
-
-module_init(init);
-module_exit(fini);
--- a/libdpp/Makefile
+++ b/libdpp/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=libdpp
-PKG_VERSION:=2.1.0
+PKG_VERSION:=2.0.0

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=1f82436531d4bb094b0b74e99613e0dfc84eada3
+PKG_SOURCE_VERSION:=f22959b107a8bf443d04d6261d00074b5514dfe8
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/libdpp.git
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
--- a/libethernet/Makefile
+++ b/libethernet/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=libethernet
-PKG_VERSION:=7.2.108
+PKG_VERSION:=7.2.107

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

 PKG_NAME:=libvoice-broadcom
 PKG_RELEASE:=1
-PKG_VERSION:=1.0.10
+PKG_VERSION:=1.0.9
 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:=059574b5036c840df97feecdace141e59210acc2
+PKG_SOURCE_VERSION:=3a8d0954ca351a1f8f669dc2f3d294409b90f091
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
--- a/libvoice-d2/Makefile
+++ b/libvoice-d2/Makefile
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=libvoice-d2
 PKG_RELEASE:=1
-PKG_VERSION:=1.1.6
+PKG_VERSION:=1.1.4
 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:=054cbe19186dbc3682f6977e7856cdac1226f17a
+PKG_SOURCE_VERSION:=17388c54e14d8505254c0640067cf697760310ee
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
--- a/libwifi/Makefile
+++ b/libwifi/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=libwifi
-PKG_VERSION:=7.4.50
+PKG_VERSION:=7.4.42

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=665fd6fd51d2676b4384938e695157f9a2e937b4
+PKG_SOURCE_VERSION:=c3efa4ecd3bbf8247bc1b4c3e0ff512e42649531
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libwifi.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
--- a/map-agent/Makefile
+++ b/map-agent/Makefile
@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=map-agent
-PKG_VERSION:=4.6.0.0
+PKG_VERSION:=4.5.1.15.1
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=34314514affb47a11b85d4cfe30211fa7a94abff
+PKG_SOURCE_VERSION:=e0538bb1eb0b85ac085e6abb61ebbf8e1712f1e7
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>

 PKG_LICENSE:=BSD-3-Clause
--- a/map-agent/files/etc/config/mapagent
+++ b/map-agent/files/etc/config/mapagent
@@ -3,6 +3,7 @@ config agent 'agent'
 	option debug '0'
 	option profile '3'
 	option al_bridge 'br-lan'
+	option netdev 'wlan'
 	option island_prevention '0'
 	option eth_onboards_wifi_bhs '1'
 	option scan_on_boot_only '0'
--- a/map-agent/files/etc/hotplug.d/ethernet/map-dynamic-backhaul
+++ b/map-agent/files/etc/hotplug.d/ethernet/map-dynamic-backhaul
@@ -1,19 +1,17 @@
 #!/bin/sh

+. /lib/network/utils.sh
+
 conn_ports_file="/var/run/multiap/map.connected.ports"
 map_bh_file="/var/run/multiap/multiap.backhaul"
-
-# Exit if AL Bridge is not configured to be a bridge device
 al_bridge="$(uci -q get mapagent.agent.al_bridge)"
 [ "${al_bridge:0:3}" = "br-" ] || exit 0
+al_brnet="${al_bridge:3}"

 # Exit if the PORT is not member of the AL Bridge
-port_bridge_sec="$(uci show network | grep -w $PORT | grep '\.ports' | cut -d'.' -f2)"
-port_bridge_name="$(uci -q get network.$port_bridge_sec.name)"
-[ "$port_bridge_name" = "$al_bridge" ] || exit 0
+[ "$(get_network_of $PORT)" = "$al_brnet" ] || exit 0

 # Exit if the device is not operating in extender/repeater mode
-al_brnet="${al_bridge:3}"
 [ "$(uci -q get network.${al_brnet}.proto)" == "dhcp" ] || exit 0

 ############## Dynamic Backhaul Daemon ##############
@@ -47,7 +45,7 @@ fi
 ########################################################

 ################ Dedicated ETH WAN Port ################
-wanport="$(jsonfilter -i /etc/board.json -e @.network.wan.device)"
+wanport="$(db -q get hw.board.ethernetWanPort)"
 if [ -n "$wanport" ]; then
 	[ "$wanport" = "$PORT" ] || exit 0
 ########################################################
--- a/map-agent/files/lib/multiap/map_genconfig
+++ b/map-agent/files/lib/multiap/map_genconfig
@@ -159,6 +159,12 @@ map_genconf () {
 		if ! uci show wireless | grep -q "mode=.*sta"; then
 			generate_wireless_sta_config=1

+			if is_broadcom; then
+				for section in $(uci show wireless | grep wifi-device | cut -d'.' -f2 | cut -d'=' -f1); do
+					uci -q set wireless.$section.apsta="1"
+				done
+			fi
+
 			for section in $(uci show wireless | grep "mode=.*ap" | cut -d'.' -f2); do
 				uci delete wireless.$section
 			done
--- a/map-controller/Makefile
+++ b/map-controller/Makefile
@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=map-controller
-PKG_VERSION:=4.7.0.0
+PKG_VERSION:=4.6.0.5.2
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=cf047cf3b9b545f36a8e4c4e32da784253fb0853
+PKG_SOURCE_VERSION:=27b2dabe45811909122a90e185bab3860a340084
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>

 LOCAL_DEV=0
--- a/mcastmngr/files/broadcom/lib/mcast/broadcom.sh
+++ b/mcastmngr/files/broadcom/lib/mcast/broadcom.sh
@@ -11,7 +11,7 @@ CONFFILE=/var/mcpd.conf
 PROG_EXE=/usr/sbin/mcpd

 proxdevs=""
-ethwan="$(jsonfilter -i /etc/board.json -e @.network.wan.device)"
+ethwan="$(db -q get hw.board.ethernetWanPort)"


 config_snooping_common_params() {
--- a/mcastmngr/files/common/lib/mcast/common.sh
+++ b/mcastmngr/files/common/lib/mcast/common.sh
@@ -62,7 +62,7 @@ read_snooping() {
 	local proto

 	config_get sec_enable "$config" enable 0
-	config_get proto "$config" proto "igmp"
+	config_get proto "$config" proto

 	if [ "$sec_enable" == "0" ]; then
 		return
@@ -103,7 +103,7 @@ read_proxy() {
 	local proto

 	config_get sec_enable "$config" enable 0
-	config_get proto "$config" proto "igmp"
+	config_get proto "$config" proto

 	if [ "$sec_enable" == "0" ]; then
 		return
--- a/mcastmngr/files/linux/lib/mcast/linux.sh
+++ b/mcastmngr/files/linux/lib/mcast/linux.sh
@@ -46,6 +46,9 @@ device_has_ip() {
 	# Read the openwrt interface for the device.
 	# Device can have multiple logical interfaces like wan and wan6
 	# but same l3 device
+	# NB. Don't use 'get_network_of' here.
+	# This function fails in some uci configurations for interfaces that refer
+	# to a device indirectly.
 	local ifaces=$(ubus call network.interface dump | jsonfilter -e "@.interface[@.device='$device'].interface")
 	for iface in $ifaces; do
 		local ip=
--- a/netmode/files/etc/uci-defaults/netmode.l2mode
+++ b/netmode/files/etc/uci-defaults/netmode.l2mode
@@ -98,10 +98,6 @@ l2_network_config() {
 	# Update CWMP Agent WAN Interface
 	uci -q set cwmp.cpe.default_wan_interface="lan"
 	uci -q commit cwmp
-
-	# disable firewall
-	uci -q set firewall.globals.enabled="0"
-	uci -q commit firewall
 }

 network_mode="$(fw_printenv -n netmode 2>/dev/null)"
--- a/obuspa/Makefile
+++ b/obuspa/Makefile
@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=obuspa
-PKG_VERSION:=7.0.5.19
+PKG_VERSION:=7.0.5.16

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/obuspa.git
-PKG_SOURCE_VERSION:=83e4608de2dd316efbe336b93dab90aa47a2b4a6
+PKG_SOURCE_VERSION:=8249b1e9ae996ed45ec5edcd1adc128bd810a45b
 PKG_MAINTAINER:=Vivek Dutta <vivek.dutta@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
--- a/obuspa/files/etc/obuspa/roles.json
+++ b/obuspa/files/etc/obuspa/roles.json
@@ -260,23 +260,6 @@
            "PERMIT_SUBS_EVT_OPER_COMP"
          ]
        },
-        {
-          "object":"Device.{BBF_VENDOR_PREFIX}OpenVPN.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SET",
-            "PERMIT_ADD",
-            "PERMIT_DEL",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
        {
          "object":"Device.NAT.",
          "perm": [
--- a/obuspa/patches/0003-set-internal-role-fix.patch
+++ b/obuspa/patches/0003-set-internal-role-fix.patch
@@ -59,7 +59,7 @@
 +**************************************************************************/
 +void SetControllerDummyID()
 +{
-+    cur_msg_controller_info.endpoint_id = "CLI_Utility";
+    cur_msg_controller_info.endpoint_id = "";
 +}
 +
 +/*********************************************************************//**
--- a/periodicstats/Makefile
+++ b/periodicstats/Makefile
@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=periodicstats
-PKG_VERSION:=1.5.5
+PKG_VERSION:=1.5.3

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
--- a/periodicstats/files/etc/init.d/periodicstats
+++ b/periodicstats/files/etc/init.d/periodicstats
@@ -3,8 +3,11 @@
 START=61
 STOP=01

+. /etc/bbfdm/bbfdm_services.sh
+
 USE_PROCD=1
 PROG="/usr/sbin/periodicstatsd"
+PERIODICSTATS_JSON_INPUT="/etc/periodicstats/input.json"

 start_service() {
 	local enable
@@ -12,6 +15,8 @@ start_service() {
 	config_load periodicstats
 	config_get_bool enable globals enable 1
 	
+	bbfdm_add_service "bbfdm.periodicstats" "${PERIODICSTATS_JSON_INPUT}"
+
 	if [ "${enable}" -ne "1" ]; then
 		return 0;
 	fi
--- a/periodicstats/files/etc/bbfdm/micro_services/periodicstats.json
+++ b/periodicstats/files/etc/bbfdm/micro_services/periodicstats.json
@@ -1,17 +1,15 @@
 {
 	"daemon": {
-		"config": {
-			"loglevel": "1"
-		},
 		"input": {
 			"type": "DotSo",
 			"name": "/etc/periodicstats/libperiodicstats.so"
 		},
 		"output": {
 			"type": "UBUS",
+			"name": "bbfdm.periodicstats",
 			"parent_dm": "Device.",
 			"object": "PeriodicStatistics",
 			"root_obj": "bbfdm"
 		}
 	}
-}
+}
--- a/ponmngr/files/airoha/lib/xpon/airoha.sh
+++ b/ponmngr/files/airoha/lib/xpon/airoha.sh
@@ -3,54 +3,50 @@
 . /lib/functions.sh

 set_serial_number() {
-	local vendor_id="$1"
-	local vssn="$2"
+	vendor_id=$1
+	vssn=$2

 	# Vendor id is not taken from serial automatically, propagate it as well
-	/userfs/bin/omcicfgCmd set vendorId "${vendor_id}"
-	/userfs/bin/omcicfgCmd set sn "${vendor_id}${vssn}"
+	/userfs/bin/omcicfgCmd set vendorId ${vendor_id}
+	/userfs/bin/omcicfgCmd set sn ${vendor_id}${vssn}
 }

 set_equipment_id() {
-	local eqid="$1"
+	local eqid=$1
+	local eq_id_default="KE2.119.241R2B"

-	if [ -z "${eqid}" ]; then
+	if [ -z "$eqid"  ]; then
 		return
 	fi

-	/userfs/bin/omcicfgCmd set equipmentId "${eqid}"
+	if [ "$eqid" = "$eq_id_default" ]; then
+		return
+	fi
+
+        /userfs/bin/omcicfgCmd set equipmentId ${eqid}
 }

 set_loid_authentication() {
-	local loid="$1"
-	local loid_pwd="$2"
+	local loid=$1
+	local loid_pwd=$2

-	[ -z "${loid}" ] && return
+	[ -z "$loid" ] && return

-	/userfs/bin/omcicfgCmd set loid "${loid}"
+	/userfs/bin/omcicfgCmd set loid ${loid}

-	if [ -n "${loid_pwd}" ]; then
-		/userfs/bin/omcicfgCmd set loidPasswd "${loid_pwd}"
+	if [ -n "$loid_pwd" ]; then
+		/userfs/bin/omcicfgCmd set loid_password ${loid_pwd}
 	fi
 }

-set_onu_version() {
-	local onu_version="$1"
-
-	[ -z "${onu_version}" ] && return
-
-	/userfs/bin/omcicfgCmd set onuVersion "${onu_version}"
-}
-
 apply_xpon_uci_config() {
 	configure_loid_authentication
 	configure_equipment_id
-	configure_onu_version
 }

 init_xpon() {
 	# don't start pon daemons if xpon module is not loaded
-	[ -d /sys/module/xpon -o -d /sys/module/xpon_10g ] || return
+	[ -d /sys/module/xpon ] || return

 	procd_open_instance ponmgr_cfg
 	procd_set_param command /userfs/bin/ponmgr_cfg
--- a/ponmngr/files/broadcom/lib/xpon/broadcom.sh
+++ b/ponmngr/files/broadcom/lib/xpon/broadcom.sh
@@ -3,49 +3,39 @@
 . /lib/functions.sh

 set_serial_number() {
-	local vendor_id="$1"
-	local vssn="$2"
+	vendor_id=$1
+	vssn=$2

-	vendor_id="$(echo "${vendor_id}" | hexdump -e '4/1 "%02X" "\n"')"
-	vendor_id="${vendor_id:0:8}"
+	vendor_id="$(echo $vendor_id | hexdump -e '4/1 "%02X" "\n"')"
+	vendor_id=${vendor_id:0:8}

 	bs /b/c gpon onu_sn={vendor_id=$vendor_id,vendor_specific=$vssn}
 }

 set_equipment_id() {
-	local equipment_id="$1"
+	equipment_id=$1
 	[ -z "$equipment_id" ] && return

-	json_add_string "equipment_id" "$equipment_id"
+	json_add_string "equipment_id" $equipment_id
 }

 set_loid_authentication() {
-	local loid="$1"
-	local loid_password="$2"
-
+	loid=$1
+	loid_password=$2
 	[ -z "$loid" ] && return

-	json_add_string "loid" "$loid"
-	json_add_string "loid_password" "$loid_password"
-}
-
-set_onu_version() {
-	local onu_version="$1"
-	[ -z "${onu_version}" ] && return
-
-	json_add_string "onu_version" "${onu_version}"
+	json_add_string "loid" $loid
+	json_add_string "loid_password" $loid_password
 }

 apply_xpon_uci_config() {
-	local sn

 	json_init
 	json_add_object 'ani'
 	sn="$(uci -q get xpon.ani.serial_number)"
-	json_add_string "serial_number" "$sn"
+	json_add_string "serial_number" $sn
 	configure_loid_authentication
 	configure_equipment_id
-	configure_onu_version
 	json_close_object
 	json_dump > /tmp/xpon.json
 }
--- a/ponmngr/files/common/etc/init.d/xpon
+++ b/ponmngr/files/common/etc/init.d/xpon
@@ -11,21 +11,21 @@ include /lib/xpon
 configure_serial_number() {
 	# serial number generation is taken care in the uci defaults, so if
 	# serial number is not found here its a misconfig
-	local serial_number="$(uci -q get xpon.ani.serial_number)"
+	serial_number="$(uci -q get xpon.ani.serial_number)"
 	if [ ${#serial_number} -eq 12 ]; then
-		local vendor_id="${serial_number:0:4}"
-		local vssn="${serial_number:4:8}"
+		vendor_id="${serial_number:0:4}"
+		vssn="${serial_number:4:8}"
 	else
-		logger -s -t "xpon" "Serial number not found in UCI, ONT will probably not be registered at the OLT."
-		logger -s -t "xpon" "Please configure a valid serial number."
+		logger -s -t "xpon" "Serial number not found in uci, ont will probably not be registered at the olt"
+		logger -s -t "xpon" "Please configure a valid serial number"
 		return
 	fi

-	set_serial_number "${vendor_id}" "${vssn}"
+	set_serial_number $vendor_id $vssn
 }

 start_service() {
-	if [ "$(uci -q get xpon.ani.enable)" = "1" ]; then
+	if [ "$(uci -q get xpon.ani.enable)" == "1" ]; then
 		configure_serial_number
 		apply_xpon_uci_config
 		init_xpon
--- a/ponmngr/files/common/etc/uci-defaults/60-xpon-generate
+++ b/ponmngr/files/common/etc/uci-defaults/60-xpon-generate
@@ -3,15 +3,14 @@

 configure_serial_number() {
 	# check if serial number is present in the production data
-	local production_sn="$(fw_printenv -n gponsn)"
+	production_sn="$(fw_printenv -n gponsn)"
 	if [ ${#production_sn} -eq 12 ]; then
-		uci set xpon.ani.serial_number="${production_sn}"
+		uci set xpon.ani.serial_number=$production_sn
 	else
-		local macaddr="$(fw_printenv -n ethaddr | tr -d ':' | tr 'a-z' 'A-Z')"
-		local vendor_id="IOPS"
-		local vssn="${macaddr:4:8}"
-
-		uci set xpon.ani.serial_number="${vendor_id}${vssn}"
+		macaddr="$(fw_printenv -n ethaddr | tr -d ':' | tr 'a-z' 'A-Z')"
+		vendor_id="IOPS"
+		vssn="${macaddr:4:8}"
+		uci set xpon.ani.serial_number=$vendor_id$vssn
 	fi
 }

@@ -19,38 +18,37 @@ configure_loid_authentication() {
 	local production_loid
 	local production_loidpwd

-	local loid="$(uci -q get xpon.ani.loid)"
-	local loidpwd="$(uci -q get xpon.ani.loid_password)"
-
-	if [ -z "${loid}" ]; then
+	loid="$(uci -q get xpon.ani.loid)"
+	loidpwd="$(uci -q get xpon.ani.loid_password)"
+        if [ -z $loid ]; then
 		production_loid="$(fw_printenv -n gponloid)"
 	fi
-	if [ -z "${loidpwd}" ]; then
+	if [ -z $loidpwd ]; then
 		production_loidpwd="$(fw_printenv -n gponloid_password)"
 	fi

-	if [ -n "${production_loid}" ]; then
-		uci set xpon.ani.loid="${production_loid}"
+	if [ -n $production_loid ]; then
+		uci set xpon.ani.loid=$production_loid
 	fi
-	if [ -n "${production_loidpwd}" ]; then
-		uci set xpon.ani.loid_password="${production_loidpwd}"
+	if [ -n $production_loidpwd ]; then
+		uci set xpon.ani.loid_password=$production_loidpwd
 	fi

 }

 if [ -s "/etc/config/xpon" ]; then
-	if uci -q get xpon.ani >/dev/null; then
-		# generate serial number in case its not present and return
-		SERIAL_NUMBER="$(uci -q get xpon.ani.serial_number)"
-		if [ ${#SERIAL_NUMBER} -ne 12 ]; then
+        if uci -q get xpon.ani >/dev/null; then
+                # generate serial number in case its not present and return
+		serial_number="$(uci -q get xpon.ani.serial_number)"
+		if [ ${#serial_number} -ne 12 ]; then
 			configure_serial_number
 		fi
 		configure_loid_authentication
-		exit
-	else
-		rm -f /etc/config/xpon
-	fi
-fi
+                exit                                  
+        else                                          
+                rm -f /etc/config/xpon
+        fi                           
+fi                                   
 touch /etc/config/xpon

 uci set xpon.ani=ani
--- a/ponmngr/files/common/lib/xpon/get_uci_config.sh
+++ b/ponmngr/files/common/lib/xpon/get_uci_config.sh
@@ -1,20 +1,13 @@
 #!/bin/sh

-configure_equipment_id() {
-	local eqid="$(uci -q get xpon.ani.equipment_id)"
-
-	set_equipment_id "${eqid}"
+configure_equipment_id() {                                                      
+        eqid="$(uci -q get xpon.ani.equipment_id)"                              
+        set_equipment_id $eqid                                                  
+}                                                                               
+                                                                                
+configure_loid_authentication() {                                               
+        loid="$(uci -q get xpon.ani.loid)"                                      
+        loid_pwd="$(uci -q get xpon.ani.loid_password)"                         
+        set_loid_authentication $loid $loid_pwd                                 
 }

-configure_loid_authentication() {
-	local loid="$(uci -q get xpon.ani.loid)"
-	local loid_pwd="$(uci -q get xpon.ani.loid_password)"
-
-	set_loid_authentication "${loid}" "${loid_pwd}"
-}
-
-configure_onu_version() {
-	local onu_version="$(uci -q get xpon.ani.onu_version)"
-
-	set_onu_version "${onu_version}"
-}
--- a/port-trigger/Makefile
+++ b/port-trigger/Makefile
@@ -1,55 +0,0 @@
-#
-# Copyright (C) 2024 IOPSYS Software Solutions AB
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=port-trigger
-PKG_VERSION:=1.0.0
-
-LOCAL_DEV:=0
-ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/network/port-trigger.git
-PKG_SOURCE_VERSION:=715fa689e5c22721d8ccd9d4e1cbe290caca3662
-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/port-trigger
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Port Trigger Daemon
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbfdm-api +kmod-ipt-trigger +kmod-ip6t-trigger +iptables-mod-nfqueue
-endef
-
-define Package/port-trigger/description
-	Manage port trigger
-endef
-
-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-        $(CP) -rf ./port-trigger/* $(PKG_BUILD_DIR)/
-endef
-endif
-
-define Package/port-trigger/install
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_DIR) $(1)/lib/port-trigger
-	$(CP) ./files/* $(1)/
-                                                                                
-	$(INSTALL_BIN) ./files/etc/init.d/port-trigger $(1)/etc/init.d/
-	$(INSTALL_DATA) ./files/etc/config/port-trigger $(1)/etc/config/
-	$(INSTALL_DATA) ./files/lib/port-trigger/port_trigger.sh $(1)/lib/port-trigger/
-	$(call BbfdmInstallPluginInMicroservice, $(1)/etc/port-trigger,$(PKG_BUILD_DIR)/bbf_plugin/libporttrigger.so)
-	$(call BbfdmInstallMicroServiceInputFile,$(1),./files/etc/bbfdm/micro_services/port-trigger.json)
-endef
-
-$(eval $(call BuildPackage,port-trigger))
--- a/port-trigger/files/etc/bbfdm/micro_services/port-trigger.json
+++ b/port-trigger/files/etc/bbfdm/micro_services/port-trigger.json
@@ -1,17 +0,0 @@
-{
-	"daemon": {
-		"config": {
-			"loglevel": "1"
-		},
-		"input": {
-			"type": "DotSo",
-			"name": "/etc/port-trigger/libporttrigger.so"
-		},
-		"output": {
-			"type": "UBUS",
-			"parent_dm": "Device.NAT.",
-			"object": "PortTrigger",
-			"root_obj": "bbfdm"
-		}
-	}
-}
--- a/port-trigger/files/etc/config/port-trigger
+++ b/port-trigger/files/etc/config/port-trigger
@@ -1 +0,0 @@
-#port trigger uci file
--- a/port-trigger/files/etc/init.d/port-trigger
+++ b/port-trigger/files/etc/init.d/port-trigger
@@ -1,21 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=65
-STOP=20
-USE_PROCD=1
-
-. /lib/port-trigger/port_trigger.sh
-
-start_service() {
-	port_trigger_handling
-}
-
-service_triggers()
-{
-	procd_add_reload_trigger firewall
-	procd_add_reload_trigger port-trigger
-}
-
-reload_service() {
-	start
-}
--- a/port-trigger/files/lib/port-trigger/port_trigger.sh
+++ b/port-trigger/files/lib/port-trigger/port_trigger.sh
@@ -1,157 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-process_port_trigger() {
-	local rule_id="$1"
-	local is_enabled=""
-	local duration=""
-	local trigger_dport=""
-	local trigger_dport_end=""
-	local protocol=""
-	local interface=""
-	local open_dport=""
-	local open_dport_end=""
-	local open_protocol=""
-	local ptg_id=""
-	local IP_RULE=""
-	local IP6_RULE=""
-	local IP_RULE_FWD=""
-
-	get_port_trigger() {
-		local ptg_name
-		config_get ptg_name "$1" "name"
-		if [ "$ptg_name" == "$2" ]; then
-			ptg_id="$1"
-			return
-		fi
-	}
-
-	ptg_id=""
-	config_get name "$rule_id" "port_trigger"
-	config_foreach get_port_trigger  "port_trigger" "$name"
-	[ -z "$ptg_id" ] && return
-
-	is_enabled=$(uci -q get port-trigger."$ptg_id".enable)
-
-	if [ -z "$is_enabled" ] || [ "$is_enabled" = "0" ]; then
-		return
-	fi
-
-	protocol=$(uci -q get port-trigger."$ptg_id".protocol)
-	[ -z "$protocol" ] && return
-
-	if [ "$protocol" = "UDP" ] || [ "$protocol" = "udp" ]; then
-		IP_RULE="$IP_RULE -p udp"
-		IP6_RULE="$IP6_RULE -p udp"
-		IP_RULE_FWD="$IP_RULE_FWD -p udp"
-	elif [ "$protocol" = "TCP" ] || [ "$protocol" = "tcp" ]; then
-		IP_RULE="$IP_RULE -p tcp"
-		IP6_RULE="$IP6_RULE -p tcp"
-		IP_RULE_FWD="$IP_RULE_FWD -p tcp"
-	else
-		return
-	fi
-
-	trigger_dport=$(uci -q get port-trigger."$ptg_id".port)
-	[ -z "$trigger_dport" ] && return
-	IP_RULE="$IP_RULE --dport $trigger_dport"
-	IP6_RULE="$IP6_RULE --dport $trigger_dport"
-
-	trigger_dport_end=$(uci -q get port-trigger."$ptg_id".end_port_range)
-	if [ -n "$trigger_dport_end" ]; then
-		IP_RULE="$IP_RULE:$trigger_dport"
-		IP6_RULE="$IP6_RULE:$trigger_dport"
-	fi
-
-	config_get open_protocol "$rule_id" "protocol"
-	if [ "$open_protocol" = "UDP" ] || [ "$open_protocol" = "udp" ]; then
-		IP_RULE="$IP_RULE -j TRIGGER --trigger-type out --trigger-proto udp"
-		IP6_RULE="$IP6_RULE -j TRIGGER --trigger-type out --trigger-proto udp"
-	elif [ "$open_protocol" = "TCP" ] || [ "$open_protocol" = "tcp" ]; then
-		IP_RULE="$IP_RULE -j TRIGGER --trigger-type out --trigger-proto tcp"
-		IP6_RULE="$IP6_RULE -j TRIGGER --trigger-type out --trigger-proto tcp"
-	else
-		return
-	fi
-
-	config_get open_dport "$rule_id" "port"
-	[ -z "$open_dport" ] && return
-	IP_RULE="$IP_RULE --trigger-match $open_dport"
-	IP6_RULE="$IP6_RULE --trigger-match $open_dport"
-	IP_RULE_FWD="$IP_RULE_FWD --dport $open_dport"
-
-	config_get open_dport_end "$rule_id" "end_port_range"
-	if [ -z "$open_dport_end" ]; then
-		IP_RULE="$IP_RULE --trigger-relate $open_dport"
-		IP6_RULE="$IP6_RULE --trigger-relate $open_dport"
-	else
-		IP_RULE="$IP_RULE-$open_dport_end --trigger-relate $open_dport-$open_dport_end"
-		IP6_RULE="$IP6_RULE-$open_dport_end --trigger-relate $open_dport-$open_dport_end"
-		IP_RULE_FWD="$IP_RULE_FWD:$open_dport_end"
-	fi
-
-	duration=$(uci -q get port-trigger."$ptg_id".auto_disable_duration)
-        if [ -n "$duration" ]; then
-                IP_RULE="$IP_RULE --trigger-timeout $duration"
-                IP6_RULE="$IP6_RULE --trigger-timeout $duration"
-        fi
-
-	interface=$(uci -q get port-trigger."$ptg_id".src)
-	[ -z "$interface" ] && return
-	device=$(uci -q get network.$interface.device)
-       	IP_RULE_1="iptables -w -t nat -A prerouting_porttrigger -i $device $IP_RULE"
-       	echo "$IP_RULE_1">>/tmp/port_trigger_iptables
-
-       	IP_RULE_1="ip6tables -w -t nat -A prerouting_porttrigger -i $device $IP6_RULE"
-       	echo "$IP_RULE_1">>/tmp/port_trigger_ip6tables
-
-        if [ -n "$duration" ]; then
-		echo "iptables -w -t filter -A forwarding_wan_porttrigger $IP_RULE_FWD -j TRIGGER --trigger-type in --trigger-timeout $duration">>/tmp/port_trigger_iptables
-		echo "ip6tables -w -t filter -A forwarding_wan_porttrigger $IP_RULE_FWD -j TRIGGER --trigger-type in --trigger-timeout $duration">>/tmp/port_trigger_ip6tables
-
-		echo "iptables -w -t nat -A prerouting_wan_porttrigger $IP_RULE_FWD -j TRIGGER --trigger-type dnat --trigger-timeout $duration">>/tmp/port_trigger_iptables
-	else
-		echo "iptables -w -t filter -A forwarding_wan_porttrigger $IP_RULE_FWD -j TRIGGER --trigger-type in">>/tmp/port_trigger_iptables
-		echo "ip6tables -w -t filter -A forwarding_wan_porttrigger $IP_RULE_FWD -j TRIGGER --trigger-type in">>/tmp/port_trigger_ip6tables
-
-		echo "iptables -w -t nat -A prerouting_wan_porttrigger $IP_RULE_FWD -j TRIGGER --trigger-type dnat">>/tmp/port_trigger_iptables
-	fi
-}
-
-port_trigger_handling() {
-	rm /tmp/port_trigger_iptables 2> /dev/null
-	rm /tmp/port_trigger_ip6tables 2> /dev/null
-	touch /tmp/port_trigger_iptables
-	touch /tmp/port_trigger_ip6tables
-
-	echo "iptables -w -t nat -F prerouting_porttrigger 2> /dev/null">>/tmp/port_trigger_iptables
-	echo "iptables -w -t filter -F forwarding_wan_porttrigger 2> /dev/null">>/tmp/port_trigger_iptables
-	echo "iptables -w -t nat -F prerouting_wan_porttrigger 2> /dev/null">>/tmp/port_trigger_iptables
-	echo "ip6tables -w -t nat -F prerouting_porttrigger 2> /dev/null">>/tmp/port_trigger_ip6tables
-	echo "ip6tables -w -t filter -F forwarding_wan_porttrigger 2> /dev/null">>/tmp/port_trigger_ip6tables
-
-	echo "iptables -w -t nat -N prerouting_porttrigger 2> /dev/null">>/tmp/port_trigger_iptables
-	ret=$?
-	[ $ret -eq 0 ] && echo "iptables -w -t nat -I PREROUTING -j prerouting_porttrigger 2> /dev/null">>/tmp/port_trigger_iptables
-	echo "iptables -w -t filter -N forwarding_wan_porttrigger 2> /dev/null">>/tmp/port_trigger_iptables
-	ret=$?
-	[ $ret -eq 0 ] && echo "iptables -w -t filter -I forwarding_wan_rule -j forwarding_wan_porttrigger 2> /dev/null">>/tmp/port_trigger_iptables
-	echo "iptables -w -t nat -N prerouting_wan_porttrigger 2> /dev/null">>/tmp/port_trigger_iptables
-	ret=$?
-	[ $ret -eq 0 ] && echo "iptables -w -t nat -I prerouting_wan_rule -j prerouting_wan_porttrigger 2> /dev/null">>/tmp/port_trigger_iptables
-
-	echo "ip6tables -w -t nat -N prerouting_porttrigger 2> /dev/null">>/tmp/port_trigger_ip6tables
-	ret=$?
-	[ $ret -eq 0 ] && echo "ip6tables -w -t nat -I PREROUTING -j prerouting_porttrigger 2> /dev/null">>/tmp/port_trigger_ip6tables
-	echo "ip6tables -w -t filter -N forwarding_wan_porttrigger 2> /dev/null">>/tmp/port_trigger_ip6tables
-	ret=$?
-	[ $ret -eq 0 ] && echo "ip6tables -w -t filter -I forwarding_wan_rule -j forwarding_wan_porttrigger 2> /dev/null">>/tmp/port_trigger_ip6tables
-
-	# Load /etc/config/port-trigger UCI file
-	config_load port-trigger
-	config_foreach process_port_trigger rule
-
-	sh /tmp/port_trigger_iptables
-	sh /tmp/port_trigger_ip6tables
-}
--- a/qosmngr/files/airoha/lib/qos/airoha.sh
+++ b/qosmngr/files/airoha/lib/qos/airoha.sh
@@ -42,7 +42,7 @@ hw_queue_set() {
    local rate="$7"
    local burstsize="$8"
    local index="$((order - 1))"
-    local ethwan="$(jsonfilter -i /etc/board.json -e @.network.wan.device)"
+    local ethwan="$(db -q get hw.board.ethernetWanPort)"

    #if [ "${ifname}" != "${ethwan}" ] ; then
    #   return 2
--- a/qosmngr/files/airoha/lib/qos/policer.sh
+++ b/qosmngr/files/airoha/lib/qos/policer.sh
@@ -101,7 +101,7 @@ handle_policer() {

 # Configure policer based on UCI subtree 'qos.policer'
 configure_policer() {
-    for intf in $(jsonfilter -i /etc/board.json -e @.network.lan.ports[*] -e @.network.lan.device -e @.network.wan.device | xargs); do
+    for intf in $(db get hw.board.ethernetPortOrder); do
        if [ -n "${intf}" ] ; then
            hw_policer_set_ingress_rate "$intf" 0 0
        fi
@@ -129,4 +129,4 @@ configure_policer() {
    config_load qos
    config_foreach handle_policer policer
    echo $POLICER_COUNT > /tmp/qos/max_policer_inst
-}
+}
--- a/qosmngr/files/airoha/lib/qos/queue.sh
+++ b/qosmngr/files/airoha/lib/qos/queue.sh
@@ -8,7 +8,7 @@ pre_configure_queue() {
    # Delete queues
    hw_queue_init_all

-    for intf in $(jsonfilter -i /etc/board.json -e @.network.lan.ports[*] -e @.network.lan.device -e @.network.wan.device | xargs); do
+    for intf in $(db get hw.board.ethernetPortOrder); do
        hw_intf_init "${intf}"
    done
 }
--- a/qosmngr/files/airoha/lib/qos/shaper.sh
+++ b/qosmngr/files/airoha/lib/qos/shaper.sh
@@ -35,7 +35,7 @@ handle_shaper() {
 # Configure shaper based on options saved to UCI tree 'qos.shaper'
 configure_shaper() {
    # Delete existing shaper
-    for intf in $(jsonfilter -i /etc/board.json -e @.network.lan.ports[*] -e @.network.lan.device -e @.network.wan.device | xargs); do
+    for intf in $(db get hw.board.ethernetPortOrder); do
        hw_shaper_set "$intf" del
    done

--- a/qosmngr/files/broadcom/lib/qos/qos.sh
+++ b/qosmngr/files/broadcom/lib/qos/qos.sh
@@ -80,7 +80,7 @@ sort_q_by_precedence() {
 }

 sort_by_precedence() {
-	for interf in $(jsonfilter -i /etc/board.json -e @.network.lan.ports[*] -e @.network.lan.device -e @.network.wan.device | xargs); do
+	for interf in $(db -q get hw.board.ethernetPortOrder); do
 		sort_q_by_precedence $interf
 	done
 }
@@ -335,7 +335,7 @@ handle_shaper() {
 assign_policer_to_port() {
 	local ifname="$1"
 	local pindex="$2"
-	local portorder="$(jsonfilter -i /etc/board.json -e @.network.lan.ports[*] -e @.network.lan.device -e @.network.wan.device | xargs)"
+	local portorder="$(db -q get hw.board.ethernetPortOrder)"

 	for port in $portorder; do
 		if [ "$ifname" == "$port" ]; then
@@ -398,7 +398,7 @@ config_ingress_rate_limit() {
 	local ifname="$1"
 	local ingress_rate=$2
 	local in_burst_size=$3
-	local wanport="$(jsonfilter -i /etc/board.json -e @.network.wan.device)"
+	local wanport="$(db -q get hw.board.ethernetWanPort)"

 	# Unit in uci file is in bps while that accepted by ethswctl is kbits
 	if [ $ingress_rate -lt 1000 ]; then
@@ -421,7 +421,7 @@ config_ingress_rate_limit() {

 configure_shaper() {
 	# Delete existing shaper
-	for intf in $(jsonfilter -i /etc/board.json -e @.network.lan.ports[*] -e @.network.lan.device -e @.network.wan.device | xargs); do
+	for intf in $(db get hw.board.ethernetPortOrder); do
 		tmctl setportshaper --devtype 0 --if $intf --shapingrate 0 --burstsize -1
 	done
 	# Load UCI file
@@ -432,7 +432,7 @@ configure_shaper() {

 pre_configure_queue() {
 	# Delete queues
-	for intf in $(jsonfilter -i /etc/board.json -e @.network.lan.ports[*] -e @.network.lan.device -e @.network.wan.device | xargs); do
+	for intf in $(db get hw.board.ethernetPortOrder); do
 		rm -rf /tmp/qos/$intf

 		mkdir -p /tmp/qos/$intf
@@ -452,7 +452,7 @@ pre_configure_queue() {
 configure_queue_shaping_rate() {
 	# Load UCI file
 	config_load qos
-	for interf in $(jsonfilter -i /etc/board.json -e @.network.lan.ports[*] -e @.network.lan.device -e @.network.wan.device | xargs); do
+	for interf in $(db -q get hw.board.ethernetPortOrder); do
 		Q_COUNT=0
 		config_foreach handle_queue_shapingrate queue $interf
 	done
@@ -463,7 +463,7 @@ configure_queue() {
 	config_load qos
 	config_foreach handle_q_order queue
 	sort_by_precedence
-	for interf in $(jsonfilter -i /etc/board.json -e @.network.lan.ports[*] -e @.network.lan.device -e @.network.wan.device | xargs); do
+	for interf in $(db -q get hw.board.ethernetPortOrder); do
 		Q_COUNT=0
 		# sp queue have max priority value = no. of queue configured on the port
 		# hence read and update SP_Q_PRIO here
@@ -476,7 +476,7 @@ configure_queue() {
 configure_policer() {
 	# The policer object is not available on non BCM968* chips, just clean up
 	# the old config if any and return
-	for intf in $(jsonfilter -i /etc/board.json -e @.network.lan.ports[*] -e @.network.lan.device -e @.network.wan.device | xargs); do
+	for intf in $(db get hw.board.ethernetPortOrder); do
 		local unitport="$(get_port_number $intf)"
 		local unit=$(echo $unitport | cut -d ' ' -f 1)
 		local port=$(echo $unitport | cut -d ' ' -f 2)
--- a/qosmngr/files/common/lib/qos/ebtables.sh
+++ b/qosmngr/files/common/lib/qos/ebtables.sh
@@ -242,7 +242,7 @@ handle_ebtables_rules() {
    if [ "$all_interfaces" == "1" ]; then
 	is_l2_rule=1
    elif [ -n "$src_if" ]; then
-	for interf in $(jsonfilter -i /etc/board.json -e @.network.lan.ports[*] -e @.network.lan.device -e @.network.wan.device | xargs); do
+	for interf in $(db -q get hw.board.ethernetPortOrder); do
 	    if [ "$src_if" == "$interf" ]; then
 		src_if="$src_if+"
 		broute_filter_on_src_if "$src_if"
--- a/qosmngr/files/linux/lib/qos/qos.sh
+++ b/qosmngr/files/linux/lib/qos/qos.sh
@@ -82,7 +82,7 @@ sort_q_by_precedence() {
 }

 sort_by_precedence() {
-	for interf in $(jsonfilter -i /etc/board.json -e @.network.lan.ports[*] -e @.network.lan.device -e @.network.wan.device | xargs); do
+	for interf in $(db -q get hw.board.ethernetPortOrder); do
 		sort_q_by_precedence $interf
 	done
 }
@@ -356,7 +356,7 @@ config_ingress_rate_limit() {
 	local ingress_rate=$2
 	local in_burst_size=$3
 	local pindex="$4"
-	local wanport="$(jsonfilter -i /etc/board.json -e @.network.wan.device)"
+	local wanport="$(db -q get hw.board.ethernetWanPort)"

 	# Unit in uci file is in bps while that accepted by ethswctl is kbits
 	if [ $ingress_rate -lt 1000 ]; then
@@ -384,7 +384,7 @@ config_ingress_rate_limit() {

 pre_configure_queue() {
 	# Delete queues
-	for intf in $(jsonfilter -i /etc/board.json -e @.network.lan.ports[*] -e @.network.lan.device -e @.network.wan.device | xargs); do
+	for intf in $(db get hw.board.ethernetPortOrder); do
 		rm -rf /tmp/qos/$intf

 		mkdir -p /tmp/qos/$intf
@@ -462,8 +462,8 @@ configure_queue() {
 		fi
 		bs=$(( bs / 1000 ))
 	}
-	local wanport="$(jsonfilter -i /etc/board.json -e @.network.wan.device)"
-	for interf in $(jsonfilter -i /etc/board.json -e @.network.lan.ports[*] -e @.network.lan.device -e @.network.wan.device | xargs); do
+	local wanport="$(db -q get hw.board.ethernetWanPort)"
+	for interf in $(db -q get hw.board.ethernetPortOrder); do
 		Q_COUNT=0
 		rate=0
 		# sp queue have max priority value = no. of queue configured on the port
--- a/self-diagnostics/files/usr/share/self-diagnostics/helper/wifi_radio_status.sh
+++ b/self-diagnostics/files/usr/share/self-diagnostics/helper/wifi_radio_status.sh
@@ -1,3 +0,0 @@
-for radio_if in $(ubus list 'wifi.radio.*'); do
-	ubus call "${radio_if}" status
-done
--- a/self-diagnostics/files/usr/share/self-diagnostics/spec/wifi.json
+++ b/self-diagnostics/files/usr/share/self-diagnostics/spec/wifi.json
@@ -12,13 +12,9 @@
 			"cmd": "ubus call network.wireless status"
 		},
 		{
-			"description": "WiFi Status",
+			"description": "Wireless Radio Status",
 			"cmd": "ubus call wifi status"
 		},
-		{
-			"description": "WiFi Radio Status",
-			"cmd": "sh /usr/share/self-diagnostics/helper/wifi_radio_status.sh"
-		},
 		{
 			"description": "Get radio scan",
 			"cmd": "sh /usr/share/self-diagnostics/helper/wifi_radio_scan.sh"
@@ -27,10 +23,6 @@
 			"description": "Get Assoc List",
 			"cmd": "sh /usr/share/self-diagnostics/helper/wifi_assoclist.sh"
 		},
-		{
-			"description": "List Wireless Devices",
-			"cmd": "iw dev"
-		},
 		{
 			"description": "iwinfo interface details",
 			"cmd": "/usr/bin/iwinfo"
--- a/stunc/Makefile
+++ b/stunc/Makefile
@@ -7,14 +7,14 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=stunc
-PKG_VERSION:=1.4.2
 PKG_RELEASE:=1
+PKG_VERSION:=1.4.0

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/stunc.git
-PKG_SOURCE_VERSION:=92fd3d9d59b3c660266b0411b653fee9dcfda1ed
+PKG_SOURCE_VERSION:=335f52d51b3b988917f0130303d571ac1fd9636c
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -23,6 +23,7 @@ PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE

 include $(INCLUDE_DIR)/package.mk
+include ../bbfdm/bbfdm.mk

 MAKE_PATH:=src

@@ -48,11 +49,10 @@ define Package/stunc/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_DIR) $(1)/etc/icwmpd/plugins
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/stunc $(1)/usr/sbin/
 	$(INSTALL_BIN) ./files/etc/init.d/stunc $(1)/etc/init.d/stunc
 	$(INSTALL_DATA) ./files/etc/config/stunc $(1)/etc/config/stunc
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/libstunc.so $(1)/etc/icwmpd/plugins/
+	$(call BbfdmInstallPlugin,$(1),$(PKG_BUILD_DIR)/src/libstunc.so)
 endef

 $(eval $(call BuildPackage,stunc))
--- a/sulu/sulu-base/Makefile
+++ b/sulu/sulu-base/Makefile
@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=sulu-base
-PKG_VERSION:=3.1.57
+PKG_VERSION:=3.1.53

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu.git
-PKG_SOURCE_VERSION:=5c031a2e3c3ebc0b71566073a8296c75f422b8aa
+PKG_SOURCE_VERSION:=0108f9c192a168936ee223dbf4d85a7ceba7093d
 PKG_MIRROR_HASH:=skip

 SULU_MOD:=core
--- a/sulu/sulu-builder/Makefile
+++ b/sulu/sulu-builder/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=sulu-builder
-PKG_VERSION:=3.1.57
+PKG_VERSION:=3.1.53
 PKG_RELEASE:=1

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-builder.git
-PKG_SOURCE_VERSION:=f40a83b669b9a6abb527f3e7e6babbcd7c00622a
+PKG_SOURCE_VERSION:=5d0336f678a116cdf4c73fec7c0d8ab06c0f65d6
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_BUILD_DIR:=$(BUILD_DIR)/sulu-$(PKG_VERSION)/sulu-builder-$(PKG_SOURCE_VERSION)
--- a/swmodd/Makefile
+++ b/swmodd/Makefile
@@ -75,7 +75,6 @@ endif
 define Package/swmodd/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DIR) $(1)/etc/swmodd
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/usr/share/swmodd/
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
@@ -91,13 +90,13 @@ ifeq ($(CONFIG_PACKAGE_liblxc),y)
 	$(INSTALL_BIN) ./files/etc/uci-defaults/02-migrate-lxc $(1)/etc/uci-defaults/02-migrate-lxc
 endif
 ifeq ($(CONFIG_PACKAGE_crun),y)
+	$(INSTALL_DIR) $(1)/etc/swmodd
 	$(INSTALL_BIN) ./files/etc/swmodd/run.sh $(1)/etc/swmodd/run.sh
 	$(INSTALL_BIN) ./files/etc/init.d/crun $(1)/etc/init.d/crun
 	$(INSTALL_BIN) ./files/etc/config/crun $(1)/etc/config/crun
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/crun_create $(1)/usr/sbin/crun_create
 endif
-	$(call BbfdmInstallPluginInMicroservice,$(1)/etc/swmodd,$(PKG_BUILD_DIR)/libswmodd.so)
-	$(call BbfdmInstallMicroServiceInputFile,$(1),./files/etc/swmodd/input.json)
+	$(call BbfdmInstallPlugin,$(1),$(PKG_BUILD_DIR)/libswmodd.so)
 endef

 define Package/swmodd-cgroup/install
--- a/swmodd/files/etc/swmodd/input.json
+++ b/swmodd/files/etc/swmodd/input.json
@@ -1,17 +0,0 @@
-{
-	"daemon": {
-		"config": {
-			"loglevel": "1"
-		},
-		"input": {
-			"type": "DotSo",
-			"name": "/etc/swmodd/libswmodd.so"
-		},
-		"output": {
-			"type": "UBUS",
-			"parent_dm": "Device.",
-			"object": "SoftwareModules",
-			"root_obj": "bbfdm"
-		}
-	}
-}
--- a/testnet/files/sbin/testnet
+++ b/testnet/files/sbin/testnet
@@ -1,6 +1,7 @@
 #!/bin/sh

 . /lib/functions.sh
+. /lib/network/utils.sh

 NETCON=0
 LASTSTATUS=""
--- a/timemngr/Makefile
+++ b/timemngr/Makefile
@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=timemngr
-PKG_VERSION:=1.0.15
+PKG_VERSION:=1.0.13

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
@@ -20,7 +20,6 @@ PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE

 include $(INCLUDE_DIR)/package.mk
-include $(TOPDIR)/feeds/iopsys/bbfdm/bbfdm.mk

 #RSTRIP:=:

@@ -55,14 +54,14 @@ define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/etc/hotplug.d/ntp
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/timemngr $(1)/usr/sbin/timemngr
-	$(call BbfdmInstallPluginInMicroservice,$(1)/etc/timemngr,$(PKG_BUILD_DIR)/src/libtimemngr.so)
-	$(call BbfdmInstallMicroServiceInputFile,$(1),./files/etc/timemngr/input.json)
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/libtimemngr.so $(1)/etc/timemngr/
+	$(INSTALL_DATA) ./files/etc/timemngr/input.json $(1)/etc/timemngr/
 	$(INSTALL_BIN) ./files/etc/hotplug.d/iface/21-timemngr $(1)/etc/hotplug.d/iface/
 	$(INSTALL_BIN) ./files/etc/hotplug.d/ntp/40-firstUseDate $(1)/etc/hotplug.d/ntp/
 	$(INSTALL_BIN) ./files/etc/init.d/timemngr $(1)/etc/init.d/
 ifeq ($(CONFIG_TIMEMNGR_MIGRATE_SYSTEM),y)
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_BIN) ./files/etc/uci-defaults/96-system-ntp-migrate $(1)/etc/uci-defaults/
 endif
 ifeq ($(CONFIG_TIMEMNGR_NTPD),y)
--- a/timemngr/files/etc/init.d/timemngr
+++ b/timemngr/files/etc/init.d/timemngr
@@ -3,11 +3,14 @@
 START=20
 STOP=01

+. /etc/bbfdm/bbfdm_services.sh
 . /etc/timemngr/time.sh

 USE_PROCD=1
 PROG_UBUS=/usr/sbin/timemngr

+DM_INPUT="/etc/timemngr/input.json"
+
 log() {
 	echo "${@}"|logger -t time.init -p info
 }
@@ -15,12 +18,11 @@ log() {
 validate_global_section() {
 	uci_validate_section time global global \
 	    'enable:bool:1' \
-	    'loglevel:uinteger:4' \
-	    'mdns:bool:1'
+	    'loglevel:uinteger:4'
 }

 start_service() {
-	local enable loglevel server_enable
+	local enable loglevel

 	if uci -q get system.ntp >/dev/null 2>&1; then
 		log "Not starting timemngr, legacy ntp definition detected"
@@ -38,19 +40,13 @@ start_service() {
 	procd_open_instance timemngr_ubus
 	procd_set_param command $PROG_UBUS
 	procd_append_param command -l ${loglevel}
-
-	config_load time
-	config_get_bool server_enable server enable 0
-
-	if [ "${server_enable}" -eq 1 ]; then
-		[ "${mdns}" -ne 0 ] && procd_add_mdns "ntp" "udp" "123" "daemon=ntpd"
-	fi
-
 	procd_set_param respawn
 	procd_close_instance

 	generate_config
 	create_service
+
+	bbfdm_add_service "bbfdm.time" "${DM_INPUT}"
 }

 reload_service() {
--- a/timemngr/files/etc/timemngr/input.json
+++ b/timemngr/files/etc/timemngr/input.json
@@ -1,14 +1,12 @@
 {
 	"daemon": {
-		"config": {
-			"loglevel": "1"
-		},
 		"input": {
 			"type": "DotSo",
 			"name": "/etc/timemngr/libtimemngr.so"
 		},
 		"output": {
 			"type": "UBUS",
+			"name": "bbfdm.time",
 			"parent_dm": "Device.",
 			"object": "Time",
 			"root_obj": "bbfdm"
--- a/tr104/Makefile
+++ b/tr104/Makefile
@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=tr104
-PKG_VERSION:=1.0.23
+PKG_VERSION:=1.0.21

 LOCAL_DEV:=0
 ifeq ($(LOCAL_DEV),0)
@@ -71,15 +71,14 @@ endif
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/tr104/plugins/
-	$(INSTALL_DIR) $(1)/etc/uci-defaults/
-	$(call BbfdmInstallPluginInMicroservice,$(1)/etc/tr104,$(PKG_BUILD_DIR)/libdm/tr104/libtr104.so)
+	$(INSTALL_BIN) ./files/etc/tr104/input.json $(1)/etc/tr104/input.json
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libdm/tr104/libtr104.so $(1)/etc/tr104/
 ifeq ($(CONFIG_TR104_VENDOR_EXTENSIONS),y)
-	$(call BbfdmInstallPluginInMicroservice,$(1)/etc/tr104/plugins,$(PKG_BUILD_DIR)/libdm/extensions/iowrt/libtr104ext.so)
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libdm/extensions/iowrt/libtr104ext.so $(1)/etc/tr104/plugins/
 endif
 ifeq ($(CONFIG_TR104_RUNAS_BBFDM_MICROSERVICE),y)
-	$(call BbfdmInstallMicroServiceInputFile,$(1),./files/etc/tr104/input.json)
+	$(INSTALL_BIN) ./files/etc/init.d/tr104d.bbfdm $(1)/etc/init.d/tr104d
 else
-	$(INSTALL_BIN) ./files/etc/tr104/input.json $(1)/etc/tr104/input.json
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/daemon/ubus/tr104d $(1)/usr/sbin/
 	$(INSTALL_BIN) ./files/etc/init.d/tr104d $(1)/etc/init.d/tr104d
--- a/tr104/files/etc/init.d/tr104d.bbfdm
+++ b/tr104/files/etc/init.d/tr104d.bbfdm
@@ -0,0 +1,12 @@
+#!/bin/sh /etc/rc.common
+
+START=60
+STOP=10
+
+USE_PROCD=1
+. /etc/bbfdm/bbfdm_services.sh
+
+start_service()
+{
+	bbfdm_add_service "tr104" "/etc/tr104/input.json"
+}
--- a/urlfilter/Makefile
+++ b/urlfilter/Makefile
@@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk

 PKG_NAME:=urlfilter
-PKG_VERSION:=1.1.12
+PKG_VERSION:=1.1.9

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/network/urlfilter.git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/urlfilter.git
 PKG_SOURCE_VERSION:=75077256211644443ca30cc994ef16b013c4131c
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -21,7 +21,7 @@ PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE

 include $(INCLUDE_DIR)/package.mk
-include $(TOPDIR)/feeds/iopsys/bbfdm/bbfdm.mk
+include ../bbfdm/bbfdm.mk

 define Package/urlfilter
  SECTION:=utils
@@ -47,13 +47,10 @@ define Package/urlfilter/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
-	$(INSTALL_DIR) $(1)/etc/urlfilter
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/urlfilter $(1)/usr/sbin
 	$(INSTALL_BIN) ./files/etc/init.d/urlfilter $(1)/etc/init.d/
 	$(INSTALL_DATA) ./files/etc/config/urlfilter $(1)/etc/config/
-	$(call BbfdmInstallPluginInMicroservice,$(1)/etc/urlfilter,./files/etc/urlfilter/urlfilter.json)
-	$(call BbfdmInstallMicroServiceInputFile,$(1),./files/etc/urlfilter/input.json)
+	$(call BbfdmInstallPlugin,$(1),./files/etc/bbfdm/plugins/urlfilter.json)
 endef

 $(eval $(call BuildPackage,urlfilter))
--- a/urlfilter/files/etc/bbfdm/plugins/urlfilter.json
+++ b/urlfilter/files/etc/bbfdm/plugins/urlfilter.json
@@ -1,7 +1,8 @@
 {
-	"json_plugin_version": 2,
+	"json_plugin_version": 1,
 	"Device.{BBF_VENDOR_PREFIX}URLFilter.": {
 		"type": "object",
+		"version": "2.14",
 		"protocols": [
 			"cwmp",
 			"usp"
@@ -11,6 +12,7 @@
 		"array": false,
 		"Enable": {
 			"type": "boolean",
+			"version": "2.14",
 			"read": true,
 			"write": true,
 			"protocols": [
@@ -35,6 +37,7 @@
 		},
 		"GlobalBlacklist": {
 			"type": "boolean",
+			"version": "2.14",
 			"read": true,
 			"write": true,
 			"protocols": [
@@ -59,6 +62,7 @@
 		},
 		"BlacklistURL": {
 			"type": "string",
+			"version": "2.14",
 			"read": true,
 			"write": true,
 			"protocols": [
@@ -88,11 +92,11 @@
 			"type": "unsignedInt",
 			"read": true,
 			"write": false,
+			"version": "2.14",
 			"protocols": [
 				"cwmp",
 				"usp"
 			],
-			"datatype": "unsignedInt",
 			"description": "<<numentries>>",
 			"mapping": [
 				{
@@ -111,6 +115,7 @@
 		},
 		"Device.{BBF_VENDOR_PREFIX}URLFilter.Profile.{i}.": {
 			"type": "object",
+			"version": "2.14",
 			"protocols": [
 				"cwmp",
 				"usp"
@@ -137,6 +142,7 @@
 				"type": "string",
 				"read": true,
 				"write": false,
+				"version": "2.14",
 				"protocols": [
 					"cwmp",
 					"usp"
@@ -153,9 +159,16 @@
 				],
 				"mapping": [
 					{
-						"data": "@Parent",
-						"type": "uci_sec",
-						"key": "@Name"
+						"type": "uci",
+						"uci": {
+							"file": "urlfilter",
+							"section": {
+								"type": "profile"
+							},
+							"option": {
+								"name": "@Name"
+							}
+						}
 					}
 				]
 			},
@@ -163,6 +176,7 @@
 				"type": "string",
 				"read": true,
 				"write": true,
+				"version": "2.14",
 				"protocols": [
 					"cwmp",
 					"usp"
@@ -176,14 +190,22 @@
 				],
 				"mapping": [
 					{
-						"data": "@Parent",
-						"type": "uci_sec",
-						"key": "name"
+						"type": "uci",
+						"uci": {
+							"file": "urlfilter",
+							"section": {
+								"type": "profile"
+							},
+							"option": {
+								"name": "name"
+							}
+						}
 					}
 				]
 			},
 			"WhitelistURL": {
 				"type": "string",
+				"version": "2.14",
 				"read": true,
 				"write": true,
 				"protocols": [
@@ -196,14 +218,22 @@
 				},
 				"mapping": [
 					{
-						"data": "@Parent",
-						"type": "uci_sec",
-						"list": "whitelist_url"
+						"type": "uci",
+						"uci": {
+							"file": "urlfilter",
+							"section": {
+								"type": "profile"
+							},
+							"list": {
+								"name": "whitelist_url"
+							}
+						}
 					}
 				]
 			},
 			"BlacklistURL": {
 				"type": "string",
+				"version": "2.14",
 				"read": true,
 				"write": true,
 				"protocols": [
@@ -216,9 +246,16 @@
 				},
 				"mapping": [
 					{
-						"data": "@Parent",
-						"type": "uci_sec",
-						"list": "blacklist_url"
+						"type": "uci",
+						"uci": {
+							"file": "urlfilter",
+							"section": {
+								"type": "profile"
+							},
+							"list": {
+								"name": "blacklist_url"
+							}
+						}
 					}
 				]
 			}
@@ -227,11 +264,11 @@
 			"type": "unsignedInt",
 			"read": true,
 			"write": false,
+			"version": "2.14",
 			"protocols": [
 				"cwmp",
 				"usp"
 			],
-			"datatype": "unsignedInt",
 			"description": "<<numentries>>",
 			"mapping": [
 				{
@@ -250,6 +287,7 @@
 		},
 		"Device.{BBF_VENDOR_PREFIX}URLFilter.Filter.{i}.": {
 			"type": "object",
+			"version": "2.14",
 			"protocols": [
 				"cwmp",
 				"usp"
@@ -271,6 +309,7 @@
 			],
 			"Enable": {
 				"type": "boolean",
+				"version": "2.14",
 				"read": true,
 				"write": true,
 				"protocols": [
@@ -280,35 +319,51 @@
 				"description": "Enable or disable this filter instance on the CPE.",
 				"mapping": [
 					{
-						"data": "@Parent",
-						"type": "uci_sec",
-						"key": "enable"
+						"type": "uci",
+						"uci": {
+							"file": "urlfilter",
+							"section": {
+								"type": "filter"
+							},
+							"option": {
+								"name": "enable"
+							}
+						}
 					}
 				]
 			},
 			"Profile": {
 				"type": "string",
+				"version": "2.14",
 				"read": true,
 				"write": true,
 				"protocols": [
 					"cwmp",
 					"usp"
 				],
-				"flags": [
+			"flags": [
 					"Reference"
 				],
 				"description": "Path of the <<object|Profile>> that should be applied.",
 				"mapping": [
 					{
-						"data": "@Parent",
-						"type": "uci_sec",
-						"key": "profile",
+						"type": "uci",
+						"uci": {
+							"file": "urlfilter",
+							"section": {
+								"type": "filter"
+							},
+							"option": {
+								"name": "profile"
+							}
+						},
 						"linker_obj": "Device.{BBF_VENDOR_PREFIX}URLFilter.Profile.*.Alias"
 					}
 				]
 			},
 			"MACAddress": {
 				"type": "string",
+				"version": "2.14",
 				"read": true,
 				"write": true,
 				"protocols": [
@@ -321,14 +376,22 @@
 				},
 				"mapping": [
 					{
-						"data": "@Parent",
-						"type": "uci_sec",
-						"list": "macaddr"
+						"type": "uci",
+						"uci": {
+							"file": "urlfilter",
+							"section": {
+								"type": "filter"
+							},
+							"list": {
+								"name": "macaddr"
+							}
+						}
 					}
 				]
 			},
 			"Day": {
 				"type": "string",
+				"version": "2.14",
 				"read": true,
 				"write": true,
 				"protocols": [
@@ -341,14 +404,22 @@
 				},
 				"mapping": [
 					{
-						"data": "@Parent",
-						"type": "uci_sec",
-						"list": "day"
+						"type": "uci",
+						"uci": {
+							"file": "urlfilter",
+							"section": {
+								"type": "filter"
+							},
+							"list": {
+								"name": "day"
+							}
+						}
 					}
 				]
 			},
 			"StartTime": {
 				"type": "string",
+				"version": "2.14",
 				"read": true,
 				"write": true,
 				"protocols": [
@@ -358,14 +429,22 @@
 				"description": "Time when filtering shall start.",
 				"mapping": [
 					{
-						"data": "@Parent",
-						"type": "uci_sec",
-						"key": "start_time"
+						"type": "uci",
+						"uci": {
+							"file": "urlfilter",
+							"section": {
+								"type": "filter"
+							},
+							"option": {
+								"name": "start_time"
+							}
+						}
 					}
 				]
 			},
 			"Duration": {
 				"type": "string",
+				"version": "2.14",
 				"read": true,
 				"write": true,
 				"protocols": [
@@ -375,9 +454,16 @@
 				"description": "The duration in seconds to filter the URLs from start time.",
 				"mapping": [
 					{
-						"data": "@Parent",
-						"type": "uci_sec",
-						"key": "duration"
+						"type": "uci",
+						"uci": {
+							"file": "urlfilter",
+							"section": {
+								"type": "filter"
+							},
+							"option": {
+								"name": "duration"
+							}
+						}
 					}
 				]
 			}
--- a/urlfilter/files/etc/init.d/urlfilter
+++ b/urlfilter/files/etc/init.d/urlfilter
@@ -37,7 +37,6 @@ configure_firewall()
 }

 start_service() {
-
 	if [ "$(uci -q get urlfilter.globals.enable)" == "1" ]; then
 		procd_open_instance urlfilter
 		procd_set_param command ${PROG}
--- a/urlfilter/files/etc/urlfilter/input.json
+++ b/urlfilter/files/etc/urlfilter/input.json
@@ -1,17 +0,0 @@
-{
-	"daemon": {
-		"config": {
-			"loglevel": "1"
-		},
-		"input": {
-			"type": "JSON",
-			"name": "/etc/urlfilter/urlfilter.json"
-		},
-		"output": {
-			"type": "UBUS",
-			"parent_dm": "Device.",
-			"object": "{BBF_VENDOR_PREFIX}URLFilter",
-			"root_obj": "bbfdm"
-		}
-	}
-}
--- a/usermngr/Makefile
+++ b/usermngr/Makefile
@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=usermngr
-PKG_VERSION:=1.2.13
+PKG_VERSION:=1.2.12

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/usermngr.git
-PKG_SOURCE_VERSION:=497148226e0ada16656a6971c5e66a023c740e87
+PKG_SOURCE_VERSION:=b09414824b95f2a73e6f02b06d4efd15bfab77e0
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
--- a/usp-js/Makefile
+++ b/usp-js/Makefile
@@ -6,11 +6,11 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=usp-js
-PKG_VERSION:=1.2.5
+PKG_VERSION:=1.2.4

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/usp-js.git
-PKG_SOURCE_VERSION:=fa4586a0fc5fe13bc83165c8401e63d84db89e72
+PKG_SOURCE_VERSION:=0cb6c0ce635918cd7f73bb22c924d432dfcab647
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

--- a/voicemngr/Makefile
+++ b/voicemngr/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=voicemngr
 PKG_RELEASE:=1
-PKG_VERSION:=1.1.9
+PKG_VERSION:=1.1.8
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE

@@ -19,7 +19,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:=6ca306ea8e0bcc38deb94961b3ecac3bad3d046c
+PKG_SOURCE_VERSION:=c6c95fafefc39705217afd6743ab1da2a14ac417
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
--- a/wifimngr/Makefile
+++ b/wifimngr/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=wifimngr
-PKG_VERSION:=17.0.15
+PKG_VERSION:=16.2.11

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=778e7d99ec4440a91604aac2b6893c288b73e473
+PKG_SOURCE_VERSION:=646887db86a4e115455f5bf78d05540f21e76be7
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wifimngr.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
--- a/xmppc/Makefile
+++ b/xmppc/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=xmppc
-PKG_VERSION:=2.2.5
+PKG_VERSION:=2.2.4

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/xmppc.git
-PKG_SOURCE_VERSION:=c50c7ddb92967f3ee1518e40eee776bd62bc745a
+PKG_SOURCE_VERSION:=543c7a780544d195dd8d0357e453c0ce4fa62454
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -28,6 +28,7 @@ PKG_LICENSE_FILES:=LICENSE
 MAKE_PATH:=src

 include $(INCLUDE_DIR)/package.mk
+include ../bbfdm/bbfdm.mk

 define Package/$(PKG_NAME)
  SECTION:=utils
@@ -52,11 +53,10 @@ TARGET_CFLAGS += \
 	-Wall -Werror

 define Package/$(PKG_NAME)/install
-	$(INSTALL_DIR) $(1)/etc/icwmpd/plugins
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/libxmppc.so $(1)/etc/icwmpd/plugins/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/xmppc $(1)/usr/sbin/
 	$(CP) ./files/* $(1)/
+	$(call BbfdmInstallPlugin,$(1),$(PKG_BUILD_DIR)/src/libxmppc.so)
 endef

 $(eval $(call BuildPackage,$(PKG_NAME)))
Author	SHA1	Message	Date
nevadita.chatterjee	3b5c5258ba	map-controller: 4.6.0.5.2	2024-03-21 16:30:47 +05:30
Marek Puzyniak	18194372c6	map-agent: 4.5.1.15.1	2024-03-14 15:54:39 +00:00
Marek Puzyniak	4ef53b8a21	map-controller: 4.6.0.5.1	2024-03-14 15:53:14 +00:00
Marek Puzyniak	ae7eb0e3db	ieee1905: 8.3.7.1	2024-03-14 13:31:14 +00:00