timemngr: 1.1.0

* add dependencies for different backends in dhcpmngr and
  dnsmngr
* use CFLAG to indicate to data model code which backend is being
  used currently
* add uci-defaults script to set leasetrigger if unbound is dns
  backend

bbfdm/Config_bbfdm.in

@@ -1,7 +1,4 @@
-config BBF_VENDOR_EXTENSION
-	bool "Enable Vendor Extension"
-	default y
-
+if PACKAGE_libbbfdm
 config BBF_VENDOR_LIST
 	string "Vendor List"
 	default "iopsys"
@@ -10,22 +7,11 @@ config BBF_VENDOR_PREFIX
 	string "Vendor Prefix"
 	default "X_IOPSYS_EU_"
 
-config BBF_TR143
-	bool "Enable TR-143 Data Model Support"
-	default y
-
-config BBF_TR471
-	bool "Enable TR-471 Data Model Support"
-	default y
-
-config BBFDM_ENABLE_JSON_PLUGIN
-	bool "Enable json plugin to extend datamodel"
-	default y
-
-config BBFDM_ENABLE_DOTSO_PLUGIN
-	bool "Enable shared library plugin to extend datamodel"
-	default y
+config BBF_OBFUSCATION_KEY
+	string "Obfuscation key"
+	default "371d530c95a17d1ca223a29b7a6cdc97e1135c1e0959b51106cca91a0b148b5e42742d372a359760742803f2a44bd88fca67ccdcfaeed26d02ce3b6049cb1e04"
 
 config BBF_MAX_OBJECT_INSTANCES
 	int "Maximum number of instances per object"
 	default 255
+endif

bbfdm/Makefile

@@ -5,68 +5,48 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bbfdm
-PKG_VERSION:=1.3.30
+PKG_VERSION:=1.11.0
 
+USE_LOCAL:=0
+ifneq ($(USE_LOCAL),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bbfdm.git
-PKG_SOURCE_VERSION:=60171c88176bd0e8d8cb67ddea3cb4f40b834f17
+PKG_SOURCE_VERSION:=1537993fc84f9abf367d39c2b83676c5c6d5c58c
 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 $(INCLUDE_DIR)/cmake.mk
+include bbfdm.mk
 
 define Package/libbbfdm-api
   SECTION:=utils
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=BBF datamodel library, provides API to extend datamodel using DotSO plugins
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libcurl
   ABI_VERSION:=1.0
 endef
 
-define Package/libbbfdm/default
+define Package/libbbfdm-ubus
+  SECTION:=utils
+  CATEGORY:=Utilities
+  SUBMENU:=TRx69
+  TITLE:=BBF datamodel ubus library, provides API to expose datamodel over ubus
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbfdm-api
+endef
+
+define Package/libbbfdm
   SECTION:=utils
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=Library for broadband forum data model support
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libcurl +libbbfdm-api \
-	    +BBF_TR471:obudpst
-endef
-
-define Package/libbbfdm
-  $(Package/libbbfdm/default)
-  TITLE += (default)
-  VARIANT:=default
-  DEPENDS += +PACKAGE_libbbfdm-openssl:libopenssl
-  DEFAULT_VARIANT:=1
-endef
-
-define Package/libbbfdm-mbedtls
-  $(Package/libbbfdm/default)
-  TITLE += (mbedtls)
-  DEPENDS += +PACKAGE_libbbfdm-mbedtls:libmbedtls
-  VARIANT:=mbedtls
-  CONFLICTS := libbbfdm libbbfdm-openssl libbbfdm-wolfssl
-endef
-
-define Package/libbbfdm-openssl
-  $(Package/libbbfdm/default)
-  TITLE += (openssl)
-  DEPENDS += +PACKAGE_libbbfdm-openssl:libopenssl
-  VARIANT:=openssl
-  CONFLICTS := libbbfdm libbbfdm-mbedtls libbbfdm-wolfssl
-endef
-
-define Package/libbbfdm-wolfssl
-  $(Package/libbbfdm/default)
-  TITLE += (wolfssl)
-  DEPENDS += +PACKAGE_libbbfdm-wolfssl:libwolfssl
-  VARIANT:=wolfssl
-  CONFLICTS := libbbfdm libbbfdm-mbedtls libbbfdm-openssl
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbfdm-api +libopenssl
+  MENU:=1
 endef
 
 define Package/bbfdmd
@@ -74,92 +54,56 @@ define Package/bbfdmd
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=Datamodel ubus backend
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libbbfdm-api +PACKAGE_libbbfdm-mbedtls:libbbfdm-mbedtls \
-		   +PACKAGE_libbbfdm-openssl:libbbfdm-openssl +PACKAGE_libbbfdm-wolfssl:libbbfdm-wolfssl \
-		   +PACKAGE_libbbfdm:libbbfdm
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libbbfdm-api +libbbfdm-ubus +libbbfdm +jq +bbf_configmngr
 endef
 
-define Package/userinterface
+define Package/bbf_configmngr
   SECTION:=utils
   CATEGORY:=Utilities
   SUBMENU:=TRx69
-  TITLE:=Package to add Device.UserInterface. datamodel support
-endef
-
-define Package/userinterface/description
-  Package to add Device.UserInterface. datamodel support
+  TITLE:= BBF Config Manager
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json
+  MENU:=1
 endef
 
 define Package/libbbfdm/config
 	source "$(SOURCE)/Config_bbfdm.in"
 endef
 
+define Package/bbf_configmngr/config
+	source "$(SOURCE)/bbf_configmngr.in"
+endef
+
 define Package/libbbfdm-api/description
  Library contains the API(UCI, UBUS, JSON, CLI and Browse) of libbbfdm
 endef
 
-define Package/libbbfdm/description
- Library contains the data model tree. It includes TR181, TR143 data models
+define Package/libbbfdm-ubus/description
+ Library contains the APIs to expose data model over ubus
 endef
 
-USE_LOCAL=$(shell ls ./src/ 2>/dev/null >/dev/null && echo 1)
-ifneq ($(USE_LOCAL),)
+define Package/libbbfdm/description
+ Library contains the data model tree, It includes basic TR181 nodes.
+endef
+
+define Package/bbf_configmngr/description
+ Daemon for handling bbf reload services via ubus bbf.config
+endef
+
+ifeq ($(USE_LOCAL),1)
 define Build/Prepare
-	$(CP) ./src/* $(PKG_BUILD_DIR)/
+	$(CP) ~/git/bbfdm/* $(PKG_BUILD_DIR)/
 endef
 endif
 
 CMAKE_OPTIONS += \
 	-DBBF_TR181=ON
-	-DBBF_WIFI_DATAELEMENTS=ON
-
-ifeq ($(CONFIG_BBF_TR143),y)
-CMAKE_OPTIONS += \
-	-DBBF_TR143=ON
-endif
-
-ifeq ($(CONFIG_BBF_TR471),y)
-CMAKE_OPTIONS += \
-	-DBBF_TR471=ON
-endif
-
-ifeq ($(CONFIG_BBF_VENDOR_EXTENSION),y)
-CMAKE_OPTIONS += \
-	-DBBF_VENDOR_EXTENSION=ON
 
 CMAKE_OPTIONS += \
 	-DBBF_VENDOR_LIST:String="$(CONFIG_BBF_VENDOR_LIST)" \
 	-DBBF_VENDOR_PREFIX:String="$(CONFIG_BBF_VENDOR_PREFIX)" \
 	-DBBF_MAX_OBJECT_INSTANCES:Integer=$(CONFIG_BBF_MAX_OBJECT_INSTANCES)
 
-endif ##CONFIG_BBF_VENDOR_EXTENSION
-
-ifeq ($(CONFIG_BBFDM_ENABLE_JSON_PLUGIN),y)
-CMAKE_OPTIONS += \
-	-DBBF_JSON_PLUGIN=ON
-endif
-
-ifeq ($(CONFIG_BBFDM_ENABLE_DOTSO_PLUGIN),y)
-CMAKE_OPTIONS += \
-	-DBBF_DOTSO_PLUGIN=ON
-endif
-
-ifeq ($(BUILD_VARIANT),default)
-CMAKE_OPTIONS += -DWITH_OPENSSL=ON
-endif
-
-ifeq ($(BUILD_VARIANT),openssl)
-CMAKE_OPTIONS += -DWITH_OPENSSL=ON
-endif
-
-ifeq ($(BUILD_VARIANT),wolfssl)
-CMAKE_OPTIONS += -DWITH_WOLFSSL=ON
-endif
-
-ifeq ($(BUILD_VARIANT),mbedtls)
-CMAKE_OPTIONS += -DWITH_MBEDTLS=ON
-endif
-
 ifeq ($(CONFIG_PACKAGE_bbfdmd),y)
 CMAKE_OPTIONS += \
 	-DBBFDMD_MAX_MSG_LEN:Integer=10485760
@@ -168,30 +112,45 @@ endif
 define Package/libbbfdm-api/install
 	$(INSTALL_DIR) $(1)/lib
 	$(CP) $(PKG_BUILD_DIR)/libbbfdm-api/libbbfdm-api.so $(1)/lib/
-endef
 
-define Package/libbbfdm/default/install
-	$(INSTALL_DIR) $(1)/lib
-	$(INSTALL_DIR) $(1)/etc/bbfdm
-	$(INSTALL_DIR) $(1)/etc/bbfdm/dmmap
-	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
-	$(CP) $(PKG_BUILD_DIR)/libbbfdm/libbbfdm.so $(1)/lib/
-	$(INSTALL_DATA) ./files/lib/upgrade/keep.d/bbf $(1)/lib/upgrade/keep.d/bbf
-ifeq ($(CONFIG_BBF_TR143),y)
-	$(INSTALL_DIR) $(1)/usr/share/bbfdm
 	$(INSTALL_DIR) $(1)/usr/libexec/rpcd
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libbbfdm/scripts/* $(1)/usr/share/bbfdm
-	$(LN) /usr/share/bbfdm/bbf.diag $(1)/usr/libexec/rpcd/bbf.diag
-endif
-ifeq ($(CONFIG_BBFDM_ENABLE_JSON_PLUGIN),y)
-	$(INSTALL_DIR) $(1)/etc/bbfdm/json
-endif
-ifeq ($(CONFIG_BBFDM_ENABLE_DOTSO_PLUGIN),y)
-	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
-endif
+	$(CP) $(PKG_BUILD_DIR)/utilities/files/usr/libexec/rpcd/bbf.secure $(1)/usr/libexec/rpcd/bbf.secure
+	$(CP) $(PKG_BUILD_DIR)/utilities/files/usr/libexec/rpcd/bbf.diag $(1)/usr/libexec/rpcd/bbf.diag
+
+	$(INSTALL_DIR) $(1)/usr/share/bbfdm/scripts/
+	$(CP) $(PKG_BUILD_DIR)/utilities/files/usr/share/bbfdm/scripts/bbf_api $(1)/usr/share/bbfdm/scripts/
+
+	$(INSTALL_DIR) $(1)/etc/bbfdm/certificates
+	echo "$(CONFIG_BBF_OBFUSCATION_KEY)" > $(1)/etc/bbfdm/.secure_hash
 endef
 
-define Package/libbbfdm/default/prerm
+define Package/libbbfdm-ubus/install
+	$(INSTALL_DIR) $(1)/lib
+	$(CP) $(PKG_BUILD_DIR)/libbbfdm-ubus/libbbfdm-ubus.so $(1)/lib/
+endef
+
+define Package/libbbfdm/install
+	$(INSTALL_DIR) $(1)/etc/bbfdm/dmmap
+
+	$(INSTALL_DIR) $(1)/usr/share/bbfdm/
+	$(CP) $(PKG_BUILD_DIR)/libbbfdm/libbbfdm.so $(1)/usr/share/bbfdm/libbbfdm.so
+
+	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
+	$(INSTALL_DATA) ./files/lib/upgrade/keep.d/bbf $(1)/lib/upgrade/keep.d/bbf
+
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
+	$(INSTALL_BIN) ./files/etc/uci-defaults/91-fix-bbfdmd-enabled-option $(1)/etc/uci-defaults/
+
+ifeq ($(findstring iopsys,$(CONFIG_BBF_VENDOR_LIST)),iopsys)
+	$(BBFDM_INSTALL_CORE_PLUGIN) $(PKG_BUILD_DIR)/libbbfdm/dmtree/vendor/iopsys/libbbfdm_iopsys_ext.so $(1)
+endif
+
+	$(INSTALL_DIR) $(1)/usr/share/bbfdm/scripts/
+	$(CP) $(PKG_BUILD_DIR)/utilities/files/usr/share/bbfdm/scripts/bbf_activate_handler.sh $(1)/usr/share/bbfdm/scripts/
+	$(CP) $(PKG_BUILD_DIR)/utilities/files/usr/share/bbfdm/scripts/bbf_check_idle.sh $(1)/usr/share/bbfdm/scripts/
+endef
+
+define Package/libbbfdm/prerm
 	#!/bin/sh
 	rm -rf /etc/bbfdm/dmmap/*
 	exit 0
@@ -203,59 +162,41 @@ define Package/bbfdmd/install
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/etc/bbfdm
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) ./files/etc/init.d/bbfdmd $(1)/etc/init.d/bbfdmd
-	$(INSTALL_BIN) ./files/etc/hotplug.d/iface/85-bbfdm-sysctl $(1)/etc/hotplug.d/iface/85-bbfdm-sysctl
-	$(INSTALL_CONF) ./files/etc/config/bbfdm $(1)/etc/config/bbfdm
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbfdmd/ubus/bbfdmd $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/json/input.json $(1)/etc/bbfdm/
-	$(INSTALL_BIN) ./files/etc/bbfdm/bbfdm_services.sh $(1)/etc/bbfdm/
+	$(INSTALL_DATA) ./files/etc/bbfdm/input.json $(1)/etc/bbfdm/
+	$(INSTALL_BIN) ./files/etc/init.d/bbfdmd $(1)/etc/init.d/bbfdmd
+	$(INSTALL_BIN) ./files/etc/init.d/bbfdm.services $(1)/etc/init.d/
+	$(INSTALL_CONF) ./files/etc/config/bbfdm $(1)/etc/config/bbfdm
+	$(INSTALL_BIN) ./files/etc/hotplug.d/iface/85-bbfdm-sysctl $(1)/etc/hotplug.d/iface/85-bbfdm-sysctl
 endef
 
-define Package/userinterface/install
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
+define Package/bbf_configmngr/install
 	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
-	$(INSTALL_DATA) ./files/etc/config/userinterface $(1)/etc/config/userinterface
-	$(INSTALL_DATA) ./files/lib/upgrade/keep.d/userinterface $(1)/lib/upgrade/keep.d/userinterface
-	$(INSTALL_BIN) ./files/etc/init.d/userinterface $(1)/etc/init.d/userinterface
-	$(INSTALL_BIN) ./files/etc/uci-defaults/93-userinterface-firewall $(1)/etc/uci-defaults/93-userinterface-firewall
-	$(INSTALL_BIN) ./files/etc/uci-defaults/94-userinterface-json $(1)/etc/uci-defaults/94-userinterface-json
-	$(INSTALL_BIN) ./files/etc/uci-defaults/95-portmap-firewall $(1)/etc/uci-defaults/95-portmap-firewall
-	$(INSTALL_BIN) ./files/etc/firewall.userinterface $(1)/etc/firewall.userinterface
-	$(INSTALL_BIN) ./files/etc/firewall.portmap $(1)/etc/firewall.portmap
+ifeq ($(CONFIG_BBF_CONFIGMNGR_C_BACKEND),y)
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/utilities/bbf_configd $(1)/usr/sbin/
+	$(INSTALL_BIN) ./files/etc/init.d/bbf_configd $(1)/etc/init.d/bbf_configd
+endif
+ifeq ($(CONFIG_BBF_CONFIGMNGR_SCRIPT_BACKEND),y)
+	$(INSTALL_DIR) $(1)/usr/libexec/rpcd
+	$(CP) $(PKG_BUILD_DIR)/utilities/files/usr/libexec/rpcd/bbf.config $(1)/usr/libexec/rpcd/bbf.config
+endif
 endef
 
-Package/libbbfdm/prerm = $(Package/libbbfdm/default/prerm)
-Package/libbbfdm-openssl/prerm = $(Package/libbbfdm/default/prerm)
-Package/libbbfdm-wolfssl/prerm = $(Package/libbbfdm/default/prerm)
-Package/libbbfdm-mbedtls/prerm = $(Package/libbbfdm/default/prerm)
-
-Package/libbbfdm/install = $(Package/libbbfdm/default/install)
-Package/libbbfdm-openssl/install = $(Package/libbbfdm/default/install)
-Package/libbbfdm-wolfssl/install = $(Package/libbbfdm/default/install)
-Package/libbbfdm-mbedtls/install = $(Package/libbbfdm/default/install)
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/include/libbbfdm
 	$(INSTALL_DIR) $(1)/usr/include/libbbfdm-api
-	$(INSTALL_DIR) $(1)/usr/include/libbbf_api
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-api/include/*.h $(1)/usr/include/
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm/dmtree/tr181/device.h $(1)/usr/include/libbbfdm/
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm/dmtree/vendor/vendor.h $(1)/usr/include/libbbfdm/
+	$(INSTALL_DIR) $(1)/usr/include/libbbfdm-ubus
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-api/*.h $(1)/usr/include/libbbfdm-api/
-	# Work around for backward compatibility
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-api/*.h $(1)/usr/include/libbbf_api/
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-api/include/libbbfdm_api.h $(1)/usr/include/libbbf_api.h
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-ubus/bbfdm-ubus.h $(1)/usr/include/libbbfdm-ubus/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-api/include/*.h $(1)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/libbbfdm-api/libbbfdm-api.so $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libbbfdm-ubus/libbbfdm-ubus.so $(1)/usr/lib
 endef
 
+$(eval $(call BuildPackage,bbf_configmngr))
 $(eval $(call BuildPackage,libbbfdm-api))
+$(eval $(call BuildPackage,libbbfdm-ubus))
 $(eval $(call BuildPackage,libbbfdm))
-$(eval $(call BuildPackage,libbbfdm-openssl))
-$(eval $(call BuildPackage,libbbfdm-wolfssl))
-$(eval $(call BuildPackage,libbbfdm-mbedtls))
 $(eval $(call BuildPackage,bbfdmd))
-
-$(eval $(call BuildPackage,userinterface))

bbfdm/README.md

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

bbfdm/bbf_configmngr.in

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

bbfdm/bbfdm.mk

@@ -0,0 +1,114 @@
+#
+# Copyright (C) 2023 IOPSYS
+#
+
+BBFDM_BASE_DM_PATH=/usr/share/bbfdm
+BBFDM_INPUT_PATH=/etc/bbfdm/micro_services
+BBFDM_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
+
+#BBFDM_VERSION:=$(shell grep -oP '(?<=^PKG_VERSION:=).*' ${BBFDM_DIR}/Makefile)
+#BBFDM_TOOLS:=$(BUILD_DIR)/bbfdm-$(BBFDM_VERSION)/tools
+
+# Utility to install the plugin in bbfdm core path 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.
+#
+# ARGS:
+#  $1 => Plugin artifact
+#  $2 => package install directory
+#  $3 => Priority of the installed plugin (Optional)
+#
+# Note:
+# - Last loaded plugin gets the highest priority
+#
+# Example:
+#  BBFDM_INSTALL_CORE_PLUGIN ./files/etc/bbfdm/json/CWMPManagementServer.json $(1)
+#
+# Example to install plugin with priority:
+#  BBFDM_INSTALL_CORE_PLUGIN ./files/etc/bbfdm/json/CWMPManagementServer.json $(1) 01
+#
+BBFDM_INSTALL_CORE_PLUGIN:=$(BBFDM_DIR)/tools/bbfdm.sh -p
+
+
+# Utility to install the micro-service datamodel
+# Use Case:
+# user wants to run a datamodel micro-service, it required to install the
+# DotSO/JSON plugin into a bbf shared directory, this utility helps in
+# installing the DotSO/JSON plugin in bbfdm shared directory, and auto-generate
+# input file for the micro-service
+#
+# ARGS:
+#  $1 => DotSo or Json plugin with complete path
+#  $2 => package install directory
+#  $3 => service name
+#
+# Note:
+# - There could be only one main plugin file, so its bind to PKG_NAME
+# - Micro-service input.json will be auto generated with this call
+# - Use -u (optional argument) to overwrite ubus object name
+#
+# Example:
+#  BBFDM_INSTALL_MS_DM $(PKG_BUILD_DIR)/libcwmp.so $(1) $(PKG_NAME)
+#
+BBFDM_INSTALL_MS_DM:=$(BBFDM_DIR)/tools/bbfdm.sh -m
+
+
+# Utility to install a plugins in datamodel micro-service
+#
+# ARGS:
+#  $1 => DotSo or Json plugin with complete path
+#  $2 => package install directory
+#  $3 => service name
+#
+# Note:
+# - Use the service_name/PKG_NAME of the service in which this has to run
+#
+# Example:
+#  BBFDM_INSTALL_MS_PLUGIN $(PKG_BUILD_DIR)/libxmpp.so $(1) icwmp
+#
+BBFDM_INSTALL_MS_PLUGIN:=$(BBFDM_DIR)/tools/bbfdm.sh -m -p
+
+# Utility to install the helper scripts in default bbfdm script path
+#
+# Use Case:
+# User want to install some script for running diagnostics
+#
+# ARGS:
+#  $1 => Script with complete path
+#  $2 => package install directory
+#
+# Note:
+# - Use with -d option to install script in bbf.diag directory
+#
+# Example:
+#  BBFDM_INSTALL_SCRIPT $(PKG_BUILD_DIR)/download $(1)
+#  BBFDM_INSTALL_SCRIPT -d $(PKG_BUILD_DIR)/ipping $(1)
+#
+BBFDM_INSTALL_SCRIPT:=$(BBFDM_DIR)/tools/bbfdm.sh -s
+
+# Deprecated functions errors
+define BbfdmInstallPluginInMicroservice
+	$(warning # BbfdmInstallPluginInMicroservice function is deprecated, use BBFDM_INSTALL_MS_PLUGIN macro #)
+	$(INSTALL_DIR) $(1)
+	$(INSTALL_DATA) $(2) $(1)/
+endef
+
+define BbfdmInstallMicroServiceInputFile
+	$(warning # function BbfdmInstallMicroServiceInputFile deprecated, input file auto generated with BBFDM_INSTALL_MS_DM #)
+	$(INSTALL_DIR) $(1)/etc/bbfdm/micro_services
+	$(INSTALL_DATA) $(2) $(1)/etc/bbfdm/micro_services/$(PKG_NAME).json
+endef
+
+define BbfdmInstallPlugin
+	$(warning # function BbfdmInstallPlugin deprecated, use BBFDM_INSTALL_CORE_PLUGIN macro #)
+	$(INSTALL_DIR) $(1)/etc/bbfdm/plugins
+	$(INSTALL_DATA) $(2) $(1)/etc/bbfdm/plugins/
+endef
+
+define BbfdmInstallPluginWithPriority
+	$(warning # fucntion BbfdmInstallPluginWithPriority deprecated, use BBFDM_INSTALL_CORE_PLUGIN #)
+	$(INSTALL_DIR) $(1)/etc/bbfdm/plugins
+	$(INSTALL_DATA) $(3) $(1)/etc/bbfdm/plugins/$(2)_$(shell basename ${3})
+endef

bbfdm/files/etc/bbfdm/bbfdm_services.sh

@@ -1,17 +0,0 @@
-#!/bin/sh
-
-BBFDMD="/usr/sbin/bbfdmd"
-
-bbfdm_add_service()
-{
-	local name path
-
-	name="${1}"
-	path="${2}"
-
-	if [ -z "${name}" -o -z "$path" ]; then
-		return 0;
-	fi
-
-	ubus call service add "{'name':'bbfdm.services','instances':{'$name':{'command':['$BBFDMD','-m','$path'], 'respawn': [0]}}}"
-}

bbfdm/files/etc/bbfdm/input.json

@@ -0,0 +1,28 @@
+{
+        "daemon": {
+                "config": {
+                },
+                "input": {
+                        "type": "DotSo",
+                        "name": "/usr/share/bbfdm/libbbfdm.so",
+                        "plugin_dir": "/usr/share/bbfdm/plugins"
+                },
+                "output": {
+                        "type": "UBUS",
+                        "name": "bbfdm"
+                }
+        },
+        "cli": {
+                "config": {
+                        "proto": "both",
+                        "instance_mode": 0
+                },
+                "input": {
+                        "type": "UBUS",
+                        "name": "bbfdm"
+                },
+                "output": {
+                        "type": "CLI"
+                }
+        }
+}

bbfdm/files/etc/config/bbfdm

@@ -1,7 +1,9 @@
-
 config bbfdmd 'bbfdmd'
-	option enabled '1'
-	option loglevel '1'
-	option refresh_time '10'
-	option transaction_timeout '30'
+	option enable '1'
+	option loglevel '3'
+	option subprocess_level '2'
 
+config micro_services 'micro_services'
+	option enable '1'
+	option enable_core '0'
+	option enable_respawn '1'

bbfdm/files/etc/init.d/bbf_configd

@@ -0,0 +1,25 @@
+#!/bin/sh /etc/rc.common
+
+START=64
+STOP=10
+
+USE_PROCD=1
+PROG=/usr/sbin/bbf_configd
+
+create_needed_directories()
+{
+	mkdir -p /tmp/bbfdm/.cwmp
+	mkdir -p /tmp/bbfdm/.usp
+	mkdir -p /tmp/bbfdm/.bbfdm
+}
+
+start_service()
+{
+	create_needed_directories
+
+	procd_open_instance "bbf_configd"
+	procd_set_param command ${PROG}
+	#procd_append_param command -d
+	procd_set_param respawn
+	procd_close_instance "bbf_configd"
+}

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

@@ -0,0 +1,106 @@
+#!/bin/sh /etc/rc.common
+
+START=40
+STOP=8
+
+USE_PROCD=1
+PROG=/usr/sbin/bbfdmd
+
+BBFDM_MICROSERVICE_DIR="/etc/bbfdm/micro_services"
+
+. /usr/share/libubox/jshn.sh
+
+log() {
+	echo "${@}"|logger -t bbfdmd.services -p info
+}
+
+validate_bbfdm_micro_service_section()
+{
+	uci_validate_section bbfdm micro_services "micro_services" \
+		'enable:bool:true' \
+		'enable_core:bool:false' \
+		'enable_respawn:bool:true'
+}
+
+_add_microservice()
+{
+	local name path
+	local enable enable_core enable_respawn
+
+	# Check enable from micro-service
+	path="${1}"
+	enable_respawn="${2}"
+	enable_core="${3}"
+
+	name="$(basename ${path})"
+	name="${name//.json}"
+
+	enable="$(jq -r '.daemon.enable//1' ${path})"
+	if [ "${enable}" -eq "0" ]; then
+		log "datamodel micro-service ${name} not enabled"
+		return 0
+	fi
+
+	procd_open_instance "${name}"
+
+	procd_set_param command ${PROG}
+	procd_append_param command -m "${name}"
+
+	if [ "${enable_core}" -eq "1" ]; then
+		procd_set_param limits core="unlimited"
+		procd_set_param stdout 1
+		procd_set_param stderr 1
+	fi
+
+	if [ "${enable_respawn}" -eq "1" ]; then
+		procd_set_param respawn "3600" "5" "5"
+	fi
+	procd_close_instance "${name}"
+}
+
+configure_bbfdm_micro_services()
+{
+	local enable enable_core enable_respawn
+
+	config_load bbfdm
+	validate_bbfdm_micro_service_section || {
+		log "Validation of micro_service section failed"
+		return 1;
+	}
+
+	[ "${enable}" -eq "0" ] && return 0
+
+	if [ -d "${BBFDM_MICROSERVICE_DIR}" ]; then
+		FILES="$(ls -1 ${BBFDM_MICROSERVICE_DIR}/*.json)"
+
+		for file in $FILES;
+		do
+			[ -e "$file" ] || continue
+
+			_add_microservice $file "${enable_respawn}" "${enable_core}"
+		done
+	fi
+}
+
+_start_single_service()
+{
+	local service file
+
+	service="${1}"
+
+	if [ -d "${BBFDM_MICROSERVICE_DIR}" ]; then
+		file="$(ls -1 ${BBFDM_MICROSERVICE_DIR}/${service}.json)"
+		[ -e "$file" ] || return
+
+		_add_microservice $file "0" "0"
+	fi
+}
+
+start_service()
+{
+	if [ -n "${1}" ]; then
+		_start_single_service "${1}"
+	else
+		configure_bbfdm_micro_services
+	fi
+}

bbfdm/files/etc/init.d/bbfdmd

@@ -7,7 +7,9 @@ USE_PROCD=1
 PROG=/usr/sbin/bbfdmd
 
 BBFDM_JSON_INPUT="/etc/bbfdm/input.json"
-BBFDM_TEMP_JSON="/tmp/bbfdm.json"
+BBFDM_TEMP_DIR="/tmp/bbfdm"
+
+. /usr/share/libubox/jshn.sh
 
 log() {
 	echo "${@}"|logger -t bbfdmd.init -p info
@@ -16,48 +18,28 @@ log() {
 validate_bbfdm_bbfdmd_section()
 {
 	uci_validate_section bbfdm bbfdmd "bbfdmd" \
-		'enabled:bool:true' \
+		'enable:bool:true' \
 		'sock:string' \
 		'debug:bool:false' \
 		'loglevel:uinteger:1' \
-		'refresh_time:uinteger:0' \
-		'transaction_timeout:uinteger:30' \
 		'subprocess_level:uinteger'
 }
 
 configure_bbfdmd()
 {
-	local enabled debug sock update
-	local jlog jrefresh jtimeout
+	local enable debug sock
+	local jlog jrefresh jtimeout jlevel
 
-	update=0
 	config_load bbfdm
 	validate_bbfdm_bbfdmd_section || {
 		log "Validation of bbfdmd section failed"
 		return 1;
 	}
 
-	[ "${enabled}" -eq 0 ] && return 0
-	[ ! -f "${BBFDM_JSON_INPUT}" ] && return 0
+	[ "${enable}" -eq 0 ] && return 0
 
-	jlog="$(jq '.daemon.config.loglevel' ${BBFDM_JSON_INPUT})"
-	if [ "\"${loglevel}\"" != "${jlog}" ]; then
-		update=1
-	fi
-
-	jrefresh="$(jq '.daemon.config.refresh_time' ${BBFDM_JSON_INPUT})"
-	if [ "\"${refresh_time}\"" != "${jrefresh}" ]; then
-		update=1
-	fi
-
-	jtimeout="$(jq '.daemon.config.transaction_timeout' ${BBFDM_JSON_INPUT})"
-	if [ "\"${transaction_timeout}\"" != "${jtimeout}" ]; then
-		update=1
-	fi
-
-	if [ "${update}" -eq "1" ]; then
-		echo "$(jq --arg log ${loglevel} --arg tran ${transaction_timeout} --arg refresh ${refresh_time} '.daemon.config += {"loglevel": $log, "refresh_time": $refresh, "transaction_timeout": $tran}' ${BBFDM_JSON_INPUT})" > ${BBFDM_TEMP_JSON}
-		mv ${BBFDM_TEMP_JSON} ${BBFDM_JSON_INPUT}
+	if [ -f "${BBFDM_JSON_INPUT}" ]; then
+		echo "$(jq --arg log ${loglevel} --arg level ${subprocess_level} '.daemon.config += {"loglevel": $log, "subprocess_level": $level}' ${BBFDM_JSON_INPUT})" > "${BBFDM_TEMP_DIR}/input.json"
 	fi
 
 	procd_set_param command ${PROG}
@@ -73,17 +55,12 @@ configure_bbfdmd()
 
 start_service()
 {
+	mkdir -p ${BBFDM_TEMP_DIR}
+
 	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 state '{"name":"bbfdm.services", "spawn":false}'
 }
 
 service_triggers()

bbfdm/files/etc/init.d/userinterface

@@ -1,33 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=99
-STOP=01
-
-USE_PROCD=1
-
-start_service() {
-	local enable
-
-	config_load userinterface
-	config_get_bool enable global enable 1
-
-	if [ ! -f "/etc/config/nginx" ]; then
-		return 0
-	fi
-
-	if [ "${enable}" -eq "1" ]; then
-		ubus call service state '{"name":"nginx", "spawn":true}'
-	else
-		ubus call service state '{"name":"nginx", "spawn":false}'
-	fi
-
-	# Inject firewall rules
-	procd_open_instance userinterface
-	/etc/firewall.userinterface
-	procd_close_instance
-}
-
-service_triggers()
-{
-	procd_add_reload_trigger "userinterface" "nginx"
-}

bbfdm/files/etc/uci-defaults/91-fix-bbfdmd-enabled-option

@@ -0,0 +1,11 @@
+#!/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
+

bbfdm/files/etc/uci-defaults/94-userinterface-json

@@ -1,9 +0,0 @@
-#!/bin/sh
-
-# This deletes the userinterface json plugin if exists in case of upgrade
-if [ -f "/etc/bbfdm/json/UserInterface.json" ]; then
-	rm /etc/bbfdm/json/UserInterface.json
-fi
-
-exit 0
-

bbfdm/files/lib/upgrade/keep.d/userinterface

@@ -1 +0,0 @@
-/etc/nginx/allow_host_*

bbfdm/tools/bbfdm.sh

@@ -0,0 +1,169 @@
+#!/bin/bash
+
+BBFDM_BASE_DM_PATH="usr/share/bbfdm"
+BBFDM_INPUT_PATH="etc/bbfdm/micro_services"
+INPUT_TEMPLATE='{"daemon":{"enable":"1","service_name":"template","config":{"loglevel":"1"}}}'
+OUT_NAME=""
+
+MICRO_SERVICE=0
+SCRIPT=0
+DIAG=0
+PLUGIN=0
+DEST=""
+TOOLS="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
+SRC=""
+
+while getopts ":mpsdu:" opt; do
+	case ${opt} in
+	  m)
+	  	MICRO_SERVICE=1
+		;;
+	  p)
+	  	PLUGIN=1
+		;;
+	  s)
+	  	SCRIPT=1
+		;;
+	  d)
+	  	DIAG=1
+		;;
+	  u)
+	  	OUT_NAME="${OPTARG}"
+		;;
+	  ?)
+	  	echo "Invalid option: ${OPTARG}"
+		exit 1
+		;;
+	esac
+done
+shift $((OPTIND-1))
+
+SRC="${1}"
+shift
+DEST="${1}"
+shift
+DATA="${1}"
+
+install_bin() {
+	if ! install -m0755 ${1} ${2}; then
+		echo "Failed to install bin ${1} => ${2}"
+		exit 1
+	fi
+}
+
+install_dir() {
+	if ! install -d -m0755 ${1}; then
+		echo "Failed to create directory ${1}"
+		exit 1
+	fi
+}
+
+install_data() {
+	if ! install -m0644 ${1} ${2}; then
+		echo "Failed to install ${1} => ${2}"
+		exit 1
+	fi
+}
+
+# Installing datamodel
+bbfdm_install_dm()
+{
+	local src dest minfile
+
+	src="$1"
+	dest="$2"
+	minfile=""
+
+	if [ -z ${src} ] || [ -z "${dest}" ] || [ -z "${TOOLS}" ]; then
+		echo "Invalid input option for install dm $@"
+		exit 1
+	fi
+
+	if [ "${src##*.}" = "json" ]; then
+		echo "Compacting BBFDM JSON file"
+		minfile=$(mktemp)
+		jq -c 'del(..|.description?)' ${src} > ${minfile}
+
+		src=${minfile}
+		if dpkg -s python3-jsonschema >/dev/null 2>&1; then
+			echo "Verifying bbfdm Datamodel JSON file"
+			if ! ${TOOLS}/validate_plugins.py ${src}; then
+				echo "Validation of the plugin failed ${src}"
+				exit 1
+			fi
+		else
+			echo "## Install python3-jsonschema to verify datamodel plugins"
+		fi
+	fi
+
+	install_bin ${src} ${dest}
+
+	if [ -f "${minfile}" ]; then
+		rm ${minfile}
+	fi
+}
+
+bbfdm_generate_input()
+{
+	local dest ser
+
+	dest_dir=${1}
+	ser=${2}
+	dest=${dest_dir}/${ser}.json
+
+	if [ -n "${OUT_NAME}" ]; then
+		echo ${INPUT_TEMPLATE} | jq --arg service "${ser}" --arg OUT "${OUT_NAME}" '.daemon |= (.service_name = $service |.output.name = $OUT)' > ${dest}
+	else
+		echo ${INPUT_TEMPLATE} | jq --arg service "${ser}" '.daemon.service_name = $service' > ${dest}
+	fi
+
+	chmod 466 ${dest}
+}
+
+if [ -z "$SRC" ] || [ -z "${DEST}" ] ; then
+	echo "# BBFDM Null value in src[${SRC}], dest[${DEST}]"
+	exit 1
+fi
+
+if [ "${SCRIPT}" -eq "1" ]; then
+	if [ "${DIAG}" -eq "1" ]; then
+		install_dir ${DEST}/${BBFDM_BASE_DM_PATH}/scripts/bbf_diag
+		install_bin ${SRC} ${DEST}/${BBFDM_BASE_DM_PATH}/scripts/bbf_diag/
+	else
+		install_dir ${DEST}/${BBFDM_BASE_DM_PATH}/scripts
+		install_bin ${SRC} ${DEST}/${BBFDM_BASE_DM_PATH}/scripts/
+	fi
+	exit 0
+fi
+
+if [ "${MICRO_SERVICE}" -eq "1" ]; then
+	if [ -z "${DATA}" ]; then
+		echo "# service_name[${DATA}] not provided"
+		exit 1
+	fi
+
+	if [ "${PLUGIN}" -ne "1" ]; then
+		extn="$(basename ${SRC})"
+		install_dir ${DEST}/${BBFDM_BASE_DM_PATH}/micro_services
+		bbfdm_install_dm ${SRC} ${DEST}/${BBFDM_BASE_DM_PATH}/micro_services/${DATA}.${extn##*.}
+
+		# main micro-service datamodel plugin, create an input file as well
+		install_dir ${DEST}/${BBFDM_INPUT_PATH}
+		bbfdm_generate_input ${DEST}/${BBFDM_INPUT_PATH}/ ${DATA}
+	else
+		install_dir ${DEST}/${BBFDM_BASE_DM_PATH}/micro_services/${DATA}
+		bbfdm_install_dm ${SRC} ${DEST}/${BBFDM_BASE_DM_PATH}/micro_services/${DATA}/$(basename ${SRC})
+	fi
+else
+	if [ "${PLUGIN}" -eq "1" ]; then
+		priority="${DATA:-0}"
+		install_dir ${DEST}/${BBFDM_BASE_DM_PATH}/plugins
+		if [ "${priority}" -gt "0" ]; then
+			# install with priority if defined
+			bbfdm_install_dm ${SRC} ${DEST}/${BBFDM_BASE_DM_PATH}/plugins/${priority}_$(basename ${SRC})
+		else
+			bbfdm_install_dm ${SRC} ${DEST}/${BBFDM_BASE_DM_PATH}/plugins/$(basename ${SRC})
+		fi
+	fi
+fi
+

bbfdm/tools/validate_plugins.py

@@ -0,0 +1,330 @@
+#!/usr/bin/python3
+
+# Copyright (C) 2024 iopsys Software Solutions AB
+# Author: Amin Ben Romdhane <amin.benromdhane@iopsys.eu>
+
+import sys
+import json
+from jsonschema import validate
+
+JSON_PLUGIN_VERSION = 0
+
+obj_schema = {
+	"definitions": {
+		"type_t": {
+			"type": "string",
+			"enum": [
+				"object"
+			]
+		},
+		"map_type_t": {
+			"type": "string",
+			"enum": [
+				"uci",
+				"ubus"
+			]
+		},
+		"protocols_t": {
+			"type": "string",
+			"enum": [
+				"cwmp",
+				"usp"
+			]
+		}
+	},
+	"type" : "object",
+	"properties" : {
+		"type" : {"$ref": "#/definitions/type_t"},
+		"version" : {"type": "string"},
+		"protocols" : {"type" : "array", "items" : {"$ref": "#/definitions/protocols_t"}},
+		"uniqueKeys" : {"type" : "array"},
+		"access" : {"type" : "boolean"},
+		"array" : {"type" : "boolean"},
+		"mapping" : {"type" : "object", "properties" : {
+				"type" : {"$ref": "#/definitions/map_type_t"},
+				"uci" : {"type" : "object", "properties" : {
+						"file" : {"type": "string"},
+						"section" : {"type": "object", "properties" : {
+								"type" : {"type": "string"}
+							}
+						},
+						"dmmapfile" : {"type": "string"}
+					}
+				},
+				"ubus" : {"type" : "object", "properties" : {
+						"object" : {"type": "string"},
+						"method" : {"type": "string"},
+						"args" : {"type": "object"},
+						"key" : {"type": "string"}
+					}
+				}
+			}
+		}
+	},
+	"required": [
+		"type",
+		"protocols",
+		"array",
+		"access"
+	]
+}
+
+obj_schema_v1 = {
+	"definitions": {
+		"type_t": {
+			"type": "string",
+			"enum": [
+				"object"
+			]
+		},
+		"map_type_t": {
+			"type": "string",
+			"enum": [
+				"uci",
+				"ubus"
+			]
+		},
+		"protocols_t": {
+			"type": "string",
+			"enum": [
+				"cwmp",
+				"usp",
+				"none"
+			]
+		}
+	},
+	"type" : "object",
+	"properties" : {
+		"type" : {"$ref": "#/definitions/type_t"},
+		"version" : {"type": "string"},
+		"protocols" : {"type" : "array", "items" : {"$ref": "#/definitions/protocols_t"}},
+		"uniqueKeys" : {"type" : "array"},
+		"access" : {"type" : "boolean"},
+		"array" : {"type" : "boolean"},
+		"mapping" : {"type" : "array", "items" : {
+			"type" : "object", "properties" : {
+				"type" : {"$ref": "#/definitions/map_type_t"},
+					"uci" : {"type" : "object", "properties" : {
+							"file" : {"type": "string"},
+							"section" : {"type": "object", "properties" : {
+									"type" : {"type": "string"}
+								}
+							},
+							"dmmapfile" : {"type": "string"}
+						}
+					},
+					"ubus" : {"type" : "object", "properties" : {
+							"object" : {"type": "string"},
+							"method" : {"type": "string"},
+							"args" : {"type": "object"},
+							"key" : {"type": "string"}
+						}
+					}
+				}
+			}
+		}
+	},
+	"required": [
+		"type",
+		"protocols",
+		"array",
+		"access"
+	]
+}
+
+param_schema = {
+	"definitions": {
+		"type_t": {
+			"type": "string",
+			"enum": [
+				"string",
+				"unsignedInt",
+				"unsignedLong",
+				"int",
+				"long",
+				"boolean",
+				"dateTime",
+				"hexBinary",
+				"base64",
+				"decimal"
+			]
+		},
+		"map_type_t": {
+			"type": "string",
+			"enum": [
+				"uci",
+				"ubus",
+				"procfs",
+				"sysfs",
+				"json",
+				"uci_sec"
+			]
+		},
+		"protocols_t": {
+			"type": "string",
+			"enum": [
+				"cwmp",
+				"usp",
+				"none"
+			]
+		}
+	},
+	"type" : "object",
+	"properties" : {
+		"type" : {"$ref": "#/definitions/type_t"},
+		"protocols" : {"type" : "array", "items" : {"$ref": "#/definitions/protocols_t"}},
+		"read" : {"type" : "boolean"},
+		"write" : {"type" : "boolean"},
+		"mapping" : {"type" : "array", "items" : {"type": "object", "properties" : {
+					"type" : {"$ref": "#/definitions/map_type_t"},
+					"uci" : {"type" : "object", "properties" : {
+							"file" : {"type": "string"},
+							"section" : {"type": "object", "properties" : {
+									"type" : {"type": "string"},
+									"index" : {"type": "string"}
+								}
+							},
+							"option" : {"type": "object", "properties" : {
+									"name" : {"type": "string"}								}
+							}
+						}
+					},
+					"ubus" : {"type" : "object", "properties" : {
+							"object" : {"type": "string"},
+							"method" : {"type": "string"},
+							"args" : {"type": "object"},
+							"key" : {"type": "string"}
+						}
+					},
+					"procfs" : {"type" : "object", "properties" : {
+							"file" : {"type": "string"}
+						}
+					},
+					"sysfs" : {"type" : "object", "properties" : {
+							"file" : {"type": "string"}
+						}
+					}
+				}
+			}
+		}
+	},
+	"required": [
+		"type",
+		"protocols",
+		"read",
+		"write"
+	]
+}
+
+event_schema = {
+	"definitions": {
+		"type_t": {
+			"type": "string",
+			"enum": [
+				"event"
+			]
+		},
+		"protocols_t": {
+			"type": "string",
+			"enum": [
+				"usp"
+			]
+		}
+	},
+	"type" : "object",
+	"properties" : {
+		"type" : {"$ref": "#/definitions/type_t"},
+		"version" : {"type": "string"},
+		"protocols" : {"type" : "array", "items" : {"$ref": "#/definitions/protocols_t"}}
+	},
+	"required": [
+		"type",
+		"protocols"
+	]
+}
+
+command_schema = {
+	"definitions": {
+		"type_t": {
+			"type": "string",
+			"enum": [
+				"command"
+			]
+		},
+		"protocols_t": {
+			"type": "string",
+			"enum": [
+				"usp"
+			]
+		}
+	},
+	"type" : "object",
+	"properties" : {
+		"type" : {"$ref": "#/definitions/type_t"},
+		"async" : {"type" : "boolean"},
+		"protocols" : {"type" : "array", "items" : {"$ref": "#/definitions/protocols_t"}},
+		"input" : {"type" : "object"},
+		"output" : {"type" : "object"}
+	},
+	"required": [
+		"type",
+		"async",
+		"protocols"
+	]
+}
+
+def print_validate_json_usage():
+    print("Usage: " + sys.argv[0] + " <dm json file>")
+    print("Examples:")
+    print("  - " + sys.argv[0] + " datamodel.json")
+    print("    ==> Validate the json file")
+    print("")
+    exit(1)
+
+def parse_value( key , value ):
+
+    if key.endswith('.') and not key.startswith('Device.'):
+        print(key + " is not a valid path")
+        exit(1)
+
+    if key.endswith('.') and (JSON_PLUGIN_VERSION == 1 or JSON_PLUGIN_VERSION == 2):
+        __schema = obj_schema_v1
+    elif key.endswith('.'):
+        __schema = obj_schema
+    elif key.endswith('!'):
+        __schema = event_schema
+    elif key.endswith('()'):
+        __schema = command_schema
+    else:
+        __schema = param_schema
+    
+    validate(instance = value, schema = __schema)
+    
+    for k, v in value.items():
+        if k != "list" and k != "mapping" and k != "input" and k != "output" and isinstance(v, dict):
+            parse_value(k, v)
+
+### main ###
+if len(sys.argv) < 2:
+    print_validate_json_usage()
+    
+json_file = open(sys.argv[1], "r", encoding='utf-8')
+try:
+    json_data = json.loads(json_file.read())
+except ValueError:
+    print(sys.argv[1] + " file has a wrong JSON format!!!!!")
+    exit(1)
+
+for __key, __value in json_data.items():
+
+    if __key == "json_plugin_version":
+
+        if not isinstance(__value, int) or __value not in [0, 1, 2]:
+            raise ValueError("Invalid value for json_plugin_version")
+
+        JSON_PLUGIN_VERSION = __value
+        continue
+
+    parse_value(__key , __value)
+
+print("JSON File is Valid")

bridgemngr/Config.in

@@ -0,0 +1,11 @@
+if PACKAGE_bridgemngr
+
+menu "Configuration"
+
+config BRIDGEMNGR_BRIDGE_VLAN
+	bool "Use bridge-vlan backend"
+	help
+	   Set this option to use bridge-vlan as backend for VLAN objects.
+
+endmenu
+endif

bridgemngr/Makefile

@@ -0,0 +1,61 @@
+#
+# Copyright (C) 2020-2024 iopsys
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=bridgemngr
+PKG_VERSION:=1.0.5
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+LOCAL_DEV:=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/network/bridgemngr
+PKG_SOURCE_VERSION:=c0f2e17f6d4f96aecfe72ab90be885939413176d
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
+endif
+
+PKG_LICENSE:=GPL-2.0-only
+PKG_LICENSE_FILES:=LICENSE
+
+include $(INCLUDE_DIR)/package.mk
+include ../bbfdm/bbfdm.mk
+
+define Package/bridgemngr
+ CATEGORY:=Utilities
+ TITLE:=Bridge Manager
+ DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libbbfdm-api
+endef
+
+define Package/bridgemngr/description
+	Package to add Device.Bridging. data model support.
+endef
+
+define Package/$(PKG_NAME)/config
+	source "$(SOURCE)/Config.in"
+endef
+
+MAKE_PATH:=src
+
+TARGET_CFLAGS += -DBBF_VENDOR_PREFIX=\\\"$(CONFIG_BBF_VENDOR_PREFIX)\\\"
+
+ifeq ($(CONFIG_BRIDGEMNGR_BRIDGE_VLAN),y)
+	TARGET_CFLAGS += -DBRIDGE_VLAN_BACKEND
+endif
+
+define Package/bridgemngr/install
+	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/libbridgemngr.so $(1) $(PKG_NAME)
+ifeq ($(findstring iopsys,$(CONFIG_BBF_VENDOR_LIST)),iopsys)
+	$(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/src/libbridgeext.so $(1) $(PKG_NAME)
+endif
+endef
+
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+	$(CP) ~/git/bridgemngr/* $(PKG_BUILD_DIR)/
+endef
+endif
+
+$(eval $(call BuildPackage,bridgemngr))

bulkdata/Makefile

@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bulkdata
-PKG_VERSION:=2.1.2
+PKG_VERSION:=2.1.11
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bulkdata.git
-PKG_SOURCE_VERSION:=d83c42070e7f10178dc1c2d0ce078e3d6d42d889
+PKG_SOURCE_VERSION:=5dd9cd3cfc95e9dce5f64fe9cadd274bb31b8fa6
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -22,6 +22,7 @@ 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
@@ -43,10 +44,14 @@ endif
 
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bulkdatad $(1)/usr/sbin/	
-	$(INSTALL_DIR) $(1)/etc/bulkdata
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbf_plugin/*.json $(1)/etc/bulkdata
-	$(CP) ./files/* $(1)/
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(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_BIN) ./files/etc/init.d/bulkdatad $(1)/etc/init.d/
+	$(INSTALL_DATA) ./files/etc/uci-defaults/95-bulkdata-translation-options $(1)/etc/uci-defaults/
+	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/bbf_plugin/bulkdata.json $(1) $(PKG_NAME)
 endef
 
 $(eval $(call BuildPackage,$(PKG_NAME)))

bulkdata/bulkdata/usr/share/bbfdm/micro_services/bulkdata.json

@@ -0,0 +1,960 @@
+{
+	"json_plugin_version": 2,
+	"Device.BulkData.": {
+		"type": "object",
+		"protocols": [
+			"cwmp",
+			"usp"
+		],
+		"access": false,
+		"array": false,
+		"Enable": {
+			"type": "boolean",
+			"read": true,
+			"write": true,
+			"protocols": [
+				"cwmp",
+				"usp"
+			],
+			"datatype": "boolean",
+			"mapping": [
+				{
+					"type": "uci",
+					"uci": {
+						"file": "bulkdata",
+						"section": {
+							"name": "bulkdata"
+						},
+						"option": {
+							"name": "enable"
+						}
+					}
+				}
+			]
+		},
+		"Status": {
+			"type": "string",
+			"read": true,
+			"write": false,
+			"protocols": [
+				"cwmp",
+				"usp"
+			],
+			"datatype": "string",
+			"enumerations": [
+				"Enabled",
+				"Disabled",
+				"Error"
+			],
+			"mapping": [
+				{
+					"type": "uci",
+					"uci": {
+						"file": "bulkdata",
+						"section": {
+							"name": "bulkdata"
+						},
+						"option": {
+							"name": "enable"
+						}
+					}
+				}
+			]
+		},
+		"MinReportingInterval": {
+			"type": "unsignedInt",
+			"read": true,
+			"write": false,
+			"protocols": [
+				"cwmp",
+				"usp"
+			],
+			"default": "0",
+			"datatype": "unsignedInt",
+			"unit": "seconds"
+		},
+		"Protocols": {
+			"type": "string",
+			"read": true,
+			"write": false,
+			"protocols": [
+				"cwmp",
+				"usp"
+			],
+			"default": "HTTP",
+			"list": {
+				"datatype": "string",
+				"enumerations": [
+					"Streaming",
+					"File",
+					"HTTP",
+					"MQTT"
+				]
+			}
+		},
+		"EncodingTypes": {
+			"type": "string",
+			"read": true,
+			"write": false,
+			"protocols": [
+				"cwmp",
+				"usp"
+			],
+			"default": "JSON,CSV",
+			"list": {
+				"datatype": "string",
+				"enumerations": [
+					"XML",
+					"XDR",
+					"CSV",
+					"JSON"
+				]
+			}
+		},
+		"ParameterWildCardSupported": {
+			"type": "boolean",
+			"read": true,
+			"write": false,
+			"protocols": [
+				"cwmp",
+				"usp"
+			],
+			"default": "1",
+			"datatype": "boolean"
+		},
+		"MaxNumberOfProfiles": {
+			"type": "int",
+			"read": true,
+			"write": false,
+			"protocols": [
+				"cwmp",
+				"usp"
+			],
+			"default": "-1",
+			"datatype": "int",
+			"range": [
+				{
+					"min": -1
+				}
+			]
+		},
+		"MaxNumberOfParameterReferences": {
+			"type": "int",
+			"read": true,
+			"write": false,
+			"protocols": [
+				"cwmp",
+				"usp"
+			],
+			"default": "-1",
+			"datatype": "int",
+			"range": [
+				{
+					"min": -1
+				}
+			]
+		},
+		"ProfileNumberOfEntries": {
+			"type": "unsignedInt",
+			"read": true,
+			"write": false,
+			"protocols": [
+				"cwmp",
+				"usp"
+			],
+			"datatype": "unsignedInt",
+			"mapping": [
+				{
+					"type": "uci",
+					"uci": {
+						"file": "bulkdata",
+						"section": {
+							"type": "profile"
+						},
+						"option": {
+							"name": "@Count"
+						}
+					}
+				}
+			]
+		},
+		"Device.BulkData.Profile.{i}.": {
+			"type": "object",
+			"protocols": [
+				"cwmp",
+				"usp"
+			],
+			"access": true,
+			"array": true,
+			"mapping": [
+				{
+					"type": "uci",
+					"uci": {
+						"file": "bulkdata",
+						"section": {
+							"type": "profile"
+						},
+						"dmmapfile": "dmmap_bulkdata"
+					}
+				}
+			],
+			"Enable": {
+				"type": "boolean",
+				"read": true,
+				"write": true,
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"datatype": "boolean",
+				"mapping": [
+					{
+						"data": "@Parent",
+						"type": "uci_sec",
+						"key": "enable"
+					}
+				]
+			},
+			"Alias": {
+				"type": "string",
+				"read": true,
+				"write": true,
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"datatype": "Alias",
+				"range": [
+					{
+						"max": 64
+					}
+				],
+				"flags": [
+					"Unique"
+				],
+				"mapping": [
+					{
+						"data": "@Parent",
+						"type": "uci_sec",
+						"key": "alias"
+					}
+				]
+			},
+			"Name": {
+				"type": "string",
+				"read": true,
+				"write": true,
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"datatype": "string",
+				"range": [
+					{
+						"max": 255
+					}
+				],
+				"mapping": [
+					{
+						"data": "@Parent",
+						"type": "uci_sec",
+						"key": "name"
+					}
+				]
+			},
+			"NumberOfRetainedFailedReports": {
+				"type": "int",
+				"read": true,
+				"write": true,
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"datatype": "int",
+				"range": [
+					{
+						"min": -1
+					}
+				],
+				"mapping": [
+					{
+						"data": "@Parent",
+						"type": "uci_sec",
+						"key": "nbre_of_retained_failed_reports"
+					}
+				]
+			},
+			"Protocol": {
+				"type": "string",
+				"read": true,
+				"write": true,
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"datatype": "string",
+				"enumerations": [
+					"Streaming",
+					"File",
+					"HTTP"
+				],
+				"mapping": [
+					{
+						"data": "@Parent",
+						"type": "uci_sec",
+						"key": "protocol"
+					}
+				]
+			},
+			"EncodingType": {
+				"type": "string",
+				"read": true,
+				"write": true,
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"datatype": "string",
+				"enumerations": [
+					"XML",
+					"XDR",
+					"CSV",
+					"JSON"
+				],
+				"mapping": [
+					{
+						"data": "@Parent",
+						"type": "uci_sec",
+						"key": "encoding_type"
+					}
+				]
+			},
+			"ReportingInterval": {
+				"type": "unsignedInt",
+				"read": true,
+				"write": true,
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"datatype": "unsignedInt",
+				"range": [
+					{
+						"min": 1
+					}
+				],
+				"unit": "seconds",
+				"mapping": [
+					{
+						"data": "@Parent",
+						"type": "uci_sec",
+						"key": "reporting_interval"
+					}
+				]
+			},
+			"TimeReference": {
+				"type": "dateTime",
+				"read": true,
+				"write": true,
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"datatype": "dateTime",
+				"mapping": [
+					{
+						"data": "@Parent",
+						"type": "uci_sec",
+						"key": "time_reference"
+					}
+				]
+			},
+			"ParameterNumberOfEntries": {
+				"type": "unsignedInt",
+				"read": true,
+				"write": false,
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"datatype": "unsignedInt",
+				"mapping": [
+					{
+						"type": "uci",
+						"uci": {
+							"file": "bulkdata",
+							"section": {
+								"type": "profile_parameter"
+							},
+							"option": {
+								"name": "@Count"
+							}
+						}
+					}
+				]
+			},
+			"Device.BulkData.Profile.{i}.Parameter.{i}.": {
+				"type": "object",
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"access": true,
+				"array": true,
+				"mapping": [
+					{
+						"type": "uci",
+						"uci": {
+							"file": "bulkdata",
+							"section": {
+								"type": "profile_parameter"
+							},
+							"dmmapfile": "dmmap_bulkdata"
+						}
+					}
+				],
+				"Name": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "string",
+					"range": [
+						{
+							"max": 64
+						}
+					],
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "uci_sec",
+							"key": "name"
+						}
+					]
+				},
+				"Reference": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "string",
+					"range": [
+						{
+							"max": 256
+						}
+					],
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "uci_sec",
+							"key": "reference"
+						}
+					]
+				}
+			},
+			"Device.BulkData.Profile.{i}.CSVEncoding.": {
+				"type": "object",
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"access": false,
+				"array": false,
+				"FieldSeparator": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "string",
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "uci_sec",
+							"key": "csv_encoding_field_separator"
+						}
+					]
+				},
+				"RowSeparator": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "string",
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "uci_sec",
+							"key": "csv_encoding_row_separator"
+						}
+					]
+				},
+				"EscapeCharacter": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "string",
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "uci_sec",
+							"key": "csv_encoding_escape_character"
+						}
+					]
+				},
+				"ReportFormat": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "string",
+					"enumerations": [
+						"ParameterPerRow",
+						"ParameterPerColumn"
+					],
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "uci_sec",
+							"key": "csv_encoding_report_format"
+						}
+					]
+				},
+				"RowTimestamp": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "string",
+					"enumerations": [
+						"Unix-Epoch",
+						"ISO-8601",
+						"None"
+					],
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "uci_sec",
+							"key": "csv_encoding_row_time_stamp"
+						}
+					]
+				}
+			},
+			"Device.BulkData.Profile.{i}.JSONEncoding.": {
+				"type": "object",
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"access": false,
+				"array": false,
+				"ReportFormat": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "string",
+					"enumerations": [
+						"ObjectHierarchy",
+						"NameValuePair"
+					],
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "uci_sec",
+							"key": "json_encoding_report_format"
+						}
+					]
+				},
+				"ReportTimestamp": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "string",
+					"enumerations": [
+						"Unix-Epoch",
+						"ISO-8601",
+						"None"
+					],
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "uci_sec",
+							"key": "json_encoding_report_time_stamp"
+						}
+					]
+				}
+			},
+			"Device.BulkData.Profile.{i}.HTTP.": {
+				"type": "object",
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"access": false,
+				"array": false,
+				"URL": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "URL",
+					"range": [
+						{
+							"max": 2048
+						}
+					],
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "uci_sec",
+							"key": "http_url"
+						}
+					]
+				},
+				"Username": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "string",
+					"range": [
+						{
+							"max": 256
+						}
+					],
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "uci_sec",
+							"key": "http_username"
+						}
+					]
+				},
+				"Password": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "string",
+					"range": [
+						{
+							"max": 256
+						}
+					],
+					"flags": [
+						"Secure"
+					],
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "uci_sec",
+							"key": "http_password"
+						}
+					]
+				},
+				"CompressionsSupported": {
+					"type": "string",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"default": "GZIP",
+					"list": {
+						"datatype": "string",
+						"enumerations": [
+							"GZIP",
+							"Compress",
+							"Deflate"
+						]
+					}
+				},
+				"Compression": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "string",
+					"enumerations": [
+						"GZIP",
+						"Compress",
+						"Deflate"
+					],
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "uci_sec",
+							"key": "http_compression"
+						}
+					]
+				},
+				"MethodsSupported": {
+					"type": "string",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"default": "POST,PUT",
+					"list": {
+						"datatype": "string",
+						"enumerations": [
+							"POST",
+							"PUT"
+						]
+					}
+				},
+				"Method": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "string",
+					"enumerations": [
+						"POST",
+						"PUT"
+					],
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "uci_sec",
+							"key": "http_method"
+						}
+					]
+				},
+				"UseDateHeader": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "boolean",
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "uci_sec",
+							"key": "http_use_date_header"
+						}
+					]
+				},
+				"RetryEnable": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "boolean",
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "uci_sec",
+							"key": "http_retry_enable"
+						}
+					]
+				},
+				"RetryMinimumWaitInterval": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "unsignedInt",
+					"range": [
+						{
+							"min": 1,
+							"max": 65535
+						}
+					],
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "uci_sec",
+							"key": "http_retry_minimum_wait_interval"
+						}
+					]
+				},
+				"RetryIntervalMultiplier": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "unsignedInt",
+					"range": [
+						{
+							"min": 1000,
+							"max": 65535
+						}
+					],
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "uci_sec",
+							"key": "http_retry_interval_multiplier"
+						}
+					]
+				},
+				"RequestURIParameterNumberOfEntries": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "unsignedInt",
+					"mapping": [
+						{
+							"type": "uci",
+							"uci": {
+								"file": "bulkdata",
+								"section": {
+									"type": "profile_http_request_uri_parameter"
+								},
+								"option": {
+									"name": "@Count"
+								}
+							}
+						}
+					]
+				},
+				"PersistAcrossReboot": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "boolean",
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "uci_sec",
+							"key": "http_persist_across_reboot"
+						}
+					]					
+				},
+				"Device.BulkData.Profile.{i}.HTTP.RequestURIParameter.{i}.": {
+					"type": "object",
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"access": true,
+					"array": true,
+					"mapping": [
+						{
+							"type": "uci",
+							"uci": {
+								"file": "bulkdata",
+								"section": {
+									"type": "profile_http_request_uri_parameter"
+								},
+								"dmmapfile": "dmmap_bulkdata"
+							}
+						}
+					],
+					"Name": {
+						"type": "string",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"datatype": "string",
+						"range": [
+							{
+								"max": 64
+							}
+						],
+						"mapping": [
+							{
+								"data": "@Parent",
+								"type": "uci_sec",
+								"key": "name"
+							}
+						]
+					},
+					"Reference": {
+						"type": "string",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"datatype": "string",
+						"range": [
+							{
+								"max": 256
+							}
+						],
+						"mapping": [
+							{
+								"data": "@Parent",
+								"type": "uci_sec",
+								"key": "reference"
+							}
+						]
+					}
+				}
+			}
+		}
+	}
+}

bulkdata/files/etc/bulkdata/input.json

@@ -1,15 +0,0 @@
-{
-	"daemon": {
-		"input": {
-			"type": "JSON",
-			"name": "/etc/bulkdata/bulkdata.json"
-		},
-		"output": {
-			"type": "UBUS",
-			"name": "bbfdm.bulkdata",
-			"parent_dm": "Device.",
-			"object": "BulkData",
-			"root_obj": "bbfdm"
-		}
-	}
-}

bulkdata/files/etc/init.d/bulkdatad

@@ -3,11 +3,8 @@
 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
@@ -15,14 +12,21 @@ start_service() {
 	config_load bulkdata
 	config_get_bool enable bulkdata enable 1
 
-	[ "$enable" -eq "1" ] && {
+	if [ ! -f "/var/state/bulkdatad" ]; then
+		touch /var/state/bulkdatad
+		uci -q -c /var/state set bulkdatad.global='global'
+		uci -q -c /var/state commit bulkdatad
+	fi
+
+	if [ "$enable" -eq "1" ]; then
 		procd_open_instance "bulkdata"
 		procd_set_param command "$PROG"
 		procd_set_param respawn
 		procd_close_instance "bulkdata"
-	}
-
-	bbfdm_add_service "bbfdm.bulkdata" "${BULKDATA_JSON_INPUT}"
+	else
+		uci -q -c /var/state set bulkdatad.global.status='Disabled'
+		uci -q -c /var/state commit bulkdatad
+	fi
 }
 
 reload_service() {

capiagent/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=capiagent
-PKG_VERSION:=2.1.0
+PKG_VERSION:=2.1.1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=3e671db8f567b19c109fc13b25bc571c4c73a962
+PKG_SOURCE_VERSION:=136cab3a9f1eec0132db9fa3f7bb1c8748ce1449
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/capiagent.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
@@ -31,7 +31,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/capiagent
   TITLE+= capiagent (daemon implementing Wi-Fi Alliance's CAPI commands)
   DEPENDS= +libubox +libuci +libubus +libnl-genl +libeasy +libwifi \
-	   +libjson-c +libblobmsg-json +ubus +libieee1905
+	   +libjson-c +libblobmsg-json +ubus +libieee1905 +libwifiutils
 endef
 
 define Package/capiagent/description

csmngr/Makefile

@@ -0,0 +1,64 @@
+#
+# Copyright (C) 2020-2024 IOPSYS Software Solutions AB
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=csmngr
+PKG_VERSION:=1.0.2
+
+LOCAL_DEV=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=5e50fe388fff29b08d895c1c580152cccfa290ad
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/csmngr.git
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
+PKG_MIRROR_HASH:=skip
+endif
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
+PKG_LICENSE:=BSD-3-Clause
+PKG_LICENSE_FILES:=LICENSE
+
+PKG_CONFIG_DEPENDS := \
+		     CONFIG_PACKAGE_libwifiutils \
+		     CONFIG_PACKAGE_libwifi
+
+PKG_BUILD_DEPENDS := libwifi
+
+include $(INCLUDE_DIR)/package.mk
+
+
+MAKE_PATH:=src
+
+define Package/csmngr
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=WiFi channel selection manager
+  DEPENDS:=+libwifiutils +libwifi +libuci +libubox +ubus +libnl-genl
+endef
+
+define Package/csmngr/description
+ WiFi Auto Channel Selection manager.
+endef
+
+TARGET_CFLAGS += \
+	-I$(STAGING_DIR)/usr/include \
+	-I$(STAGING_DIR)/usr/include/libnl3 \
+	-D_GNU_SOURCE
+
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+  rsync -r --exclude=.* ~/git/csmngr/ $(PKG_BUILD_DIR)/
+endef
+endif
+
+define Package/csmngr/install
+	$(CP) ./files/* $(1)/
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/csmngr $(1)/usr/sbin/
+endef
+
+$(eval $(call BuildPackage,csmngr))

csmngr/files/etc/init.d/csmngr

@@ -0,0 +1,21 @@
+#!/bin/sh /etc/rc.common
+
+START=95
+STOP=10
+
+USE_PROCD=1
+PROG=/usr/sbin/csmngr
+
+start_service() {
+	procd_open_instance
+	procd_set_param command ${PROG}
+#	procd_set_param stderr 1                    #for debugging only
+#	procd_set_param respawn
+	procd_close_instance
+}
+
+reload_service() {
+        stop
+        start
+}
+

ddnsmngr/Config.in

@@ -0,0 +1,16 @@
+if PACKAGE_ddnsmngr
+choice
+	prompt "Select backend for dynamic DNS management"
+	default DDNSMNGR_BACKEND_DDNSSCRIPT
+	depends on PACKAGE_ddnsmngr
+	help
+		Select which package to use for dynamic DNS support
+
+config DDNSMNGR_BACKEND_DDNSSCRIPT
+	bool "Use ddns_script"
+
+config DDNSMNGR_BACKEND_INADYN
+	bool "Use inadyn"
+
+endchoice
+endif

ddnsmngr/Makefile

@@ -0,0 +1,77 @@
+#
+# Copyright (C) 2024 IOPSYS
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=ddnsmngr
+PKG_VERSION:=1.0.7
+
+LOCAL_DEV:=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/network/ddnsmngr.git
+PKG_SOURCE_VERSION:=4b0c679c4dc3e3725de5c0c55ed60f24b87c6edd
+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
+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
+  CATEGORY:=Utilities
+  SUBMENU:=TRx69
+  TITLE:=Dynamic DNS manager
+  DEPENDS:=+libbbfdm-api +DDNSMNGR_BACKEND_DDNSSCRIPT:ddns-scripts +DDNSMNGR_BACKEND_INADYN:inadyn
+  MENU:=1
+endef
+
+define Package/$(PKG_NAME)/config
+	source "$(SOURCE)/Config.in"
+endef
+
+MAKE_PATH:=src
+
+define Package/$(PKG_NAME)/description
+	Manage dynamic DNS updation and provides Device.DynamicDNS. datamodel object based on TR181-2.16
+endef
+
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+	$(CP) -rf ~/git/ddnsmngr/* $(PKG_BUILD_DIR)/
+endef
+endif
+
+define Package/$(PKG_NAME)/install
+	$(INSTALL_DIR) $(1)/etc/ddnsmngr/ddns
+	$(INSTALL_DIR) $(1)/etc/ddnsmngr/servers
+	$(INSTALL_DIR) $(1)/usr/lib/ddnsmngr
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
+	$(INSTALL_DIR) $(1)/usr/libexec/rpcd
+	$(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
+ifeq ($(CONFIG_DDNSMNGR_BACKEND_DDNSSCRIPT),y)
+	$(INSTALL_BIN) ./files/usr/lib/ddns_script/ddnsmngr_service.sh $(1)/usr/lib/ddnsmngr/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/ddns-script/usr/lib/ddnsmngr/ddnsmngr_updater.sh $(1)/usr/lib/ddnsmngr/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/files/ddns-script/server/* $(1)/etc/ddnsmngr/servers
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/ddns-script/usr/libexec/rpcd/ddnsmngr $(1)/usr/libexec/rpcd/ddnsmngr
+endif
+ifeq ($(CONFIG_DDNSMNGR_BACKEND_INADYN),y)
+	$(INSTALL_BIN) ./files/usr/lib/inadyn/ddnsmngr_service.sh $(1)/usr/lib/ddnsmngr/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/files/inadyn/server/* $(1)/etc/ddnsmngr/servers
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/inadyn/usr/libexec/rpcd/ddnsmngr $(1)/usr/libexec/rpcd/ddnsmngr
+endif
+	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/libddnsmngr.so $(1) $(PKG_NAME)
+endef
+
+
+$(eval $(call BuildPackage,$(PKG_NAME)))

ddnsmngr/files/etc/config/ddnsmngr

@@ -0,0 +1,23 @@
+config ddnsmngr 'global'
+	option configfile '/var/run/ddnsmngr/ddnsmngr.json'
+	option ddns_dateformat '%F %R'
+	option ddns_rundir '/var/run/ddnsmngr'
+	option ddns_logdir '/var/log/ddnsmngr'
+	option ddns_loglines '250'
+	option upd_privateip '0'
+	option use_curl '1'
+
+config server 'ddns_server_1'
+	option enabled '1'
+	option service 'dynu.com'
+	option name 'dynu.com'
+
+config server 'ddns_server_2'
+	option enabled '1'
+	option service 'dyndns.org'
+	option name 'dyndns.org'
+
+config server 'ddns_server_3'
+	option enabled '1'
+	option service 'zoneedit.com'
+	option name 'zoneedit.com'

ddnsmngr/files/etc/init.d/ddnsmngr

@@ -0,0 +1,26 @@
+#!/bin/sh /etc/rc.common
+
+START=80
+STOP=10
+USE_PROCD=1
+
+. /usr/lib/ddnsmngr/ddnsmngr_service.sh
+
+start_service() {
+	start_ddnsmngr_service
+}
+
+stop_service() {
+	stop_ddnsmngr_service
+}
+
+reload_service() {
+	stop
+	sleep 1
+	start
+}
+
+service_triggers() {
+	procd_add_reload_trigger ddnsmngr
+	add_ddnsmngr_triggers
+}

ddnsmngr/files/etc/uci-defaults/01-ddns-config-migrate

@@ -0,0 +1,170 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+cl_id=1
+srv_id=1
+
+function get_ddns_config_option() {
+	local val
+
+	val="$(uci -q get ddns.${1}.${2})"
+
+	if [ -z "${val}" ] && [ -n "${3}" ]; then
+		val="${3}"
+	fi
+
+	echo "${val}"
+}
+
+function config_supported_service() {
+	if ! uci -q get ddnsmngr.global >/dev/null 2>&1; then
+		uci -q set ddnsmngr.global="ddnsmngr"
+	fi
+
+	servers=""
+
+	for i in $(find /etc/ddnsmngr/servers/ -name '*.json' | cut -d'/' -f 5 | sed "s/.json//")
+	do
+		if [ -z "${servers}" ]; then
+			servers="${i}"
+		else
+			servers="${servers},${i}"
+		fi
+	done
+
+	uci -q set ddnsmngr.global.supported_services="${servers}"
+}
+
+function migrate_service_section() {
+	client_sec=""
+	enabled="$(get_ddns_config_option ${1} enabled "0")"
+	service_name="$(get_ddns_config_option ${1} service_name)"
+	interface="$(get_ddns_config_option ${1} interface)"
+	ip_network="$(get_ddns_config_option ${1} ip_network)"
+	username="$(get_ddns_config_option ${1} username)"
+	password="$(get_ddns_config_option ${1} password)"
+	lookup_host="$(get_ddns_config_option ${1} lookup_host)"
+	use_ipv6="$(get_ddns_config_option ${1} use_ipv6 "0")"
+	force_ipversion="$(get_ddns_config_option ${1} force_ipversion "0")"
+	use_https="$(get_ddns_config_option ${1} use_https "0")"
+	force_dnstcp="$(get_ddns_config_option ${1} force_dnstcp "0")"
+
+	if [ -z "${service_name}" ]; then
+		uci -q delete ddns."${1}"
+		return 0
+	fi
+
+	# check server file is present in device
+	if [ ! -f "/etc/ddnsmngr/servers/${service_name}.json" ]; then
+		uci -q delete ddns."${1}"
+		return 0
+	fi
+
+	# Check if client section is already added for this service
+	clients=$(uci -q show ddnsmngr | grep "=client")
+	client_count=$(echo "${clients}" | wc -l)
+
+	tmp=0
+	while [ $tmp -lt $client_count ]
+	do
+		mngr_serv="$(uci -q get ddnsmngr.@client[$tmp].service_name)"
+		mngr_intf="$(uci -q get ddnsmngr.@client[$tmp].interface)"
+		mngr_netw="$(uci -q get ddnsmngr.@client[$tmp].ip_network)"
+		mngr_user="$(uci -q get ddnsmngr.@client[$tmp].username)"
+		mngr_ipv6="$(uci -q get ddnsmngr.@client[$tmp].use_ipv6)"
+		mngr_forceip="$(uci -q get ddnsmngr.@client[$tmp].force_ipversion)"
+		mngr_https="$(uci -q get ddnsmngr.@client[$tmp].use_https)"
+		mngr_dnstcp="$(uci -q get ddnsmngr.@client[$tmp].force_dnstcp)"
+
+		[ -z "${mngr_ipv6}" ] && mngr_ipv6="0"
+		[ -z "${mngr_forceip}" ] && mngr_forceip="0"
+		[ -z "${mngr_https}" ] && mngr_https="0"
+		[ -z "${mngr_dnstcp}" ] && mngr_dnstcp="0"
+
+		if [ "${mngr_serv}" == "${service_name}" ] && [ "${mngr_intf}" == "${interface}" ] && \
+		   [ "${mngr_netw}" == "${ip_network}" ] && [ "${mngr_user}" == "${username}" ] && \
+		   [ "${mngr_ipv6}" == "${use_ipv6}" ] && [ "${mngr_forceip}" == "${force_ipversion}" ] && \
+		   [ "${mngr_https}" == "${use_https}" ] && [ "${mngr_dnstcp}" == "${force_dnstcp}" ]; then
+			break
+		fi
+
+		tmp=$(( tmp + 1 ))
+	done
+
+	if [ $tmp -ne $client_count ]; then
+		i=0
+		for client in $clients; do
+			if [ $i -eq $tmp ]; then
+				client_sec="$(echo $client | cut -d'=' -f 1 | cut -d'.' -f 2)"
+				break
+			fi
+			i=$(( i + 1 ))
+		done
+
+		if [ $enabled -eq 1 ]; then
+			uci -q set ddnsmngr."${client_sec}".enabled="1"
+		fi
+	else
+		client_sec=ddns_mig_client_"${cl_id}"
+
+		uci -q set ddnsmngr."${client_sec}"="client"
+		uci -q set ddnsmngr."${client_sec}".enabled="${enabled}"
+		uci -q set ddnsmngr."${client_sec}".service_name="${service_name}"
+		uci -q set ddnsmngr."${client_sec}".interface="${interface}"
+		uci -q set ddnsmngr."${client_sec}".ip_network="${ip_network}"
+		uci -q set ddnsmngr."${client_sec}".username="${username}"
+		uci -q set ddnsmngr."${client_sec}".password="${password}"
+		uci -q set ddnsmngr."${client_sec}".use_ipv6="${use_ipv6}"
+		uci -q set ddnsmngr."${client_sec}".force_ipversion="${force_ipversion}"
+		uci -q set ddnsmngr."${client_sec}".use_https="${use_https}"
+		uci -q set ddnsmngr."${client_sec}".force_dnstcp="${force_dnstcp}"
+
+		cl_id=$(( cl_id + 1 ))
+
+		# add server section if not added
+		servers=$(uci -q show ddnsmngr | grep "service=\'${service_name}\'")
+		if [ -z "${servers}" ]; then
+			server_sec=ddns_mig_server_"${srv_id}"
+			uci -q set ddnsmngr."${server_sec}"="server"
+			uci -q set ddnsmngr."${server_sec}".enabled="1"
+			uci -q set ddnsmngr."${server_sec}".service="${service_name}"
+			uci -q set ddnsmngr."${server_sec}".name="${service_name}"
+
+			srv_id=$(( srv_id + 1 ))
+		fi
+	fi
+
+
+	# if lookup_host is set then add host section
+	if [ -n "${lookup_host}" ] && [ -n "${client_sec}" ]; then
+		# check number of hosts present for this client
+		host_count=$(uci -q show ddnsmngr | grep "dm_parent=\'${client_sec}\'" | wc -l)
+		host_ix=$(( host_count + 1 ))
+		host_sec="${client_sec}"_host_"${host_ix}"
+
+		uci -q set ddnsmngr."${host_sec}"="host"
+		uci -q set ddnsmngr."${host_sec}".enabled="${enabled}"
+		uci -q set ddnsmngr."${host_sec}".lookup_host="${lookup_host}"
+		uci -q set ddnsmngr."${host_sec}".dm_parent="${client_sec}"
+	fi
+
+	uci -q delete ddns."${1}"
+}
+
+function migrate_ddns_config() {
+	if [ ! -f "/etc/config/ddnsmngr" ]; then
+		# Create ddnsmngr config file
+		touch /etc/config/ddnsmngr
+	fi
+
+	config_supported_service
+
+	config_load ddns
+	config_foreach migrate_service_section service
+
+	uci -q commit ddns
+	uci -q commit ddnsmngr
+}
+
+migrate_ddns_config

ddnsmngr/files/usr/lib/ddns_script/ddnsmngr_service.sh

@@ -0,0 +1,169 @@
+#! /bin/sh
+
+RUNDIR="/var/run/ddnsmngr"
+LOGDIR="/var/log/ddnsmngr"
+PROG="/usr/lib/ddnsmngr/ddnsmngr_updater.sh"
+CONFIGFILE="/var/run/ddnsmngr/ddnsmngr.json"
+CLIENT_INTFS=""
+
+. /usr/share/libubox/jshn.sh
+
+log() {
+	echo "$*"|logger -t ddnsmngr.init -p debug
+}
+
+validate_host_section() {
+	uci_validate_section ddnsmngr host "${1}" \
+		'enabled:bool:0' \
+		'lookup_host:string' \
+		'dm_parent:string'
+}
+
+validate_client_section() {
+	uci_validate_section ddnsmngr client "${1}" \
+		'enabled:bool:0' \
+		'service_name:string' \
+		'interface:string' \
+		'ip_network:string' \
+		'username:string' \
+		'password:string' \
+		'use_https:bool:0' \
+		'force_dnstcp:bool:0' \
+		'use_ipv6:bool:0' \
+		'force_ipversion:bool:0'
+}
+
+add_object() {
+	local enabled lookup_host dm_parent use_ipv6 force_ipversion proc_info_file
+	local service_name interface ip_network username password use_https force_dnstcp
+
+	validate_host_section "${1}" || {
+		log "Validation of host section failed"
+		return 0
+	}
+
+	if [ "${enabled}" -ne 1 ] || [ -z "${dm_parent}" ]; then
+		return 0
+	fi
+
+	validate_client_section "${dm_parent}" || {
+		log "Validation of client section failed"
+		return 0 
+	}
+
+	if [ "${enabled}" -ne 1 ]; then
+		return 0
+	fi
+
+	service_name=$(uci -q get ddnsmngr.${dm_parent}.service_name)
+	if [ -z "${service_name}" ]; then
+		return 0
+	fi
+
+	service_section=$(uci -q show ddnsmngr | grep "service=\'${service_name}\'" | cut -d'.' -f 2 | head -1)
+	if [ -z "${service_section}" ]; then
+		return 0
+	fi
+
+	service_enabled=$(uci -q get ddnsmngr.${service_section}.enabled)
+	if [ "${service_enabled}" -ne 1 ]; then
+		return 0
+	fi
+
+	json_add_object
+	json_add_string "interface" "${interface}"
+	json_add_string "service_name" "${service_name}"
+	json_add_string "username" "${username}"
+	json_add_string "password" "${password}"
+	json_add_string "lookup_host" "${lookup_host}"
+	json_add_string "ip_network" "${ip_network}"
+	json_add_string "proc_info_file" "${1}"
+	json_add_string "use_ipv6" "${use_ipv6}"
+	json_add_string "force_ipversion" "${force_ipversion}"
+	json_add_string "use_https" "${use_https}"
+	json_add_string "force_dnstcp" "${force_dnstcp}"
+	json_close_object
+
+	if [ -z "${interface}" ]; then
+		if [ "${use_ipv6}" -eq 0 ]; then
+			interface="wan"
+		else
+			interface="wan6"
+		fi
+	fi
+
+	for intf in $CLIENT_INTFS; do
+		if [ "${intf}" == "${interface}" ]; then
+			return 0
+		fi
+	done
+
+	CLIENT_INTFS="${CLIENT_INTFS} ${interface}"
+}
+
+start_ddnsmngr_service() {
+	run_dir=$(uci -q get ddnsmngr.global.ddns_rundir)
+	log_dir=$(uci -q get ddnsmngr.global.ddns_logdir)
+
+	if [ -n "${run_dir}" ]; then
+		RUNDIR="${run_dir}"
+	fi
+
+	if [ -n "${log_dir}" ]; then
+		LOGDIR="${log_dir}"
+	fi
+
+	mkdir -p "${RUNDIR}"
+	mkdir -p "${LOGDIR}"
+
+	conf_file=$(uci -q get ddnsmngr.global.configfile)
+	if [ -n "${conf_file}" ]; then
+		CONFIGFILE="${conf_file}"
+	fi
+
+	touch "${CONFIGFILE}"
+
+	if [ ! -f "${CONFIGFILE}" ]; then
+		log "Can not create ${CONFIGFILE}, exit"
+		exit 0
+	fi
+
+	json_init
+	json_add_array "services"
+
+	config_load ddnsmngr
+	config_foreach add_object host
+
+	json_close_array
+	json_dump > "${CONFIGFILE}"
+
+	procd_open_instance ddnsmngr
+	procd_set_param command "$PROG"
+	procd_append_param command -c "${CONFIGFILE}"
+	procd_append_param command -- start
+	procd_close_instance
+}
+
+stop_ddnsmngr_service() {
+	conf_file=$(uci -q get ddnsmngr.global.configfile)
+	if [ -n "${conf_file}" ]; then
+		CONFIGFILE="${conf_file}"
+	fi
+
+	if [ ! -f "${CONFIGFILE}" ]; then
+		log "${CONFIGFILE} not found, can't stop services if running any"
+	fi
+
+	"$PROG" -c "${CONFIGFILE}" -- stop
+	return 0
+}
+
+add_ddnsmngr_triggers() {
+	procd_open_trigger
+	for intf in $CLIENT_INTFS; do
+		# No need to handle other ifevents like ifupdate etc
+		procd_add_interface_trigger "interface.*.up" $intf /etc/init.d/ddnsmngr restart
+		procd_add_interface_trigger "interface.*.down" $intf /etc/init.d/ddnsmngr restart
+	done
+	procd_close_trigger
+}

ddnsmngr/files/usr/lib/inadyn/ddnsmngr_service.sh

@@ -0,0 +1,311 @@
+#!/bin/sh
+
+PROG="/usr/sbin/inadyn"
+CONFIGPATH="/tmp/inadyn_config"
+PIDPATH="/etc/inadyn_pid"
+CLIENT_INTFS=""
+CONFIG_FILES=""
+SERVER_PATH="/etc/ddnsmngr/servers"
+
+FORMAT="custom [SECTION] {\n\tusername\t= [USER]\n\tpassword\t= [PWD]\n\tddns-server\t= [SERV]\n\tddns-path\t= [URI]\n\tssl\t\t= [SSL]\n\thostname\t= [NAME]\n\tcheckip-command\t= [CMD]\n\tddns-response\t= [RESPONSES]\n}"
+
+
+. /usr/share/libubox/jshn.sh
+
+log() {
+	echo "$*"|logger -t ddnsmngr.init -p debug
+}
+
+get_service_data() {
+	local provider="$1"
+	shift
+	local dir="$1"
+	shift
+	local ipv6="$1"
+	shift
+
+	local name data url answer script
+
+	[ $# -ne 2 ] && {
+		return 1
+	}
+
+	[ -f "${dir}/${provider}.json" ] || {
+		eval "$1=\"\""
+		eval "$2=\"\""
+		return 1
+	}
+
+	json_load_file "${dir}/${provider}.json"
+	json_get_var name "name"
+	if [ "$ipv6" -eq "1" ]; then
+		json_select "ipv6"
+	else
+		json_select "ipv4"
+	fi
+	json_get_var data "url"
+	json_get_var answer "answer"
+	json_select ".."
+	json_cleanup
+
+	response=""
+	if [ -n "${answer}" ]; then
+		answer=$(echo "${answer}" | sed 's/|/ /g')
+		for ans in $answer; do
+			if [ -z "${response}" ]; then
+				response="${ans}"
+			else
+				response="${response}, ${ans}"
+			fi
+		done
+		response="{ ${response} }"
+	fi
+
+	eval "$1=\"$data\""
+	eval "$2=\"$response\""
+
+	return 0
+}
+
+generate_inadyn_config() {
+	json_load "${1}"
+	json_get_var service_name service_name
+	json_get_var use_ipv6 use_ipv6
+	json_get_var interface interface
+	json_get_var username username
+	json_get_var password password
+	json_get_var host lookup_host
+	json_get_var conf_file config_file
+	json_get_var conf_dir config_dir
+	json_get_var server_address server_address
+	json_cleanup
+
+	if [ -z "${service_name}" ] || [ -z "${host}" ]; then
+		return 1
+	fi
+
+	if [ -z "${conf_file}" ]; then
+		return 1
+	fi
+
+	if [ -z "${conf_dir}" ]; then
+		return 1
+	fi
+
+	# First look into custom path to load the url otherwise default path
+	get_service_data "${service_name}" "${SERVER_PATH}" "${use_ipv6}" server_url server_answer
+
+	if [ -z "${server_url}" ]; then
+		return 1
+	fi
+
+	# Need to pick proto, server address and request uri separately from the url
+	# format http://[server_address]/[update_Request_uri]
+	proto=$(echo $server_url | cut -d':' -f 1)
+	serv=$(echo $server_url | cut -d'/' -f 3 | cut -d'@' -f 2)
+	uri=${server_url#*$serv}
+
+	if [ -z $proto ] || [ -z $serv ] || [ -z $uri ]; then
+		return 1
+	fi
+
+	path=$(echo "$uri" | sed 's/&/\\&/g')
+	update_uri=$(echo $path | sed -e "s#\[DOMAIN\]#%h#g"	-e "s#\[PASSWORD\]#%p#g" \
+				      -e "s#\[USERNAME\]#%u#g"	-e "s#\[IP\]#%i#g")
+
+	if [ -z "${interface}" ]; then
+		if [ "${use_ipv6}" -eq 0 ]; then
+			interface="wan"
+		else
+			interface="wan6"
+		fi
+	fi
+
+	# now get the physical interface name
+	intf=$(ifstatus "${interface}" | jsonfilter -e '@.device')
+	if [ -z "${intf}" ]; then
+		return 1
+	fi
+
+	# command to get ip of the interface
+	if [ "${use_ipv6}" -eq 0 ]; then
+		get_ip="\"ifstatus ${interface} | jsonfilter -e '@[\\\\\"ipv4-address\\\\\"][0].address'\""
+	else
+		get_ip="\"ifstatus ${interface} | jsonfilter -e '@[\\\\\"ipv6-address\\\\\"][0].address'\""
+	fi
+
+	if [ "${proto}" = "http" ]; then
+		ssl="false"
+	else
+		ssl="true"
+	fi
+
+	inadyn_ver=$(inadyn -v)
+	user_agent="inadyn/${inadyn_ver}"
+
+	config_file="${conf_dir}/${conf_file}"
+	touch "${config_file}"
+
+	echo "iface = ${intf}" > "${config_file}"
+	echo "period = 600" >> "${config_file}"
+	echo "user-agent = ${user_agent}" >> "${config_file}"
+
+	if [ "${use_ipv6}" -eq 1 ]; then
+		echo "allow-ipv6 = true" >> "${config_file}"
+	fi
+
+	if [ -z "${password}" ]; then
+		FORMAT=$(echo "${FORMAT}" | sed 's/\\tpassword\\t= \[PWD\]\\n//g')
+	fi
+
+	if [ -z "${server_answer}" ]; then
+		FORMAT=$(echo "${FORMAT}" | sed 's/\\tddns-response\\t= \[RESPONSES\]\\n//g')
+	fi
+
+	config=$(echo $FORMAT | sed -e "s#\[SECTION\]#$conf_file#g"	-e "s#\[PWD\]#$password#g" \
+				    -e "s#\[USER\]#$username#g"	-e "s#\[SERV\]#$serv#g" \
+				    -e "s#\[URI\]#\"$update_uri\"#g"	-e "s#\[SSL\]#$ssl#g" \
+				    -e "s#\[NAME\]#$host#g"	-e "s#\[CMD\]#$get_ip#g" \
+				    -e "s#\[RESPONSES\]#$server_answer#g")
+
+	echo -e "\n\n${config}" >> "${config_file}"
+
+	return 0
+}
+
+validate_host_section() {
+	uci_validate_section ddnsmngr host "${1}" \
+		'enabled:bool:0' \
+		'lookup_host:string' \
+		'dm_parent:string'
+}
+
+validate_client_section() {
+	uci_validate_section ddnsmngr client "${1}" \
+		'enabled:bool:0' \
+		'service_name:string' \
+		'interface:string' \
+		'ip_network:string' \
+		'username:string' \
+		'password:string' \
+		'use_https:bool:0' \
+		'force_dnstcp:bool:0' \
+		'use_ipv6:bool:0' \
+		'force_ipversion:bool:0'
+}
+
+add_object() {
+	local enabled lookup_host dm_parent use_ipv6 force_ipversion
+	local service_name interface ip_network username password use_https force_dnstcp
+
+	validate_host_section "${1}" || {
+		log "Validation of host section failed"
+		return
+	}
+
+	if [ "${enabled}" -ne 1 ] || [ -z "${dm_parent}" ]; then
+		return
+	fi
+
+	validate_client_section "${dm_parent}" || {
+		log "Validation of client section failed"
+		return
+	}
+
+	if [ "${enabled}" -ne 1 ]; then
+		return
+	fi
+
+	service_name=$(uci -q get ddnsmngr.${dm_parent}.service_name)
+	if [ -z "${service_name}" ]; then
+		return
+	fi
+
+	service_section=$(uci show ddnsmngr | grep "service=\'${service_name}\'" | cut -d'.' -f 2 | head -1)
+	if [ -z "${service_section}" ]; then
+		return
+	fi
+
+	service_enabled=$(uci -q get ddnsmngr.${service_section}.enabled)
+	if [ "${service_enabled}" -ne 1 ]; then
+		return
+	fi
+
+	json_init
+	json_add_string "interface" "${interface}"
+	json_add_string "service_name" "${service_name}"
+	json_add_string "username" "${username}"
+	json_add_string "password" "${password}"
+	json_add_string "lookup_host" "${lookup_host}"
+	json_add_string "ip_network" "${ip_network}"
+	json_add_string "use_ipv6" "${use_ipv6}"
+	json_add_string "force_ipversion" "${force_ipversion}"
+	json_add_string "use_https" "${use_https}"
+	json_add_string "force_dnstcp" "${force_dnstcp}"
+	json_add_string "config_file" "${1}"
+	json_add_string "config_dir" "${CONFIGPATH}"
+
+	json_str=$(json_dump)
+	json_cleanup
+
+	generate_inadyn_config "${json_str}"
+
+	if [ "$?" -ne 0 ]; then
+		return
+	fi
+
+	CONFIG_FILES="${CONFIG_FILES} ${1}"
+
+	if [ -z "${interface}" ]; then
+		if [ "${use_ipv6}" -eq 0 ]; then
+			interface="wan"
+		else
+			interface="wan6"
+		fi
+	fi
+
+	for intf in $CLIENT_INTFS; do
+		if [ "${intf}" == "${interface}" ]; then
+			return
+		fi
+	done
+
+	CLIENT_INTFS="${CLIENT_INTFS} ${interface}"
+}
+
+start_ddnsmngr_service() {
+	rm -rf $CONFIGPATH
+	mkdir $CONFIGPATH
+	mkdir -p $PIDPATH
+
+	config_load ddnsmngr
+	config_foreach add_object host
+
+	i=1
+	for conf in $CONFIG_FILES; do
+		instance="ddnsmngr_${i}"
+		i=$(( i + 1 ))
+
+		procd_open_instance $instance
+		procd_set_param command "$PROG"
+		procd_append_param command -f "${CONFIGPATH}/${conf}"
+		procd_append_param command -l debug
+		procd_append_param command -P "${PIDPATH}/${conf}"
+		procd_append_param command -n -C
+		procd_close_instance
+	done
+}
+
+stop_ddnsmngr_service() {
+	rm -rf $CONFIGPATH
+	return 0
+}
+
+add_ddnsmngr_triggers() {
+	procd_open_trigger
+	for intf in $CLIENT_INTFS; do
+		# No need to handle other ifevents like ifupdate etc
+		procd_add_interface_trigger "interface.*.up" $intf /etc/init.d/ddnsmngr restart
+	done
+	procd_close_trigger
+}

decollector/Config.in

@@ -2,6 +2,6 @@ menu "Configuration"
 
 config DECOLLECTOR_EASYMESH_VERSION
 	int "Support Easymesh version"
-	default 4
+	default 6
 
 endmenu

decollector/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=decollector
-PKG_VERSION:=4.1.0.4
+PKG_VERSION:=6.0.1.0
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=566f0b7d148c0ece72f311c4f4b6b5f8e11d6f97
+PKG_SOURCE_VERSION:=a94894a827259471a1ed528c20eae85596a56743
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/decollector.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -29,7 +29,7 @@ define Package/decollector
   CATEGORY:=Utilities
   TITLE:=WiFi DataElements Collector Proxy
   DEPENDS:=+libuci +libubox +ubus +libpthread +libnl-genl \
-	   +libeasy +libwifiutils +libieee1905 +map-plugin
+	   +libeasy +libwifiutils +libieee1905 +ieee1905-map-plugin
 endef
 
 define Package/decollector/description

decollector/files/decollector.init

@@ -7,7 +7,7 @@ USE_PROCD=1
 PROG=/usr/sbin/decollector
 
 service_running() {
-	ubus -t 2 wait_for ieee1905 ieee1905.map topology
+	ubus -t 2 wait_for ieee1905 ieee1905.map
 }
 
 start_service() {

dectmngr/Makefile

@@ -2,13 +2,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dectmngr
 PKG_RELEASE:=3
-PKG_VERSION:=3.5.14
+PKG_VERSION:=3.6.9
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=4f16755f8ac09d373234565f050832c049bdf543
+PKG_SOURCE_VERSION:=82d5bae7ef1d54b41029c9f87e8c821cde38a28e
 PKG_MIRROR_HASH:=skip
 endif
 

dectmngr/files/etc/init.d/dectmngr

@@ -11,8 +11,6 @@ LOG_PATH=/var/log/dectmngr
 DB_PATH=/etc/dect
 DCX81_UART_DT_ALIAS=/proc/device-tree/aliases/dcx81-uart
 
-DECT_GPIO="$(gpiofind DCX81_RSTN | cut -d ' ' -f 2 2>/dev/null)"
-
 # Ask dectmngr to exit nicely and wait for it to clean up, which is a slow process.
 stop_and_wait_dectmngr() {
 	dect_pid=$(pidof $PROG)
@@ -64,8 +62,6 @@ start_service() {
 		dcx81_uart_device=/dev/ttyH0
 	fi
 
-	[ -n "$DECT_GPIO" ] && echo 1 > /sys/class/gpio/gpio${DECT_GPIO}/value
-
 	rfpi=$(db -q get hw.board.dect_rfpi)
 	[ -n "$rfpi" -a ${#rfpi} -eq 14 ] && opt_ext="$opt_ext -rfpi $rfpi"
 
@@ -112,7 +108,6 @@ start_service() {
 stop_service() {
 	has_dect || return 0
 
-	[ -n "$DECT_GPIO" ] && echo 0 > /sys/class/gpio/gpio${DECT_GPIO}/value
 	stop_and_wait_dectmngr
 }
 
@@ -126,11 +121,6 @@ service_triggers() {
 }
 
 boot() {
-	[ -n "$DECT_GPIO" ] && {
-		echo ${DECT_GPIO} > /sys/class/gpio/export
-		echo out > /sys/class/gpio/gpio${DECT_GPIO}/direction
-	}
-
 	[ ! -d $LOG_PATH ] && mkdir -p $LOG_PATH
 	[ ! -d $DB_PATH ] && mkdir -p $DB_PATH
 	start

dhcpmngr/Makefile

@@ -0,0 +1,56 @@
+#
+# Copyright (C) 2024 IOPSYS Software Solutions AB
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=dhcpmngr
+PKG_VERSION:=1.0.3
+
+LOCAL_DEV:=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/network/dhcpmngr.git
+PKG_SOURCE_VERSION:=93f756f80a9391afd9b01f2608e031c4db3ca48b
+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/dhcpmngr
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=Package to add Device.DHCPv4 and v6 data model support.
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbfdm-api +odhcpd
+  DEPENDS+=+DNSMNGR_DNS_SD:umdns
+  DEPENDS+=+DNSMNGR_BACKEND_DNSMASQ:dnsmasq
+endef
+
+define Package/dhcpmngr/description
+  Package to add Device.DHCPv4. and Device.DHCPv6. data model support.
+endef
+
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+	$(CP) -rf ~/git/dhcpmngr/* $(PKG_BUILD_DIR)/
+endef
+endif
+
+define Package/dhcpmngr/install
+	$(INSTALL_DIR) $(1)/etc/udhcpc.user.d
+	$(INSTALL_BIN) ./files/etc/udhcpc.user.d/udhcpc_lease_start_time.user $(1)/etc/udhcpc.user.d/udhcpc_lease_start_time.user
+ifeq ($(CONFIG_DNSMNGR_BACKEND_UNBOUND),y)
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
+	$(INSTALL_DATA) ./files/etc/uci-defaults/unbound.odhcpd.uci_default $(1)/etc/uci-defaults/16-set-unbound-as-odhcpd-leasetrigger
+endif
+	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/libdhcpmngr.so $(1) $(PKG_NAME)
+endef
+
+$(eval $(call BuildPackage,dhcpmngr))

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

@@ -0,0 +1,18 @@
+#!/bin/sh
+
+# update odhcpd uci to use unbound's script as leasetrigger
+uci -q get dhcp.odhcpd >/dev/null 2>&1 && {
+	maindhcp="$(uci -q get dhcp.odhcpd.maindhcp)"
+
+	# if odhcpd is the main dhcp
+	[ "$maindhcp" = "1" ] || [ "$maindhcp" = "true" ] || [ "$maindhcp" = "on" ] && {
+		# if unbound daemon and unbound script file is present
+		[ -e /usr/lib/unbound/odhcpd.sh ] && [ -e /usr/sbin/unbound ] && {
+			# then set unbound script as leasetrigger in dhcp UCI
+			uci -q set dhcp.odhcpd.leasetrigger='/usr/lib/unbound/odhcpd.sh'
+			uci commit dhcp
+		}
+	}
+}
+
+exit 0

dhcpmngr/files/etc/udhcpc.user.d/udhcpc_lease_start_time.user

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+leasestarttime="$(awk -F'.' '{print $1}' /proc/uptime 2> /dev/null)"
+target_file=/tmp/dhcp_client_info
+target_str="$INTERFACE $lease $leasestarttime"
+
+# if this interface is present in file, then replace it
+if grep -q "$INTERFACE" "$target_file" 2> /dev/null; then
+	# replace the whole line if pattern matches
+	sed -i "/${INTERFACE}/c\\${target_str}" "$target_file"
+else
+	# interface info was not present, append it to the file
+	echo "$target_str" >> "$target_file"
+fi

dnsmngr/Config.in

@@ -0,0 +1,30 @@
+if PACKAGE_dnsmngr
+
+menu "Configuration"
+
+config DNSMNGR_DNS_SD
+	bool "Include Device.DNS.SD. TR-181 support"
+	default y
+	help
+	   Set this option to include support for TR-181 DNS.SD. object.
+
+choice
+	prompt "Select backend for DNS management"
+	default DNSMNGR_BACKEND_DNSMASQ
+	depends on PACKAGE_dnsmngr
+	help
+		Select which backend daemon to use for DNS
+
+config DNSMNGR_BACKEND_DNSMASQ
+	bool "Use dnsmasq for dns and dhcp"
+	help
+	   Enable this option to use dnsmasq + odhcpd for dns and dhcp.
+
+config DNSMNGR_BACKEND_UNBOUND
+	bool "Use unbound with odhcpd-full for dns and dhcp"
+	help
+	   Enable this option to use unbound + odhcpd for dns and dhcp.
+
+endchoice
+endmenu
+endif

dnsmngr/Makefile

@@ -0,0 +1,73 @@
+#
+# Copyright (C) 2022-2024 IOPSYS Software Solutions AB
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=dnsmngr
+PKG_VERSION:=1.0.10
+
+LOCAL_DEV:=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/network/dnsmngr.git
+PKG_SOURCE_VERSION:=dd7a285798b48e199f5e5d90d9c20cb5e0c14888
+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 +odhcpd
+  DEPENDS+=+DNSMNGR_DNS_SD:umdns
+  DEPENDS+=+DNSMNGR_BACKEND_DNSMASQ:dnsmasq
+  DEPENDS+=+DNSMNGR_BACKEND_UNBOUND:unbound-daemon +DNSMNGR_BACKEND_UNBOUND:unbound-control
+  TITLE:=Package to configure DNS backend and TR-181 support
+endef
+
+define Package/dnsmngr/description
+  Package to configure DNS backend and TR-181 support.
+endef
+
+define Package/$(PKG_NAME)/config
+	source "$(SOURCE)/Config.in"
+endef
+
+ifeq ($(CONFIG_DNSMNGR_DNS_SD),y)
+define Build/Compile
+	$(call Build/Compile/Default,all)
+endef
+else
+define Build/Compile
+	$(call Build/Compile/Default,dns)
+endef
+endif
+
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+	$(CP) -rf ~/git/dnsmngr/* $(PKG_BUILD_DIR)/
+endef
+endif
+
+ifeq ($(CONFIG_DNSMNGR_BACKEND_DNSMASQ),y)
+        TARGET_CFLAGS += -DDNSMASQ_BACKEND
+endif
+
+define Package/dnsmngr/install
+	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/libdnsmngr.so $(1) $(PKG_NAME)
+	$(BBFDM_INSTALL_SCRIPT) -d $(PKG_BUILD_DIR)/scripts/nslookup $(1)
+ifeq ($(CONFIG_DNSMNGR_DNS_SD),y)
+	$(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/src/libdns_sd.so $(1) $(PKG_NAME)
+endif
+endef
+
+$(eval $(call BuildPackage,dnsmngr))

dslmngr/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2018 iopsys Software Solutions AB
+# Copyright (C) 2018-2024 iopsys Software Solutions AB
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,14 +8,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dslmngr
-PKG_VERSION:=1.2.0
+PKG_VERSION:=1.2.6
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=43dec92b1c86be7859521da337e7bd1168848b26
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dslmngr.git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/hal/dslmngr.git
+PKG_SOURCE_VERSION:=2b1ecbd2079dbd88ed6d58b277b91dcf5038d869
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MAINTAINER:=Rahul Thakur <rahul.thakur@iopsys.eu>
 PKG_MIRROR_HASH:=skip
 endif
 
@@ -25,6 +26,7 @@ PKG_LICENSE_FILES:=LICENSE
 
 
 include $(INCLUDE_DIR)/package.mk
+include ../bbfdm/bbfdm.mk
 
 ifeq ($(CONFIG_TARGET_brcmbca),y)
   TARGET_PLATFORM=BROADCOM
@@ -38,7 +40,7 @@ define Package/dslmngr
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=XDSL status and configration utility
-  DEPENDS:=+libdsl +libuci +libubox +ubus +libpthread +libnl-genl +libeasy
+  DEPENDS:=+libdsl +libuci +libubox +ubus +libpthread +libnl-genl +libeasy +libbbfdm-api
 endef
 
 define Package/dslmngr/description
@@ -59,7 +61,7 @@ MAKE_FLAGS += \
 
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
-	rsync -r --exclude=.* ~/git/dslmngr/ $(PKG_BUILD_DIR)/
+	rsync -r --exclude=.* ./dslmngr/ $(PKG_BUILD_DIR)/
 endef
 endif
 
@@ -68,12 +70,14 @@ 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/
+	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/libbbfdsl.so $(1) $(PKG_NAME)
 endef
 
 $(eval $(call BuildPackage,dslmngr))

dslmngr/files/broadcom/lib/dsl/broadcom.sh

@@ -211,8 +211,8 @@ create_ptm_devices() {
 
 prioritize_arp()
 {
-      ebtables -t nat -D POSTROUTING -j mark --mark-or 0x7 -p ARP >/dev/null
-      ebtables -t nat -A POSTROUTING -j mark --mark-or 0x7 -p ARP >/dev/null
+      ebtables --concurrent -t nat -D POSTROUTING -j mark --mark-or 0x7 -p ARP >/dev/null
+      ebtables --concurrent -t nat -A POSTROUTING -j mark --mark-or 0x7 -p ARP >/dev/null
 }
 
 xtm_remove_devices() {

easy-qos/Makefile

@@ -1,47 +0,0 @@
-#
-# Copyright (C) 2019 iopsys Software Solutions AB
-#
-# This is free software, licensed under the GNU General Public License v2.
-# 
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=easy-qos
-PKG_VERSION:=1.1
-PKG_RELEASE:=0
-
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=none
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/easy-qos
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=Easy QoS
-  DEPENDS:=@(TARGET_brcmbca||TARGET_airoha)
-endef
-
-define Package/easy-qos/description
-	This package contains Easy QoS utility
-endef
-
-define Build/Prepare
-	mkdir -p $(PKG_BUILD_DIR)
-	$(CP) ./files/* $(PKG_BUILD_DIR)/
-endef
-
-define Build/Compile
-endef
-
-define Package/easy-qos/install
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
-	$(CP) ./files/etc/config/easy_qos $(1)/etc/config/
-	$(CP) ./files/etc/init.d/easy_qos.iptables $(1)/etc/init.d/easy_qos
-	$(CP) ./files/etc/uci-defaults/* $(1)/etc/uci-defaults/
-	$(CP) ./files/etc/firewall.easyqos $(1)/etc/firewall.easyqos
-endef
-
-$(eval $(call BuildPackage,easy-qos))

easy-qos/files/etc/firewall.easyqos

@@ -1 +0,0 @@
-/etc/init.d/easy_qos reload

easy-qos/files/etc/init.d/easy_qos.ebtables

@@ -1,140 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=99
-USE_PROCD=1
-
-log() {
-	echo "${@}"|logger -t easy_qos.ebtable -p debug
-}
-
-exec_log() {
-	${@}
-	if [ "${?}" -ne 0 ]; then
-		log "Failed to create ${@}";
-	fi
-}
-
-get_priority() {
-	local prio=$(echo $1|tr 'A-Z' 'a-z');
-	case "${prio}" in
-		"lowest")
-			echo 0;;
-		"low")
-			echo 1;;
-		"besteffort")
-			echo 2;;
-		"normal")
-			echo 3;;
-		"video")
-			echo 4;;
-		"medium")
-			echo 5;;
-		"high")
-			echo 6;;
-		"highest")
-			echo 7;;
-	esac
-}
-
-validate_rule_section()
-{
-	uci_validate_section easy_qos rule "${1}" \
-		'priority:string' \
-		'macaddr:string' \
-		'proto:string:none' \
-		'port:list(uinteger)' \
-		'comment:string:none'
-}
-
-# Clear existing rules before applying new rules
-clear_existing_rules() {
-	local rule=$(ebtables -t broute -L BROUTING|grep -m 1 mark)
-	while [ -n "${rule}" ]; do
-		exec_log ebtables -t broute -D BROUTING ${rule}
-		rule=$(ebtables -t broute -L BROUTING|grep -m 1 mark)
-	done
-}
-
-create_rule() {
-	local protocol=$1; shift
-	local mac=$1; shift
-	local mark="0x$1"; shift
-	local forward_port=$1;
-	local cmd="";
-	local protocol_number
-
-	cmd="-j mark --mark-or ${mark}";
-	if [ -n "${forward_port}" ]; then
-		cmd="--ip-destination-port ${forward_port} ${cmd}";
-	fi
-	
-	case "${protocol}" in
-		"tcp")
-			protocol_number=6;;
-		"udp")
-			protocol_number=17;;
-		"dccp")
-			protocol_number=33;;
-		"sctp")
-			protocol_number=132;;
-		*)
-			log "Protocol ${protocol} not supported in ebtables"
-			return;;
-	esac
-			
-	cmd="--ip-proto ${protocol_number} $cmd"
-	cmd="-p ip $cmd"
-
-	cmd="-s ${mac} $cmd"
-	exec_log ebtables -t broute -A BROUTING ${cmd}
-}
-
-manage_rule() {
-	local cfg="$1"
-	local priority macaddr proto port comment prio_num protocol
-
-	validate_rule_section "${1}" || {
-		log "Validation of section failed"
-		return 1;
-	}
-
-	protocol=$(echo ${proto}|tr 'A-Z' 'a-z')
-	prio_num=$(get_priority ${priority})
-	if [ -n "${macaddr}" -a -n "${prio_num}" ]; then
-		for p in ${port}; do
-			if [ "${protocol}" == "none" -o "${protocol}" == "tcpudp" ]; then
-				create_rule tcp ${macaddr} ${prio_num} ${p}
-				create_rule udp ${macaddr} ${prio_num} ${p}
-			else
-				create_rule ${protocol} ${macaddr} ${prio_num} ${p}
-			fi
-		done
-		# Create rule for all ports if port is not mentioned in uci
-		if [ -z "${port}" ]; then
-			if [ "${protocol}" == "none" -o "${protocol}" == "tcpudp" ]; then
-				create_rule tcp ${macaddr} ${prio_num}
-				create_rule udp ${macaddr} ${prio_num}
-			else
-				create_rule ${protocol} ${macaddr} ${prio_num}
-			fi
-		fi
-	fi
-}
-
-reload_service() {
-	# Do not apply rules if ebtables is not present in system
-	[ -x /usr/sbin/ebtables ] || return;
-
-	clear_existing_rules
-	config_load easy_qos
-	config_foreach manage_rule rule
-}
-
-start_service() {
-	reload_service
-}
-
-service_triggers() {
-	procd_add_reload_trigger "easy_qos"
-}
-

easy-qos/files/etc/init.d/easy_qos.iptables

@@ -1,186 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-. /usr/share/libubox/jshn.sh
-
-START=99
-USE_PROCD=1
-
-CLIENT_LIST="/tmp/easy_qos_client.list"
-
-log() {
-	echo "${@}"|logger -t easy_qos -p debug
-}
-
-exec_log() {
-	${@}
-	if [ "${?}" -ne 0 ]; then
-		log "Failed to create ${@}";
-	fi
-}
-
-get_priority() {
-	local prio=$(echo $1|tr 'A-Z' 'a-z');
-	case "${prio}" in
-		"lowest")
-			echo 0;;
-		"low")
-			echo 1;;
-		"besteffort")
-			echo 2;;
-		"normal")
-			echo 3;;
-		"video")
-			echo 4;;
-		"medium")
-			echo 5;;
-		"high")
-			echo 6;;
-		"highest")
-			echo 7;;
-	esac
-}
-
-clean_client_entries() {
-	[ -f ${CLIENT_LIST} ] && rm ${CLIENT_LIST}
-}
-
-map_client_entries() {
-	local clients ip mac host
-
-	json_load "$(ubus call router.network 'clients')"
-	json_get_keys keys
-
-	for key in ${keys};
-	do
-		json_select ${key}
-		json_get_vars ipaddr macaddr hostname
-		clients="${macaddr} ${ipaddr} ${hostname};${clients}"
-		json_select ..
-	done
-
-	json_init
-
-#	json_add_array "clients"
-	IFS=";"
-	for client in ${clients};
-	do
-		macaddr=$(echo ${client} | cut -d" " -f1)
-		json_add_object "${macaddr//:/_}"
-		json_add_string "ip" "$(echo ${client} | cut -d" " -f2)"
-		json_add_string "macaddr" "$(echo ${client} | cut -d" " -f1)"
-		json_add_string "host" "$(echo ${client} | cut -d" " -f3)"
-		json_close_object
-	done
-
-	IFS=' '
-	echo `json_dump` > ${CLIENT_LIST}
-	json_cleanup
-}
-
-# Find the IP of a corresponding mac from arp table
-get_ipaddress() {
-	local clients ip mac host
-
-	json_load "$(cat ${CLIENT_LIST})"
-	json_get_keys keys
-
-	# jshn seems a bit iffy on having : in key, replace by _
-	json_select "${1//:/_}" 2 > /dev/null
-	json_get_var ip ip
-
-	echo "$ip"
-}
-
-validate_rule_section()
-{
-	uci_validate_section easy_qos rule "${1}" \
-		'priority:string' \
-		'macaddr:string' \
-		'proto:string:none' \
-		'port:list(uinteger)' \
-		'comment:string:none'
-}
-
-# Clear existing rules before applying new rules
-clear_existing_rules() {
-	local rule=$(iptables -t mangle -S PREROUTING | grep -m 1 MARK |sed 's/-A/-D/1')
-	while [ -n "${rule}" ]; do
-		exec_log iptables -t mangle ${rule}
-		rule=$(iptables -t mangle -S PREROUTING | grep -m 1 MARK |sed 's/-A/-D/1')
-	done
-}
-
-check_and_create() {
-	iptables -t mangle -C PREROUTING ${@} 2>/dev/null
-	# Create rule if not exists
-	if [ ${?} -ne 0 ]; then
-		exec_log iptables -t mangle -A PREROUTING ${@}
-	else
-		log "Rule exists for ${@}"
-	fi
-}
-
-create_rule() {
-	local proto=$1; shift
-	local src_ip=$1; shift
-	local mark="0x$1/0x$1"; shift
-	local ports=$1;
-	local cmd="";
-
-	cmd="-j MARK --set-xmark ${mark}";
-	if [ -n "${ports}" ]; then
-		cmd="--match multiport --dports ${ports} ${cmd}";
-	fi
-
-	if [ "${proto}" == "icmp" ]; then
-		cmd="-p icmp -m icmp --icmp-type 8 $cmd"
-	elif [ "${proto}" == "all" ]; then
-		cmd="-p all $cmd"
-	else
-		cmd="-p ${proto} -m ${proto} $cmd"
-	fi
-	cmd="-s ${src_ip} $cmd"
-
-	check_and_create ${cmd} 
-}
-
-manage_rule() {
-	local cfg="$1"
-	local priority macaddr proto port comment prio_num ip port_list
-
-	validate_rule_section "${1}" || {
-		log "Validation of section failed"
-		return 1;
-	}
-
-	prio_num=$(get_priority ${priority})
-	ip=$(get_ipaddress ${macaddr})
-	port_list=$(echo ${port}|sed 's/ /,/g')
-
-	if [ -n "${ip}" -a -n "${prio_num}" ]; then
-		if [ "${proto}" == "none" -o "${proto}" == "tcpudp" ]; then
-			create_rule tcp ${ip} ${prio_num} ${port_list}
-			create_rule udp ${ip} ${prio_num} ${port_list}
-		else
-			create_rule ${proto} ${ip} ${prio_num} ${port_list}
-		fi
-	fi
-}
-
-reload_service() {
-	clear_existing_rules
-	map_client_entries
-	config_load easy_qos
-	config_foreach manage_rule rule
-	clean_client_entries
-}
-
-start_service() {
-	reload_service
-	echo "Easy QoS installed">/dev/console;
-}
-
-service_triggers() {
-	procd_add_reload_trigger "easy_qos"
-}
-

easy-qos/files/etc/uci-defaults/60-easyqos-reqs

@@ -1,8 +0,0 @@
-# Add firewall include
-uci -q batch <<-EOT
-        delete firewall.easyqos
-        set firewall.easyqos=include
-        set firewall.easyqos.path=/etc/firewall.easyqos
-        set firewall.easyqos.reload=1
-        commit firewall
-EOT

ebtables-extensions/Makefile

@@ -0,0 +1,80 @@
+#
+# Copyright (C) 2024 IOPSYS Software Solutions AB
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=ebtables-extensions
+PKG_VERSION:=1.0.4
+PKG_LICENSE:=GPL-2.0
+
+LOCAL_DEV:=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=35fb79f95c47d90e3791c7e126048b451f078f24
+PKG_SOURCE_URL:=https://dev.iopsys.eu/network/ebtables-extensions.git
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
+endif
+
+include $(INCLUDE_DIR)/package.mk
+
+define KernelPackage/vlantranslation
+  SUBMENU:=Other modules
+  TITLE:=Kernel module for ebtables VLAN translation
+  FILES:=$(PKG_BUILD_DIR)/src/ebt_vlantranslation.ko
+  DEPENDS+=+kmod-ebtables
+  AUTOLOAD:=$(call AutoLoad,30,ebt_vlantranslation,1)
+  KCONFIG:=
+endef
+
+define KernelPackage/dscp2pbit
+  SUBMENU:=Other modules
+  TITLE:=Kernel module for DSCP-to-Pbit mapping
+  DEPENDS+=+kmod-ebtables
+  FILES:=$(PKG_BUILD_DIR)/src/ebt_dscp2pbit.ko
+  AUTOLOAD:=$(call AutoLoad,30,ebt_dscp2pbit,1)
+  KCONFIG:=
+endef
+
+define KernelPackage/vlantranslation/description
+	Kernel module to enable VLAN translation for ebtables
+endef
+
+define KernelPackage/dscp2pbit/description
+	Kernel module to enableDSCP-to-Pbit mapping for ebtables
+endef
+
+ifeq ($(CONFIG_TARGET_brcmbca),y)
+	include ../../broadcom/bcmkernel/bcm-kernel-toolchain.mk
+endif
+
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+	$(CP) -rf ./src/* $(PKG_BUILD_DIR)/
+	$(CP) $(PKG_BUILD_DIR)/src/ebt_vlantranslation.h $(LINUX_DIR)/include/uapi/linux/netfilter_bridge/
+	$(CP) $(PKG_BUILD_DIR)/src/ebt_dscp2pbit.h $(LINUX_DIR)/include/uapi/linux/netfilter_bridge/
+endef
+else
+define Build/Prepare
+	$(Build/Prepare/Default)
+	$(CP) $(PKG_BUILD_DIR)/src/ebt_vlantranslation.h $(LINUX_DIR)/include/uapi/linux/netfilter_bridge/
+	$(CP) $(PKG_BUILD_DIR)/src/ebt_dscp2pbit.h $(LINUX_DIR)/include/uapi/linux/netfilter_bridge/
+endef
+endif
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/include/uapi/linux/netfilter_bridge/
+	$(CP) $(PKG_BUILD_DIR)/src/ebt_vlantranslation.h $(1)/include/uapi/linux/netfilter_bridge/
+	$(CP) $(PKG_BUILD_DIR)/src/ebt_dscp2pbit.h $(1)/include/uapi/linux/netfilter_bridge/
+endef
+
+KERNEL_MAKE_FLAGS += -I$(LINUX_DIR)/include
+
+define Build/Compile
+	$(KERNEL_MAKE) M="$(PKG_BUILD_DIR)/src" modules
+endef
+
+$(eval $(call KernelPackage,vlantranslation))
+$(eval $(call KernelPackage,dscp2pbit))

ethmngr/Config.in

@@ -0,0 +1,9 @@
+if (PACKAGE_ethmngr)
+
+menu "Configurations"
+
+config TR181_VENDOR_EXTENSIONS_MACVLAN
+	bool "Use TR181 vendor extension MACVLAN"
+	default y
+endmenu
+endif

ethmngr/Makefile

@@ -1,29 +1,33 @@
 #
-# Copyright (C) 2020 Iopsys
+# Copyright (C) 2020-2024 Iopsys
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ethmngr
-PKG_VERSION:=2.1.0
+PKG_VERSION:=2.1.9
 
+LOCAL_DEV:=0
+ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=5a0ff3bc7c49dcb05129f423ef8e0c4929f6aa03
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ethmngr.git
-
+PKG_SOURCE_URL:=https://dev.iopsys.eu/hal/ethmngr.git
+PKG_SOURCE_VERSION:=2d35e86cc8dfd7ef4e0d8579f5d314e90faadc90
+PKG_MAINTAINER:=Rahul Thakur <rahul.thakur@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
+endif
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
+include ../bbfdm/bbfdm.mk
 
 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
+  DEPENDS:=+(TARGET_brcmbca||TARGET_airoha||TARGET_ipq95xx||TARGET_ipq53xx||TARGET_mediatek):libethernet +libuci +libubox +ubus +libpthread +libnl-genl +libeasy +libbbfdm-api
 endef
 
 define Package/ethmngr/description
@@ -32,10 +36,25 @@ 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)/
+endef
+endif
+
 TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include \
 	-I$(STAGING_DIR)/usr/include/libnl3 \
-	-D_GNU_SOURCE
+	-D_GNU_SOURCE \
+	-DBBF_VENDOR_PREFIX=\\\"$(CONFIG_BBF_VENDOR_PREFIX)\\\"
+
+ifeq ($(CONFIG_TR181_VENDOR_EXTENSIONS_MACVLAN),y)
+TARGET_CFLAGS += -DTR181_VENDOR_EXTENSIONS_MACVLAN
+endif
 
 ifeq ($(CONFIG_TARGET_brcmbca)$(CONFIG_TARGET_airoha)$(CONFIG_TARGET_ipq95xx)$(CONFIG_TARGET_ipq53xx)$(CONFIG_TARGET_mediatek),)
 define Build/Compile
@@ -44,9 +63,15 @@ endif
 
 define Package/ethmngr/install
 	$(CP) ./files/* $(1)/
+	$(INSTALL_DIR) $(1)/etc/ethmngr
+	$(INSTALL_DIR) $(1)/etc/ethmngr/plugins
 ifneq ($(CONFIG_TARGET_brcmbca)$(CONFIG_TARGET_airoha)$(CONFIG_TARGET_ipq95xx)$(CONFIG_TARGET_ipq53xx)$(CONFIG_TARGET_mediatek),)
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ethmngr $(1)/usr/sbin/
+endif
+	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/libbbfethernet.so $(1) $(PKG_NAME)
+ifeq ($(CONFIG_TR181_VENDOR_EXTENSIONS_MACVLAN),y)
+	$(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/libbbfethernetmacvlan.so $(1) $(PKG_NAME)
 endif
 endef
 

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

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

ethmngr/files/etc/ruleng/ethport.json

@@ -0,0 +1,20 @@
+{
+	"ethport_update": {
+		"if" : [
+			{
+				"event": "network.device"
+			}
+		],
+		"then" : [
+			{
+				"cli": "/sbin/hotplug-call ethernet",
+				"envs": {
+					"PORT": "&network.device->ifname",
+					"LINK": "&network.device->link"
+				},
+				"timeout": 1
+			}
+		]
+	}
+}
+

ethmngr/files/etc/uci-defaults/ruleng.ethport

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

firewallmngr/Config.in

@@ -0,0 +1,12 @@
+if PACKAGE_firewallmngr
+
+menu "Configuration"
+
+config FIREWALLMNGR_PORT_TRIGGER
+	bool "Include Device.NAT.PortTrigger"
+	default y
+	help
+	   Set this option to include support for PortTrigger object.
+
+endmenu
+endif

firewallmngr/Makefile

@@ -0,0 +1,74 @@
+#
+# Copyright (C) 2024 IOPSYS Software Solutions AB
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=firewallmngr
+PKG_VERSION:=1.0.5
+
+LOCAL_DEV:=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/network/firewallmngr.git
+PKG_SOURCE_VERSION:=94246676dc2e2db29b94fcffec1be3cee3ec8e9f
+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/firewallmngr
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=Package to add Device.Firewall and Device.NAT. data model support.
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbfdm-api +firewall
+  DEPENDS+=+FIREWALLMNGR_PORT_TRIGGER:kmod-ipt-trigger +FIREWALLMNGR_PORT_TRIGGER:kmod-ip6t-trigger
+  DEPENDS+=+FIREWALLMNGR_PORT_TRIGGER:iptables-mod-nfqueue
+endef
+
+define Package/firewallmngr/description
+  Package to add Device.Firewall. and Device.NAT. data model support.
+endef
+
+define Package/$(PKG_NAME)/config
+        source "$(SOURCE)/Config.in"
+endef
+
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+	$(CP) -rf ~/git/firewallmngr/* $(PKG_BUILD_DIR)/
+endef
+endif
+
+ifeq ($(CONFIG_FIREWALLMNGR_PORT_TRIGGER),y)
+	TARGET_CFLAGS += -DINCLUDE_PORT_TRIGGER
+endif
+
+define Package/firewallmngr/install
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
+ifeq ($(CONFIG_FIREWALLMNGR_PORT_TRIGGER),y)
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_DIR) $(1)/lib/port-trigger
+
+	$(INSTALL_BIN) ./files/port-trigger/etc/init.d/port-trigger $(1)/etc/init.d/
+	$(INSTALL_DATA) ./files/port-trigger/etc/config/port-trigger $(1)/etc/config/
+	$(INSTALL_DATA) ./files/port-trigger/lib/port-trigger/port_trigger.sh $(1)/lib/port-trigger/
+endif
+	$(INSTALL_BIN) ./files/firewall.portmap $(1)/etc/
+	$(INSTALL_DATA) ./files/etc/uci-defaults/95-portmap-firewall $(1)/etc/uci-defaults/
+
+	$(INSTALL_BIN) ./files/firewall.service $(1)/etc/
+	$(INSTALL_DATA) ./files/etc/uci-defaults/97-firewall-service $(1)/etc/uci-defaults/
+
+	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/libfirewallmngr.so $(1) $(PKG_NAME)
+endef
+
+$(eval $(call BuildPackage,firewallmngr))

firewallmngr/files/etc/uci-defaults/97-firewall-service

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+uci -q batch <<-EOT
+        delete firewall.service_hook
+        set firewall.service_hook=include
+        set firewall.service_hook.path=/etc/firewall.service
+        set firewall.service_hook.reload=1
+        commit firewall
+EOT
+
+exit 0
+

firewallmngr/files/firewall.service

@@ -0,0 +1,163 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+log() {
+	echo "${@}"|logger -t firewall.service -p info
+}
+
+exec_cmd() {
+	if ! eval "$*"; then
+		log "Failed to run [$*]"
+		echo "-1"
+		return 0
+	fi
+
+	echo "0"
+	return 0
+}
+
+add_iptable_rule() {
+	chain_name=$1
+	protocol=$2
+	dest_port=$3
+	icmp_type=$4
+	family=$5
+	src_prefix=$6
+	action=$7
+	res=-1
+
+	cmd="-I ${chain_name}"
+
+	if [ -n "${protocol}" ]; then
+		cmd="${cmd} -p $protocol"
+
+		if [ "${protocol}" -eq 41 ] || [ "${protocol}" -eq 43 ] || [ "${protocol}" -eq 44 ] ||
+		   [ "${protocol}" -eq 58 ] || [ "${protocol}" -eq 59 ] || [ "${protocol}" -eq 60 ]; then
+		   	# Explicit v6 protocols
+			if [ "${family}" = "ipv4" ]; then
+				echo $res
+				return 0
+			else
+				family="ipv6"
+			fi
+		elif [ "${protocol}" -eq 1 ]; then
+		   	# Explicit v4 protocols
+			if [ "${family}" = "ipv6" ]; then
+				echo $res
+				return 0
+			else
+				family="ipv4"
+			fi
+		fi
+
+		# Limitation:: iptables do not accept dport without specific protocol
+		count=$(echo "${dest_port}" | sed -n "/-1/p" | wc -l)
+
+		if [ "${count}" -eq 0 ]; then
+			# dest_port not contains -1 so need to have this match criteria
+			count=$(echo "${dest_port}" | wc -w)
+			if [ "${count}" -gt 1 ]; then
+				# multiple ports present
+				port=$(echo "${dest_port}" | sed "s/ /,/g")
+				cmd="${cmd} -m multiport --dports ${port}"
+			else
+				cmd="${cmd} --dport ${dest_port}"
+			fi
+		fi
+	fi
+
+	if [ "${family}" = "ipv4" ] || [ "${family}" = "-1" ]; then
+		if [ "${protocol}" -eq 1 ] && [ "${icmp_type}" -ge 0 ]; then
+			cmd="${cmd} --icmp-type ${icmp_type}"
+		fi
+
+		if [ -z "${src_prefix}" ]; then
+			res=$(exec_cmd "iptables ${cmd} -m comment --comment IPtables_service_rule -j ${action}")
+		else
+			#Add ipv4 sources if any
+			src_list=""
+			for src in $src_prefix; do
+				ret=$(echo $src | grep ":" | wc -l)
+				if [ "${ret}" -eq 0 ]; then
+					src_list="$src,$src_list"
+				fi
+			done
+
+			if [ -n "$src_list" ]; then
+				src_list=$(echo "${src_list}" | sed "s/,$//")
+				res=$(exec_cmd "iptables -s $src_list ${cmd} -m comment --comment IPtables_service_rule -j ${action}")
+			fi
+		fi
+	fi
+
+	if [ "${family}" = "ipv6" ] || [ "${family}" = "-1" ]; then
+		if [ "${protocol}" -eq 58 ] && [ "${icmp_type}" -ge 0 ]; then
+			cmd="${cmd} --icmpv6-type ${icmp_type}"
+		fi
+
+		if [ -z "${src_prefix}" ]; then
+			res=$(exec_cmd "ip6tables ${cmd} -m comment --comment IP6tables_service_rule -j ${action}")
+		else
+			#Add ipv6 sources if any
+			src_list=""
+			for src in $src_prefix; do
+				ret=$(echo $src | grep ":" | wc -l)
+				if [ "${ret}" -eq 1 ]; then
+					src_list="$src,$src_list"
+				fi
+			done
+
+			if [ -n "$src_list" ]; then
+				src_list=$(echo "${src_list}" | sed "s/,$//")
+				res=$(exec_cmd "ip6tables -s $src_list ${cmd} -m comment --comment IP6tables_service_rule -j ${action}")
+			fi
+		fi
+	fi
+
+	echo $res
+}
+
+add_service() {
+	local enable proto family dest_port interface target icmp_type
+
+	config_get enable "$1" enable "0"
+	config_get icmp_type "$1" icmp_type "-1"
+	config_get target "$1" target "Accept"
+	config_get interface "$1" interface ""
+	config_get family "$1" family "-1"
+	config_get dest_port "$1" dest_port "-1"
+	config_get proto "$1" proto "-1"
+	config_get src_prefix "$1" src_prefix ""
+
+	if [ "${enable}" -eq 0 ] || [ -z "${interface}" ]; then
+		return 0
+	fi
+
+	action=$(echo "${target}" | tr a-z A-Z)
+	chain_name="zone_${interface}_input"
+	res=0
+
+	count=$(echo "${proto}" | sed -n "/-1/p" | wc -l)
+
+	if [ "${count}" -eq 0 ]; then
+		# proto not contains -1 so need to have this match criteria
+		for protocol in $proto; do
+			res=$(add_iptable_rule "$chain_name" "$protocol" "$dest_port" "$icmp_type" "$family" "$src_prefix" "$action")
+		done
+	else
+		# proto contains -1 so no need to have this match criteria
+		res=$(add_iptable_rule "$chain_name" "" "$dest_port" "$icmp_type" "$family" "$src_prefix" "$action")
+	fi
+
+	if [ "${res}" -ne 0 ]; then
+		uci -q set firewall."${1}".status="Error"
+	else
+		uci -q set firewall."${1}".status=""
+	fi
+
+	uci commit firewall
+}
+
+config_load firewall
+config_foreach add_service "service"

firewallmngr/files/port-trigger/etc/config/port-trigger

@@ -0,0 +1 @@
+#port trigger uci file

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

@@ -0,0 +1,21 @@
+#!/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
+}

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

@@ -0,0 +1,157 @@
+#!/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
+}

fluent-bit/Makefile

@@ -0,0 +1,176 @@
+#
+# Copyright (C) 2024 IOPSYS
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=fluent-bit
+PKG_VERSION:=3.1.0
+PKG_RELEASE:=1
+
+LOCAL_DEV:=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/fluent/fluent-bit.git
+PKG_SOURCE_VERSION=v$(PKG_VERSION)
+PKG_MIRROR_HASH:=9a0730ee9b181b0514d50b32700fa29d711d1f44c6e3a78d67e4e5d830962d0f
+endif
+
+PKG_LICENSE:=Apache-2.0
+PKG_LICENSE_FILES:=LICENSE
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+define Package/fluent-bit
+	CATEGORY:=Utilities
+	DEPENDS:= +libyaml +libopenssl +libcurl +libatomic +musl-fts +flex +bison
+	TITLE:=Fluent-Bit
+	URL:=https://fluentbit.io/
+endef
+
+define Package/fluent-bit/description
+	Fluent Bit is a super fast, lightweight, and highly scalable logging and metrics processor and forwarder.
+endef
+
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+        $(CP) -rf ./fluent-bit/* $(PKG_BUILD_DIR)/
+endef
+endif
+
+# General options
+TARGET_LDFLAGS +=-lfts -latomic
+
+CMAKE_OPTIONS+= \
+	-DFLB_RELEASE=Yes \
+	-DFLB_SMALL=No \
+	-DEXCLUDE_FROM_ALL=true \
+	-DFLB_SHARED_LIBS=Yes \
+	-DFLB_DEBUG=Yes \
+	-DFLB_ALL=No \
+	-DFLB_JEMALLOC=No \
+	-DFLB_EXAMPLES=No \
+	-DFLB_CHUNK_TRACE=No \
+	-DFLB_BACKTRACE=No \
+	-DFLB_WASM=No \
+	-DFLB_LUAJIT=No
+
+# In plugins
+CMAKE_OPTIONS += \
+	-DFLB_IN_SYSLOG=Yes \
+	-DFLB_IN_CPU=Yes \
+	-DFLB_IN_MEM=Yes \
+	-DFLB_IN_DISK=Yes \
+	-DFLB_IN_EXEC=Yes \
+	-DFLB_IN_HEAD=Yes \
+	-DFLB_IN_FORWARD=No \
+	-DFLB_IN_KMSG=No \
+	-DFLB_IN_PROC=No \
+	-DFLB_IN_RANDOM=No \
+	-DFLB_IN_SERIAL=No \
+	-DFLB_IN_MQTT=No \
+	-DFLB_IN_STDIN=No \
+	-DFLB_IN_SYSTEMD=No \
+	-DFLB_IN_TAIL=No \
+	-DFLB_IN_TCP=No \
+	-DFLB_IN_THERMAL=No \
+	-DFLB_IN_UDP=No \
+	-DFLB_IN_DOCKER=No \
+	-DFLB_IN_EXEC_WASI=No \
+	-DFLB_IN_EVENT_TYPE=No \
+	-DFLB_IN_FLUENTBIT_METRICS=No \
+	-DFLB_IN_KUBERNETES_EVENTS=No \
+	-DFLB_IN_KAFKA=No \
+	-DFLB_IN_LIB=No \
+	-DFLB_IN_SYSTEMD=No \
+	-DFLB_IN_DUMMY=No \
+	-DFLB_IN_NETIF=No \
+	-DFLB_IN_COLLECTD=No \
+	-DFLB_IN_PROMETHEUS_SCRAPE=No \
+	-DFLB_IN_STATSD=No \
+	-DFLB_IN_STORAGE_BACKLOG=No \
+	-DFLB_IN_PODMAN_METRICS=No \
+	-DFLB_IN_OPENTELEMETRY=No \
+	-DFLB_IN_ELASTICSEARCH=No \
+	-DFLB_IN_CALYPTIA_FLEET=No \
+	-DFLB_IN_SPLUNK=No
+	-DFLB_IN_HEALTH=No \
+	-DFLB_IN_WINLOG=No \
+	-DFLB_IN_WINEVTLOG=No
+
+
+# Filter options
+CMAKE_OPTIONS += 
+	-DFLB_FILTER_AWS=No \
+	-DFLB_FILTER_ECS=No \
+	-DFLB_FILTER_KUBERNETES=No \
+	-DFLB_FILTER_LUA=No \
+	-DFLB_FILTER_NEST=No \
+	-DFLB_FILTER_RECORD_MODIFIER=No \
+	-DFLB_FILTER_THROTTLE=No \
+	-DFLB_FILTER_TYPE_CONVERTER=No \
+	-DFLB_FILTER_WASM=No \
+	-DFLB_FILTER_TENSORFLOW=No \
+	-DFLB_FILTER_GEOIP2=No \
+	-DFLB_FILTER_NIGHTFALL=No
+
+# out plugins
+CMAKE_OPTIONS += \
+	-DFLB_OUT_EXIT=Yes \
+	-DFLB_OUT_FORWARD=Yes \
+	-DFLB_OUT_HTTP=Yes \
+	-DFLB_OUT_NATS=Yes \
+	-DFLB_OUT_TCP=Yes \
+	-DFLB_OUT_UDP=Yes \
+	-DFLB_OUT_FILE=Yes \
+	-DFLB_OUT_STDOUT=Yes \
+	-DFLB_OUT_SYSLOG=Yes \
+	-DFLB_OUT_NULL=Yes \
+	-DFLB_OUT_PLOT=No \
+	-DFLB_OUT_AZURE=No \
+	-DFLB_OUT_AZURE_BLOB=No \
+	-DFLB_OUT_AZURE_LOGS_INGESTION=No \
+	-DFLB_OUT_AZURE_KUSTO=No \
+	-DFLB_OUT_BIGQUERY=No \
+	-DFLB_OUT_CALYPTIA=No \
+	-DFLB_OUT_COUNTER=No \
+	-DFLB_OUT_DATADOG=No \
+	-DFLB_OUT_ES=No \
+	-DFLB_OUT_GELF=No \
+	-DFLB_OUT_INFLUXDB=No \
+	-DFLB_OUT_NRLOGS=No \
+	-DFLB_OUT_OPENSEARCH=No \
+	-DFLB_OUT_TD=No \
+	-DFLB_OUT_SKYWALKING=No \
+	-DFLB_OUT_SLACK=No \
+	-DFLB_OUT_SPLUNK=No \
+	-DFLB_OUT_STACKDRIVER=No \
+	-DFLB_OUT_LIB=No \
+	-DFLB_OUT_FLOWCOUNTER=No \
+	-DFLB_OUT_LOGDNA=No \
+	-DFLB_OUT_LOKI=No \
+	-DFLB_OUT_KAFKA=No \
+	-DFLB_OUT_KAFKA_REST=No \
+	-DFLB_OUT_CLOUDWATCH_LOGS=No \
+	-DFLB_OUT_KINESIS_FIREHOSE=No \
+	-DFLB_OUT_KINESIS_STREAMS=No \
+	-DFLB_OUT_OPENTELEMETRY=No \
+	-DFLB_OUT_PROMETHEUS_EXPORTER=No \
+	-DFLB_OUT_PROMETHEUS_REMOTE_WRITE=No \
+	-DFLB_OUT_S3=No \
+	-DFLB_OUT_VIVO_EXPORTER=No \
+	-DFLB_OUT_WEBSOCKET=No \
+	-DFLB_OUT_ORACLE_LOG_ANALYTICS=No \
+	-DFLB_OUT_CHRONICLE=No \
+	-DFLB_OUT_PGSQL=No
+
+define Package/fluent-bit/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_DIR) $(1)/etc/fluent-bit
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/fluent-bit $(1)/usr/sbin/
+	$(INSTALL_DATA) ./files/fluent-bit.conf $(1)/etc/fluent-bit/fluent-bit.conf
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/conf/parsers.conf $(1)/etc/fluent-bit/parsers.conf
+endef
+
+$(eval $(call BuildPackage,fluent-bit))

fluent-bit/files/fluent-bit.conf

@@ -0,0 +1,15 @@
+[SERVICE]
+    flush           3
+    daemon          Off
+    log_level       info
+    parsers_file    /etc/fluent-bit/parsers.conf
+
+[INPUT]
+    name            syslog
+    tag             syslog
+    path            /dev/log
+
+[OUTPUT]
+    name            null
+    match           *
+

fluent-bit/patches/0001-fix_out_file_plugin.patch

@@ -0,0 +1,14 @@
+diff --git a/plugins/out_file/file.c b/plugins/out_file/file.c
+index 2e47c9666..42ace24c6 100644
+--- a/plugins/out_file/file.c
++++ b/plugins/out_file/file.c
+@@ -45,6 +45,9 @@
+ #define NEWLINE "\n"
+ #endif
+ 
++#undef PATH_MAX
++#define PATH_MAX 256
++
+ struct flb_file_conf {
+     const char *out_path;
+     const char *out_file;

fluent-bit/patches/0002-add_hostname_to_log_dump.patch

@@ -0,0 +1,45 @@
+diff --git a/plugins/out_file/file.c b/plugins/out_file/file.c
+index 2e47c9666..95d28e438 100644
+--- a/plugins/out_file/file.c
++++ b/plugins/out_file/file.c
+@@ -27,6 +27,7 @@
+ #include <msgpack.h>
+ 
+ #include <stdio.h>
++#include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
+@@ -55,6 +56,7 @@ struct flb_file_conf {
+     int csv_column_names;
+     int mkdir;
+     struct flb_output_instance *ins;
++    char hostname[256];
+ };
+ 
+ static char *check_delimiter(const char *str)
+@@ -141,6 +143,9 @@ static int cb_file_init(struct flb_output_instance *ins,
+         }
+     }
+ 
++    if (gethostname(ctx->hostname, sizeof(ctx->hostname)) != 0)
++	    snprintf(ctx->hostname, sizeof(ctx->hostname), "%s", "localhost");
++
+     tmp = flb_output_get_property("delimiter", ins);
+     ret_str = check_delimiter(tmp);
+     if (ret_str != NULL) {
+@@ -233,12 +238,8 @@ static int template_output_write(struct flb_file_conf *ctx,
+     int i;
+     msgpack_object_kv *kv;
+ 
+-    /*
+-     * Right now we treat "{time}" specially and fill the placeholder
+-     * with the metadata timestamp (formatted as float).
+-     */
+-    if (!strncmp(key, "time", size)) {
+-        fprintf(fp, "%f", flb_time_to_double(tm));
++    if (!strncmp(key, "hostname", size)) {
++        fprintf(fp, "%s", ctx->hostname);
+         return 0;
+     }
+ 

gryphon-led-module/Makefile

@@ -28,7 +28,7 @@ define KernelPackage/$(PKG_NAME)
   FILES:=$(PKG_BUILD_DIR)/$(PKG_NAME).$(LINUX_KMOD_SUFFIX)
   KCONFIG:=CONFIG_PACKAGE_kmod-gryphon-led-kernel-module=y
   AUTOLOAD:=$(call AutoLoad,60,$(PKG_NAME))
-  DEPENDS:= +(TARGET_brcmbca):bcmkernel
+  DEPENDS:= +(TARGET_brcmbca):bcm963xx-bsp
   PKG_LICENSE:=GPLv2
   PKG_LICENSE_URL:=
 endef

hostmngr/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hostmngr
-PKG_VERSION:=1.0.3
+PKG_VERSION:=1.2.6
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=bfb9098121d665a324c86a2a9ee0971871d6c22e
+PKG_SOURCE_VERSION:=aa365710b227ba82b1c43f9cdf497261edb21852
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/hostmngr.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
@@ -22,7 +22,7 @@ PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
-
+include $(TOPDIR)/feeds/iopsys/bbfdm/bbfdm.mk
 
 define Package/hostmngr
   SECTION:=utils
@@ -31,7 +31,8 @@ define Package/hostmngr
   DEPENDS= +libubox +libuci +libubus +ubus +libeasy +libnl-genl \
 	   +libjson-c +libblobmsg-json +libnfnetlink +libmnl \
 	   +libnetfilter-conntrack \
-	   +HOSTMNGR_PLATFORM_HAS_WIFI:libwifi +libbbfdm-api
+	   +HOSTMNGR_PLATFORM_HAS_WIFI:libwifi +libbbfdm-api \
+	   +libwifiutils
 
 endef
 
@@ -57,12 +58,12 @@ endif
 MAKE_PATH:=src
 
 define Package/hostmngr/install
-	$(CP) ./files/* $(1)/
+	$(CP) ./files/etc $(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/
+	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/bbf_plugin/libhostmngr.so $(1) $(PKG_NAME)
 endef
 
 ifeq ($(LOCAL_DEV),1)

hostmngr/files/etc/firewall.hosts

@@ -1,126 +1,3 @@
 #!/bin/sh
 
-. /lib/functions.sh
-
-day=""
-IP_RULE=""
-
-process_ac_schedule() {
-	local acs_id="$1"
-	local is_enabled
-	local access_control
-	local start_time=""
-	local stop_time=""
-	local mac=""
-
-	handle_day_list() {
-		local value=$1
-
-		val=$(echo $value | cut -c 1-3)
-		if [ -z $day ]; then
-			day="$val"
-		else
-			day="$day,$val"
-		fi
-	}
-
-	config_list_foreach "$acs_id" "day" handle_day_list
-	config_get is_enabled "$acs_id" "enable" 1
-	config_get access_control "$acs_id" "dm_parent"
-
-	if [ "$is_enabled" == "0" ] || [ -z "$access_control" ]; then
-		return
-	fi
-
-	IP_RULE=""
-
-	mac=$(uci -q get hosts.$access_control.macaddr)
-	access_policy=$(uci -q get hosts.$access_control.access_policy)
-
-	config_get start_time "$acs_id" "start_time"
-	config_get duration "$acs_id" "duration"
-
-	if [ -z "$mac" ] && [ -z "$start_time" ] && [ -z "$duration" ] && [ -z "$day" ] && [ -z "$access_policy" ]; then
-		return
-	fi
-	if [ -n "$mac" ]; then
-		IP_RULE="$IP_RULE -m mac --mac-source $mac"
-	fi
-
-	# as per iptables manual default starttime is 00:00
-	# default stoptime is 23:59
-	if [ -z "$start_time" ]; then
-		start_time="0:0"
-	fi
-
-        if [ -n "$duration" ]; then
-		hh=$(echo $start_time | awk -F: '{ print $1 }')
-                mm=$(echo $start_time | awk -F: '{ print $2 }')
-                hh_s=`expr $hh \* 3600`
-                mm_s=`expr $mm \* 60`
-                ss=$(( hh_s + mm_s ))
-
-                stop_ss=$(( ss + duration ))
-                hh=$(( stop_ss / 3600 ))
-                if [ $hh -lt 24 ]; then
-                	rem_ss=$(( stop_ss % 3600 ))
-                	mm=$(( rem_ss / 60 ))
-                	ss=$(( rem_ss % 60 ))
-                	stop_time="$hh:$mm:$ss"
-                else
-                	stop_time="23:59"
-                fi
-        else
-        	stop_time="23:59"
-        fi
-
-	# conversion to utc
-	zone=$(date +%z | cut -c 1)
-	utc_h=$(date -u -d @$(date "+%s" -d "$start_time") +%H)
-	local_h=$(echo $start_time | awk -F: '{ print $1 }')
-	if [ "$zone" == "+" ] && [ $utc_h -gt $local_h ]; then
-		start_utc="0:0"
-	else
-		start_utc=$(date -u -d @$(date "+%s" -d "$start_time") +%H:%M)
-	fi
-
-	utc_h=$(date -u -d @$(date "+%s" -d "$stop_time") +%H)
-	local_h=$(echo $stop_time | awk -F: '{ print $1 }')
-	if [ "$zone" == "-" ] && [ $utc_h -lt $local_h ]; then
-		stop_utc="23:59"
-	else
-		stop_utc=$(date -u -d @$(date "+%s" -d "$stop_time") +%H:%M)
-	fi
-
-
-	IP_RULE="$IP_RULE -m time --timestart $start_utc --timestop $stop_utc"
-	if [ -n "$day" ]; then
-		IP_RULE="$IP_RULE --weekdays $day"
-	fi
-
-	if [ "$access_policy" == "Deny" ]; then
-		IP_RULE="$IP_RULE -j DROP"
-	else
-		IP_RULE="$IP_RULE -j ACCEPT"
-	fi
-
-	iptables -w -A hosts_forward ${IP_RULE}
-	ip6tables -w -A hosts_forward ${IP_RULE}
-
-	day=""
-}
-
-iptables -w -F hosts_forward
-ip6tables -w -F hosts_forward
-
-iptables -w -t filter -N hosts_forward
-ret=$?                        
-[ $ret -eq 0 ] && iptables -w -t filter -I FORWARD -j hosts_forward
-ip6tables -w -t filter -N hosts_forward
-ret=$?                        
-[ $ret -eq 0 ] && ip6tables -w -t filter -I FORWARD -j hosts_forward
-
-# Load /etc/config/hosts UCI file
-config_load hosts
-config_foreach process_ac_schedule ac_schedule
-
+sh /usr/share/hostmngr/hosts_acl.sh

hostmngr/files/etc/hostmngr/input.json

@@ -1,16 +0,0 @@
-{
-	"daemon": {
-		"input": {
-			"type": "DotSo",
-			"name": "/etc/hostmngr/libhostmngr.so"
-		},
-		"output": {
-			"type": "UBUS",
-			"name": "bbfdm.hosts",
-			"parent_dm": "Device.",
-			"object": "Hosts",
-			"root_obj": "bbfdm"
-		}
-	}
-}
-

hostmngr/files/etc/init.d/hostmngr

@@ -1,14 +1,10 @@
 #!/bin/sh /etc/rc.common
 
-START=97
+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"
@@ -18,7 +14,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
 }
 
 service_triggers()

hostmngr/files/scripts/hosts_acl.sh

@@ -0,0 +1,299 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+day=""
+next_days=""
+prev_days=""
+schedule_added=""
+
+ACCESS_RULE=""
+IP_RULE=""
+IP_RULE1=""
+
+get_next_day() {
+	local weekday="$1"
+	case "$weekday" in
+		"Mon"|"Monday") echo "Tuesday"
+		;;
+		"Tue"|"Tuesday") echo "Wednesday"
+		;;
+		"Wed"|"Wednesday") echo "Thursday"
+		;;
+		"Thu"|"Thursday") echo "Friday"
+		;;
+		"Fri"|"Friday") echo "Saturday"
+		;;
+		"Sat"|"Saturday") echo "Sunday"
+		;;
+		"Sun"|"Sunday") echo "Monday"
+		;;
+	esac
+}
+
+get_previous_day() {
+	local weekday="$1"
+	case "$weekday" in
+		"Mon"|"Monday") echo "Sunday"
+		;;
+		"Tue"|"Tuesday") echo "Monday"
+		;;
+		"Wed"|"Wednesday") echo "Tuesday"
+		;;
+		"Thu"|"Thursday") echo "Wednesday"
+		;;
+		"Fri"|"Friday") echo "Thursday"
+		;;
+		"Sat"|"Saturday") echo "Friday"
+		;;
+		"Sun"|"Sunday") echo "Saturday"
+		;;
+	esac
+}
+
+ip_rule_west_zone() {
+	local utc_start_t_h="$1"
+	local utc_stop_t_h="$2"
+	local local_start_t_h="$3"
+	local local_stop_t_h="$4"
+	local utc_start_time="$5"
+	local utc_stop_time="$6"
+
+	if [ "$utc_start_t_h" -lt "$local_start_t_h" ]; then
+		IP_RULE="$IP_RULE -m time --timestart $utc_start_time --timestop $utc_stop_time"
+		if [ -n "$next_days" ]; then
+			IP_RULE="$IP_RULE --weekdays $next_days"
+		fi
+	else
+		if [ "$utc_stop_t_h" -lt "$local_stop_t_h" ]; then
+			IP_RULE1="$IP_RULE"
+			IP_RULE="$IP_RULE -m time --timestart $utc_start_time --timestop 23:59"
+			IP_RULE1="$IP_RULE1 -m time --timestart 00:00 --timestop $utc_stop_time"
+			if [ -n "$next_days" ]; then
+				IP_RULE1="$IP_RULE1 --weekdays $next_days"
+			fi
+		else
+			IP_RULE="$IP_RULE -m time --timestart $utc_start_time --timestop $utc_stop_time"
+		fi
+		if [ -n "$day" ]; then
+			IP_RULE="$IP_RULE --weekdays $day"
+		fi
+	fi
+}
+
+ip_rule_east_zone() {
+	local utc_start_t_h="$1"
+	local utc_stop_t_h="$2"
+	local local_start_t_h="$3"
+	local local_stop_t_h="$4"
+	local utc_start_time="$5"
+	local utc_stop_time="$6"
+
+	if [ "$utc_start_t_h" -lt "$local_start_t_h" ]; then
+		IP_RULE="$IP_RULE -m time --timestart $utc_start_time --timestop $utc_stop_time"
+		if [ -n "$day" ]; then
+			IP_RULE="$IP_RULE --weekdays $day"
+		fi
+	else
+		if [ "$utc_stop_t_h" -lt "$local_stop_t_h" ]; then
+			IP_RULE1="$IP_RULE"
+			IP_RULE="$IP_RULE -m time --timestart 00:00 --timestop $utc_stop_time"
+			IP_RULE1="$IP_RULE1 -m time --timestart $utc_start_time --timestop 23:59"
+			if [ -n "$prev_days" ]; then
+				IP_RULE1="$IP_RULE1 --weekdays $prev_days"
+			fi
+		else
+			IP_RULE="$IP_RULE -m time --timestart $utc_start_time --timestop $utc_stop_time"
+		fi
+		if [ -n "$day" ]; then
+			IP_RULE="$IP_RULE --weekdays $day"
+		fi
+	fi
+}
+
+
+add_access_rule() {
+	local rule="$1"
+	echo "iptables -w -A hosts_forward ${rule}" >> $ACL_FILE
+	echo "ip6tables -w -A hosts_forward ${rule}" >> $ACL_FILE
+}
+
+handle_day_list() {
+	local value=$1
+
+	val=$(echo $value | cut -c 1-3)
+	next_day_val=$(get_next_day $val)
+	prev_day_val=$(get_previous_day $val)
+	if [ -z $day ]; then
+		day="$val"
+		next_days="$next_day_val"
+		prev_days="$prev_day_val"
+	else
+		day="$day,$val"
+		next_days="$next_days,$next_day_val"
+		prev_days="$prev_days,$prev_day_val"
+	fi
+}
+
+handle_schedule() {
+	local schd_section="$1"
+	local ac_section="$2"
+	local acs_id
+	local start_time
+	local duration
+
+	IP_RULE="$ACCESS_RULE"
+	IP_RULE1=""
+	day=""
+	next_days=""
+	prev_days=""
+
+	config_get acs_id "$schd_section" "dm_parent"
+
+	if [ "$acs_id" != "$ac_section" ]; then
+		return # schedule not for this access control section
+	fi
+
+	local is_enabled
+	config_get is_enabled "$schd_section" "enable" 0
+	if [ "$is_enabled" == "0" ]; then
+		return
+	fi
+
+	local all_days="Monday Tuesday Wednesday Thursday Friday Saturday Sunday"
+	local day_config
+	config_get day_config "$schd_section" "day" "$all_days"
+
+	IFS=" "
+	for d in $day_config; do
+		handle_day_list $d
+	done
+
+	config_get start_time "$schd_section" "start_time" "00:00"
+	config_get duration "$schd_section" "duration"
+
+	zone=$(date +%z | cut -c 1)
+	local_start_time=$start_time
+	hh=$(echo $local_start_time | awk -F: '{ print $1 }')
+	mm=$(echo $local_start_time | awk -F: '{ print $2 }')
+	hh_s=`expr $hh \* 3600`
+	mm_s=`expr $mm \* 60`
+	ss=$(( hh_s + mm_s ))
+	local_start_hh=$hh
+
+        if [ -n "$duration" ]; then
+                stop_ss=$(( ss + duration ))
+                hh=$(( stop_ss / 3600 ))
+               	rem_ss=$(( stop_ss % 3600 ))
+               	mm=$(( rem_ss / 60 ))
+               	ss=$(( rem_ss % 60 ))
+		local_stop_time="$hh:$mm:$ss"
+		local_stop_hh=$hh
+	else
+		# if duartion is not specified, then apply rule to end of the day
+		local_stop_time="23:59:59"
+		local_stop_hh="23"
+	fi
+
+	utc_start_time=$(date -u -d @$(date "+%s" -d "$local_start_time") +%H:%M)
+	utc_stop_time=$(date -u -d @$(date "+%s" -d "$local_stop_time") +%H:%M)
+	utc_start_hh=$(echo $utc_start_time | awk -F: '{ print $1 }')
+	utc_stop_hh=$(echo $utc_stop_time | awk -F: '{ print $1 }')
+	if [ "$zone" == "-" ]; then
+		ip_rule_west_zone $utc_start_hh $utc_stop_hh $local_start_hh $local_stop_hh $utc_start_time $utc_stop_time
+	else
+		ip_rule_east_zone $utc_start_hh $utc_stop_hh $local_start_hh $local_stop_hh $utc_start_time $utc_stop_time
+	fi
+
+	IP_RULE="$IP_RULE -j ACCEPT"
+	if [ -n "$IP_RULE1" ]; then
+		IP_RULE1="$IP_RULE1 -j ACCEPT"
+	fi
+
+	add_access_rule "$IP_RULE"
+	if [ -n "$IP_RULE1" ]; then
+		add_access_rule "$IP_RULE1"
+	fi
+
+	# for access rules to be effective for a schedule, need to add DROP rule
+	# to block the access outside the defined schedule
+	if [ "$schedule_added" == "0" ]; then
+		schedule_added="1"
+	fi
+}
+
+handle_access_control() {
+	local ac_section="$1"
+	local is_enabled
+
+	# default value of Hosts.AccessControl.{i}.Enable is false,
+	# so, if not defined in uci as 1, assume 0
+	config_get is_enabled "$ac_section" "enable" 0
+	if [ "$is_enabled" == "0" ]; then
+		return
+	fi
+
+	local mac_addr
+	config_get mac_addr "$ac_section" "macaddr"
+	if [ -z "$mac_addr" ]; then
+		return
+	else
+		ACCESS_RULE="-m mac --mac-source $mac_addr"
+	fi
+
+	local access_policy
+	config_get access_policy "$ac_section" "access_policy"
+	if [ -z "$access_policy" ]; then
+		return # since system default is allow so no need to do anything
+	fi
+
+	# As per Data Model, if access policy is deny, then schedule is to be ignored
+	# and no access is to be provided for the device
+	if [ "$access_policy" == "Deny" ]; then
+		ACCESS_RULE="$ACCESS_RULE -j DROP"
+		add_access_rule "$ACCESS_RULE"
+		return # no need to parse schedule
+	fi
+
+	schedule_added="0"
+	# check if schedule is defined for this access_control instance
+	# and if yes, create rule accordingly
+	config_foreach handle_schedule  ac_schedule "$ac_section"
+
+	# for access rule to work, need to have default drop rule as last rule
+	if [ "$schedule_added" == "1" ]; then
+		IP_RULE="$ACCESS_RULE -j DROP"
+		add_access_rule "$IP_RULE"
+	fi
+}
+
+ACL_FILE="/tmp/hosts_access_control/access_control.rules"
+
+rm -f $ACL_FILE
+
+mkdir -p /tmp/hosts_access_control/
+touch $ACL_FILE
+
+echo "iptables -w -F hosts_forward" >> $ACL_FILE
+echo "ip6tables -w -F hosts_forward" >> $ACL_FILE
+
+hosts_ipv4_forward=$(iptables -t filter --list -n | grep hosts_forward)
+if [ -z "$hosts_ipv4_forward" ]; then
+	echo "iptables -w -t filter -N hosts_forward" >> $ACL_FILE
+	ret=$?
+	[ $ret -eq 0 ] && echo "iptables -w -t filter -I FORWARD -j hosts_forward" >> $ACL_FILE
+fi
+
+hosts_ipv6_forward=$(ip6tables -t filter --list -n | grep hosts_forward)
+if [ -z "$hosts_ipv6_forward" ]; then
+	echo "ip6tables -w -t filter -N hosts_forward" >> $ACL_FILE
+	ret=$?
+	[ $ret -eq 0 ] && echo "ip6tables -w -t filter -I FORWARD -j hosts_forward" >> $ACL_FILE
+fi
+
+# Load /etc/config/hosts UCI file
+config_load hosts
+config_foreach handle_access_control access_control
+
+# apply the rules
+sh $ACL_FILE

icwmp/Config.in

@@ -0,0 +1,6 @@
+menu "Configuration"
+
+config ICWMP_MGMT_FROM_USP
+	bool "Support configuration of ManagementServer from USP"
+	default y
+endmenu

icwmp/Makefile

@@ -8,114 +8,72 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=9.5.8
+PKG_VERSION:=9.8.9
 
+LOCAL_DEV:=0
+ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/icwmp.git
-PKG_SOURCE_VERSION:=79871c5365cf89ce718b922b0863c8a68c09a771
+PKG_SOURCE_VERSION:=f16a9bcb529b199c5cebe2afe18828b5fa53e497
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
-
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
+endif
 
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
+include ../bbfdm/bbfdm.mk
 
-define Package/icwmp/default
+define Package/icwmp
   SECTION:=utils
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=TR069 CWMP client
-  DEPENDS:=+libuci +libubox +libblobmsg-json +libubus +libjson-c +libcurl +mxml +libuuid +libbbfdm-api
+  DEPENDS:=+libuci +libubox +libblobmsg-json +libubus +libjson-c +libcurl +mxml +libuuid +libbbfdm-api +libopenssl
+  MENU:=1
 endef
 
-define Package/icwmp
-  $(Package/icwmp/default)
-  VARIANT:=default
-  DEFAULT_VARIANT:=1
-  DEPENDS += +PACKAGE_icwmp-openssl:libopenssl
+define Package/icwmp/description
+ TR069 client implementation with bbfdm backend for TR181 support
 endef
 
-define Package/icwmp-openssl
-  $(Package/icwmp/default)
-  TITLE += (openssl)
-  VARIANT:=openssl
-  DEPENDS += +PACKAGE_icwmp-openssl:libopenssl
-  CONFLICTS := icwmp icwmp-mbedtls icwmp-wolfssl
+define Package/icwmp/config
+	source "$(SOURCE)/Config.in"
 endef
 
-define Package/icwmp-wolfssl
-  $(Package/icwmp/default)
-  TITLE += (wolfssl)
-  VARIANT:=wolfssl
-  DEPENDS += +PACKAGE_icwmp-wolfssl:libwolfssl
-  CONFLICTS := icwmp icwmp-mbedtls icwmp-openssl
-endef
-
-define Package/icwmp-mbedtls
-  $(Package/icwmp/default)
-  TITLE += (mbedtls)
-  DEPENDS += +PACKAGE_icwmp-mbedtls:libmbedtls
-  VARIANT:=mbedtls
-  CONFLICTS := icwmp icwmp-wolfssl icwmp-openssl
-endef
-
-ifeq ($(BUILD_VARIANT),default)
-CMAKE_OPTIONS += -DWITH_OPENSSL=ON
+ifeq ($(CONFIG_ICWMP_MGMT_FROM_USP),y)
+EXTRA_CFLAGS += -DCWMP_DUAL_SUPPORT=BBFDM_BOTH
 endif
 
-ifeq ($(BUILD_VARIANT),openssl)
-CMAKE_OPTIONS += -DWITH_OPENSSL=ON
-endif
-
-ifeq ($(BUILD_VARIANT),wolfssl)
-CMAKE_OPTIONS += -DWITH_WOLFSSL=ON
-endif
-
-ifeq ($(BUILD_VARIANT),mbedtls)
-CMAKE_OPTIONS += -DWITH_MBEDTLS=ON
-endif
-
-USE_LOCAL=$(shell ls ./src/ 2>/dev/null >/dev/null && echo 1)
-ifneq ($(USE_LOCAL),)
+ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
-	$(CP) ./src/* $(PKG_BUILD_DIR)/
+	$(CP) -rf ~/git/icwmp/* $(PKG_BUILD_DIR)/
 endef
 endif
 
-define Package/icwmp/default/install
+define Package/icwmp/install
 	$(INSTALL_DIR) $(1)/etc/icwmpd
 	$(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)/lib/upgrade/keep.d
-	$(INSTALL_DIR) $(1)/etc/bbfdm/json/
 	$(INSTALL_DIR) $(1)/etc/udhcpc.user.d
-	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libcwmpdm.so $(1)/usr/lib/bbfdm/libcwmpdm.so
 	$(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
+	$(INSTALL_BIN) ./files/etc/critical_services.json $(1)/etc/icwmpd/critical_services.json
 	$(INSTALL_BIN) ./files/etc/init.d/icwmpd $(1)/etc/init.d/icwmpd
 	$(INSTALL_BIN) ./files/etc/uci-defaults/85-cwmp-set-userid $(1)/etc/uci-defaults/
 	$(INSTALL_BIN) ./files/etc/uci-defaults/90-cwmpfirewall $(1)/etc/uci-defaults/
+	$(INSTALL_BIN) ./files/etc/uci-defaults/95-set-random-inform-time $(1)/etc/uci-defaults/
 	$(INSTALL_DATA) ./files/lib/upgrade/keep.d/icwmp $(1)/lib/upgrade/keep.d/icwmp
-	$(INSTALL_BIN) ./files/etc/icwmpd/update.sh $(1)/etc/icwmpd/update.sh
-	$(INSTALL_DATA) ./files/etc/bbfdm/json/CWMPManagementServer.json $(1)/etc/bbfdm/json/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/etc/udhcpc.user.d/udhcpc_icwmp_opt125.user $(1)/etc/udhcpc.user.d/udhcpc_icwmp_opt125.user
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/etc/udhcpc.user.d/udhcpc_icwmp_opt43.user $(1)/etc/udhcpc.user.d/udhcpc_icwmp_opt43.user
+	$(INSTALL_BIN) ./files/etc/udhcpc.user.d/udhcpc_icwmp_opt125.user $(1)/etc/udhcpc.user.d/udhcpc_icwmp_opt125.user
+	$(INSTALL_BIN) ./files/etc/udhcpc.user.d/udhcpc_icwmp_opt43.user $(1)/etc/udhcpc.user.d/udhcpc_icwmp_opt43.user
+	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/libcwmpdm.so $(1) $(PKG_NAME)
+	$(BBFDM_INSTALL_MS_PLUGIN) ./files/etc/bbfdm/json/CWMPManagementServer.json $(1) $(PKG_NAME)
 endef
 
-Package/icwmp/install = $(Package/icwmp/default/install)
-Package/icwmp-openssl/install = $(Package/icwmp/default/install)
-Package/icwmp-wolfssl/install = $(Package/icwmp/default/install)
-Package/icwmp-mbedtls/install = $(Package/icwmp/default/install)
-
 $(eval $(call BuildPackage,icwmp))
-$(eval $(call BuildPackage,icwmp-openssl))
-$(eval $(call BuildPackage,icwmp-wolfssl))
-$(eval $(call BuildPackage,icwmp-mbedtls))

icwmp/files/etc/bbfdm/json/CWMPManagementServer.json

@@ -1,8 +1,7 @@
 {
-	"json_plugin_version": 1,
+	"json_plugin_version": 2,
 	"Device.CWMPManagementServer.": {
 		"type": "object",
-		"version": "2.15",
 		"protocols": [
 			"usp"
 		],
@@ -11,7 +10,6 @@
 		"dependency": "file:/etc/config/cwmp",
 		"EnableCWMP": {
 			"type": "boolean",
-			"version": "2.15",
 			"read": true,
 			"write": true,
 			"protocols": [

icwmp/files/etc/config/cwmp

@@ -5,12 +5,14 @@ config acs 'acs'
 	option periodic_inform_interval '1800'
 	option periodic_inform_time '0001-01-01T00:00:00Z'
 	option dhcp_discovery 'enable'
+	#option ssl_capath "/etc/icwmpd/ca.pem"
 	# compression possible configs: GZIP, Deflate, Disabled
 	option compression 'Disabled'
 	#­ possible configs interval :[1:65535]
 	option retry_min_wait_interval '5'
 	#­ possible configs interval :[1000:65535]
 	option retry_interval_multiplier '2000'
+	option skip_dhcp_boot_options '0'
 
 config cpe 'cpe'
 	option enable '1'
@@ -20,7 +22,7 @@ config cpe 'cpe'
 	option log_to_file 'disable'
 	# log_severity: INFO (Default)	
 	# log_severity possible configs: EMERG, ALERT, CRITIC ,ERROR, WARNING, NOTICE, INFO, DEBUG
-	option log_severity 'INFO'
+	option log_severity 'ERROR'
 	option log_file_name '/var/log/icwmpd.log'
 	option log_max_size '102400'
 	option userid '' #$OUI-$SER
@@ -37,6 +39,9 @@ config cpe 'cpe'
 	option periodic_notify_interval '10'
 	option incoming_rule 'Port_Only'
 	option active_notif_throttle '0'
+	option disable_gatewayinfo '0'
+	option fw_upgrade_keep_settings '1'
+	option clock_sync_timeout '128'
 	
 config lwn 'lwn'
 	option enable '0'

icwmp/files/etc/critical_services.json

@@ -0,0 +1,11 @@
+{
+	"services_list": [
+			"firewall",
+			"network",
+			"dhcp",
+			"stunc",
+			"xmpp",
+			"wireless",
+			"time"
+	]
+}

icwmp/files/etc/firewall.cwmp

@@ -6,7 +6,7 @@ log() {
 }
 
 get_firewall_zone() {
-	zone="$(uci show firewall|grep network|grep ${1}|cut -d. -f 2)"
+	zone="$(uci show firewall|grep network|grep -w ${1}|cut -d. -f 2)"
 	zone="${zone:-wan}" # defaults to wan zone
 	echo "$zone"
 }

icwmp/files/etc/icwmpd/update.sh

@@ -1,27 +0,0 @@
-#!/bin/sh
-. /lib/functions.sh
-
-log() {
-	echo "$@" |logger -t cwmp.update -p info
-}
-
-handle_icwmp_update() {
-	local cwmp_enable
-	config_load cwmp
-
-	config_get_bool cwmp_enable cpe enable 1
-	if [ "$cwmp_enable" = "0" ]; then
-		return 0
-	fi
-
-	# wait for some time to avoid interface fluctuation
-	sleep 10
-	ret=$(ubus call service list '{"name":"icwmpd"}' | jsonfilter -qe '@.icwmpd.instances.icwmp.running')
-
-	if [ "$ret" != "true" ]; then
-		log "Restarting icwmp tr069 object"
-		/etc/init.d/icwmpd restart
-	fi
-}
-
-handle_icwmp_update "$@"

icwmp/files/etc/init.d/icwmpd

@@ -9,38 +9,40 @@ PROG="/usr/sbin/icwmpd"
 
 . /lib/functions.sh
 . /usr/share/libubox/jshn.sh
+
 include /lib/network
 
 log() {
 	echo "${@}"|logger -t cwmp.init -p info
 }
 
-regenerate_ssl_link()
-{
-	local cert_dir all_file rehash
+regenerate_ssl_link() {
+	local cert_dir
 
-	cert_dir="${1}"
-	[ ! -d "${cert_dir}" ] && return 0;
-
-	### Generate all ssl link for pem certicates ###
-	all_file=$(ls "${cert_dir}"/*.pem 2>/dev/null)
-	if [ -n "${all_file}" ]; then
-		for cfile in $all_file; do
-			rehash="$(openssl x509 -hash -noout -in "${cfile}")"
-			[ -f "${cert_dir}"/"${rehash}".0 ] || \
-				ln -s "${cfile}" "${cert_dir}"/"${rehash}".0
-		done
+	cert_dir="${1%/}"
+	if [ -f "${cert_dir}" ]; then
+		return 0
 	fi
 
-	### Generate all ssl link for crt certicates ###
-	all_file=$(ls "${cert_dir}"/*.crt 2>/dev/null)
-	if [ -n "${all_file}" ]; then
-		for cfile in $all_file; do
-			rehash="$(openssl x509 -hash -noout -in "${cfile}")"
-			[ -f "${cert_dir}"/"${rehash}".0 ] || \
-				ln -s "${cfile}" "${cert_dir}"/"${rehash}".0
+	# do not generate the c_rehash if its system default cert path
+	# ca-certificate package already generates c_rehash on compilation
+	[ ! -d "${cert_dir}" ] || [ "${cert_dir}" = "/etc/ssl/certs" ] && return 0
+
+	generate_links() {
+		local file_type="$1"
+		local files="${cert_dir}"/*."${file_type}"
+		for cfile in ${files}; do
+			if [ -f "${cfile}" ]; then
+				rehash="$(openssl x509 -hash -noout -in "${cfile}")"
+				if [ ! -f "${cert_dir}/${rehash}.0" ]; then
+					log "Generating c_rehash for ${cfile}=>${rehash}.0"
+					ln -s "${cfile}" "${cert_dir}/${rehash}.0"
+				fi
+			fi
 		done
-	fi
+	}
+
+	generate_links "pem"
 }
 
 enable_dhcp_option43() {
@@ -407,6 +409,7 @@ validate_acs_section()
 		'periodic_inform_time:string' \
 		'url:string' \
 		'dhcp_discovery:string' \
+		'skip_dhcp_boot_options:bool:0' \
 		'dhcp_url:string' \
 		'compression:or("GZIP","Deflate","Disabled")' \
 		'retry_min_wait_interval:range(1, 65535)' \
@@ -435,12 +438,14 @@ validate_cpe_section()
 		'notification:bool' \
 		'exec_download:bool' \
 		'periodic_notify_enable:bool' \
-		'enable:bool' \
-		'periodic_notify_interval:uinteger'
+		'enable:bool:1' \
+		'periodic_notify_interval:uinteger' \
+		'fw_upgrade_keep_settings:bool'
 }
 
 validate_defaults() {
-	local ssl_capath
+	local ssl_capath enable url dhcp_url
+
 	config_load cwmp
 
 	validate_acs_section || {
@@ -448,13 +453,17 @@ validate_defaults() {
 		return 1;
 	}
 
+	if [ -z "${url}" ] && [ -z "${dhcp_url}" ]; then
+		log "No ACS URL is configured"
+		return 1
+	fi
+
 	ssl_capath="${ssl_capath%/}"
 	# Put the cert pem file in keep list
-	if [ -d "${ssl_capath}" ]; then
+	if [ -d "${ssl_capath}" ] && [ "${ssl_capath}" != "/etc/ssl/certs" ]; then
 		if ! grep "*.pem\|*.crt" /lib/upgrade/keep.d/icwmp; then
 			echo "${ssl_capath}"'/*.pem' >> /lib/upgrade/keep.d/icwmp
 			echo "${ssl_capath}"'/*.crt' >> /lib/upgrade/keep.d/icwmp
-			echo "${ssl_capath}"'/*.0' >> /lib/upgrade/keep.d/icwmp
 		fi
 	fi
 
@@ -463,37 +472,41 @@ validate_defaults() {
 		return 1;
 	}
 
+	if [ "$enable" = "0" ]; then
+		log "CWMP service disabled"
+		return 1
+	fi
+
 	return 0;
 }
 
 boot() {
-	local enable_cwmp="0"
-	local dhcp_discovery="0"
+	local dhcp_discovery wan_interface skip_dhcp_boot_options disable_gatewayinfo
 
 	config_load cwmp
-	config_get_bool enable_cwmp cpe enable 1
-	local wan_interface=""
-	
 	config_get wan_interface cpe default_wan_interface "wan"
-	
-	if [ "$enable_cwmp" = "0" ]; then
-		return 0
-	fi
+	config_get disable_gatewayinfo cpe disable_gatewayinfo "0"
 
 	config_get dhcp_discovery acs dhcp_discovery "0"
+	config_get dhcp_discovery acs dhcp_discovery "0"
+	config_get skip_dhcp_boot_options acs skip_dhcp_boot_options "0"
 
 	if [ "${dhcp_discovery}" = "enable" ] || [ "${dhcp_discovery}" = "1" ]; then
-		# Set dhcp option 43 if not already configured
-		enable_dhcp_option43 "${wan_interface}"
-		# Set dhcp option 60
-		set_vendor_id "${wan_interface}"
+		if [ "${skip_dhcp_boot_options}" -ne 1 ]; then
+			# Set dhcp option 43 if not already configured
+			enable_dhcp_option43 "${wan_interface}"
+			# Set dhcp option 60
+			set_vendor_id "${wan_interface}"
+		fi
 	fi
 
 	config_get lan_interface cpe default_lan_interface ""
 	if [ -n "${lan_interface}" ]; then
-		# Set dhcp_option 125 if not already configured
-		enable_dhcp_option125 "${wan_interface}"
-		enable_dnsmasq_option125 "${lan_interface}"
+		if [ "${disable_gatewayinfo}" -ne 1 ]; then
+			# Set dhcp_option 125 if not already configured
+			enable_dhcp_option125 "${wan_interface}"
+			enable_dnsmasq_option125 "${lan_interface}"
+		fi
 	fi
 	
 	config_get ssl_capath acs ssl_capath
@@ -511,32 +524,22 @@ boot() {
 }
 
 start_service() {
-	local enable_cwmp
 
-	config_load cwmp
-	config_get_bool enable_cwmp cpe enable 1
-
-	if [ "$enable_cwmp" = "0" ]; then
-		return 0
-	fi
-
-	[ -f /sbin/netifd ] && log "Waiting for Network to be started ..." && ubus -t 5 wait_for network.interface
-	[ -f /usr/sbin/dnsmasq ] && log "Waiting for DNS Proxy to be started ..." && ubus -t 5 wait_for dnsmasq
-	[ -f /etc/config/dhcp ] && log "Waiting for DNS Server(s) ..." && wait_for_resolvfile 20
+	procd_open_instance icwmp
 
 	validate_defaults || {
 		log "Validation of defaults failed"
+		procd_close_instance
 		return 1;
 	}
 
-	procd_open_instance icwmp
 	procd_set_param command "$PROG"
 	procd_append_param command -b
+
 	procd_set_param respawn \
 		"${respawn_threshold:-5}" \
 		"${respawn_timeout:-10}" "${respawn_retry:-3}"
 
-	procd_set_param watch network.interface
 	procd_close_instance
 }
 
@@ -548,11 +551,18 @@ stop_service()
 reload_service() {
 	local ret
 
-	config_load cwmp
-	config_get_bool enable_cwmp cpe enable 1
-
+	log "Reload service $ret"
 	ret="0"
-	if [ "$enable_cwmp" = "0" ]; then
+
+	validate_defaults || {
+		stop
+		start
+		return 0;
+	}
+
+	ret=$(ubus call service list '{"name":"icwmpd"}' | jsonfilter -qe '@.icwmpd.instances.icwmp.running')
+	if [ "$ret" != "true" ]; then
+		log "Reloading cwmp service ..."
 		stop
 		start
 		return 0
@@ -561,7 +571,8 @@ reload_service() {
 	tr069_status="$(ubus -t 1 call tr069 status)"
 	ret="$?"
 	if [ "$ret" = "7" ]; then
-		# ubus timed out may be due to uloop is busy in some task so returning
+		# ubus timed out may be due to uloop is busy in some task so return
+		log "Skipping ubus reload due to ubus timeout"
 		return 0
 	fi
 
@@ -571,17 +582,7 @@ reload_service() {
 	fi
 }
 
-add_interface_trigger() {
-        procd_add_interface_trigger "interface.update" "$1" /etc/icwmpd/update.sh
-}
-
 service_triggers() {
-       local wan_interface
-
-       config_load cwmp
-       config_get wan_interface cpe default_wan_interface "wan"
-
        procd_add_reload_trigger "cwmp"
-       add_interface_trigger ${wan_interface}
 }
 

icwmp/files/etc/uci-defaults/95-set-random-inform-time

@@ -0,0 +1,20 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+set_inform_time()
+{
+	local sec inform_time value
+
+	config_load cwmp
+	config_get inform_time acs periodic_inform_time '0001-01-01T00:00:00Z'
+
+	if [ "${inform_time}" == "0001-01-01T00:00:00Z" ]; then
+		sec=$(date +%s)
+		value="$(date -d @$(($sec-$RANDOM)) +%Y-%m-%dT%H:%M:%SZ)"
+
+		uci_set cwmp acs periodic_inform_time "$value"
+	fi
+}
+
+set_inform_time

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

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

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

@@ -0,0 +1,141 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+DHCP_ACS_URL=""
+DHCP_PROV_CODE=""
+MIN_WAIT_INVL=""
+INVL_MULTIPLIER=""
+
+log() {
+	echo "$@" |logger -t cwmp.update -p info
+}
+
+get_opt43() {
+	# Check if option value is in encapsulated form
+	local opt43="$1"
+	local len="$2"
+
+	[ "$len" -gt "2" ] || return
+
+	first_byte=${opt43:0:2}
+	first_byte=$(printf "%d\n" "0x$first_byte")
+
+	if [ $len -ge 4 ] && [ $first_byte -ge 1 ] && [ $first_byte -le 4 ]; then
+		# it is in encapsulated form
+		# opt43 encapsulated vendor-specific option has data in below format
+		#  Code   Len   Data item        Code   Len   Data item        Code
+		# +-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+		# |  T1 |  n  |  d1 |  d2 | ... |  T2 |  n  |  D1 |  D2 | ... | ... |
+		# +-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+
+		#hex-string 2 character=1 Byte
+		# length in hex string will be twice of actual Byte length
+
+		data="${opt43}"
+		rem_len="${len}"
+		# parsing of suboption of option 43
+		while [ $rem_len -gt 0 ]; do
+			# get the suboption id
+			sub_opt_id=${data:0:2}
+			sub_opt_id=$(printf "%d\n" "0x$sub_opt_id")
+
+			# get the length of suboption
+			sub_opt_len=${data:2:2}
+			sub_opt_len=$(printf "%d\n" "0x$sub_opt_len")
+			sub_opt_len=$(( sub_opt_len * 2 ))
+
+			# get the value of sub option starting 4 means starting after length
+			sub_opt_val=${data:4:${sub_opt_len}}
+
+			# assign the value found in sub option
+			case "${sub_opt_id}" in
+				"1") DHCP_ACS_URL=$(echo -n $sub_opt_val | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
+				;;
+				"2") DHCP_PROV_CODE=$(echo -n $sub_opt_val | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
+				;;
+				"3") MIN_WAIT_INVL=$(echo -n $sub_opt_val | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
+				;;
+				"4") INVL_MULTIPLIER=$(echo -n $sub_opt_val | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
+				;;
+			esac
+
+			# add 2 bytes for sub_opt id and sub_opt len field
+			sub_opt_end=$(( sub_opt_len + 4 ))
+
+			# fetch next sub option hex string
+			data=${data:${sub_opt_end}:${len}}
+
+			# update the remaining sub option hex string length
+			rem_len=$((rem_len - sub_opt_end))
+		done
+	else
+		DHCP_ACS_URL=$(echo -n $opt43 | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
+	fi
+}
+
+config_load cwmp
+config_get wan_intf cpe default_wan_interface "wan"
+config_get dhcp_discovery acs dhcp_discovery "0"
+config_get dhcp_url acs dhcp_url ""
+config_get min_wait_intvl acs dhcp_retry_min_wait_interval "0"
+config_get intvl_multi acs dhcp_retry_interval_multiplier "0"
+
+config_change=0
+discovery_enable=0
+
+if [ "$dhcp_discovery" = "1" ] || [ "$dhcp_discovery" = "true" ] || [ "$dhcp_discovery" = "enable" ]; then
+	discovery_enable=1
+fi
+
+if [ "$discovery_enable" = "0" ]; then
+	return 0
+fi
+
+if [ "${wan_intf}" == "${INTERFACE}" ]; then
+	if [ -n "$opt43" ]; then
+		len=$(printf "$opt43"|wc -c)
+		get_opt43 "$opt43" "$len"
+	fi
+
+	if [ -z "$DHCP_ACS_URL" ]; then
+		return 0
+	fi
+
+	sec=$(uci -q get cwmp.acs)
+
+	if [ -z "${sec}" ]; then
+		return 0
+	fi
+
+	if [ "${dhcp_url}" != "${DHCP_ACS_URL}" ]; then
+		uci -q set cwmp.acs.dhcp_url="$DHCP_ACS_URL"
+		config_change=1
+	fi
+
+	if [ -n "$MIN_WAIT_INVL" ] && [ "${MIN_WAIT_INVL}" != "${min_wait_intvl}" ]; then
+		uci -q set cwmp.acs.dhcp_retry_min_wait_interval="$MIN_WAIT_INVL"
+		config_change=1
+	fi
+
+	if [ -n "$INVL_MULTIPLIER" ] && [ "${INVL_MULTIPLIER}" != "${intvl_multi}" ]; then
+		uci -q set cwmp.acs.dhcp_retry_interval_multiplier="$INVL_MULTIPLIER"
+		config_change=1
+	fi
+
+	sec=$(uci -q get cwmp.cpe)
+
+	if [ -n "${sec}" ] && [ -n "$DHCP_PROV_CODE" ]; then
+		uci -q set cwmp.cpe.dhcp_provisioning_code="$DHCP_PROV_CODE"
+		config_change=1
+	fi
+
+	if [ $config_change -eq 0 ]; then
+		return 0
+	fi
+
+	# ACS url has been set, inform icwmpd to reload new configuration
+	sleep 10 # wait for some time to avoid interface fluctuation
+
+	ubus call uci commit '{"config":"cwmp"}'
+fi

ieee1905/Config.in

@@ -20,7 +20,6 @@ config IEEE1905_WIFI_EASYMESH
 
 config IEEE1905_CMDU_FRAGMENT_TLV_BOUNDARY
 	bool "Fragment large CMDU frame at TLV boundary instead of octet boundary"
-	default y
 
 endmenu
 

ieee1905/Makefile

@@ -1,16 +1,16 @@
 #
-# Copyright (C) 2020-2023 IOPSYS Software Solutions AB
+# Copyright (C) 2020-2024 IOPSYS Software Solutions AB
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=8.2.19
+PKG_VERSION:=8.5.6
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=3d175485a7461ce567e3bee47e1c760e15434367
+PKG_SOURCE_VERSION:=25925684c21de7494d4973b1799f5bd121014518
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/ieee1905.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
@@ -22,6 +22,7 @@ PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
+include $(TOPDIR)/feeds/iopsys/bbfdm/bbfdm.mk
 
 
 define Package/ieee1905/Default
@@ -38,7 +39,7 @@ define Package/libieee1905
   $(call Package/ieee1905/Default)
   TITLE:=libieee1905.so (library for CMDU and TLV handling)
   DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
-	   +libjson-c +libblobmsg-json
+	   +libjson-c +libblobmsg-json +libwifiutils
 endef
 
 define Package/ieee1905
@@ -46,7 +47,8 @@ define Package/ieee1905
   TITLE:=ieee1905d (daemon implementing 1905.1 and provides cli)
   DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
 	   +libjson-c +libblobmsg-json +ubus +libpthread \
-	   +libieee1905 +IEEE1905_PLATFORM_HAS_WIFI:libwifi
+	   +libieee1905 +IEEE1905_PLATFORM_HAS_WIFI:libwifi \
+	   +libwifiutils +libbbfdm-api
 endef
 
 include $(wildcard plugins/*.mk)
@@ -60,12 +62,12 @@ define Package/libieee1905/description
 endef
 
 plugins := \
-	$(if $(CONFIG_PACKAGE_map-plugin),map) \
-	$(if $(CONFIG_PACKAGE_snoop-plugin),snoop) \
-	$(if $(CONFIG_PACKAGE_topology-plugin),topology)
+	$(if $(CONFIG_PACKAGE_ieee1905-map-plugin),map) \
+	$(if $(CONFIG_PACKAGE_ieee1905-snoop-plugin),snoop) \
+	$(if $(CONFIG_PACKAGE_ieee1905-topology-plugin),topology)
 
 
-ppkg:=$(patsubst plugins/%.mk,%-plugin,$(wildcard plugins/*.mk))
+ppkg:=$(patsubst plugins/%.mk,ieee1905-%-plugin,$(wildcard plugins/*.mk))
 
 
 TARGET_CFLAGS += \
@@ -107,6 +109,7 @@ define Package/ieee1905/install
 	$(INSTALL_DIR) $(1)/usr/lib/ieee1905
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/ieee1905d $(1)/usr/sbin/
+	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/tr181/ieee1905dm.so $(1) $(PKG_NAME)
 endef
 
 define Package/libieee1905/install
@@ -123,7 +126,6 @@ define Build/InstallDev/libieee1905
 	$(CP) $(PKG_BUILD_DIR)/src/cmdu_ackq.h $(1)/usr/include/
 	$(CP) $(PKG_BUILD_DIR)/src/1905_tlvs.h $(1)/usr/include/
 	$(CP) $(PKG_BUILD_DIR)/src/i1905_wsc.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/src/bufutil.h $(1)/usr/include/
 	$(CP) $(PKG_BUILD_DIR)/src/timer_impl.h $(1)/usr/include/
 	$(CP) $(PKG_BUILD_DIR)/src/i1905_extension.h $(1)/usr/include/
 	$(CP) $(PKG_BUILD_DIR)/src/libmidgen.so $(1)/usr/lib/

ieee1905/files/etc/config/ieee1905

@@ -4,6 +4,7 @@ config ieee1905 'ieee1905'
 	list extmodule 'map'
 	list extmodule 'topology'
 	option registrar '2 5 6'
+	list exclude_tagging '/eth.*'
 #	option macaddress '0a:1b:2c:3d:4e:50'
 
 config al-iface

ieee1905/files/etc/init.d/ieee1905

@@ -1,6 +1,6 @@
 #!/bin/sh /etc/rc.common
 
-START=96
+START=60
 STOP=21
 
 USE_PROCD=1

ieee1905/plugins/map.mk

@@ -1,18 +1,18 @@
-define Package/map-plugin
+define Package/ieee1905-map-plugin
   $(call Package/ieee1905/Default)
   TITLE:=Multi-AP plugin supporting WiFi-Alliance Easymesh standard
   DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
 	   +libjson-c +libblobmsg-json +ieee1905 +libieee1905
 endef
 
-define Package/map-plugin/config
-	if (PACKAGE_map-plugin)
+define Package/ieee1905-map-plugin/config
+	if (PACKAGE_ieee1905-map-plugin)
 
 		menu "Configuration"
 
 		config MULTIAP_EASYMESH_VERSION
 		int "Easymesh version"
-		default 4
+		default 6
 
 		config MULTIAP_DYNAMIC_CNTLR_SYNC_CONFIG
 		bool "Sync configuration between dynamic controllers in the network"
@@ -32,7 +32,7 @@ ifeq ($(CONFIG_MULTIAP_DYNAMIC_CNTLR_SYNC_CONFIG),y)
 TARGET_CFLAGS += -DDYNAMIC_CNTLR_SYNC_CONFIG
 endif
 
-define Build/InstallDev/map-plugin
+define Build/InstallDev/ieee1905-map-plugin
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/include
 	$(INSTALL_DIR) $(1)/usr/lib/ieee1905
@@ -43,7 +43,7 @@ define Build/InstallDev/map-plugin
 	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/libmaputil.so $(1)/usr/lib/libmaputil.so
 endef
 
-define Package/map-plugin/install
+define Package/ieee1905-map-plugin/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/lib/ieee1905
 	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/libmaputil.so $(1)/usr/lib/libmaputil.so

ieee1905/plugins/snoop.mk

@@ -1,11 +1,11 @@
-define Package/snoop-plugin
+define Package/ieee1905-snoop-plugin
   $(call Package/ieee1905/Default)
   TITLE:=Show all received 1905 CMDUs over UBUS
   DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
 	   +libjson-c +libblobmsg-json +ieee1905 +libieee1905
 endef
 
-define Package/snoop-plugin/install
+define Package/ieee1905-snoop-plugin/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/lib/ieee1905
 	$(CP) $(PKG_BUILD_DIR)/src/extensions/snoop/snoop.so $(1)/usr/lib/ieee1905/snoop.so

ieee1905/plugins/topology.mk

@@ -1,11 +1,11 @@
-define Package/topology-plugin
+define Package/ieee1905-topology-plugin
   $(call Package/ieee1905/Default)
   TITLE:=Build full network topology of the 1905 nodes only
   DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
 	   +libjson-c +libblobmsg-json +ieee1905 +libieee1905
 endef
 
-define Package/topology-plugin/install
+define Package/ieee1905-topology-plugin/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/lib/ieee1905
 	$(CP) $(PKG_BUILD_DIR)/src/extensions/topology/topology.so $(1)/usr/lib/ieee1905/topology.so

inbd/Makefile

@@ -1,56 +0,0 @@
-#
-# Copyright (C) 2016 iopsys
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=inbd
-PKG_VERSION:=1.2.3
-PKG_RELEASE:=1
-
-PKG_SOURCE_VERSION:=d4e910a31039e0c0b7a539311eafcd716c36be77
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/inbd
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
-
-# support parallel build
-PKG_BUILD_PARALLEL:=1
-
-#re create configure scripts if not present.
-PKG_FIXUP:=autoreconf
-
-# run install target when cross compiling. basically, make install DESTDIR=$(PKG_INSTALL_DIR)
-# this way we don't need to pick out the resulting files from the build dir.
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/inbd
-	CATEGORY:=Utilities
-	TITLE:=iopsys Netlink Bridge Daemon
-	URL:=
-	DEPENDS:=+libuci +libubus +libblobmsg-json +libnl-genl
-endef
-
-define Package/inbd/description
-	Application handling netlink messages from kernel and sending them out on ubus.
-endef
-
-define Package/inbd/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_DIR) $(1)/etc/init.d/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/inbd $(1)/usr/bin/
-	cp $(PKG_BUILD_DIR)/files/etc/init.d/inbd $(1)/etc/init.d/
-endef
-
-$(eval $(call BuildPackage,inbd))

iop/config

@@ -1,322 +0,0 @@
-############
-# Generic #
-##########
-
-# Build #
-CONFIG_BUILD_LOG=y
-CONFIG_CCACHE=y
-CONFIG_DEBUG=y
-CONFIG_DEVEL=y
-# CONFIG_USE_SSTRIP is not set
-CONFIG_USE_STRIP=y
-# CONFIG_SIGNED_PACKAGES is not set
-
-# Image #
-CONFIG_TARGET_CUSTOMER="IOPSYS"
-CONFIG_TARGET_ROOTFS_TARGZ=y
-
-# /etc/banner and /etc/device_info #
-CONFIG_IMAGEOPT=y
-CONFIG_VERSIONOPT=y
-CONFIG_VERSION_MANUFACTURER="IOPSYS"
-CONFIG_VERSION_MANUFACTURER_URL="https://iopsys.eu/"
-CONFIG_VERSION_DIST="IOWRT"
-
-# OpenWrt is given by CONFIG_VERSION_NUMBER which we do not want to override.
-# disabling CONFIG_VERSION_FILENAMES will hide the OpenWrt version from the image filename
-# CONFIG_VERSION_FILENAMES is not set
-
-# CONFIG_VERSION_CODE is set to the IOWRT version instead by the genconfig-script and
-# CONFIG_VERSION_CODE_FILENAMES will put it into the image filename.
-CONFIG_VERSION_CODE_FILENAMES=y
-
-CONFIG_VERSION_HOME_URL="https://iopsys.eu"
-CONFIG_VERSION_BUG_URL="https://iopsys.eu"
-CONFIG_VERSION_SUPPORT_URL="https://iopsys.eu"
-
-# /lib/preinit #
-CONFIG_PREINITOPT=y
-# CONFIG_TARGET_PREINIT_SUPPRESS_STDERR is not set
-CONFIG_TARGET_PREINIT_DISABLE_FAILSAFE=y
-CONFIG_TARGET_PREINIT_TIMEOUT=1
-# CONFIG_TARGET_PREINIT_SHOW_NETMSG is not set
-# CONFIG_TARGET_PREINIT_SUPPRESS_FAILSAFE_NETMSG is not set
-CONFIG_TARGET_PREINIT_IFNAME=""
-CONFIG_TARGET_PREINIT_IP=""
-CONFIG_TARGET_PREINIT_NETMASK=""
-CONFIG_TARGET_PREINIT_BROADCAST=""
-
-# Mirror #
-CONFIG_LOCALMIRROR="https://download.iopsys.eu/iopsys/mirror/"
-
-
-##################
-# IOWRT Add-ons #
-################
-
-# EasySoC HAL #
-CONFIG_PACKAGE_inbd=y
-CONFIG_PACKAGE_qosmngr=y
-CONFIG_PACKAGE_libwifiutils=y
-CONFIG_PACKAGE_wifimngr=y
-
-# Multi-AP #
-CONFIG_PACKAGE_ieee1905=y
-CONFIG_IEEE1905_CMDU_SA_IS_ALMAC=y
-CONFIG_PACKAGE_topology-plugin=y
-CONFIG_PACKAGE_decollector=y
-CONFIG_PACKAGE_map-agent=y
-CONFIG_PACKAGE_map-controller=y
-
-# Network #
-CONFIG_PACKAGE_hostmngr=y
-CONFIG_PACKAGE_netmode=y
-CONFIG_PACKAGE_urlfilter=y
-
-# System #
-CONFIG_PACKAGE_imonitor=m
-CONFIG_PACKAGE_questd=y
-CONFIG_PACKAGE_rulengd=y
-CONFIG_PACKAGE_usermngr=y
-
-# TR-x69 #
-CONFIG_PACKAGE_libbbfdm=y
-CONFIG_PACKAGE_bbfdmd=y
-CONFIG_PACKAGE_icwmp=y
-CONFIG_PACKAGE_obuspa=y
-CONFIG_PACKAGE_bulkdata=y
-CONFIG_PACKAGE_periodicstats=y
-CONFIG_PACKAGE_stunc=y
-CONFIG_PACKAGE_swmodd=y
-CONFIG_PACKAGE_twamp=y
-CONFIG_PACKAGE_udpecho-client=y
-CONFIG_PACKAGE_udpecho-server=y
-CONFIG_PACKAGE_userinterface=y
-CONFIG_PACKAGE_xmppc=y
-CONFIG_PACKAGE_timemngr=y
-
-# WebGUI #
-CONFIG_PACKAGE_sulu=y
-
-
-############
-# Network #
-##########
-
-# Protocols #
-CONFIG_PACKAGE_6in4=y
-CONFIG_PACKAGE_6rd=y
-CONFIG_PACKAGE_6to4=y
-CONFIG_PACKAGE_chat=y
-CONFIG_PACKAGE_comgt=y
-CONFIG_PACKAGE_comgt-directip=y
-CONFIG_PACKAGE_comgt-ncm=y
-CONFIG_PACKAGE_ds-lite=y
-CONFIG_PACKAGE_firewall=y
-# CONFIG_PACKAGE_firewall4 is not set
-CONFIG_PACKAGE_gre=y
-CONFIG_PACKAGE_map=y
-CONFIG_PACKAGE_ntfs-3g=y
-CONFIG_PACKAGE_ntpd=y
-CONFIG_PACKAGE_odhcp6c=y
-CONFIG_PACKAGE_odhcpd=y
-CONFIG_PACKAGE_ppp-mod-pppoa=y
-CONFIG_PACKAGE_ppp-mod-pppoe=y
-CONFIG_PACKAGE_ppp-mod-pppol2tp=y
-CONFIG_PACKAGE_ppp-mod-pptp=y
-CONFIG_PACKAGE_ppp-multilink=y
-# CONFIG_PACKAGE_ppp is not set
-CONFIG_PACKAGE_relayd=y
-CONFIG_PACKAGE_umbim=y
-CONFIG_PACKAGE_uqmi=y
-CONFIG_PACKAGE_wwan=y
-CONFIG_PACKAGE_xl2tpd=y
-
-# Services #
-CONFIG_PACKAGE_atftp=y
-CONFIG_PACKAGE_atftpd=y
-CONFIG_PACKAGE_ddns-scripts=y
-CONFIG_PACKAGE_dnsmasq=y
-CONFIG_PACKAGE_ssdpd=y
-CONFIG_PACKAGE_miniupnpd-iptables=y
-CONFIG_PACKAGE_mosquitto-client-ssl=y
-CONFIG_PACKAGE_mosquitto-ssl=y
-CONFIG_PACKAGE_nginx=y
-CONFIG_PACKAGE_openvpn-easy-rsa=y
-CONFIG_PACKAGE_openvpn-openssl=y
-CONFIG_OPENVPN_openssl_ENABLE_IPROUTE2=y
-# CONFIG_PACKAGE_qos-scripts is not set
-CONFIG_PACKAGE_rdnssd=y
-CONFIG_PACKAGE_vsftpd-tls=y
-
-# Tools and Utilities #
-CONFIG_PACKAGE_curl=y
-CONFIG_PACKAGE_libcurl=y
-CONFIG_LIBCURL_CRYPTO_AUTH=y
-# CONFIG_LIBCURL_MBEDTLS is not set
-CONFIG_LIBCURL_OPENSSL=y
-CONFIG_PACKAGE_ethtool=y
-CONFIG_PACKAGE_ip-bridge=y
-CONFIG_PACKAGE_ip-full=y
-CONFIG_PACKAGE_iperf3=y
-CONFIG_PACKAGE_ipset=y
-CONFIG_PACKAGE_ip6tables-zz-legacy=y
-CONFIG_PACKAGE_iptables-zz-legacy=y
-CONFIG_PACKAGE_iptables-mod-conntrack-extra=y
-CONFIG_PACKAGE_iptables-mod-extra=y
-CONFIG_PACKAGE_iptables-mod-filter=y
-CONFIG_PACKAGE_iptables-mod-ipmark=y
-CONFIG_PACKAGE_iptables-mod-ipopt=y
-CONFIG_PACKAGE_iptables-mod-nflog=y
-CONFIG_PACKAGE_iptables-mod-nfqueue=y
-CONFIG_PACKAGE_ndisc6=y
-CONFIG_PACKAGE_nping=y
-CONFIG_PACKAGE_rdisc6=y
-CONFIG_PACKAGE_resolveip=y
-CONFIG_PACKAGE_socat=y
-CONFIG_PACKAGE_tcpdump=y
-CONFIG_PACKAGE_traceroute6=y
-
-
-############
-# System  #
-##########
-
-CONFIG_PACKAGE_at=y
-CONFIG_PACKAGE_ca-certificates=y
-CONFIG_PACKAGE_crun=y
-CONFIG_PACKAGE_getopt=y
-# CONFIG_PACKAGE_iwatchdog is not set
-CONFIG_PACKAGE_jq=y
-CONFIG_PACKAGE_libcap-bin=y
-CONFIG_PACKAGE_libustream-openssl=y
-# CONFIG_PACKAGE_libustream-wolfssl is not set
-CONFIG_PACKAGE_lscpu=y
-CONFIG_PACKAGE_nand-utils=y
-CONFIG_PACKAGE_openssl-util=y
-CONFIG_OPENSSL_WITH_COMPRESSION=y
-CONFIG_PACKAGE_procd-ujail=m
-CONFIG_PACKAGE_quota=y
-CONFIG_PACKAGE_rpcd=y
-CONFIG_PACKAGE_rpcd-mod-rpcsys=y
-CONFIG_PACKAGE_rpcd-mod-rrdns=y
-CONFIG_PACKAGE_strace=y
-CONFIG_PACKAGE_terminfo=y
-CONFIG_PACKAGE_uledd=y
-# The urandom-seed package is very strange. It seeds urandom with urandom...
-# Disable it. Most SoCs nowadays has HW random generators anyway.
-# CONFIG_PACKAGE_urandom-seed is not set
-# CONFIG_PACKAGE_urngd is not set
-CONFIG_PACKAGE_usb-modeswitch=y
-CONFIG_PACKAGE_uuidgen=y
-CONFIG_PACKAGE_zoneinfo-core=y
-CONFIG_PACKAGE_zoneinfo-europe=y
-
-
-################
-# LuCI WebGUI #
-##############
-
-# BEGIN: luci-nginx metapackage with some changes
-# We do not want libiwinfo-lua on non-WiFi targets, but it is already
-# depended on by other luci-packages, so no need to take it in explicitly
-CONFIG_PACKAGE_luci-mod-admin-full=y
-CONFIG_PACKAGE_luci-app-firewall=y
-CONFIG_PACKAGE_luci-app-opkg=y
-CONFIG_PACKAGE_luci-proto-ppp=y
-CONFIG_PACKAGE_luci-proto-ipv6=y
-# CONFIG_LUCI_JSMIN is not set
-# CONFIG_LUCI_CSSTIDY is not set
-CONFIG_PACKAGE_luci-mod-dashboard=y
-CONFIG_PACKAGE_luci-theme-openwrt-2020=y
-CONFIG_PACKAGE_nginx-mod-luci=y
-
-
-############
-# BusyBox #
-##########
-
-CONFIG_BUSYBOX_CUSTOM=y
-CONFIG_BUSYBOX_CONFIG_ADDUSER=y
-CONFIG_BUSYBOX_CONFIG_ARPING=y
-CONFIG_BUSYBOX_CONFIG_ASH_IDLE_TIMEOUT=y
-CONFIG_BUSYBOX_CONFIG_ASH_RANDOM_SUPPORT=y
-CONFIG_BUSYBOX_CONFIG_CTTYHACK=y
-CONFIG_BUSYBOX_CONFIG_DELUSER=y
-# CONFIG_BUSYBOX_CONFIG_DEVMEM is not set
-CONFIG_BUSYBOX_CONFIG_FEATURE_UDHCP_8021Q=y
-CONFIG_BUSYBOX_CONFIG_FIRST_SYSTEM_ID=100
-# CONFIG_BUSYBOX_CONFIG_HTTPD is not set
-# CONFIG_BUSYBOX_CONFIG_INSMOD is not set
-# CONFIG_BUSYBOX_CONFIG_MODINFO is not set
-# CONFIG_BUSYBOX_CONFIG_MODPROBE is not set
-CONFIG_BUSYBOX_CONFIG_FEATURE_MODPROBE_BLACKLIST=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_MODUTILS_ALIAS=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_MODUTILS_SYMBOLS=y
-CONFIG_BUSYBOX_CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
-CONFIG_BUSYBOX_CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
-# CONFIG_BUSYBOX_CONFIG_IP is not set
-CONFIG_BUSYBOX_CONFIG_LAST_SYSTEM_ID=999
-CONFIG_BUSYBOX_CONFIG_LOGIN=y
-# CONFIG_BUSYBOX_CONFIG_LSMOD is not set
-CONFIG_BUSYBOX_CONFIG_LSPCI=y
-CONFIG_BUSYBOX_CONFIG_LSUSB=y
-CONFIG_BUSYBOX_CONFIG_MICROCOM=y
-# CONFIG_BUSYBOX_CONFIG_RMMOD is not set
-CONFIG_BUSYBOX_CONFIG_STTY=y
-CONFIG_BUSYBOX_CONFIG_TFTP=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_AUTH_MD5=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_BASIC_AUTH=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_CGI=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_ERROR_PAGES=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_GZIP=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_PROXY=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_RANGES=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_SETUID=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_USE_SENDFILE=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
-# CONFIG_BUSYBOX_CONFIG_FEATURE_NOLOGIN is not set
-CONFIG_BUSYBOX_CONFIG_FEATURE_SECURETTY=y
-# CONFIG_BUSYBOX_CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
-CONFIG_BUSYBOX_CONFIG_FEATURE_TFTP_GET=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_TFTP_PUT=y
-# CONFIG_BUSYBOX_CONFIG_WGET is not set
-# CONFIG_BUSYBOX_CONFIG_LOGIN_SCRIPTS is not set
-# CONFIG_BUSYBOX_CONFIG_LOGIN_SESSION_AS_CHILD is not set
-# CONFIG_BUSYBOX_CONFIG_PAM is not set
-# CONFIG_BUSYBOX_CONFIG_TFTP_DEBUG is not set
-# CONFIG_BUSYBOX_CONFIG_NTPD is not set
-CONFIG_BUSYBOX_CONFIG_MOUNTPOINT=y
-CONFIG_BUSYBOX_CONFIG_RUN_PARTS=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_RUN_PARTS_FANCY=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_GZIP_LEVELS=y
-CONFIG_BUSYBOX_CONFIG_GZIP_FAST=2
-CONFIG_BUSYBOX_CONFIG_FEATURE_FANCY_SLEEP=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_FLOAT_SLEEP=y
-CONFIG_BUSYBOX_CONFIG_FLOAT_DURATION=y
-CONFIG_BUSYBOX_CONFIG_USLEEP=y
-CONFIG_BUSYBOX_CONFIG_REALPATH=y
-CONFIG_BUSYBOX_CONFIG_TTY=y
-CONFIG_BUSYBOX_CONFIG_BLOCKDEV=y
-CONFIG_BUSYBOX_CONFIG_PARTPROBE=y
-CONFIG_BUSYBOX_CONFIG_LFS=y
-CONFIG_BUSYBOX_CONFIG_FDISK=y
-CONFIG_BUSYBOX_CONFIG_FDISK_SUPPORT_LARGE_DISKS=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_GPT_LABEL=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_FDISK_ADVANCED=y
-CONFIG_BUSYBOX_CONFIG_IONICE=y
-CONFIG_BUSYBOX_CONFIG_RENICE=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_BTRFS=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_F2FS=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_SQUASHFS=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_UBIFS=y
-CONFIG_BUSYBOX_CONFIG_TIMEOUT=y
-CONFIG_BUSYBOX_CONFIG_NOHUP=y

iop/iop.completion

@@ -33,9 +33,10 @@ _iop()
     prev="${COMP_WORDS[COMP_CWORD-1]}"
 
     iopcmds="bootstrap cfe_upgrade cfe_upgrade_latest extract_core \
-             feeds_update genconfig generate_tarballs install_key \
+             feeds_update genconfig \
+             generate_tarballs install_key \
              scp_changes setup_host ssh_install_key status \
-             update_package update_feed_branches ssh_upgrade smoketest"
+             update_feed_branches ssh_upgrade smoketest"
 
     if [ $COMP_CWORD -eq 1 ] ; then
 

iop/scripts/feeds_update.sh

@@ -1,72 +1,9 @@
 #!/bin/bash
 
 function feeds_update {
-	heads=1
-	developer=0
-	override=1
-	while getopts "inh" opt; do
-		case $opt in
-		i)
-			heads=0
-			;;
-		n)
-			override=0
-			;;
-		h|\?)
-			echo "Usage: ./iop feeds_update [-i] [-n] [-h]"
-			echo
-			echo "OPTIONS:"
-			echo "  -i - Only update index. Do not change HEAD in feeds."
-			echo "  -n - Do not replace core packages with iopsys versions."
-			echo "  -h - Display this help message and exit."
-			exit 1
-			;;
-		esac
-	done
-
-	git remote -v | grep -qE '(git@|ssh://)' && developer=1
-
-	cp .config .genconfig_config_bak
-
-	if [ $heads == 1 ]; then
-		if [ $developer == 1 ]; then
-			./scripts/feeds update -g
-		else
-			./scripts/feeds update
-		fi
-	fi
-	./scripts/feeds update -ai || exit 1
-
-	# replace core packages with iopsys versions
-	if [ $override == 1 ]; then
-		./scripts/feeds install -f -p openwrt_core -a || exit 1
-	fi
-
-	(
-		echo '# DO NOT EDIT. Autogenerated file by ./iop feeds_update'
-		echo 'FEED_DEVICES_DIRS:='
-		find feeds -type f -name .is-feed-devices-dir -printf 'FEED_DEVICES_DIRS+=$(TOPDIR)/%h'
-	) > target/linux/feed-devices/feed-devices-list.mk || exit 1
-
-	# targets need to be installed explicitly
-	for target in $(ls ./feeds/targets); do
-		./scripts/feeds install -f -p targets $target || exit 1
-	done
-
-	# install all packages
-	./scripts/feeds install -a || exit 1
-
-	# remove broken symlinks ( for packages that are no longer in the feed )
-	find -L package/feeds -maxdepth 2 -type l -delete || exit 1
-
-	cp .genconfig_config_bak .config
-	make defconfig || exit 1
-
-	# record when we last run this script
-	touch tmp/.iop_bootstrap || exit 1
 
 	# always return true
 	exit 0
 }
 
-register_command "feeds_update" "Update feeds to point to commit hashes from feeds.conf"
+register_command "feeds_update" "Compatibility function only"

iop/scripts/genconfig.sh

@@ -1,514 +0,0 @@
-#!/bin/bash
-
-function genconfig {
-	export CLEAN=0
-	export IMPORT=1
-	export SRCTREEOVERR=0
-	export FILEDIR="files/"
-	CURRENT_CONFIG_FILE=".current_config_file"
-	export CONFIGPATH="package/feeds/iopsys/iop"
-	CUSTPATH="customerconfigs"
-	export CUSTCONF="customerconfigs/customers"
-	export VERBOSE=0
-	export DEVELOPER=0
-	target="bogus"
-	target_config_path=""
-	brcmbca_feed="target/linux/feeds/brcmbca"
-	airoha_feed="target/linux/feeds/airoha"
-	x86_feed="target/linux/feeds/x86"
-	armvirt_feed="target/linux/feeds/armvirt"
-	mediatek_feed="target/linux/feeds/mediatek"
-	qualcomm_ipq95xx_feed="target/linux/feeds/ipq95xx"
-	qualcomm_ipq53xx_feed="target/linux/feeds/ipq53xx"
-
-	Red='\033[0;31m'          # Red
-	Color_Off='\033[0m'       # Text Reset
-	Yellow='\033[0;33m'       # Yellow
-
-	function find_last {
-	    egrep "^[ #]*${1}[ =]" $2 | tail -n1
-	}
-
-	function is_new {
-	    for opt in $conf_warned
-	    do
-		if [ "$opt" == "$1" ]
-		then
-		    return 1
-		fi
-	    done
-	    # option not found return true
-	    return 0
-	}
-
-	function verify_config {
-	    local conf_opt
-	    local conf_org
-	    local conf_new
-
-	    while read -r line
-	    do
-		conf_opt=$(echo $line | grep "^[ #]*CONFIG_" | sed 's|.*\(CONFIG_[^ =]*\)[ =].*|\1|')
-		if [ -n "${conf_opt}" ]
-		then
-		    conf_org=$(find_last ${conf_opt} .genconfig.config)
-		    conf_new=$(find_last ${conf_opt} .config)
-		    if [ "$conf_org" != "$conf_new" ]
-		    then
-			if is_new $conf_opt
-			then
-			    echo -e "config option [${Red}$conf_opt${Color_Off}] is not set correctly in .config"
-			    echo -e "got value [${Yellow}$conf_new${Color_Off}] but wanted [${Yellow}$conf_org${Color_Off}]"
-			    echo "This is a real problem somebody needs to investigate"
-			    echo ""
-			    conf_warned="$conf_warned $conf_opt"
-			fi
-		    else
-			true
-			# for debug to see all options
-			#echo -e "wanted [$conf_org] got [$conf_new]"
-		    fi
-		fi
-	    done < .genconfig.config
-	}
-
-	# Takes a board name and returns the target name in global var $target
-	set_target() {
-		local profile=$1
-
-		[ -n "$profile" ] || return
-
-		if [ -n "$TARGET" -a -d "./target/linux/feeds/$TARGET" ]; then
-			local targetpath="./target/linux/feeds/$TARGET"
-			local profiles=
-			local pfound=0
-
-			if [ -e "$targetpath/genconfig" ]; then
-				profiles=$(cd $targetpath; ./genconfig)
-
-				for p in $profiles; do
-					if [ $p == $profile ]; then
-						pfound=1
-						break
-					fi
-				done
-			fi
-
-			if [ $pfound -eq 1 ]; then
-				target="$(echo $TARGET | tr '-' '_')"
-				target_config_path="$targetpath/config"
-			fi
-
-			return
-		fi
-
-		[ -e $brcmbca_feed/genconfig ] &&
-			brcmbca=$(cd $brcmbca_feed; ./genconfig)
-		[ -e $airoha_feed/genconfig ] &&
-			airoha=$(cd $airoha_feed; ./genconfig)
-		[ -e $x86_feed/genconfig ] &&
-			x86=$(cd $x86_feed; ./genconfig)
-		[ -e $armvirt_feed/genconfig ] &&
-			armvirt=$(cd $armvirt_feed; ./genconfig)
-		[ -e $mediatek_feed/genconfig ] &&
-			mediatek=$(cd $mediatek_feed; ./genconfig)
-		[ -e $qualcomm_ipq95xx_feed/genconfig ] &&
-			ipq95xx=$(cd $qualcomm_ipq95xx_feed; ./genconfig)
-		[ -e $qualcomm_ipq53xx_feed/genconfig ] &&
-			ipq53xx=$(cd $qualcomm_ipq53xx_feed; ./genconfig)
-
-	    if [ "$profile" == "LIST" ]; then
-			for list in brcmbca airoha x86 armvirt mediatek ipq95xx ipq53xx; do
-				echo "$list based boards:"
-				a=$(echo "${!list}" | sort)
-				for b in $a; do
-					echo -e "\t$b"
-				done
-			done
-			return
-	    fi
-
-	    for p in $airoha; do
-		if [ $p == $profile ]; then
-		    target="airoha"
-			target_config_path="$airoha_feed/config"
-		    return
-		fi
-	    done
-
-	    for p in $x86; do
-		if [ $p == $profile ]; then
-		    target="x86"
-			target_config_path="$x86_feed/config"
-		    return
-		fi
-	    done
-
-	    for p in $armvirt; do
-		if [ $p == $profile ]; then
-		    target="armvirt"
-			target_config_path="$armvirt_feed/config"
-		    return
-		fi
-	    done
-
-	    for p in $mediatek; do
-		if [ $p == $profile ]; then
-		    target="mediatek"
-			target_config_path="$mediatek_feed/config"
-		    return
-		fi
-	    done
-
-	    for p in $ipq95xx; do
-		if [ $p == $profile ]; then
-		    target="ipq95xx"
-			target_config_path="$qualcomm_ipq95xx_feed/config"
-		    return
-		fi
-	    done
-
-	    for p in $ipq53xx; do
-		if [ $p == $profile ]; then
-		    target="ipq53xx"
-			target_config_path="$qualcomm_ipq53xx_feed/config"
-		    return
-		fi
-	    done
-
-	    for p in $brcmbca; do
-		if [ $p == $profile ]; then
-		    target="brcmbca"
-			target_config_path="$brcmbca_feed/config"
-		    return
-		fi
-	    done
-	}
-
-	git remote -v | grep -qE '(git@|ssh://)' && {
-		DEVELOPER=1
-	}
-
-	v() {
-		[ "$VERBOSE" -ge 1 ] && echo "$@"
-	}
-
-	usage() {
-		echo
-		echo 1>&2 "Usage: $0 [ OPTIONS ] < Board_Type > [ Customer [customer2 ]...]"
-		echo
-		echo -e "  -c|--clean\t\tRemove all files under ./files and import from config "
-		echo -e "  -v|--verbose\t\tVerbose"
-		echo -e "  -n|--no-update\tDo NOT! Update customer config before applying"
-		echo -e "  -t|--target\t\tExplicitly specify the linux target to build the board profile from"
-		echo -e "  -s|--override\t\tEnable 'Package source tree override'"
-		echo -e "  -S|--brcmsingle\tForce build of bcmkernel to use only one thread"
-		echo -e "  -h|--help\t\tShow this message"
-		echo -e "  -l|--list [customer]\tList all Customers or all boards for one customer"
-		echo -e "  -a|--list-all\t\tList all Customers and their board types"
-		echo -e "  -b|--boards\t\tList all board types"
-		echo
-		echo "Example ./iop genconfig eg400 OPERATORX"
-		echo "(if no customerconfig is chosen, iopsys config will be used)"
-		echo
-		exit 0
-	}
-
-	list_customers()
-	{
-		local ALL="$1"
-		local CUSTOMER="$2"
-		if [ "$CUSTOMER" -a -d "$CUSTCONF/$CUSTOMER" ]; then
-			local boards="$(ls -1 "$CUSTCONF/$CUSTOMER" | grep -v common)"
-			if [ "$boards" ]; then
-				echo "$CUSTOMER has following boards:"
-				for board in $boards; do
-					echo -e "\t$board"
-				done
-			else
-				echo "No boards found for $CUSTOMER"
-			fi
-		elif [ "$CUSTOMER" ]; then
-			echo "No customer called $CUSTOMER"
-			exit 1
-		elif [ -d $CUSTCONF ]; then
-			local customers="$(ls -1 $CUSTCONF)"
-			if [ "$customers" -a "$ALL" == 1 ]; then
-				for customer in $customers; do
-					echo $customer
-					local boards="$(ls -1 $CUSTCONF/$customer | grep -v common)"
-					if [ "$boards" ]; then
-						for board in $boards; do
-							echo -e "\t$board"
-						done
-					else
-						echo "has no boards"
-					fi
-				done
-			elif [ "$customers" ]; then
-				echo -e "$customers"
-			else
-				echo "no customers found"
-			fi
-		else
-			echo "No $CUSTCONF folder found"
-		fi
-		exit 0
-	}
-
-
-	generate_config()
-	{
-		DIFFFILE="$1"
-		MASTERFILE="$2"
-		while read p; do
-			v "$p"
-			sed -r -i "$p" $MASTERFILE
-		done < $DIFFFILE
-	}
-
-	setup_dirs()
-	{
-		git remote -v | grep -q http || {
-			CUSTBRANCH="$(git rev-parse --abbrev-ref HEAD)"
-			if git ls-remote $CUSTREPO -q 2>/dev/null; then
-				if [ ! -d "$CUSTPATH" ]; then
-					echo "Cloning $CUSTBRANCH branch of $CUSTREPO"
-					git clone -b "$CUSTBRANCH" "$CUSTREPO" "$CUSTPATH" 2>/dev/null || {
-						DEFBRANCH="$(git remote show $CUSTREPO | grep 'HEAD branch' | cut -d' ' -f5)"
-						echo "$CUSTBRANCH branch is not found, cloning $DEFBRANCH branch of $CUSTREPO"
-						git clone "$CUSTREPO" "$CUSTPATH"
-					}
-				elif [ $IMPORT -eq 1 ]; then
-					cd $CUSTPATH
-					echo "Checking out $CUSTBRANCH branch in $CUSTPATH"
-					git checkout "$CUSTBRANCH" 2>/dev/null || {
-						DEFBRANCH="$(git symbolic-ref refs/remotes/origin/HEAD | cut -d '/' -f4)"
-						echo "Checking out $CUSTBRANCH branch has failed, using $DEFBRANCH branch in $CUSTPATH"
-					}
-					v "git pull"
-					git pull
-					cd - >/dev/null #go back
-				fi
-			else
-				echo "You do not have access to $CUSTREPO"
-			fi
-		}
-
-		if [ ! -d "$FILEDIR" ]; then
-			mkdir -p $FILEDIR
-		elif [ -d "$FILEDIR" -a $CLEAN -eq 1 ]; then
-			v "rm -rf $FILEDIR*"
-			rm -rf $FILEDIR*
-		fi
-	}
-
-	get_subtarget_for_device() {
-		readonly target="$1"
-		readonly device="$2"
-		readonly targetinfo_file="tmp/info/.targetinfo-feeds_$target"
-		readonly target_profile_line="Target-Profile: DEVICE_$device"
-		# We want to know after which Target: $target/$subtarget line
-		# our $target_profile_line appears
-		# This is a crude way to "parse" the file using shell 🤯
-		# 1. grep for both lines with line number output
-		# 2. grep again to determine the device profile line that we looked for
-		#    but output one context line before as well to determine corresponding subtarget line
-		# 4. Use head and sed to extract the subtarget
-		grep "^Target: $target/\|^$target_profile_line" "$targetinfo_file" \
-			| grep -E -B1 "^$target_profile_line" \
-			| head -n1 \
-			| sed -E "s|^Target: $target/||"
-	}
-
-	create_and_copy_files()
-	{
-		local BOARDTYPE=$1
-		shift
-		local CUSTOMERS=$@
-
-		# Validate seleced board and customers
-		set_target $BOARDTYPE
-		if [ $target == "bogus" ]; then
-			echo "Hardware profile does not exist"
-			exit 1
-		elif [ -n "$CUSTOMERS" ]; then
-			for CUSTOMER in $CUSTOMERS; do
-				if [ ! -d "$CUSTCONF/$CUSTOMER/" ]; then
-					echo "Customer profile for '$CUSTOMER' does not exist"
-					exit 1
-				elif [ ! -d "$CUSTCONF/$CUSTOMER/$BOARDTYPE/" ]; then
-					echo "'$BOARDTYPE' board profile does not exist for customer '$CUSTOMER'"
-					if [ -f "$CUSTCONF/$CUSTOMER/common/common.diff" ]; then
-						echo "Common profile configuration will be used"
-					else
-						exit 1
-					fi
-				fi
-			done
-		fi
-
-		# Generate base config
-		rm -f .config
-		v "Config $BOARDTYPE selected"
-		v "cp $CONFIGPATH/config .config"
-		cp $CONFIGPATH/config .config
-
-		if [ -f $target_config_path/config ]; then
-		    cat $target_config_path/config >> .config
-		    echo "" >> .config
-		fi
-		if [ -f $target_config_path/$BOARDTYPE/config ]; then
-		    cat $target_config_path/$BOARDTYPE/config >> .config
-		    echo "" >> .config
-		fi
-		# hack to support custom-devices until we have deprecated this genconfig-script...
-		if [ -f "feeds/custom_devices/devices/$target/config/$BOARDTYPE/config" ]; then
-			cat "feeds/custom_devices/devices/$target/config/$BOARDTYPE/config" >> .config
-			echo "" >> .config
-		fi
-		
-		# Special handling for targets which use TARGET_DEVICES
-		case "$target" in
-		airoha | mediatek | brcmbca | ipq95xx | ipq53xx)
-			# This assumes the device name to be unique within one target,
-			# which is a fair assumption to make.
-			local subtarget="$(get_subtarget_for_device "${target/_/-}" "$BOARDTYPE")"
-			if [ -z "$subtarget" ]; then
-				echo "Error determining subtarget for $target / ${BOARDTYPE}"
-				return 1
-			fi
-			echo "CONFIG_TARGET_${target}=y" >> .config
-			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
-			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
-			;;
-		*)
-			echo "CONFIG_TARGET_${target}=y" >> .config
-			echo "CONFIG_TARGET_${target}_${BOARDTYPE}=y" >> .config
-			;;
-		esac
-
-		echo "$CUSTOMERS $BOARDTYPE" > $CURRENT_CONFIG_FILE
-
-		# Add customerconfig diff if a customer is selected
-		if [ -n "$CUSTOMERS" ]; then
-			for CUSTOMER in $CUSTOMERS; do
-				if [ -d "$CUSTCONF/$CUSTOMER/common/fs" ]; then
-					v "cp -ar $CUSTCONF/$CUSTOMER/common/fs/* $FILEDIR"
-					cp -ar $CUSTCONF/$CUSTOMER/common/fs/* $FILEDIR
-				fi
-				if [ -d "$CUSTCONF/$CUSTOMER/$BOARDTYPE/fs" ]; then
-					v "cp -ar $CUSTCONF/$CUSTOMER/$BOARDTYPE/fs/* $FILEDIR"
-					cp -ar $CUSTCONF/$CUSTOMER/$BOARDTYPE/fs/* $FILEDIR
-				fi
-				if [ -e "$CUSTCONF/$CUSTOMER/common/common.diff" ]; then
-					v "Apply $CUSTCONF/$CUSTOMER/common/common.diff"
-					cat $CUSTCONF/$CUSTOMER/common/common.diff >> .config
-					echo "" >> .config
-				fi
-				if [ -e "$CUSTCONF/$CUSTOMER/$BOARDTYPE/$BOARDTYPE.diff" ]; then
-					v "Apply $CUSTCONF/$CUSTOMER/$BOARDTYPE/$BOARDTYPE.diff"
-					cat $CUSTCONF/$CUSTOMER/$BOARDTYPE/$BOARDTYPE.diff >> .config
-					echo "" >> .config
-				fi
-			done
-		fi
-
-		# Set target version
-		local git_version
-		if ! git_version="$(git describe --always --dirty --tags --match '[0-9].*.*' --match '[0-9][0-9].*.*')"; then
-			echo "ERROR: Failed getting version via git describe, exiting." >&2
-			return 1
-		fi
-		local version="${git_version,,}${CUSTOMERS:+-${CUSTOMERS// /}}"
-		local version_lower="${version,,}"
-		echo "CONFIG_TARGET_VERSION=\"${version_lower}\"" >> .config
-		echo "CONFIG_VERSION_CODE=\"${version_lower}\"" >> .config
-		echo "CONFIG_VERSION_PRODUCT=\"$BOARDTYPE"\" >> .config
-
-		# Enable Package source tree override if selected
-		[ $SRCTREEOVERR -eq 1 ] && echo CONFIG_SRC_TREE_OVERRIDE=y >> .config
-
-		# developer mode selected ?
-		echo "CONFIG_DEVEL=y" >>.config
-		if [ $DEVELOPER -eq 1 ]; then
-			# rewrite url to clone with ssh instead of http
-			echo "CONFIG_GITMIRROR_REWRITE=y" >>.config
-		else
-			echo "# CONFIG_GITMIRROR_REWRITE is not set" >>.config
-		fi
-
-		if [ -n "$BRCM_MAX_JOBS" ]
-		then
-		    echo "CONFIG_BRCM_MAX_JOBS=\"1\"" >>.config
-		fi
-
-		# Force regeneration of kernel Makefile
-		# Needed to disable kmods for iopsys-brcm targets
-		touch package/kernel/linux/Makefile
-
-		# we need to signal to bradcom SDK that we have changed the board id
-		# currently boardparms.c and boardparms_voice.c is the only place that is depending on boardid name
-		# so just touch that file.
-		[ -d ./build_dir ] && find build_dir/ -name "boardparms*c" -print0 2>/dev/null | xargs -0 touch 2>/dev/null
-
-		# Store generated config
-		cp .config .genconfig.config
-
-		# Set default values based on selected parameters
-		v "$(make defconfig 2>&1)"
-
-		echo Set version to $(grep -w CONFIG_TARGET_VERSION .config | cut -d'=' -f2 | tr -d '"')
-
-		# Clean base-file package to force rebuild when changing profile
-		v "$(make package/base-files/clean 2>&1)"
-
-		verify_config
-	}
-
-	####### main #####
-	if [ ! -e tmp/.iop_bootstrap ]; then
-		echo "You have not installed feeds. Running genconfig in this state would create a non functional configuration."
-		echo "Run: iop feeds_update"
-		exit 1
-	fi
-
-	if [ $# -eq 0 ]; then
-		echo Current profile:
-		cat $CURRENT_CONFIG_FILE
-		echo "Try ./iop genconfig -h' to get instructions if you want to change current config"
-		exit 0
-	else
-		while [ -n "$1" ]; do
-			case "$1" in
-
-			-c|--clean) export CLEAN=1;;
-			-n|--no-update) export IMPORT=0;;
-			-v|--verbose) export VERBOSE="$(($VERBOSE + 1))";;
-			-t|--target) export TARGET="$2"; shift;;
-			-p|--profile) export PROFILE="$2"; shift;;
-			-r|--repo) export CUSTREPO="$2"; shift;;
-			-s|--override) export SRCTREEOVERR=1;;
-			-S|--brcmsingel) export BRCM_MAX_JOBS=1;;
-			-h|--help) usage;;
-			-l|--list) list_customers 0 $2;;
-			-a|--list-all)list_customers 1;;
-			-b|--boards)set_target LIST;exit 0;;
-			-*)
-				echo "Invalid option: $1 "
-				echo "Try -h or --help for more information."
-				exit 1
-				;;
-			*) break;;
-			esac
-			shift;
-		done
-
-		CUSTREPO="${CUSTREPO:-git@dev.iopsys.eu:consumer/iopsys.git}"
-
-		setup_dirs
-		create_and_copy_files "$@" || exit 1
-	fi
-}
-
-register_command "genconfig" "Generate configuration for board and customer"

iop/scripts/genconfig_min.sh

@@ -1,482 +0,0 @@
-#!/bin/bash
-
-function genconfig_min {
-	export CLEAN=0
-	export SRCTREEOVERR=0
-	export FILEDIR="files/"
-	CURRENT_CONFIG_FILE=".current_config_file"
-	export CONFIGPATH="package/feeds/iopsys/iop"
-	CUSTPATH="customerconfigs"
-	export CUSTCONF="customerconfigs/customers"
-	export VERBOSE=0
-	export DEVELOPER=0
-	target="bogus"
-	target_config_path=""
-	brcmbca_feed="target/linux/feeds/brcmbca"
-	airoha_feed="target/linux/feeds/airoha"
-	x86_feed="target/linux/feeds/x86"
-	armvirt_feed="target/linux/feeds/armvirt"
-	mediatek_feed="target/linux/feeds/mediatek"
-	qualcomm_ipq95xx_feed="target/linux/feeds/ipq95xx"
-	qualcomm_ipq53xx_feed="target/linux/feeds/ipq53xx"
-
-	Red='\033[0;31m'          # Red
-	Color_Off='\033[0m'       # Text Reset
-	Yellow='\033[0;33m'       # Yellow
-
-	function find_last {
-	    egrep "^[ #]*${1}[ =]" $2 | tail -n1
-	}
-
-	function is_new {
-	    for opt in $conf_warned
-	    do
-		if [ "$opt" == "$1" ]
-		then
-		    return 1
-		fi
-	    done
-	    # option not found return true
-	    return 0
-	}
-
-	function verify_config {
-	    local conf_opt
-	    local conf_org
-	    local conf_new
-
-	    while read -r line
-	    do
-		conf_opt=$(echo $line | grep "^[ #]*CONFIG_" | sed 's|.*\(CONFIG_[^ =]*\)[ =].*|\1|')
-		if [ -n "${conf_opt}" ]
-		then
-		    conf_org=$(find_last ${conf_opt} .genconfig.config)
-		    conf_new=$(find_last ${conf_opt} .config)
-		    if [ "$conf_org" != "$conf_new" ]
-		    then
-			if is_new $conf_opt
-			then
-			    echo -e "config option [${Red}$conf_opt${Color_Off}] is not set correctly in .config"
-			    echo -e "got value [${Yellow}$conf_new${Color_Off}] but wanted [${Yellow}$conf_org${Color_Off}]"
-			    echo "This is a real problem somebody needs to investigate"
-			    echo ""
-			    conf_warned="$conf_warned $conf_opt"
-			fi
-		    else
-			true
-			# for debug to see all options
-			#echo -e "wanted [$conf_org] got [$conf_new]"
-		    fi
-		fi
-	    done < .genconfig.config
-	}
-
-	# Takes a board name and returns the target name in global var $target
-	set_target() {
-		local profile=$1
-
-		[ -n "$profile" ] || return
-
-		if [ -n "$TARGET" -a -d "./target/linux/feeds/$TARGET" ]; then
-			local targetpath="./target/linux/feeds/$TARGET"
-			local profiles=
-			local pfound=0
-
-			if [ -e "$targetpath/genconfig" ]; then
-				profiles=$(cd $targetpath; ./genconfig)
-
-				for p in $profiles; do
-					if [ $p == $profile ]; then
-						pfound=1
-						break
-					fi
-				done
-			fi
-
-			if [ $pfound -eq 1 ]; then
-				target="$(echo $TARGET | tr '-' '_')"
-				target_config_path="$targetpath/config"
-			fi
-
-			return
-		fi
-
-		[ -e $brcmbca_feed/genconfig ] &&
-			brcmbca=$(cd $brcmbca_feed; ./genconfig)
-		[ -e $airoha_feed/genconfig ] &&
-			airoha=$(cd $airoha_feed; ./genconfig)
-		[ -e $x86_feed/genconfig ] &&
-			x86=$(cd $x86_feed; ./genconfig)
-		[ -e $armvirt_feed/genconfig ] &&
-			armvirt=$(cd $armvirt_feed; ./genconfig)
-		[ -e $mediatek_feed/genconfig ] &&
-			mediatek=$(cd $mediatek_feed; ./genconfig)
-		[ -e $qualcomm_ipq95xx_feed/genconfig ] &&
-			ipq95xx=$(cd $qualcomm_ipq95xx_feed; ./genconfig)
-		[ -e $qualcomm_ipq53xx_feed/genconfig ] &&
-			ipq53xx=$(cd $qualcomm_ipq53xx_feed; ./genconfig)
-
-	    if [ "$profile" == "LIST" ]; then
-			for list in brcmbca airoha x86 armvirt mediatek ipq95xx ipq53xx; do
-				echo "$list based boards:"
-				a=$(echo "${!list}" | sort)
-				for b in $a; do
-					echo -e "\t$b"
-				done
-			done
-			return
-	    fi
-
-	    for p in $airoha; do
-		if [ $p == $profile ]; then
-		    target="airoha"
-			target_config_path="$airoha_feed/config"
-		    return
-		fi
-	    done
-
-	    for p in $x86; do
-		if [ $p == $profile ]; then
-		    target="x86"
-			target_config_path="$x86_feed/config"
-		    return
-		fi
-	    done
-
-	    for p in $armvirt; do
-		if [ $p == $profile ]; then
-		    target="armvirt"
-			target_config_path="$armvirt_feed/config"
-		    return
-		fi
-	    done
-
-	    for p in $mediatek; do
-		if [ $p == $profile ]; then
-		    target="mediatek"
-			target_config_path="$mediatek_feed/config"
-		    return
-		fi
-	    done
-
-	    for p in $ipq95xx; do
-		if [ $p == $profile ]; then
-		    target="ipq95xx"
-			target_config_path="$qualcomm_ipq95xx_feed/config"
-		    return
-		fi
-	    done
-
-	    for p in $ipq53xx; do
-		if [ $p == $profile ]; then
-		    target="ipq53xx"
-			target_config_path="$qualcomm_ipq53xx_feed/config"
-		    return
-		fi
-	    done
-
-	    for p in $brcmbca; do
-		if [ $p == $profile ]; then
-		    target="brcmbca"
-			target_config_path="$brcmbca_feed/config"
-		    return
-		fi
-	    done
-	}
-
-	git remote -v | grep -qE '(git@|ssh://)' && {
-		DEVELOPER=1
-	}
-
-	v() {
-		[ "$VERBOSE" -ge 1 ] && echo "$@"
-	}
-
-	usage() {
-		echo
-		echo 1>&2 "Usage: $0 [ OPTIONS ] < Board_Type > [ Customer [customer2 ]...]"
-		echo
-		echo -e "  -c|--clean\t\tRemove all files under ./files and import from config "
-		echo -e "  -v|--verbose\t\tVerbose"
-		echo -e "  -n|--no-update\tDo NOT! Update customer config before applying"
-		echo -e "  -t|--target\t\tExplicitly specify the linux target to build the board profile from"
-		echo -e "  -s|--override\t\tEnable 'Package source tree override'"
-		echo -e "  -S|--brcmsingle\tForce build of bcmkernel to use only one thread"
-		echo -e "  -h|--help\t\tShow this message"
-		echo -e "  -l|--list [customer]\tList all Customers or all boards for one customer"
-		echo -e "  -a|--list-all\t\tList all Customers and their board types"
-		echo -e "  -b|--boards\t\tList all board types"
-		echo
-		echo "Example ./iop genconfig eg400 OPERATORX"
-		echo "(if no customerconfig is chosen, iopsys config will be used)"
-		echo
-		exit 0
-	}
-
-	list_customers()
-	{
-		local ALL="$1"
-		local CUSTOMER="$2"
-		if [ "$CUSTOMER" -a -d "$CUSTCONF/$CUSTOMER" ]; then
-			local boards="$(ls -1 "$CUSTCONF/$CUSTOMER" | grep -v common )"
-			if [ "$boards" ]; then
-				echo "$CUSTOMER has following boards:"
-				for board in $boards; do
-					echo -e "\t$board"
-				done
-			else
-				echo "No boards found for $CUSTOMER"
-			fi
-		elif [ "$CUSTOMER" ]; then
-			echo "No customer called $CUSTOMER"
-			exit 1
-		elif [ -d $CUSTCONF ]; then
-			local customers="$(ls -1 $CUSTCONF)"
-			if [ "$customers" -a "$ALL" == 1 ]; then
-				for customer in $customers; do
-					echo $customer
-					local boards="$(ls -1 $CUSTCONF/$customer | grep -v common )"
-					if [ "$boards" ]; then
-						for board in $boards; do
-							echo -e "\t$board"
-						done
-					else
-						echo "has no boards"
-					fi
-				done
-			elif [ "$customers" ]; then
-				echo -e "$customers"
-			else
-				echo "no customers found"
-			fi
-		else
-			echo "No $CUSTCONF folder found"
-		fi
-		exit 0
-	}
-
-
-	generate_config()
-	{
-		DIFFFILE="$1"
-		MASTERFILE="$2"
-		while read p; do
-			v "$p"
-			sed -r -i "$p" $MASTERFILE
-		done < $DIFFFILE
-	}
-
-	setup_dirs()
-	{
-
-		if [ ! -d "$FILEDIR" ]; then
-			mkdir -p $FILEDIR
-		elif [ -d "$FILEDIR" -a $CLEAN -eq 1 ]; then
-			v "rm -rf $FILEDIR*"
-			rm -rf $FILEDIR*
-		fi
-	}
-
-	get_subtarget_for_device() {
-		readonly target="$1"
-		readonly device="$2"
-		readonly targetinfo_file="tmp/info/.targetinfo-feeds_$target"
-		readonly target_profile_line="Target-Profile: DEVICE_$device"
-		# We want to know after which Target: $target/$subtarget line
-		# our $target_profile_line appears
-		# This is a crude way to "parse" the file using shell 🤯
-		# 1. grep for both lines with line number output
-		# 2. grep again to determine the device profile line that we looked for
-		#    but output one context line before as well to determine corresponding subtarget line
-		# 4. Use head and sed to extract the subtarget
-		grep "^Target: $target/\|^$target_profile_line" "$targetinfo_file" \
-			| grep -E -B1 "^$target_profile_line" \
-			| head -n1 \
-			| sed -E "s|^Target: $target/||"
-	}
-
-	create_and_copy_files()
-	{
-		local BOARDTYPE=$1
-		shift
-		local CUSTOMERS=$@
-
-		# Validate seleced board and customers
-		set_target $BOARDTYPE
-		if [ $target == "bogus" ]; then
-			echo "Hardware profile does not exist"
-			exit 1
-		elif [ -n "$CUSTOMERS" ]; then
-			for CUSTOMER in $CUSTOMERS; do
-				if [ ! -d "$CUSTCONF/$CUSTOMER/" ]; then
-					echo "Customer profile for '$CUSTOMER' does not exist"
-					exit 1
-				elif [ ! -d "$CUSTCONF/$CUSTOMER/$BOARDTYPE/" ]; then
-					echo "'$BOARDTYPE' board profile does not exist for customer '$CUSTOMER'"
-					if [ -f "$CUSTCONF/$CUSTOMER/common/common.diff" ]; then
-						echo "Common profile configuration will be used"
-					else
-						exit 1
-					fi
-				fi
-			done
-		fi
-
-		# Generate base config
-		rm -f .config
-		v "Config $BOARDTYPE selected"
-		v "cp $CONFIGPATH/config .config"
-		cp $CONFIGPATH/config .config
-
-		if [ -f $target_config_path/config ]; then
-		    cat $target_config_path/config >> .config
-		    echo "" >> .config
-		fi
-		if [ -f $target_config_path/$BOARDTYPE/config ]; then
-		    cat $target_config_path/$BOARDTYPE/config >> .config
-		    echo "" >> .config
-		fi
-		# hack to support custom-devices until we have deprecated this genconfig-script...
-		if [ -f "feeds/custom_devices/devices/$target/config/$BOARDTYPE/config" ]; then
-			cat "feeds/custom_devices/devices/$target/config/$BOARDTYPE/config" >> .config
-			echo "" >> .config
-		fi
-
-		# Special handling for targets which use TARGET_DEVICES
-		case "$target" in
-		airoha | mediatek | brcmbca | ipq95xx | ipq53xx)
-			# This assumes the device name to be unique within one target,
-			# which is a fair assumption to make.
-			local subtarget="$(get_subtarget_for_device "${target/_/-}" "$BOARDTYPE")"
-			if [ -z "$subtarget" ]; then
-				echo "Error determining subtarget for $target / ${BOARDTYPE}"
-				return 1
-			fi
-			echo "CONFIG_TARGET_${target}=y" >> .config
-			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
-			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
-			;;
-		*)
-			echo "CONFIG_TARGET_${target}=y" >> .config
-			echo "CONFIG_TARGET_${target}_${BOARDTYPE}=y" >> .config
-			;;
-		esac
-
-		echo "$CUSTOMERS $BOARDTYPE" > $CURRENT_CONFIG_FILE
-
-		# Add customerconfig diff if a customer is selected
-		if [ -n "$CUSTOMERS" ]; then
-			for CUSTOMER in $CUSTOMERS; do
-				if [ -d "$CUSTCONF/$CUSTOMER/common/fs" ]; then
-					v "cp -ar $CUSTCONF/$CUSTOMER/common/fs/* $FILEDIR"
-					cp -ar $CUSTCONF/$CUSTOMER/common/fs/* $FILEDIR
-				fi
-				if [ -d "$CUSTCONF/$CUSTOMER/$BOARDTYPE/fs" ]; then
-					v "cp -ar $CUSTCONF/$CUSTOMER/$BOARDTYPE/fs/* $FILEDIR"
-					cp -ar $CUSTCONF/$CUSTOMER/$BOARDTYPE/fs/* $FILEDIR
-				fi
-				if [ -e "$CUSTCONF/$CUSTOMER/common/common.diff" ]; then
-					v "Apply $CUSTCONF/$CUSTOMER/common/common.diff"
-					cat $CUSTCONF/$CUSTOMER/common/common.diff >> .config
-					echo "" >> .config
-				fi
-				if [ -e "$CUSTCONF/$CUSTOMER/$BOARDTYPE/$BOARDTYPE.diff" ]; then
-					v "Apply $CUSTCONF/$CUSTOMER/$BOARDTYPE/$BOARDTYPE.diff"
-					cat $CUSTCONF/$CUSTOMER/$BOARDTYPE/$BOARDTYPE.diff >> .config
-					echo "" >> .config
-				fi
-			done
-		fi
-
-		# Set target version
-		local git_version
-		if ! git_version="$(git describe --always --dirty --tags --match '[0-9].*.*' --match '[0-9][0-9].*.*')"; then
-			echo "ERROR: Failed getting version via git describe, exiting." >&2
-			return 1
-		fi
-		local version="${git_version,,}${CUSTOMERS:+-${CUSTOMERS// /}}"
-		local version_lower="${version,,}"
-		echo "CONFIG_TARGET_VERSION=\"${version_lower}\"" >> .config
-		echo "CONFIG_VERSION_CODE=\"${version_lower}\"" >> .config
-		echo "CONFIG_VERSION_PRODUCT=\"$BOARDTYPE"\" >> .config
-
-		# Enable Package source tree override if selected
-		[ $SRCTREEOVERR -eq 1 ] && echo CONFIG_SRC_TREE_OVERRIDE=y >> .config
-
-		# developer mode selected ?
-		echo "CONFIG_DEVEL=y" >>.config
-
-		if [ -n "$BRCM_MAX_JOBS" ]
-		then
-		    echo "CONFIG_BRCM_MAX_JOBS=\"1\"" >>.config
-		fi
-
-		# Force regeneration of kernel Makefile
-		# Needed to disable kmods for iopsys-brcm targets
-		touch package/kernel/linux/Makefile
-
-		# we need to signal to bradcom SDK that we have changed the board id
-		# currently boardparms.c and boardparms_voice.c is the only place that is depending on boardid name
-		# so just touch that file.
-		[ -d ./build_dir ] && find build_dir/ -name "boardparms*c" -print0 2>/dev/null | xargs -0 touch 2>/dev/null
-
-		# Store generated config
-		cp .config .genconfig.config
-
-		# Set default values based on selected parameters
-		v "$(make defconfig 2>&1)"
-
-		echo Set version to $(grep -w CONFIG_TARGET_VERSION .config | cut -d'=' -f2 | tr -d '"')
-
-		# Clean base-file package to force rebuild when changing profile
-		v "$(make package/base-files/clean 2>&1)"
-
-		verify_config
-	}
-
-	####### main #####
-	if [ ! -e tmp/.iop_bootstrap ]; then
-		echo "You have not installed feeds. Running genconfig in this state would create a non functional configuration."
-		echo "Run: iop feeds_update"
-		exit 1
-	fi
-
-	if [ $# -eq 0 ]; then
-		echo Current profile:
-		cat $CURRENT_CONFIG_FILE
-		echo "Try ./iop genconfig -h' to get instructions if you want to change current config"
-		exit 0
-	else
-		while [ -n "$1" ]; do
-			case "$1" in
-
-			-c|--clean) export CLEAN=1;;
-			-n|--no-update) export IMPORT=0;;
-			-v|--verbose) export VERBOSE="$(($VERBOSE + 1))";;
-			-t|--target) export TARGET="$2"; shift;;
-			-p|--profile) export PROFILE="$2"; shift;;
-			-r|--repo) export CUSTREPO="$2"; shift;;
-			-s|--override) export SRCTREEOVERR=1;;
-			-S|--brcmsingel) export BRCM_MAX_JOBS=1;;
-			-h|--help) usage;;
-			-l|--list) list_customers 0 $2;;
-			-a|--list-all)list_customers 1;;
-			-b|--boards)set_target LIST;exit 0;;
-			-*)
-				echo "Invalid option: $1 "
-				echo "Try -h or --help for more information."
-				exit 1
-				;;
-			*) break;;
-			esac
-			shift;
-		done
-
-		CUSTREPO="${CUSTREPO:-git@dev.iopsys.eu:consumer/iopsys.git}"
-
-		setup_dirs
-		create_and_copy_files "$@"
-	fi
-}
-
-register_command "genconfig_min" "Generate configuration for customer with manual board configuration"