emctrl2: example easymesh controller dm package

bbfdm/Config_bbfdm.in

@@ -1,10 +1,17 @@
-if PACKAGE_bbfdmd
+if PACKAGE_libbbfdm
+config BBF_VENDOR_LIST
+	string "Vendor List"
+	default "iopsys"
 
 config BBF_VENDOR_PREFIX
 	string "Vendor Prefix"
-	default "X_IOWRT_EU_"
+	default "X_IOPSYS_EU_"
 
 config BBF_OBFUSCATION_KEY
 	string "Obfuscation key"
 	default "371d530c95a17d1ca223a29b7a6cdc97e1135c1e0959b51106cca91a0b148b5e42742d372a359760742803f2a44bd88fca67ccdcfaeed26d02ce3b6049cb1e04"
+
+config BBF_MAX_OBJECT_INSTANCES
+	int "Maximum number of instances per object"
+	default 255
 endif

bbfdm/Makefile

@@ -5,22 +5,20 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bbfdm
-PKG_VERSION:=1.18.17
+PKG_VERSION:=1.10.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:=df25ff7ce0e42ea6a489cff2386774887a7dbd37
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.zst
+PKG_SOURCE_VERSION:=75195a112e3aef2b07e224afbbffcb15368be58f
+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
 
-RSTRIP:=true
-
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 include bbfdm.mk
@@ -34,28 +32,21 @@ define Package/libbbfdm-api
   ABI_VERSION:=1.0
 endef
 
-define Package/libbbfdm-ubus
+define Package/libbbfdm
   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
+  TITLE:=Library for broadband forum data model support
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbfdm-api +libopenssl
+  MENU:=1
 endef
 
 define Package/bbfdmd
   SECTION:=utils
   CATEGORY:=Utilities
   SUBMENU:=TRx69
-  TITLE:=Datamodel ubus backend to expose core tree
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbfdm-api +libopenssl +libbbfdm-ubus +bbf_configmngr
-endef
-
-define Package/dm-service
-  SECTION:=utils
-  CATEGORY:=Utilities
-  SUBMENU:=TRx69
-  TITLE:=Datamodel ubus backend to expose micro-service tree
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbfdm-api +libbbfdm-ubus +bbf_configmngr +libeasy
+  TITLE:=Datamodel ubus backend
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libbbfdm-api +libbbfdm +jq +bbf_configmngr
 endef
 
 define Package/bbf_configmngr
@@ -64,35 +55,23 @@ define Package/bbf_configmngr
   SUBMENU:=TRx69
   TITLE:= BBF Config Manager
   DEPENDS:=+libuci +libubox +libubus +libblobmsg-json
+  MENU:=1
 endef
 
-define Package/bbfdmd/config
-	source "$(SOURCE)/Config_bbfdmd.in"
+define Package/libbbfdm/config
+	source "$(SOURCE)/Config_bbfdm.in"
 endef
 
-# Below config is a hack to force-recompile dependent micro-services
-define Package/libbbfdm-api/config
-	if PACKAGE_bbfdmd
-		config BBF_LIBBBFDM_VERSION
-			string "Internal config variable to force recompile"
-			default "v${PKG_VERSION}"
-	endif
+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-ubus/description
- Library contains the APIs to expose data model over ubus
-endef
-
-define Package/bbfdmd/description
- Daemon to expose Datamodel core tree
-endef
-
-define Package/dm-service/description
- Daemon to expose Datamodel micro-service tree
+define Package/libbbfdm/description
+ Library contains the data model tree, It includes basic TR181 nodes.
 endef
 
 define Package/bbf_configmngr/description
@@ -106,15 +85,21 @@ endef
 endif
 
 CMAKE_OPTIONS += \
-	-DBBF_VENDOR_PREFIX:String="$(CONFIG_BBF_VENDOR_PREFIX)" \
-	-DBBFDMD_MAX_MSG_LEN:Integer=20971520 \
-	-DCMAKE_BUILD_TYPE:String="Debug" \
+	-DBBF_TR181=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)
+
+ifeq ($(CONFIG_PACKAGE_bbfdmd),y)
+CMAKE_OPTIONS += \
+	-DBBFDMD_MAX_MSG_LEN:Integer=10485760
+endif
 
 define Package/libbbfdm-api/install
 	$(INSTALL_DIR) $(1)/lib
-	$(CP) $(PKG_BUILD_DIR)/libbbfdm-api/legacy/libbbfdm-api.so $(1)/lib/
-	$(CP) $(PKG_BUILD_DIR)/libbbfdm-api/version-2/libbbfdm-api-v2.so $(1)/lib/
+	$(CP) $(PKG_BUILD_DIR)/libbbfdm-api/libbbfdm-api.so $(1)/lib/
 
 	$(INSTALL_DIR) $(1)/usr/libexec/rpcd
 	$(CP) $(PKG_BUILD_DIR)/utilities/files/usr/libexec/rpcd/bbf.secure $(1)/usr/libexec/rpcd/bbf.secure
@@ -127,92 +112,69 @@ define Package/libbbfdm-api/install
 	echo "$(CONFIG_BBF_OBFUSCATION_KEY)" > $(1)/etc/bbfdm/.secure_hash
 endef
 
-define Package/libbbfdm-ubus/install
-	$(INSTALL_DIR) $(1)/lib
-	$(CP) $(PKG_BUILD_DIR)/libbbfdm-ubus/libbbfdm-ubus.so $(1)/lib/
+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
 endef
 
 define Package/bbfdmd/install
-	$(INSTALL_DIR) $(1)/etc/bbfdm/dmmap
-	$(INSTALL_DIR) $(1)/usr/share/bbfdm
-
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
 	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) ./files/etc/config/bbfdm $(1)/etc/config/bbfdm
-	$(INSTALL_CONF) ./files/etc/config/schedules $(1)/etc/config/schedules
-
+	$(INSTALL_DIR) $(1)/etc/bbfdm
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbfdmd/ubus/bbfdmd $(1)/usr/sbin/
-	$(STRIP) $(1)/usr/sbin/bbfdmd
-
-	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_DATA) ./files/etc/bbfdm/input.json $(1)/etc/bbfdm/
 	$(INSTALL_BIN) ./files/etc/init.d/bbfdmd $(1)/etc/init.d/bbfdmd
-
-	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
-	$(INSTALL_BIN) ./files/etc/hotplug.d/iface/85-bbfdm-sysctl $(1)/etc/hotplug.d/iface/85-bbfdm-sysctl
-	
-	$(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/
-	$(INSTALL_BIN) ./files/etc/uci-defaults/ruleng.bbfdm $(1)/etc/uci-defaults
-
-	$(INSTALL_DIR) $(1)/etc/ruleng
-	$(INSTALL_BIN) ./files/etc/ruleng/bbfdm.json $(1)/etc/ruleng
-endef
-
-define Package/dm-service/install
-	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/etc/init.d/bbfdm.services $(1)/etc/init.d/
-
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/dm-service/dm-service $(1)/usr/sbin/
-
-	$(BBFDM_REGISTER_SERVICES) -v ${CONFIG_BBF_VENDOR_PREFIX} ./bbfdm_service.json $(1) core
-	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/libbbfdm/libcore.so $(1) core
+	$(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/bbf_configmngr/install
 	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_DIR) $(1)/etc/bbfdm/
+ifeq ($(CONFIG_BBF_CONFIGMNGR_C_BACKEND),y)
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/usr/share/bbfdm/scripts
-
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/utilities/bbf_configd $(1)/usr/sbin/
-	$(STRIP) $(1)/usr/sbin/bbf_configd
-
 	$(INSTALL_BIN) ./files/etc/init.d/bbf_configd $(1)/etc/init.d/bbf_configd
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/utilities/files/usr/share/bbfdm/scripts/bbf_config_notify.sh $(1)/usr/share/bbfdm/scripts/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/utilities/files/usr/share/bbfdm/scripts/bbf_default_reload.sh $(1)/etc/bbfdm/
-	$(INSTALL_DATA) ./files/etc/bbfdm/critical_services.json $(1)/etc/bbfdm/
-endef
-
-define Package/bbfdmd/prerm
-	#!/bin/sh
-	rm -rf /etc/bbfdm/dmmap/*
-	exit 0
+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
 
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/include
 	$(INSTALL_DIR) $(1)/usr/include/libbbfdm-api
-	$(INSTALL_DIR) $(1)/usr/include/libbbfdm-api/legacy
-	$(INSTALL_DIR) $(1)/usr/include/libbbfdm-api/version-2
-	$(INSTALL_DIR) $(1)/usr/include/libbbfdm-ubus
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-api/legacy/*.h $(1)/usr/include/libbbfdm-api/
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-api/legacy/*.h $(1)/usr/include/libbbfdm-api/legacy/
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-api/version-2/*.h $(1)/usr/include/libbbfdm-api/
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-api/version-2/*.h $(1)/usr/include/libbbfdm-api/version-2/
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-ubus/bbfdm-ubus.h $(1)/usr/include/libbbfdm-ubus/
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-api/legacy/include/*.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/libbbfdm-api/legacy/libbbfdm-api.so $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libbbfdm-api/version-2/libbbfdm-api-v2.so $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libbbfdm-ubus/libbbfdm-ubus.so $(1)/usr/lib
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-api/*.h $(1)/usr/include/libbbfdm-api/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-api/include/*.h $(1)/usr/include/
 endef
 
 $(eval $(call BuildPackage,bbf_configmngr))
 $(eval $(call BuildPackage,libbbfdm-api))
-$(eval $(call BuildPackage,libbbfdm-ubus))
+$(eval $(call BuildPackage,libbbfdm))
 $(eval $(call BuildPackage,bbfdmd))
-$(eval $(call BuildPackage,dm-service))

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

@@ -6,7 +6,6 @@ BBFDM_BASE_DM_PATH=/usr/share/bbfdm
 BBFDM_INPUT_PATH=/etc/bbfdm/micro_services
 BBFDM_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 
-PKG_CONFIG_DEPENDS += CONFIG_BBF_LIBBBFDM_VERSION
 #BBFDM_VERSION:=$(shell grep -oP '(?<=^PKG_VERSION:=).*' ${BBFDM_DIR}/Makefile)
 #BBFDM_TOOLS:=$(BUILD_DIR)/bbfdm-$(BBFDM_VERSION)/tools
 
@@ -48,6 +47,7 @@ BBFDM_INSTALL_CORE_PLUGIN:=$(BBFDM_DIR)/tools/bbfdm.sh -p
 # Note:
 # - There could be only one main plugin file, so its bind to PKG_NAME
 # - Micro-service input.json will be auto generated with this call
+# - Use -u (optional argument) to overwrite ubus object name
 #
 # Example:
 #  BBFDM_INSTALL_MS_DM $(PKG_BUILD_DIR)/libcwmp.so $(1) $(PKG_NAME)
@@ -88,5 +88,27 @@ BBFDM_INSTALL_MS_PLUGIN:=$(BBFDM_DIR)/tools/bbfdm.sh -m -p
 #
 BBFDM_INSTALL_SCRIPT:=$(BBFDM_DIR)/tools/bbfdm.sh -s
 
+# Deprecated functions errors
+define BbfdmInstallPluginInMicroservice
+	$(warning # BbfdmInstallPluginInMicroservice function is deprecated, use BBFDM_INSTALL_MS_PLUGIN macro #)
+	$(INSTALL_DIR) $(1)
+	$(INSTALL_DATA) $(2) $(1)/
+endef
 
-BBFDM_REGISTER_SERVICES:=$(BBFDM_DIR)/tools/bbfdm.sh -t
+define BbfdmInstallMicroServiceInputFile
+	$(warning # function BbfdmInstallMicroServiceInputFile deprecated, input file auto generated with BBFDM_INSTALL_MS_DM #)
+	$(INSTALL_DIR) $(1)/etc/bbfdm/micro_services
+	$(INSTALL_DATA) $(2) $(1)/etc/bbfdm/micro_services/$(PKG_NAME).json
+endef
+
+define BbfdmInstallPlugin
+	$(warning # function BbfdmInstallPlugin deprecated, use BBFDM_INSTALL_CORE_PLUGIN macro #)
+	$(INSTALL_DIR) $(1)/etc/bbfdm/plugins
+	$(INSTALL_DATA) $(2) $(1)/etc/bbfdm/plugins/
+endef
+
+define BbfdmInstallPluginWithPriority
+	$(warning # fucntion BbfdmInstallPluginWithPriority deprecated, use BBFDM_INSTALL_CORE_PLUGIN #)
+	$(INSTALL_DIR) $(1)/etc/bbfdm/plugins
+	$(INSTALL_DATA) $(3) $(1)/etc/bbfdm/plugins/$(2)_$(shell basename ${3})
+endef

bbfdm/bbfdm_service.json

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

bbfdm/files/etc/bbfdm/critical_services.json

@@ -1,47 +0,0 @@
-{
-	"usp": [
-			"/etc/config/firewall",
-			"/etc/bbfdm/dmmap/dmmap_firewall",
-			"/etc/config/network",
-			"/etc/bbfdm/dmmap/IP",
-			"/etc/bbfdm/dmmap/Ethernet",
-			"/etc/bbfdm/dmmap/GRE",
-			"/etc/bbfdm/dmmap/IPv6rd",
-			"/etc/bbfdm/dmmap/PPP",
-			"/etc/bbfdm/dmmap/Routing",
-			"/etc/config/dhcp",
-			"/etc/bbfdm/dmmap/DHCPv4",
-			"/etc/bbfdm/dmmap/DHCPv6",
-			"/etc/config/time",
-			"/etc/bbfdm/dmmap/dmmap_time",
-			"/etc/config/mapcontroller",
-			"/etc/config/wireless",
-			"/etc/bbfdm/dmmap/WiFi",
-			"/etc/config/ieee1905",
-			"/etc/config/mosquitto",
-			"/etc/config/nginx",
-			"/etc/config/netmode",
-			"/etc/bbfdm/dmmap/dmmap_netmode"
-	],
-	"cwmp": [
-			"/etc/config/firewall",
-			"/etc/bbfdm/dmmap/dmmap_firewall",
-			"/etc/config/network",
-			"/etc/bbfdm/dmmap/IP",
-			"/etc/bbfdm/dmmap/Ethernet",
-			"/etc/bbfdm/dmmap/GRE",
-			"/etc/bbfdm/dmmap/IPv6rd",
-			"/etc/bbfdm/dmmap/PPP",
-			"/etc/bbfdm/dmmap/Routing",
-			"/etc/config/dhcp",
-			"/etc/bbfdm/dmmap/DHCPv4",
-			"/etc/bbfdm/dmmap/DHCPv6",
-			"/etc/config/mapcontroller",
-			"/etc/config/wireless",
-			"/etc/bbfdm/dmmap/WiFi",
-			"/etc/config/time",
-			"/etc/bbfdm/dmmap/dmmap_time",
-			"/etc/config/netmode",
-			"/etc/bbfdm/dmmap/dmmap_netmode"
-	]
-}

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,12 +1,11 @@
 config bbfdmd 'bbfdmd'
 	option enable '1'
-	option debug '0'
-	option loglevel '3'
+	option loglevel '1'
+	option refresh_time '120'
+	option transaction_timeout '30'
+	option subprocess_level '2'
 
 config micro_services 'micro_services'
 	option enable '1'
 	option enable_core '0'
-
-
-config reload_handler 'reload_handler'
-	option log_level '1'
+	option enable_respawn '1'

bbfdm/files/etc/init.d/bbf_configd

@@ -1,32 +1,15 @@
 #!/bin/sh /etc/rc.common
 
-START=80
-STOP=07
+START=64
+STOP=10
 
 USE_PROCD=1
 PROG=/usr/sbin/bbf_configd
 
-log() {
-	echo "${@}"|logger -t bbf.config -p info
-}
-
 start_service()
 {
-	local log_level
-
-	config_load bbfdm
-	config_get log_level "reload_handler" log_level 2
-
 	procd_open_instance "bbf_configd"
 	procd_set_param command ${PROG}
-	procd_append_param command -l "${log_level}"
 	procd_set_param respawn
 	procd_close_instance "bbf_configd"
 }
-
-service_triggers() {
-	for config_file in /etc/config/*; do
-		config_name=$(basename "$config_file")
-		procd_add_config_trigger "config.change" "$config_name" /usr/share/bbfdm/scripts/bbf_config_notify.sh "$config_name"
-	done
-}

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

@@ -1,12 +1,12 @@
 #!/bin/sh /etc/rc.common
 
-START=60
-STOP=05
+START=40
+STOP=8
 
 USE_PROCD=1
-PROG=/usr/sbin/dm-service
+PROG=/usr/sbin/bbfdmd
 
-BBFDM_MICROSERVICE_DIR="/etc/bbfdm/services"
+BBFDM_MICROSERVICE_DIR="/etc/bbfdm/micro_services"
 
 . /usr/share/libubox/jshn.sh
 
@@ -18,43 +18,33 @@ validate_bbfdm_micro_service_section()
 {
 	uci_validate_section bbfdm micro_services "micro_services" \
 		'enable:bool:true' \
-		'enable_core:bool:false'
+		'enable_core:bool:false' \
+		'enable_respawn:bool:true'
 }
 
 _add_microservice()
 {
-	local name path loglevel
-	local enable enable_core unified_daemon
+	local name path
+	local enable enable_core enable_respawn
 
 	# Check enable from micro-service
 	path="${1}"
-	enable_core="${2}"
+	enable_respawn="${2}"
+	enable_core="${3}"
 
 	name="$(basename ${path})"
 	name="${name//.json}"
 
-	json_load_file "${path}"
-	json_select daemon
-
-	json_get_var enable enable 1
+	enable="$(jq -r '.daemon.enable//1' ${path})"
 	if [ "${enable}" -eq "0" ]; then
 		log "datamodel micro-service ${name} not enabled"
 		return 0
 	fi
 
-	json_get_var unified_daemon unified_daemon 0
-	if [ "${unified_daemon}" -eq "1" ]; then
-		return 0
-	fi
-
-	json_select config
-	json_get_var loglevel loglevel 4
-
 	procd_open_instance "${name}"
 
 	procd_set_param command ${PROG}
 	procd_append_param command -m "${name}"
-	procd_append_param command -l "${loglevel}"
 
 	if [ "${enable_core}" -eq "1" ]; then
 		procd_set_param limits core="unlimited"
@@ -62,13 +52,15 @@ _add_microservice()
 		procd_set_param stderr 1
 	fi
 
-	procd_set_param respawn
+	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
+	local enable enable_core enable_respawn
 
 	config_load bbfdm
 	validate_bbfdm_micro_service_section || {
@@ -85,7 +77,7 @@ configure_bbfdm_micro_services()
 		do
 			[ -e "$file" ] || continue
 
-			_add_microservice $file "${enable_core}"
+			_add_microservice $file "${enable_respawn}" "${enable_core}"
 		done
 	fi
 }
@@ -100,7 +92,7 @@ _start_single_service()
 		file="$(ls -1 ${BBFDM_MICROSERVICE_DIR}/${service}.json)"
 		[ -e "$file" ] || return
 
-		_add_microservice $file "0"
+		_add_microservice $file "0" "0"
 	fi
 }
 

bbfdm/files/etc/init.d/bbfdmd

@@ -1,11 +1,14 @@
 #!/bin/sh /etc/rc.common
 
-START=97
-STOP=06
+START=65
+STOP=10
 
 USE_PROCD=1
 PROG=/usr/sbin/bbfdmd
 
+BBFDM_JSON_INPUT="/etc/bbfdm/input.json"
+BBFDM_TEMP_DIR="/tmp/bbfdm"
+
 . /usr/share/libubox/jshn.sh
 
 log() {
@@ -16,13 +19,17 @@ validate_bbfdm_bbfdmd_section()
 {
 	uci_validate_section bbfdm bbfdmd "bbfdmd" \
 		'enable:bool:true' \
+		'sock:string' \
 		'debug:bool:false' \
-		'loglevel:uinteger:4'
+		'loglevel:uinteger:1' \
+		'refresh_time:uinteger:0' \
+		'transaction_timeout:uinteger:30' \
+		'subprocess_level:uinteger'
 }
 
 configure_bbfdmd()
 {
-	local enable debug
+	local enable debug sock
 	local jlog jrefresh jtimeout jlevel
 
 	config_load bbfdm
@@ -33,17 +40,25 @@ configure_bbfdmd()
 
 	[ "${enable}" -eq 0 ] && return 0
 
-	procd_set_param command ${PROG}
-	procd_append_param command -l "${loglevel}"
+	if [ -f "${BBFDM_JSON_INPUT}" ]; then
+		echo "$(jq --arg log ${loglevel} --arg tran ${transaction_timeout} --arg refresh ${refresh_time} --arg level ${subprocess_level} '.daemon.config += {"loglevel": $log, "refresh_time": $refresh, "transaction_timeout": $tran, "subprocess_level": $level}' ${BBFDM_JSON_INPUT})" > "${BBFDM_TEMP_DIR}/input.json"
+	fi
 
+	procd_set_param command ${PROG}
 	if [ "${debug}" -eq 1 ]; then
 		procd_set_param stdout 1
 		procd_set_param stderr 1
 	fi
+
+	if [ -f "${sock}" ]; then
+		procd_append_param command -s "${sock}"
+	fi
 }
 
 start_service()
 {
+	mkdir -p ${BBFDM_TEMP_DIR}
+
 	procd_open_instance "bbfdm"
 	configure_bbfdmd
 	procd_set_param respawn

bbfdm/files/etc/ruleng/bbfdm.json

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

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

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

bbfdm/files/etc/uci-defaults/ruleng.bbfdm

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

bbfdm/tools/bbfdm.sh

@@ -2,19 +2,18 @@
 
 BBFDM_BASE_DM_PATH="usr/share/bbfdm"
 BBFDM_INPUT_PATH="etc/bbfdm/micro_services"
-INPUT_FILE="0"
+INPUT_TEMPLATE='{"daemon":{"enable":"1","service_name":"template","config":{"loglevel":"1"}}}'
+OUT_NAME=""
 
 MICRO_SERVICE=0
 SCRIPT=0
 DIAG=0
 PLUGIN=0
 DEST=""
-VENDOR_EXTN=""
 TOOLS="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
 SRC=""
-EXTRA_DATA=""
 
-while getopts ":mpsdtv:" opt; do
+while getopts ":mpsdu:" opt; do
 	case ${opt} in
 	  m)
 	  	MICRO_SERVICE=1
@@ -28,11 +27,8 @@ while getopts ":mpsdtv:" opt; do
 	  d)
 	  	DIAG=1
 		;;
-	  t)
-	  	INPUT_FILE=1
-		;;
-	  v)
-	  	VENDOR_EXTN=${OPTARG}
+	  u)
+	  	OUT_NAME="${OPTARG}"
 		;;
 	  ?)
 	  	echo "Invalid option: ${OPTARG}"
@@ -47,9 +43,6 @@ shift
 DEST="${1}"
 shift
 DATA="${1}"
-shift
-EXTRA_DATA="${1}"
-
 
 install_bin() {
 	if ! install -m0755 ${1} ${2}; then
@@ -86,20 +79,11 @@ bbfdm_install_dm()
 		exit 1
 	fi
 
-	if [ ! -f "${src}" ]; then
-		echo "File $src does not exists..."
-		exit 1
-	fi
-
 	if [ "${src##*.}" = "json" ]; then
 		echo "Compacting BBFDM JSON file"
 		minfile=$(mktemp)
 		jq -c 'del(..|.description?)' ${src} > ${minfile}
 
-		if [ -n "${VENDOR_EXTN}" ]; then
-			sed -i "s/{BBF_VENDOR_PREFIX}/${VENDOR_EXTN}/g" ${minfile}
-		fi
-
 		src=${minfile}
 		if dpkg -s python3-jsonschema >/dev/null 2>&1; then
 			echo "Verifying bbfdm Datamodel JSON file"
@@ -119,6 +103,23 @@ bbfdm_install_dm()
 	fi
 }
 
+bbfdm_generate_input()
+{
+	local dest ser
+
+	dest_dir=${1}
+	ser=${2}
+	dest=${dest_dir}/${ser}.json
+
+	if [ -n "${OUT_NAME}" ]; then
+		echo ${INPUT_TEMPLATE} | jq --arg service "${ser}" --arg OUT "${OUT_NAME}" '.daemon |= (.service_name = $service |.output.name = $OUT)' > ${dest}
+	else
+		echo ${INPUT_TEMPLATE} | jq --arg service "${ser}" '.daemon.service_name = $service' > ${dest}
+	fi
+
+	chmod 466 ${dest}
+}
+
 if [ -z "$SRC" ] || [ -z "${DEST}" ] ; then
 	echo "# BBFDM Null value in src[${SRC}], dest[${DEST}]"
 	exit 1
@@ -135,40 +136,6 @@ if [ "${SCRIPT}" -eq "1" ]; then
 	exit 0
 fi
 
-if [ "${INPUT_FILE}" -eq "1" ]; then
-
-	tempfile=""
-	if [ ! -f "${SRC}" ]; then
-		echo "# Datamodel Input file ${SRC} not available"
-		exit 1
-	fi
-
-	if ! cat ${SRC} |jq >/dev/null 2>&1; then
-		echo "# Invalid datamodel json input file"
-		exit 1
-	fi
-
-	service_name="$(cat ${SRC}|jq -r '.daemon.service_name')"
-	if [ -z "${service_name}" ]; then
-		echo "# service_name not defined in service json ...."
-		exit 1
-	fi
-
-	tempfile=$(mktemp)
-	cp ${SRC} ${tempfile}
-	if [ -n "${VENDOR_EXTN}" ]; then
-		sed -i "s/{BBF_VENDOR_PREFIX}/${VENDOR_EXTN}/g" ${tempfile}
-	fi
-
-	install_dir ${DEST}/etc/bbfdm/services
-	install_data ${tempfile} ${DEST}/etc/bbfdm/services/${service_name}.json
-
-	if [ -f "${tempfile}" ]; then
-		rm ${tempfile}
-	fi
-	exit 0
-fi
-
 if [ "${MICRO_SERVICE}" -eq "1" ]; then
 	if [ -z "${DATA}" ]; then
 		echo "# service_name[${DATA}] not provided"
@@ -179,24 +146,23 @@ if [ "${MICRO_SERVICE}" -eq "1" ]; then
 		extn="$(basename ${SRC})"
 		install_dir ${DEST}/${BBFDM_BASE_DM_PATH}/micro_services
 		bbfdm_install_dm ${SRC} ${DEST}/${BBFDM_BASE_DM_PATH}/micro_services/${DATA}.${extn##*.}
+
+		# main micro-service datamodel plugin, create an input file as well
+		install_dir ${DEST}/${BBFDM_INPUT_PATH}
+		bbfdm_generate_input ${DEST}/${BBFDM_INPUT_PATH}/ ${DATA}
 	else
 		install_dir ${DEST}/${BBFDM_BASE_DM_PATH}/micro_services/${DATA}
-		bbfdm_install_dm ${SRC} ${DEST}/${BBFDM_BASE_DM_PATH}/micro_services/${DATA}/$(printf "%02d" ${EXTRA_DATA})$(basename ${SRC})
+		bbfdm_install_dm ${SRC} ${DEST}/${BBFDM_BASE_DM_PATH}/micro_services/${DATA}/$(basename ${SRC})
 	fi
 else
 	if [ "${PLUGIN}" -eq "1" ]; then
-		echo "# WARNING: BBFDM_INSTALL_CORE_PLUGIN macro will be deprecated soon. Please use BBFDM_INSTALL_MS_PLUGIN macro instead, specifying 'core' as micro-service name #"
 		priority="${DATA:-0}"
-		install_dir ${DEST}/${BBFDM_BASE_DM_PATH}/micro_services/core
-
+		install_dir ${DEST}/${BBFDM_BASE_DM_PATH}/plugins
 		if [ "${priority}" -gt "0" ]; then
 			# install with priority if defined
-			bbfdm_install_dm ${SRC} ${DEST}/${BBFDM_BASE_DM_PATH}/micro_services/core/${priority}_$(basename ${SRC})
-		elif [ "${priority}" -eq "0" ]; then
-			bbfdm_install_dm ${SRC} ${DEST}/${BBFDM_BASE_DM_PATH}/micro_services/core/$(basename ${SRC})
+			bbfdm_install_dm ${SRC} ${DEST}/${BBFDM_BASE_DM_PATH}/plugins/${priority}_$(basename ${SRC})
 		else
-			echo "# Priority should be an unsigned integer"
-			exit 1
+			bbfdm_install_dm ${SRC} ${DEST}/${BBFDM_BASE_DM_PATH}/plugins/$(basename ${SRC})
 		fi
 	fi
 fi

bbfdm/tools/validate_plugins.py

@@ -27,7 +27,6 @@ obj_schema = {
 		"protocols_t": {
 			"type": "string",
 			"enum": [
-				"none",
 				"cwmp",
 				"usp"
 			]
@@ -228,7 +227,6 @@ event_schema = {
 		"protocols_t": {
 			"type": "string",
 			"enum": [
-				"none",
 				"usp"
 			]
 		}
@@ -256,7 +254,6 @@ command_schema = {
 		"protocols_t": {
 			"type": "string",
 			"enum": [
-				"none",
 				"usp"
 			]
 		}

bbk_cli/Makefile

@@ -9,7 +9,7 @@ PKG_SOURCE_VERSION:=7b810a696c78b746185c11282bdbe3fb7f8c5d4b
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/dotse/bbk.git
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.zst
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 

blkpg-part/Makefile

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

bootchart2/Makefile

@@ -15,7 +15,7 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/mmeeks/bootchart.git
 PKG_SOURCE_VERSION:=3ab81137cafe25c2ca4bc3a5f322a63646f9ce8d
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.zst
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_LICENSE:=GPLv2

bridgemngr/Config.in

@@ -1,28 +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.
 
-config BRIDGEMNGR_COPY_PBITS
-	bool "Copy pbits from cvlan to svlan"
-	default y
-	help
-	   Set this option to copy cvlan pbits to svlan pbits by default (driver vlan).
-
-config BRIDGEMNGR_BRIDGE_VENDOR_EXT
-	bool "Use bridge BBF vendor extensions"
-	default y
-	help
-	   Set this option to use bridge BBF vendor extensions.
-
-config BRIDGEMNGR_BRIDGE_VENDOR_PREFIX
-	string "Package specific datamodel Vendor Prefix for TR181 extensions"
-	default ""
-
-config BRIDGEMNGR_USE_DM_FRAMEWORK
-	bool "Use new DM framework support"
-	default n
-
+endmenu
 endif

bridgemngr/Makefile

@@ -5,14 +5,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bridgemngr
-PKG_VERSION:=1.1.6
+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.git
-PKG_SOURCE_VERSION:=882f8c8cc9a97372297d192cc916c4f8ffe7c25a
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.zst
+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
 
@@ -20,76 +21,35 @@ PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
-
-ifneq ($(CONFIG_BRIDGEMNGR_USE_DM_FRAMEWORK),y)
 include ../bbfdm/bbfdm.mk
-else
-include ../dm-framework/dm-framework.mk
-endif
 
 define Package/bridgemngr
-  CATEGORY:=Utilities
-  TITLE:=Bridge Manager
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json
-ifeq ($(CONFIG_BRIDGEMNGR_USE_DM_FRAMEWORK),y)
-  DEPENDS+= +dm-framework
-  PKG_BUILD_DEPENDS:=dm-framework
-else
-  DEPENDS+= +libbbfdm-api +libbbfdm-ubus +dm-service
-endif
+ 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.
+	Package to add Device.Bridging. data model support.
 endef
 
 define Package/$(PKG_NAME)/config
-  source "$(SOURCE)/Config.in"
+	source "$(SOURCE)/Config.in"
 endef
 
-ifneq ($(CONFIG_BRIDGEMNGR_USE_DM_FRAMEWORK),y)
 MAKE_PATH:=src
-endif
 
-ifeq ($(CONFIG_BRIDGEMNGR_BRIDGE_VENDOR_PREFIX),"")
-VENDOR_PREFIX = $(if $(CONFIG_BBF_VENDOR_PREFIX),$(CONFIG_BBF_VENDOR_PREFIX),$(CONFIG_DM_FRAMEWORK_VENDOR_PREFIX))
-else
-VENDOR_PREFIX = $(CONFIG_BRIDGEMNGR_BRIDGE_VENDOR_PREFIX)
-endif
-
-TARGET_CFLAGS += -DBBF_VENDOR_PREFIX=\\\"$(VENDOR_PREFIX)\\\"
+TARGET_CFLAGS += -DBBF_VENDOR_PREFIX=\\\"$(CONFIG_BBF_VENDOR_PREFIX)\\\"
 
 ifeq ($(CONFIG_BRIDGEMNGR_BRIDGE_VLAN),y)
-TARGET_CFLAGS += -DBRIDGE_VLAN_BACKEND
-endif
-
-ifeq ($(CONFIG_BRIDGEMNGR_COPY_PBITS),y)
-TARGET_CFLAGS += -DBRIDGEMNGR_COPY_PBITS
-endif
-
-ifeq ($(CONFIG_BRIDGEMNGR_USE_DM_FRAMEWORK),y)
-define Build/Compile
-	$(call Build/Compile/DM,./dm,$(PKG_BUILD_DIR)/dm_build,$(VENDOR_PREFIX))
-endef
+	TARGET_CFLAGS += -DBRIDGE_VLAN_BACKEND
 endif
 
 define Package/bridgemngr/install
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_DIR) $(1)/etc/config
-
-ifeq ($(CONFIG_BRIDGEMNGR_USE_DM_FRAMEWORK),y)
-	$(call Build/Install/DM,./dm,$(PKG_BUILD_DIR)/dm_build,$(1),bridgemngr)
-else
-	$(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) $(PKG_NAME)
 	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/libbridgemngr.so $(1) $(PKG_NAME)
-ifeq ($(CONFIG_BRIDGEMNGR_BRIDGE_VENDOR_EXT), y)
-	$(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/src/libbridgeext.so $(1) $(PKG_NAME) 10
-	$(BBFDM_INSTALL_MS_PLUGIN) -v ${VENDOR_PREFIX} ./files/VLAN_Filtering_Extension.json $(1) $(PKG_NAME) 11
+ifeq ($(findstring iopsys,$(CONFIG_BBF_VENDOR_LIST)),iopsys)
+	$(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/src/libbridgeext.so $(1) $(PKG_NAME)
 endif
-endif
-
-	$(INSTALL_BIN) ./files/etc/init.d/bridging $(1)/etc/init.d/
-	$(INSTALL_DATA) ./files/etc/config/bridging $(1)/etc/config/
 endef
 
 ifeq ($(LOCAL_DEV),1)

bridgemngr/bbfdm_service.json

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

bridgemngr/dm/VLANBridge.json

@@ -1,449 +0,0 @@
-[
-    {
-        "object": "Device.Bridging.",
-        "access": "readOnly",
-        "parameters": [
-            {
-                "name": "MaxBridgeEntries",
-                "access": "readOnly",
-                "dataType": "unsignedInt",
-                "const" : "4094"
-            },
-            {
-                "name": "MaxDBridgeEntries",
-                "access": "readOnly",
-                "dataType": "unsignedInt",
-                "const" : "4094"
-            },
-            {
-                "name": "MaxQBridgeEntries",
-                "access": "readOnly",
-                "dataType": "unsignedInt",
-                "const" : "4094"
-            },
-            {
-                "name": "MaxVLANEntries",
-                "access": "readOnly",
-                "dataType": "unsignedInt",
-                "const" : "4094"
-            },
-            {
-                "name": "BridgeNumberOfEntries",
-                "access": "readOnly",
-                "dataType": "unsignedInt"
-            }
-        ]
-    },
-    {
-        "object": "Device.Bridging.Bridge.{i}.",
-        "uniqueKeys": "Name,Alias",
-        "access": "readWrite",
-        "uci": "network.device",
-        "flags": [
-            "dmmap"
-        ],
-        "parameters": [
-            {
-                "name": "Enable",
-                "access": "readWrite",
-                "dataType": "boolean",
-                "uci": "enabled",
-                "uci-default": "true"
-            },
-            {
-                "name": "Name",
-                "access": "readOnly",
-                "dataType": "string(:64)",
-                "set_on_create": "bridge_",
-                "db": true
-            },
-            {
-                "name": "Alias",
-                "access": "readWrite",
-                "dataType": "string(:64)"
-            },
-            {
-                "name": "Status",
-                "access": "readOnly",
-                "dataType": "enum",
-                "enum": [
-                    "Disabled",
-                    "Enabled",
-                    "Error"
-                ],
-                "default": "Disabled"
-            },
-            {
-                "name": "Standard",
-                "access": "readWrite",
-                "dataType": "enum",
-                "enum": [
-                    "802.1D-2004",
-                    "802.1Q-2005",
-                    "802.1Q-2011"
-                ],
-                "default": "802.1Q-2011"
-            },
-            {
-                "name": "PortNumberOfEntries",
-                "access": "readOnly",
-                "dataType": "unsignedInt"
-            },
-            {
-                "name": "VLANNumberOfEntries",
-                "access": "readOnly",
-                "dataType": "unsignedInt"
-            },
-            {
-                "name": "VLANPortNumberOfEntries",
-                "access": "readOnly",
-                "dataType": "unsignedInt"
-            }
-        ]
-    },
-    {
-        "object": "Device.Bridging.Bridge.{i}.STP.",
-        "access": "readOnly",
-        "parameters": [
-            {
-                "name": "Enable",
-                "access": "readWrite",
-                "dataType": "boolean",
-                "uci": "stp"
-            },
-            {
-                "name": "Status",
-                "access": "readOnly",
-                "dataType": "enum",
-                "enum": [
-                    "Disabled",
-                    "Enabled",
-                    "Error_Misconfigured",
-                    "Error"
-                ],
-                "default": "Disabled"
-            },
-            {
-                "name": "Protocol",
-                "access": "readWrite",
-                "dataType": "enum",
-                "enum": [
-                    "STP",
-                    "RSTP"
-                ]
-            },
-            {
-                "name": "BridgePriority",
-                "access": "readWrite",
-                "dataType": "unsignedInt(0:61440)",
-                "default": "32768"
-            },
-            {
-                "name": "HelloTime",
-                "access": "readWrite",
-                "dataType": "unsignedInt(100:1000)",
-                "default": "200"
-            },
-            {
-                "name": "MaxAge",
-                "access": "readWrite",
-                "dataType": "unsignedInt(600:4000)",
-                "default": "2000"
-            },
-            {
-                "name": "ForwardingDelay",
-                "access": "readWrite",
-                "dataType": "unsignedInt(4:30)",
-                "default": "15"
-            }
-        ]
-    },
-    {
-        "object": "Device.Bridging.Bridge.{i}.Port.{i}.",
-        "uniqueKeys": "Alias,Name",
-        "access": "readWrite",
-        "flags": [
-            "dmmap"
-        ],
-        "parameters": [
-            {
-                "name": "Enable",
-                "access": "readWrite",
-                "dataType": "boolean"
-            },
-            {
-                "name": "Status",
-                "access": "readOnly",
-                "dataType": "enum",
-                "enum": [
-                    "Up",
-                    "Down",
-                    "Unknown",
-                    "Dormant",
-                    "NotPresent",
-                    "LowerLayerDown",
-                    "Error"
-                ],
-                "default": "Down"
-            },
-            {
-                "name": "Alias",
-                "access": "readWrite",
-                "dataType": "string(:64)"
-            },
-            {
-                "name": "Name",
-                "access": "readOnly",
-                "dataType": "string(:64)",
-                "set_on_create": "port_",
-                "db": "true",
-                "flags": [
-                    "linker"
-                ],
-                "js-value": "ifname"
-            },
-            {
-                "name": "LastChange",
-                "access": "readOnly",
-                "dataType": "unsignedInt",
-                "const": "0"
-            },
-            {
-                "name": "LowerLayers",
-                "access": "readWrite",
-                "dataType": "pathRef[]",
-                "pathRef": [
-                    "Device.Bridging.Bridge.{i}.Port."
-                ],
-                "js-value": "ssidPath"
-            },
-            {
-                "name": "ManagementPort",
-                "access": "readWrite",
-                "dataType": "boolean"
-            },
-            {
-                "name": "PriorityRegeneration",
-                "access": "readWrite",
-                "dataType": "unsignedInt(0:7)[]",
-                "default": "0,1,2,3,4,5,6,7"
-            },
-            {
-                "name": "{BBF_VENDOR_PREFIX}EgressPriorityRegeneration",
-                "access": "readWrite",
-                "dataType": "unsignedInt(0:7)[]"
-            },
-            {
-                "name": "Type",
-                "access": "readWrite",
-                "dataType": "enum",
-                "enum": [
-                    "ProviderNetworkPort",
-                    "CustomerNetworkPort",
-                    "CustomerEdgePort",
-                    "CustomerVLANPort",
-                    "VLANUnawarePort"
-                ],
-                "default": "CustomerVLANPort"
-            },
-            {
-                "name": "PVID",
-                "access": "readWrite",
-                "dataType": "int(1:4094)",
-                "default": "1"
-            },
-            {
-                "name": "TPID",
-                "access": "readWrite",
-                "dataType": "unsignedInt",
-                "default": "33024"
-            }
-        ]
-    },
-    {
-        "object": "Device.Bridging.Bridge.{i}.Port.{i}.Stats.",
-        "access": "readOnly",
-        "parameters": [
-            {
-                "name": "BytesSent",
-                "dataType": "unsignedLong"
-            },
-            {
-                "name": "BytesReceived",
-                "dataType": "unsignedLong"
-            },
-            {
-                "name": "PacketsSent",
-                "dataType": "unsignedLong"
-            },
-            {
-                "name": "PacketsReceived",
-                "dataType": "unsignedLong"
-            },
-            {
-                "name": "ErrorsSent",
-                "dataType": "StatsCounter32"
-            },
-            {
-                "name": "ErrorsReceived",
-                "dataType": "StatsCounter32"
-            },
-            {
-                "name": "UnicastPacketsSent",
-                "dataType": "unsignedLong"
-            },
-            {
-                "name": "DiscardPacketsSent",
-                "dataType": "StatsCounter32"
-            },
-            {
-                "name": "DiscardPacketsReceived",
-                "dataType": "StatsCounter32"
-            },
-            {
-                "name": "MulticastPacketsSent",
-                "dataType": "unsignedLong"
-            },
-            {
-                "name": "UnicastPacketsReceived",
-                "dataType": "unsignedLong"
-            },
-            {
-                "name": "MulticastPacketsReceived",
-                "dataType": "unsignedLong"
-            },
-            {
-                "name": "BroadcastPacketsSent",
-                "dataType": "unsignedLong"
-            },
-            {
-                "name": "BroadcastPacketsReceived",
-                "dataType": "unsignedLong"
-            },
-            {
-                "name": "UnknownProtoPacketsReceived",
-                "dataType": "StatsCounter32"
-            }
-        ]
-    },
-    {
-        "object": "Device.Bridging.Bridge.{i}.VLAN.{i}.",
-        "uniqueKeys": "Alias,VLANID",
-        "access": "readWrite",
-        "parameters": [
-            {
-                "name": "Enable",
-                "access": "readWrite",
-                "dataType": "boolean"
-            },
-            {
-                "name": "Name",
-                "access": "readWrite",
-                "dataType": "string(:64)",
-                "set_on_create": "vlan_"
-            },
-            {
-                "name": "Alias",
-                "access": "readWrite",
-                "dataType": "string(:64)"
-            },
-            {
-                "name": "VLANID",
-                "access": "readWrite",
-                "dataType": "int(0:4094)"
-            }
-        ]
-    },
-    {
-        "object": "Device.Bridging.Bridge.{i}.VLANPort.{i}.",
-        "uniqueKeys": "Alias,VLAN",
-        "access": "readWrite",
-        "parameters": [
-            {
-                "name": "Enable",
-                "access": "readWrite",
-                "dataType": "boolean"
-            },
-            {
-                "name": "Alias",
-                "access": "readWrite",
-                "dataType": "string(:64)"
-            },
-            {
-                "name": "VLAN",
-                "access": "readWrite",
-                "dataType": "pathRef",
-                "pathRef": [
-                    "Device.Bridging.Bridge.{i}.VLAN."
-                ]
-            },
-            {
-                "name": "Port",
-                "access": "readWrite",
-                "dataType": "pathRef",
-                "pathRef": [
-                    "Device.Bridging.Bridge.{i}.Port."
-                ]
-            },
-            {
-                "name": "Untagged",
-                "access": "readWrite",
-                "dataType": "boolean"
-            }
-        ]
-    },
-    {
-        "object": "Device.Bridging.ProviderBridge.{i}.",
-        "uniqueKeys": "Alias",
-        "access": "readWrite",
-        "parameters": [
-            {
-                "name": "Enable",
-                "access": "readWrite",
-                "dataType": "boolean"
-            },
-            {
-                "name": "Status",
-                "access": "readOnly",
-                "dataType": "enum",
-                "enum": [
-                    "Disabled",
-                    "Enabled",
-                    "Error_Misconfigured",
-                    "Error"
-                ],
-                "default": "Disabled"
-            },
-            {
-                "name": "Alias",
-                "access": "readWrite",
-                "dataType": "string(:64)"
-            },
-            {
-                "name": "Type",
-                "access": "readWrite",
-                "dataType": "enum",
-                "enum": [
-                    "S-VLAN",
-                    "PE"
-                ]
-            },
-            {
-                "name": "SVLANcomponent",
-                "access": "readWrite",
-                "dataType": "pathRef",
-                "pathRef": [
-                    "Device.Bridging.Bridge."
-                ]
-            },
-            {
-                "name": "CVLANcomponents",
-                "access": "readWrite",
-                "dataType": "pathRef[]",
-                "pathRef": [
-                    "Device.Bridging.Bridge."
-                ]
-            }
-        ]
-    }
-]

bridgemngr/dm/bridge-apply.js

@@ -1,343 +0,0 @@
-/*
- * Copyright (c) 2025 Genexis B.V. All rights reserved.
- *
- * This Software and its content are protected by the Dutch Copyright Act
- * ('Auteurswet'). All and any copying and distribution of the software
- * and its content without authorization by Genexis B.V. is
- * prohibited. The prohibition includes every form of reproduction and
- * distribution.
- *
- */
-
-import {
-    getUciOption, getUciByType, setUci, addUci, delUci
-} from '../uci.js';
-import { getParamValue, replaceArrayElement, isTrue } from '../utils.js';
-import * as dm from './dm_consts.js';
-import { getBridgeDeviceType, getTPIDFromDeviceType } from './common.js';
-
-function findVLANPort(vlanPort, VLANs, Ports) {
-    const [, vlanIndices] = _dm_node(vlanPort.VLAN);
-    const vlanIdx = vlanIndices[vlanIndices.length - 1];
-    const vlan = VLANs?.find(x => x['.index'] === vlanIdx);
-    if (!vlan) {
-        _log_error(`vlan not found for vlanPort: ${vlanPort.VLAN}`);
-        return;
-    }
-
-    const [, portIndices] = _dm_node(vlanPort.Port);
-    const portIdx = portIndices[portIndices.length - 1];
-    const port = Ports?.find(x => x['.index'] === portIdx);
-    if (!port) {
-        _log_error(`port not found for vlanPort: ${vlanPort.Port}`);
-        return;
-    }
-
-    return [vlan, port];
-}
-
-function createVLANDevice(devName, ifname, VLAN, Port) {
-    const ingress_qos_mapping = Port.PriorityRegeneration !== '0,1,2,3,4,5,6,7'
-            ? Port.PriorityRegeneration.split(',').map((p, i) => `${i}:${p}`)
-            : '';
-
-    const egress_qos_mapping = Port.X_IOPSYS_EU_EgressPriorityRegeneration !== ''
-        ? Port.X_IOPSYS_EU_EgressPriorityRegeneration.split(',').map((p, i) => `${i}:${p}`)
-        : '';
-
-    const uciConfigs = {
-        ifname: ifname,
-        vid: VLAN.VLANID,
-        name: ifname + '.' + VLAN.VLANID,
-        type: getBridgeDeviceType(Port.Type),
-        tpid: getTPIDFromDeviceType(Port.Type, Port.TPID),
-        ingress_qos_mapping,
-        egress_qos_mapping,
-    };
-    addUci('network', 'device', devName, uciConfigs);
-}
-
-function applyBridge(bri, Ports, VLANs, VLANPorts) {
-    deinitDeviceBridgingBridge(bri._key, false);
-
-    const ports = [];
-
-    for (const vlan of VLANs || []) {
-        vlan.ports = [];
-        vlan.hasUntagged = false;
-    }
-
-    for (const vlanPort of VLANPorts || []) {
-        if (!vlanPort.Enable || !vlanPort.Port || !vlanPort.VLAN) {
-            continue;
-        }
-
-        const [vlan, port] = findVLANPort(vlanPort, VLANs, Ports);
-        if (!vlan || !port || port.LowerLayers === '' || !port.Enable || !vlan.Enable || vlan.VLANID <= 0) {
-            continue;
-        }
-
-        port.used = true;
-
-        if (port.Type === 'ProviderNetworkPort') {
-            continue;
-        }
-
-        const devName = `br_${bri['.index']}_dev_${vlanPort['.index']}`;
-        if (!port.LowerLayers.startsWith('Device.Ethernet.Interface')) {
-            _log_error(`applyBridge, LowerLayers not found for port: ${port.LowerLayers}`);
-            continue;
-        }
-
-        const ifname = _dm_linker_value(port.LowerLayers);
-        if (!ifname) {
-            _log_error(`applyBridge, ifname not found for port: ${port.LowerLayers}`);
-            continue;
-        }
-
-        if (vlanPort.Untagged) {
-            ports.push(ifname);
-            vlan.hasUntagged = true;
-            vlan.ports.push(ifname + ':u' + (vlanPort.PVID === vlan.VLANID ? '*' : ''));
-            // vlan.ports.push(ifname + ':u*');
-        } else {
-            createVLANDevice(devName, ifname, vlan, port);
-            const vlanDevName = ifname + '.' + vlan.VLANID;
-            ports.push(vlanDevName);
-            vlan.ports.push(vlanDevName + ':u*');
-        }
-    }
-
-    for (const port of Ports || []) {
-        if (port.used || isTrue(port.ManagementPort)) {
-            continue;
-        }
-        if (port.LowerLayers.startsWith('Device.Ethernet.Interface')) {
-            const ifname = _dm_linker_value(port.LowerLayers);
-            if (!ifname) {
-                _log_error(`applyBridge, ifname not found for port: ${port.LowerLayers}`);
-                continue;
-            }
-            ports.push(ifname);
-        }
-    }
-
-    if (ports.length > 0) {
-        setUci('network', bri._key, { ports: ports });
-    }
-
-    // create the bridge-vlan for the untagged port
-    for (const vlan of VLANs || []) {
-        if (vlan.hasUntagged) {
-            addUci('network', 'bridge-vlan', `br_${bri['.index']}_bv_${vlan['.index']}`, {
-                device: bri.Name,
-                vlan: vlan.VLANID,
-                ports: vlan.ports,
-            });
-        }
-    }
-
-    applyProviderBridges();
-}
-
-function applyPEBridges(ifname, vlanID, portLowerLayers, cvlanBridgePath) {const vlanPorts = _dm_get(cvlanBridgePath + '.VLANPort.');
-    for (const vlanPort of vlanPorts || []) {
-        if (!vlanPort.Enable || !vlanPort.Port || !vlanPort.VLAN) {
-            continue;
-        }
-        const portVals = _dm_get(vlanPort.Port);
-        if (portVals?.LowerLayers !== portLowerLayers || portVals?.Type !== 'CustomerEdgePort') {
-            _log_error(`applyPEBridges, portVals not found for vlanPort: ${vlanPort.Port}`);
-            continue;
-        }
-
-        const vlan = _dm_get(vlanPort.VLAN);
-        if (!vlan || vlan.VLANID <= 0 || !vlan.Enable) {
-            _log_error(`applyPEBridges, vlan not found for vlanPort: ${vlanPort.VLAN}`);
-            continue;
-        }
-
-        const devName = ifname + '.' + vlan.VLANID;
-
-        const briName = getParamValue(cvlanBridgePath, '_key');
-        if (!briName) {
-            _log_error(`applyPEBridges, briName not found for cvlanBridgePath: ${cvlanBridgePath}`);
-            continue;
-        }
-
-        const ports = getUciOption('network', briName, 'ports') || [];
-        const devs = getUciByType('network', 'device', { match: { name: devName } });
-        if (devs.length === 0) {
-            _log_error(`applyPEBridges, device not found for devName: ${devName}`);
-            continue;
-        }
-
-        const newName = `${ifname}.${vlanID}.${vlan.VLANID}`;
-        setUci('network', devs[0]['.name'], {ifname: `${ifname}.${vlanID}`, name: newName});
-        replaceArrayElement(ports, devName, newName);
-        setUci('network', briName, { ports: ports });
-    }
-}
-
-function applyProviderBridge(pbridgeIndex, type, svlanBridgePath, cvlanBridgePaths) {
-    const vlanPorts = _dm_get(svlanBridgePath + '.VLANPort.');
-    const briName = getParamValue(svlanBridgePath, '_key');
-    if (briName) {
-        delUci('network', briName);
-    }
-    for (const vlanPort of vlanPorts || []) {
-        if (!vlanPort.Enable || !vlanPort.Port || !vlanPort.VLAN) {
-            continue;
-        }
-
-        const portVals = _dm_get(vlanPort.Port);
-        if (!portVals) {
-            _log_error(`applyProviderBridge, portVals not found for vlanPort: ${vlanPort.Port}`);
-            continue;
-        }
-
-        if (portVals.Type !== 'ProviderNetworkPort') {
-            _log_error(`applyProviderBridge, portVals.Type is not ProviderNetworkPort for vlanPort: ${vlanPort.Port}`);
-            continue;
-        }
-
-        const ifname = _dm_linker_value(portVals.LowerLayers);
-        if (!ifname) {
-            _log_error(`applyProviderBridge, ifname not found for port: ${portVals.LowerLayers}`);
-            continue;
-        }
-
-        const vlan = _dm_get(vlanPort.VLAN);
-        if (!vlan || !vlan.Enable || vlan.VLANID <= 0) {
-            _log_error(`applyProviderBridge, vlan invalid for vlanPort: ${vlanPort.VLAN}`);
-            continue;
-        }
-
-        const devName = `pb_${pbridgeIndex}_dev_${vlanPort['.index']}`;
-        createVLANDevice(devName, ifname, vlan, portVals);
-
-        cvlanBridgePaths.split(',').forEach(cvlanBridgePath => {
-            if (type === 'S-VLAN') {
-                const briName = getParamValue(cvlanBridgePath, '_key');
-                if (briName) {
-                    let ports = getUciOption('network', briName, 'ports') || [];
-                    ports = ports.filter(x => !x.startsWith(ifname));
-                    ports.push(ifname + '.' + vlan.VLANID);
-                    setUci('network', briName, { ports: ports });
-                } else {
-                    _log_error(`applyProviderBridge, briName not found for cvlanBridgePath: ${cvlanBridgePath}`);
-                }
-            } else {
-                applyPEBridges(ifname, vlan.VLANID, portVals.LowerLayers, cvlanBridgePath);
-            }
-        });
-
-    }
-}
-
-function applyProviderBridges() {
-    const pbridges = _dm_get(dm.DM_DEVICE_BRIDGING_PROVIDERBRIDGE);
-    for (const pbridge of pbridges || []) {
-        if (!pbridge.Enable || !pbridge.SVLANcomponent || !pbridge.CVLANcomponents || !pbridge.Type) {
-            continue;
-        }
-
-        applyProviderBridge(pbridge['.index'], pbridge.Type, pbridge.SVLANcomponent, pbridge.CVLANcomponents);
-    }
-}
-
-function applyAllBridges() {
-    const bridges = _dm_get(dm.DM_DEVICE_BRIDGING_BRIDGE);
-    for (const bri of bridges || []) {
-        applyBridge(bri, bri.Port, bri.VLAN, bri.VLANPort);
-    }
-}
-
-export function applyDeviceBridgingProviderBridge() {
-    applyAllBridges();
-}
-
-function isProviderBridge(ports) {
-    return ports.some(port => port.Type === 'ProviderNetworkPort' || port.Type === 'CustomerEdgePort');
-}
-
-export function applyDeviceBridgingBridgePort(ports, bri) {
-    const vlans = _dm_get(dm.DM_DEVICE_BRIDGING_BRIDGE_VLAN, bri['.index']);
-    const vlanPorts = _dm_get(dm.DM_DEVICE_BRIDGING_BRIDGE_VLANPORT, bri['.index']);
-    if (isProviderBridge(ports)) {
-        applyAllBridges();
-        return;
-    }
-    applyBridge(bri, ports, vlans, vlanPorts);
-}
-
-export function applyDeviceBridgingBridgeVLAN(vlans, bri) {
-    const ports = _dm_get(dm.DM_DEVICE_BRIDGING_BRIDGE_PORT, bri['.index']);
-    if (isProviderBridge(ports)) {
-        applyAllBridges();
-        return;
-    }
-    const vlanPorts = _dm_get(dm.DM_DEVICE_BRIDGING_BRIDGE_VLANPORT, bri['.index']);
-    applyBridge(bri, ports, vlans, vlanPorts);
-}
-
-export function applyDeviceBridgingBridgeVLANPort(vlanPorts, bri) {
-    const ports = _dm_get(dm.DM_DEVICE_BRIDGING_BRIDGE_PORT, bri['.index']);
-    if (isProviderBridge(ports)) {
-        applyAllBridges();
-        return;
-    }
-    const vlans = _dm_get(dm.DM_DEVICE_BRIDGING_BRIDGE_VLAN, bri['.index']);
-    applyBridge(bri, ports, vlans, vlanPorts);
-}
-
-export function initDeviceBridgingBridge(bri) {
-    setUci('network', bri._key, {
-        type: 'bridge',
-        name: bri.Name,
-        enabled: '0',
-    });
-    // create empty interface for the bridge
-    addUci('network', 'interface', `itf_${bri._key}`, {
-        device: bri.Name,
-        bridge_empty: '1',
-    });
-}
-
-export const filterDeviceBridgingBridge = uci => uci.type === 'bridge';
-
-function delVLANDevice(devName, devices, ethPorts) {
-    if (ethPorts.find(x => x.name === devName))  {
-        return;
-    }
-
-    const dev = devices.find(x => x.name === devName);
-    if (!dev) {
-        return;
-    }
-
-    // delete possible vlan stack device
-    delVLANDevice(dev.ifname, devices, ethPorts);
-    delUci('network', dev['.name']);
-}
-
-export function deinitDeviceBridgingBridge(uci, removeInterface = true) {
-    const ports = getUciOption('network', uci, 'ports');
-    const devices = getUciByType('network', 'device');
-
-    const ethPorts = devices.filter(x => x.type === undefined && x.eee !== undefined);
-    ports?.forEach(port => {
-        delVLANDevice(port, devices, ethPorts);
-    });
-
-    const name = getUciOption('network', uci, 'name');
-    // delete related bridge-vlan devices (query first to avoid noisy "section missing" logs)
-    const bridgeVlans = getUciByType('network', 'bridge-vlan', { match: { device: name } }) || [];
-    bridgeVlans.forEach(vlan => delUci('network', vlan['.name']));
-
-    if (removeInterface) {
-        // delete the empty interface created for this bridge (query first)
-        const interfaces = getUciByType('network', 'interface', { match: { device: name, bridge_empty: '1' } }) || [];
-        interfaces.forEach(intf => delUci('network', intf['.name']));
-    }
-}

bridgemngr/dm/bridge-import.js

@@ -1,268 +0,0 @@
-/*
- * Copyright (c) 2025 Genexis B.V. All rights reserved.
- *
- * This Software and its content are protected by the Dutch Copyright Act
- * ('Auteurswet'). All and any copying and distribution of the software
- * and its content without authorization by Genexis B.V. is
- * prohibited. The prohibition includes every form of reproduction and
- * distribution.
- *
- */
-
-import { getUciByType } from '../uci.js';
-import { getBridgePortType, getTPIDFromDeviceType } from './common.js';
-
-// find the port from bridge-vlan; returns [vlanId, isTagged, isPvid] or null
-function findPortFromBridgeVlan(bridgeVlans, portName) {
-    if (!bridgeVlans) return null;
-
-    for (const bridgeVlan of bridgeVlans) {
-        const port = bridgeVlan.ports?.find(x => x.split(':')[0] === portName);
-        if (port) {
-            const flags = port.includes(':') ? port.split(':')[1] : '';
-            return [bridgeVlan.vlan, flags.includes('t'), flags.includes('*')];
-        }
-    }
-    return null;
-}
-
-function isVLANSubInterface(portName, ethPorts) {
-    const names = portName.split('.');
-    if (names.length > 1) {
-        const baseIfname = names.slice(0, -1).join('.');
-        if (ethPorts.find(x => x.ifname === baseIfname)) {
-            return true;
-        }
-    }
-    return false;
-}
-
-function createProviderBridge(dev, type, ethIndex, bridges, providerBridges, cVLANBridgeIndex) {
-    const briIndex = bridges.length + 1;
-
-    let sVLANBridgeIndex = bridges.findIndex((x) => x['VLAN.']?.[0]?.VLANID === dev.vid && x['Port.']?.[0]?.LowerLayers === `Device.Ethernet.Interface.${ethIndex}`);
-    if (sVLANBridgeIndex < 0) {
-        // no management port needed for provider bridge
-        bridges.push({
-            Name: dev.name,
-            Alias: `cpe-${dev.name}`,
-            Standard: '802.1Q-2011',
-            Enable: 1,
-            'Port.': [{
-                Enable: 1,
-                Name: dev.name,
-                Alias: `cpe-${dev.name}`,
-                TPID: 34984,
-                PVID: 1,
-                Type: 'ProviderNetworkPort',
-                LowerLayers: `Device.Ethernet.Interface.${ethIndex}`,
-            }],
-            'VLAN.': [{
-                Enable: 1,
-                VLANID: dev.vid,
-            }],
-            'VLANPort.': [{
-                Enable: 1,
-                VLAN: `Device.Bridging.Bridge.${briIndex}.VLAN.1`,
-                Port: `Device.Bridging.Bridge.${briIndex}.Port.1`,
-                Untagged: 1,
-            }],
-            _key: dev['.name'],
-        });
-        sVLANBridgeIndex = bridges.length;
-    } else {
-        sVLANBridgeIndex = sVLANBridgeIndex + 1;
-        const pvBridge = providerBridges.find(x => x.SVLANcomponent === `Device.Bridging.Bridge.${sVLANBridgeIndex}`);
-        if (pvBridge) {
-            pvBridge.CVLANcomponents = pvBridge.CVLANcomponents + `,Device.Bridging.Bridge.${cVLANBridgeIndex}`;
-            return;
-        }
-    }
-
-    providerBridges.push({
-        Alias: `cpe-${dev.name}`,
-        Enable: 1,
-        Type: type,
-        SVLANcomponent: `Device.Bridging.Bridge.${sVLANBridgeIndex}`,
-        CVLANcomponents: `Device.Bridging.Bridge.${cVLANBridgeIndex}`,
-        _key: dev['.name'],
-    });
-}
-
-function addRegularEthernetPort(ethDevice, portIndex, briPorts) {
-    const tpid = getTPIDFromDeviceType(ethDevice.type, ethDevice.tpid);
-
-    briPorts.push({
-        Enable: 1,
-        Name: ethDevice['ifname'],
-        Alias: `cpe-${ethDevice['.name']}`,
-        TPID: tpid,
-        PVID: 1,
-        Type: 'VLANUnawarePort',
-        LowerLayers: `Device.Ethernet.Interface.${portIndex + 1}`,
-        _key: ethDevice['.name'],
-    });
-}
-
-
-function handleVlanDevice(bridgeIndex, device, ethPorts, devices, bridges, briPorts, briVLAN, briVLANPort, providerBridges) {
-    let qinqDev;
-    let ethIndex = ethPorts.findIndex(x => device.ifname === x.ifname);
-
-    if (device.type === '8021ad') {
-        if (ethIndex < 0) {
-            _log_error('base ethernet device not found', device.ifname);
-            return;
-        }
-        createProviderBridge(device, 'S-VLAN', ethIndex + 1, bridges, providerBridges, bridgeIndex);
-        return;
-    }
-
-    if (ethIndex < 0) {
-        qinqDev = devices.find(x => x.name === device.ifname);
-        if (!qinqDev || !qinqDev.ifname) {
-            _log_error('device ifname not found', device.ifname);
-            return;
-        }
-        if (qinqDev.type !== '8021ad' || device.type !== '8021q') {
-            _log_error('invalid qinq device type', qinqDev['.name'], device['.name']);
-            return;
-        }
-        device.ifname = qinqDev.ifname;
-        ethIndex = ethPorts.findIndex(x => device.ifname === x.ifname);
-        if (ethIndex < 0) {
-            _log_error('base ethernet device not found', device.ifname);
-            return;
-        }
-    }
-
-    if (device.type !== '8021q') {
-        _log_error('unsupported device type', device['.name'], device.type);
-        return;
-    }
-
-    let vlanIndex = briVLAN.findIndex(x => Number(x.VLANID) === Number(device.vid));
-    if (vlanIndex < 0) {
-        briVLAN.push({ Enable: 1, VLANID: Number(device.vid) });
-        vlanIndex = briVLAN.length;
-    } else {
-        vlanIndex += 1;
-    }
-
-    const portType = qinqDev ? 'CustomerEdgePort' : getBridgePortType(device.type);
-    const tpid = getTPIDFromDeviceType(device.type, device.tpid);
-
-    briPorts.push({
-        Enable: 1,
-        Name: device['ifname'],
-        Alias: `cpe-${device['.name']}`,
-        TPID: tpid,
-        PVID: device.pvid ? Number(device.vid): 1,
-        Type: portType,
-        LowerLayers: `Device.Ethernet.Interface.${ethIndex + 1}`,
-        _key: device['.name'],
-    });
-
-    briVLANPort.push({
-        Enable: 1,
-        VLAN: `Device.Bridging.Bridge.${bridgeIndex}.VLAN.${vlanIndex}`,
-        Port: `Device.Bridging.Bridge.${bridgeIndex}.Port.${briPorts.length}`,
-        Untagged: device.untagged ? 1 : 0,
-        _key: device['.name'],
-    });
-
-    if (qinqDev && qinqDev.vid) {
-        createProviderBridge(qinqDev, 'PE', ethIndex + 1, bridges, providerBridges, bridgeIndex);
-    }
-}
-
-function importBridge(dev, devices, bridges, bridgeVlans, providerBridges) {
-    const briPorts = [];
-    const briVLAN = [];
-    const briVLANPort = [];
-
-    // create the management port first
-    briPorts.push({
-        Alias: `cpe-${dev.name}`,
-        Enable: 1,
-        Name: dev.name,
-        ManagementPort: 1,
-        PVID: 1,
-        TPID: 37120,
-        Type: 'CustomerVLANPort',
-    });
-
-    bridges.push({
-        Name: dev.name,
-        Alias: `cpe-${dev.name}`,
-        Enable: 1,
-        'Port.': briPorts,
-        'VLAN.': briVLAN,
-        'VLANPort.': briVLANPort,
-        _key: dev['.name'],
-    });
-
-    const ethPorts = devices.filter(x => x.type === undefined && x.eee !== undefined);
-
-    for (const portName of (dev.ports || [])) {
-        let device;
-        const portIndex = ethPorts.findIndex(x => x.ifname === portName);
-        const briVLANInfo = findPortFromBridgeVlan(bridgeVlans, portName);
-        if (portIndex >= 0 && !briVLANInfo) {
-            // Regular ethernet port
-            const ethDevice = ethPorts[portIndex];
-            addRegularEthernetPort(ethDevice, portIndex, briPorts);
-            continue;
-        }
-
-        if (briVLANInfo && portIndex >= 0) {
-            // bridge-vlan device
-            device = {['.name']: portName, ifname: portName, type: '8021q', name: portName, vid: Number(briVLANInfo[0]), untagged: !briVLANInfo[1], pvid: briVLANInfo[2]};
-        } else {
-            // vlan device
-            device = devices.find(x => x.name === portName);
-            if (!device) {
-                // check if it is a valid sub-interface
-                if (isVLANSubInterface(portName, ethPorts)) {
-                    const ifname = portName.split('.').slice(0, -1).join('.');
-                    const vid = portName.split('.').pop();
-                    device = {['.name']: portName, ifname: ifname, type: '8021q', name: portName, vid: Number(vid)};
-                } else {
-                    _log_error('device not found', portName);
-                    return;
-                }
-            }
-        }
-
-        if (!device.ifname || !device.vid) {
-            _log_error('ifname or vid not found', device['.name']);
-            return;
-        }
-
-        handleVlanDevice(bridges.length, device, ethPorts, devices, bridges, briPorts, briVLAN, briVLANPort, providerBridges);
-    }
-
-    if (briPorts.length > 1) {
-        const indexes = Array.from({ length: briPorts.length - 1 }, (v, i) => i + 2);
-        briPorts[0].LowerLayers = indexes.map(i => `Device.Bridging.Bridge.${bridges.length}.Port.${i}`).join(',');
-    }
-}
-
-export function importDeviceBridgingBridge() {
-    const bridges = [];
-    const providerBridges = [];
-    const devices = getUciByType('network', 'device');
-    const bridgeVlans = getUciByType('network', 'bridge-vlan');
-    devices?.forEach(dev => {
-        if (dev.type === 'bridge') {
-            const bridgeVlan = bridgeVlans?.filter(x => x.device === dev.name);
-            importBridge(dev, devices, bridges, bridgeVlan, providerBridges);
-        }
-    });
-
-    if (providerBridges.length > 0) {
-        _dm_update('Device.Bridging.ProviderBridge.', providerBridges);
-    }
-
-    return bridges;
-}

bridgemngr/dm/bridge.js

@@ -1,133 +0,0 @@
-/*
- * Copyright (c) 2025 Genexis B.V. All rights reserved.
- *
- * This Software and its content are protected by the Dutch Copyright Act
- * ('Auteurswet'). All and any copying and distribution of the software
- * and its content without authorization by Genexis B.V. is
- * prohibited. The prohibition includes every form of reproduction and
- * distribution.
- *
- */
-
-import * as std from 'std';
-import { isTrue } from '../utils.js';
-import { getUciByType } from '../uci.js';
-
-function setMgmtPortLowerLayers(bri) {
-    if (!bri) return 0;
-
-    const portPath = `Device.Bridging.Bridge.${bri['.index']}.Port.`;
-    const mgmtPort = _dm_instances(portPath, '(ManagementPort="true" OR ManagementPort=1)');
-    if (mgmtPort.length !== 1) return 0;
-
-    const nonMgmtPort = _dm_instances(portPath, '(ManagementPort="false" OR ManagementPort=0)');
-    _dm_update(`${mgmtPort[0]}.LowerLayers`, nonMgmtPort.join(','));
-    return 0;
-}
-
-export function changedDeviceBridgingBridgePort(bri) {
-    return setMgmtPortLowerLayers(bri);
-}
-
-export function changedDeviceBridgingBridgePortManagementPort(bri) {
-    return setMgmtPortLowerLayers(bri);
-}
-
-export function getDeviceBridgingBridgeStatus(bri) {
-    const enable = _dm_get(`Device.Bridging.Bridge.${bri['.index']}.Enable`);
-    return enable ? 'Enabled' : 'Disabled';
-}
-
-export function getDeviceBridgingBridgeSTPStatus(bri) {
-    const stpState = std.loadFile(`/sys/class/net/${bri.Name}/bridge/stp_state`)?.trim();
-    return stpState === '1' ? 'Enabled' : 'Disabled';
-}
-
-export function getDeviceBridgingBridgePortStatus(bri, port) {
-    if (!port['.db']) return 'Up';
-
-    const enable = _dm_get(`Device.Bridging.Bridge.${bri['.index']}.Port.${port['.index']}.Enable`);
-    return enable ? 'Up' : 'Down';
-}
-
-export function infoDeviceBridgingBridgePort(path, port) {
-    const mgmtPort = _dm_get(`${path}.ManagementPort`);
-    if (typeof mgmtPort === 'undefined' || mgmtPort) return;
-
-    const lower = _dm_get(`${path}.LowerLayers`);
-    if (lower) {
-        port.ifname = _dm_linker_value(lower);
-    }
-}
-
-// Helper function to read network statistics
-function getNetworkStat(port, statName) {
-    return std.loadFile(`/sys/class/net/${port.ifname}/statistics/${statName}`)?.trim();
-}
-
-export const getDeviceBridgingBridgePortStatsBytesSent = (bri, port) =>
-    getNetworkStat(port, 'tx_bytes');
-
-export const getDeviceBridgingBridgePortStatsBytesReceived = (bri, port) =>
-    getNetworkStat(port, 'rx_bytes');
-
-export const getDeviceBridgingBridgePortStatsPacketsSent = (bri, port) =>
-    getNetworkStat(port, 'tx_packets');
-
-export const getDeviceBridgingBridgePortStatsPacketsReceived = (bri, port) =>
-    getNetworkStat(port, 'rx_packets');
-
-export const getDeviceBridgingBridgePortStatsErrorsSent = (bri, port) =>
-    getNetworkStat(port, 'tx_errors');
-
-export const getDeviceBridgingBridgePortStatsErrorsReceived = (bri, port) =>
-    getNetworkStat(port, 'rx_errors');
-
-export const getDeviceBridgingBridgePortStatsDiscardPacketsSent = (bri, port) =>
-    getNetworkStat(port, 'tx_dropped');
-
-export const getDeviceBridgingBridgePortStatsDiscardPacketsReceived = (bri, port) =>
-    getNetworkStat(port, 'rx_dropped');
-
-export const getDeviceBridgingBridgePortStatsMulticastPacketsReceived = (bri, port) =>
-    getNetworkStat(port, 'multicast');
-
-export const getDeviceBridgingBridgePortStatsUnicastPacketsSent = (bri, port) =>
-    getNetworkStat(port, 'tx_unicast_packets');
-
-export const getDeviceBridgingBridgePortStatsUnicastPacketsReceived = (bri, port) =>
-    getNetworkStat(port, 'rx_unicast_packets');
-
-export const getDeviceBridgingBridgePortStatsMulticastPacketsSent = (bri, port) =>
-    getNetworkStat(port, 'tx_multicast_packets');
-
-export const getDeviceBridgingBridgePortStatsBroadcastPacketsSent = (bri, port) =>
-    getNetworkStat(port, 'tx_broadcast_packets');
-
-export const getDeviceBridgingBridgePortStatsBroadcastPacketsReceived = (bri, port) =>
-    getNetworkStat(port, 'rx_broadcast_packets');
-
-export const getDeviceBridgingBridgePortStatsUnknownProtoPacketsReceived = (bri, port) =>
-    getNetworkStat(port, 'rx_unknown_packets');
-
-export function getDeviceBridgingBridgePort(bri) {
-    const networkName = bri.Name.startsWith('br-') ? bri.Name.slice(3) : bri.Name;
-
-    const wifiIfaces = getUciByType('wireless', 'wifi-iface', { match: { multi_ap: '2', network: networkName } });
-    wifiIfaces?.forEach(x => {
-        const ssid = getUciByType('WiFi', 'SSID',
-            { match: { device: x.device, ssid: x.ssid}, confdir: '/etc/bbfdm/dmmap'});
-        if (Array.isArray(ssid) && ssid[0].__instance__) {
-            x.ssidPath = `Device.WiFi.SSID.${ssid[0].__instance__}`;
-        }
-    });
-
-    return wifiIfaces;
-}
-
-export function setDeviceBridgingBridgePortManagementPort(val, bri, port) {
-    if (isTrue(val)) {
-        _db_set(`Device.Bridging.Bridge.${bri['.index']}.Port.${port['.index']}.Name`, bri.Name);
-    }
-    return 1;
-}

bridgemngr/dm/common.js

@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2025 Genexis B.V. All rights reserved.
- *
- * This Software and its content are protected by the Dutch Copyright Act
- * ('Auteurswet'). All and any copying and distribution of the software
- * and its content without authorization by Genexis B.V. is
- * prohibited. The prohibition includes every form of reproduction and
- * distribution.
- *
- */
-
-export const bridgePortTypeMap = [
-    { portType: 'ProviderNetworkPort', devType: '8021ad' },
-    { portType: 'CustomerVLANPort', devType: '8021q' },
-    { portType: 'CustomerEdgePort', devType: '8021q' },
-    { portType: 'CustomerNetworkPort', devType: '8021q' },
-    { portType: 'VLANUnawarePort', devType: '' }
-];
-
-export function getBridgePortType(devType) {
-    const mapping = bridgePortTypeMap.find(map => map.devType === devType);
-    return mapping ? mapping.portType : null;
-}
-
-export function getBridgeDeviceType(portType) {
-    const mapping = bridgePortTypeMap.find(map => map.portType === portType);
-    return mapping ? mapping.devType : '';
-}
-
-export function getDefaultTPID(deviceType) {
-    switch (deviceType) {
-        case '8021q':
-            return '33024';
-        case '8021ad':
-            return '34984';
-        default:
-            return '37120';
-    }
-}
-
-export function getTPIDFromDeviceType(deviceType, explicitTPID) {
-    // If explicit TPID is set, use it
-    if (explicitTPID && explicitTPID !== '') {
-        return parseInt(explicitTPID, 10);
-    }
-
-    // Default TPID based on device type
-    switch (deviceType) {
-        case '8021q':
-            return 33024;
-        case '8021ad':
-            return 34984;
-        default:
-            return 37120;
-    }
-}

bridgemngr/files/VLAN_Filtering_Extension.json

@@ -1,31 +0,0 @@
-{
-	"json_plugin_version": 2,
-	"Device.Bridging.Bridge.{i}.": {
-		"type": "object",
-		"protocols": [
-			"cwmp",
-			"usp"
-		],
-		"access": true,
-		"array": true,
-		"{BBF_VENDOR_PREFIX}VLANFiltering": {
-			"type": "boolean",
-			"read": true,
-			"write": true,
-			"protocols": [
-				"cwmp",
-				"usp"
-			],
-			"datatype": "boolean",
-			"description": "Enable or disable VLAN Filtering on this bridge.",
-			"mapping": [
-				{
-					"data": "@Parent",
-					"type": "uci_sec",
-					"key": "vlan_filtering"
-				}
-			]
-		}
-	}
-}
-

bridgemngr/files/etc/config/bridging

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

bridgemngr/files/etc/init.d/bridging

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

bulkdata/Makefile

@@ -7,14 +7,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bulkdata
-PKG_VERSION:=2.1.23
+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:=f54550f2d587a701c0a8d5cac4a0910a99ce92cf
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.zst
+PKG_SOURCE_VERSION:=5dd9cd3cfc95e9dce5f64fe9cadd274bb31b8fa6
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 
@@ -24,17 +24,12 @@ PKG_LICENSE_FILES:=LICENSE
 include $(INCLUDE_DIR)/package.mk
 include $(TOPDIR)/feeds/iopsys/bbfdm/bbfdm.mk
 
-define Package/bulkdata
+define Package/$(PKG_NAME)
   SECTION:=utils
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=BBF BulkData Collection
-  DEPENDS:=+ubus +libuci +libubox +libjson-c +libcurl +libblobmsg-json +zlib
-  DEPENDS+=+libbbfdm-api +libbbfdm-ubus
-endef
-
-define Package/bulkdata/description
-  BulkData daemon for TR069 with bbfdm backend.
+  DEPENDS:=+libubus +libuci +libubox +libjson-c +libcurl +libblobmsg-json +zlib
 endef
 
 TARGET_CFLAGS += \
@@ -47,15 +42,16 @@ define Build/Prepare
 endef
 endif
 
-define Package/bulkdata/install
+define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(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/
-
-	$(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) $(PKG_NAME)
+	$(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,bulkdata))
+$(eval $(call BuildPackage,$(PKG_NAME)))

bulkdata/bbfdm_service.json

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

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/config/bulkdata

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

bulkdata/files/etc/init.d/bulkdatad

@@ -6,36 +6,35 @@ STOP=10
 USE_PROCD=1
 PROG="/usr/sbin/bulkdatad"
 
-validate_global_section() {
-	uci_validate_section bulkdata bulkdata bulkdata \
-	    'enable:bool:1' \
-	    'loglevel:uinteger:3'
-}
-
 start_service() {
-	local enable loglevel
+	local enable
 
-	validate_global_section
+	config_load bulkdata
+	config_get_bool enable bulkdata enable 1
 
-	procd_open_instance "bulkdata"
-	procd_set_param command "$PROG"
-	procd_append_param command -l ${loglevel}
-	procd_set_param respawn
-	procd_close_instance "bulkdata"
+	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"
+	else
+		uci -q -c /var/state set bulkdatad.global.status='Disabled'
+		uci -q -c /var/state commit bulkdatad
+	fi
 }
 
 reload_service() {
-	ret=$(ubus call service list '{"name":"bulkdatad"}' | jsonfilter -qe '@.bulkdatad.instances.bulkdata.running')
-	if [ "$ret" != "true" ]; then
-		stop
-		start
-	else
-		ubus send bulkdata.reload
-	fi
-
-	return 0
+	stop
+	start 
 }
 
-service_triggers() {
+service_triggers()
+{
 	procd_add_reload_trigger bulkdata
 }

bulkdata/files/etc/uci-defaults/95-bulkdata-translation-options

@@ -0,0 +1,75 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+PROFILE_COUNT=1
+
+get_next_count()
+{
+	local config="$1"
+	local default_name="${2}"
+	local count=${3}
+	local found=0
+
+	if [ -z "$count" ]; then
+		count=1
+	fi
+
+	while [ "${found}" -ne 1 ]; do
+		uci -q get "${config}"."${default_name}"_${count} >/dev/null
+		if [ "$?" -eq 0 ]; then
+			count=$((count + 1))
+		else
+			found=1;
+		fi
+	done
+
+	echo "${default_name}_${count}"
+}
+
+translate_profile_id_to_profile_name() {
+	local section="${1}"
+	local profile_id="${2}"
+	local profile_name="${3}"
+	local curr_profile_id
+
+	config_get curr_profile_id "${section}" profile_id
+
+	[ -n "${curr_profile_id}" ] || return
+	
+	[ "${curr_profile_id}" != "${profile_id}" ] && return
+
+	uci -q set bulkdata."${section}".profile_name="${profile_name}"
+	uci -q set bulkdata."${section}".profile_id=""
+}
+
+update_profile_sections() {
+	local section="${1}"
+	local default="${2}"
+	local profile_name
+
+	config_get profile_id "${section}" profile_id
+
+	[ -n "${profile_id}" ] || return
+
+	case "${section}" in
+		"cfg"*)
+			profile_name="$(get_next_count bulkdata "${default}" ${PROFILE_COUNT})"
+			uci_rename bulkdata "${section}" "${profile_name}"
+		;;
+	esac
+	PROFILE_COUNT=$((PROFILE_COUNT + 1))
+
+	[ -n "$profile_name" ] && section="${profile_name}"
+
+	uci -q set bulkdata."${section}".profile_id=""
+
+	config_foreach translate_profile_id_to_profile_name profile_parameter "${profile_id}" "${profile_name}"
+	config_foreach translate_profile_id_to_profile_name profile_http_request_uri_parameter "${profile_id}" "${profile_name}"
+}
+
+config_load bulkdata
+config_foreach update_profile_sections profile profile
+uci commit bulkdata
+
+exit 0

bulut/Makefile

@@ -11,7 +11,7 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bulut/bulut-gw-client.git
 PKG_SOURCE_VERSION:=227700c44817afa2c392fa08bf4cf70fa6177f01
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.zst
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(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)

cmph/Makefile

@@ -1,52 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=cmph
-PKG_VERSION:=2.0.2
-PKG_RELEASE:=1
-
-PKG_SOURCE:=cmph-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/cmph/
-PKG_MD5SUM:=51ec5329b47774d251a96eaaafdb409e
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-PKG_FIXUP:=autoreconf
-
-PKG_LICENSE:=LGPLv2
-PKG_LICENSE_FILES:=LGPL-2
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/$(PKG_NAME)
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=C Minimal Perfect Hashing library
-  URL:=https://sourceforge.net/projects/cmph/
-endef
-
-define Package/$(PKG_NAME)/description
-  C Minimal Perfect Hashing (CMPH) library allows the creation of minimal perfect hash functions for large data sets.
-endef
-
-define Build/Configure
-	$(call Build/Configure/Default)
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/cmph.h $(1)/usr/include/
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/cmph_time.h $(1)/usr/include/
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/cmph_types.h $(1)/usr/include/
-
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/src/.libs/libcmph.a $(1)/usr/lib/
-	$(CP) $(PKG_BUILD_DIR)/src/.libs/libcmph.so* $(1)/usr/lib/
-endef
-
-define Package/$(PKG_NAME)/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/src/.libs/libcmph.so* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,$(PKG_NAME)))
-

ddnsmngr/Makefile

@@ -5,14 +5,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ddnsmngr
-PKG_VERSION:=1.0.12
+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:=44af9a7b3fec3929f8554af9633a5b8068189b48
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.zst
+PKG_SOURCE_VERSION:=4b0c679c4dc3e3725de5c0c55ed60f24b87c6edd
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 
@@ -28,8 +28,7 @@ define Package/$(PKG_NAME)
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=Dynamic DNS manager
-  DEPENDS:=+DDNSMNGR_BACKEND_DDNSSCRIPT:ddns-scripts +DDNSMNGR_BACKEND_INADYN:inadyn
-  DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service
+  DEPENDS:=+libbbfdm-api +DDNSMNGR_BACKEND_DDNSSCRIPT:ddns-scripts +DDNSMNGR_BACKEND_INADYN:inadyn
   MENU:=1
 endef
 
@@ -71,7 +70,6 @@ ifeq ($(CONFIG_DDNSMNGR_BACKEND_INADYN),y)
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/files/inadyn/server/* $(1)/etc/ddnsmngr/servers
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/inadyn/usr/libexec/rpcd/ddnsmngr $(1)/usr/libexec/rpcd/ddnsmngr
 endif
-	$(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) $(PKG_NAME)
 	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/libddnsmngr.so $(1) $(PKG_NAME)
 endef
 

ddnsmngr/bbfdm_service.json

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

decollector/Config.in

@@ -4,16 +4,4 @@ config DECOLLECTOR_EASYMESH_VERSION
 	int "Support Easymesh version"
 	default 6
 
-config DECOLLECTOR_BUILD_TR181_PLUGIN
-	bool "Build TR-181 mapping module (responsible for Device.WiFi.DataElements.)"
-	default y
-
-config DECOLLECTOR_VENDOR_EXTENSIONS
-	bool "Iopsys vendor extensions for Device.WiFi.DataElements."
-	default y
-
-config DECOLLECTOR_VENDOR_PREFIX
-	string "Package specific datamodel Vendor Prefix for TR181 extensions"
-	default ""
-
 endmenu

decollector/Makefile

@@ -1,30 +1,28 @@
 #
-# Copyright (C) 2021-2024 IOPSYS Software Solutions AB
-# Copyright (C) 2025 Genexis AB
+# Copyright (C) 2021-2023 IOPSYS Software Solutions AB
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=decollector
-PKG_VERSION:=6.2.3.9
+PKG_VERSION:=6.0.0.13
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=d1d948a48952fe2091e84af1293a6e77857439cf
+PKG_SOURCE_VERSION:=d75639d9ae82538103123b32fc0de9280e84cabb
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/decollector.git
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.zst
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@genexis.eu>
+PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 
 
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
-include $(TOPDIR)/feeds/iopsys/bbfdm/bbfdm.mk
 
 define Package/decollector
   SECTION:=utils
@@ -67,18 +65,6 @@ MAKE_PATH:=src
 
 TARGET_CFLAGS += -DEASYMESH_VERSION=$(CONFIG_DECOLLECTOR_EASYMESH_VERSION)
 
-ifeq ($(CONFIG_DECOLLECTOR_BUILD_TR181_PLUGIN),y)
-MAKE_FLAGS += DECOLLECTOR_BUILD_TR181_PLUGIN=y
-ifeq ($(CONFIG_DECOLLECTOR_VENDOR_EXTENSIONS),y)
-TARGET_CFLAGS += -DDECOLLECTOR_VENDOR_EXTENSIONS
-ifeq ($(CONFIG_DECOLLECTOR_VENDOR_PREFIX),"")
-TARGET_CFLAGS += -DCUSTOM_PREFIX=\\\"$(CONFIG_BBF_VENDOR_PREFIX)\\\"
-else
-TARGET_CFLAGS += -DCUSTOM_PREFIX=\\\"$(CONFIG_DECOLLECTOR_VENDOR_PREFIX)\\\"
-endif
-endif
-endif
-
 EXECS := \
 	$(if $(CONFIG_PACKAGE_decollector),decollector)
 
@@ -89,7 +75,6 @@ define Package/decollector/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) ./files/decollector.init $(1)/etc/init.d/decollector
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/decollector $(1)/usr/sbin/
-	$(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) $(PKG_NAME)
 endef
 
 $(eval $(call BuildPackage,decollector))

decollector/bbfdm_service.json

@@ -1,26 +0,0 @@
-{
-  "daemon": {
-    "enable": "1",
-    "service_name": "decollector",
-    "unified_daemon": true,
-    "services": [
-      {
-        "parent_dm": "Device.WiFi.",
-        "object": "DataElements"
-      }
-    ],
-    "config": {
-      "loglevel": "3"
-    },
-    "apply_handler": {
-      "uci": [
-        {
-          "file": [
-            "mapcontroller"
-          ],
-          "external_handler": "/etc/wifidmd/bbf_config_reload.sh"
-        }
-      ]
-    }
-  }
-}

dectmngr/Makefile

@@ -2,13 +2,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dectmngr
 PKG_RELEASE:=3
-PKG_VERSION:=3.7.13
+PKG_VERSION:=3.6.7
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=5c2720563b3ed889e9d4de6fdb9b0f6a9d584094
+PKG_SOURCE_VERSION:=98999eb75755f79a3c8a7e802e024b42914d1efc
 PKG_MIRROR_HASH:=skip
 endif
 
@@ -20,7 +20,7 @@ export BUILD_DIR
 
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.zst
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
@@ -28,7 +28,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/$(PKG_NAME)
 	CATEGORY:=Utilities
  	TITLE:=DECT Manager
-	DEPENDS:= +libubox +ubus +uci +libxml2 +libjson-c +gpiod-tools +voicemngr
+	DEPENDS:= +libubox +ubus +uci +libxml2 +libjson-c +gpiod-tools
 endef
 
 define Package/$(PKG_NAME)/description
@@ -56,14 +56,11 @@ endif
 
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/etc/dspg
+	$(INSTALL_DIR) $(1)/etc
 	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
 
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/app/dectmngr $(1)/usr/sbin/
 	$(STRIP) $(1)/usr/sbin/dectmngr
-ifeq ($(CONFIG_TARGET_airoha),)
-	$(CP) ./firmware/common/* $(1)/etc/dspg/
-endif
 	$(CP) ./files/etc/* $(1)/etc/
 	$(INSTALL_DATA) ./files/lib/upgrade/keep.d/dect $(1)/lib/upgrade/keep.d/dect
 endef

dectmngr/files/etc/config/dect

@@ -1,6 +1,3 @@
 config dect 'global'
-	option log_dect_cmbs 'syslog'
-	option log_level 'realtime,warning,error'
-
-config dect 'base'
-	option enable '1'
+ 	option log_dect_cmbs 'syslog'
+        option log_level 'realtime,warning,error'

dectmngr/files/etc/init.d/dectmngr

@@ -11,25 +11,6 @@ LOG_PATH=/var/log/dectmngr
 DB_PATH=/etc/dect
 DCX81_UART_DT_ALIAS=/proc/device-tree/aliases/dcx81-uart
 
-get_extension_shift() {
-   local dect_exts
-
-   get_dect_extension() {
-       local ext=$1
-       local type
-
-       config_get type $ext type
-
-       [ "$type" == "dect" ] && echo $ext
-    }
-
-    config_load "asterisk"
-
-    dect_exts=$(config_foreach get_dect_extension "extension" |sort |head -n1)
-
-    echo "${dect_exts#extension}"
-}
-
 # Ask dectmngr to exit nicely and wait for it to clean up, which is a slow process.
 stop_and_wait_dectmngr() {
 	dect_pid=$(pidof $PROG)
@@ -57,53 +38,13 @@ get_dcx81_device() {
 			device_name_line="$(grep '^DEVNAME=' "$uevent_file")" || return 1
 			readonly device="/dev/${device_name_line##DEVNAME=}"
 			[ -c "$device" ] || return 1
-			printf "%s" "$(basename $device)"
+			printf "%s" "$device"
 			return 0
 		fi
 	done
 	return 1
 }
 
-check_dcx81_firmware() {
-	local dcx81_uart=$1
-	local fw_link="/lib/firmware/dcx81_firmware"
-	local fw_file
-
-	[ -L "$fw_link" ] || return
-
-	fw_file=$(readlink -f $fw_link)
-	[ -f "$fw_file" ] || return
-
-	# the symbolic link is not needed
-	rm -f $fw_link
-
-	eval $(/sbin/cmbs_tcx -comname "$dcx81_uart" -fw_version |grep DCX81_FW_Version)
-	[ -n "$DCX81_FW_Version" ] || return
-
-	if echo $(basename $fw_file) | grep -qi "$DCX81_FW_Version" ; then
-		logger -t "$PROG" "DCX81 running expected $DCX81_FW_Version"
-		return;
-	fi
-
-	logger -t "$PROG" "DCX81 firmware upgrading to $fw_file"
-	/sbin/cmbs_tcx -comname "$dcx81_uart" -fwu "$fw_file" 2>&1 >/dev/null &
-
-	echo -n "Updrading DCX81 firmware.." >/dev/console
-	local wait_time=0
-	while pidof cmbs_tcx >/dev/null && [ "$wait_time" -lt "200" ] ; do
-		sleep 5
-		wait_time=$(($wait_time + 5))
-		echo -n "." >/dev/console
-	done
-
-	if pidof cmbs_tcx >/dev/null ; then
-		killall -9 cmbs_tcx
-		logger -t "$PROG" "DCX81 firmware upgrade timeout"
-	else
-		logger -t "$PROG" "DCX81 firmware upgrade done"
-	fi
-}
-
 start_service() {
 	local opt_ext=
 	local rfpi=
@@ -118,13 +59,9 @@ start_service() {
 	local dcx81_uart_device
 	if ! dcx81_uart_device="$(get_dcx81_device)"; then
 		logger -t "$PROG" -p daemon.warning "Could not determine DCX81 UART device. Falling back to default ttyH0."
-		dcx81_uart_device="ttyH0"
+		dcx81_uart_device=/dev/ttyH0
 	fi
 
-	check_dcx81_firmware $dcx81_uart_device
-
-	opt_ext="-extensionShift $(get_extension_shift)"
-
 	rfpi=$(db -q get hw.board.dect_rfpi)
 	[ -n "$rfpi" -a ${#rfpi} -eq 14 ] && opt_ext="$opt_ext -rfpi $rfpi"
 
@@ -140,27 +77,24 @@ start_service() {
 
 	config_load dect
 	config_get log_dect_cmbs global log_dect_cmbs syslog
-	config_get pcm_slot_start global pcm_slot_start
-	config_get pcm_fsync global pcm_fsync
-
-        [ -n "$pcm_fsync" ] && opt_ext="$opt_ext -sync $pcm_fsync"
-        [ -n "$pcm_slot_start" ] && opt_ext="$opt_ext -slotsShift $pcm_slot_start"
 
 	procd_open_instance
 
+	# dectmngr takes expects device without /dev
+	readonly dcx81_uart_device_wo_dev="${dcx81_uart_device##/dev/}"
 	case "$log_dect_cmbs" in
 	none)
 		echo "Starting dectmngr with cmbs logging disabled"
-		procd_set_param command "$PROG" -comname "$dcx81_uart_device" $opt_ext
+		procd_set_param command "$PROG" -comname "$dcx81_uart_device_wo_dev" $opt_ext
 		rm -f $LOG_PATH/*
 		;;
 	file)
 		echo "Starting dectmngr with cmbs logging enabled to file"
-		procd_set_param command "$PROG" -comname "$dcx81_uart_device" -log $LOG_PATH/dect-cmbs.log $opt_ext
+		procd_set_param command "$PROG" -comname "$dcx81_uart_device_wo_dev" -log $LOG_PATH/dect-cmbs.log $opt_ext
 		;;
 	*)
 		echo "Starting dectmngr with cmbs logging enabled to syslog"
-		procd_set_param command "$PROG" -comname "$dcx81_uart_device" -syslog $opt_ext
+		procd_set_param command "$PROG" -comname "$dcx81_uart_device_wo_dev" -syslog $opt_ext
 		rm -f $LOG_PATH/*
 		;;
 	esac

dhcpmngr/Config.in

@@ -1,12 +0,0 @@
-if PACKAGE_dhcpmngr
-
-config DHCPMNGR_ENABLE_VENDOR_EXT
-	bool "Use datamodel vendor extensions"
-	default y
-	help
-	   Set this option to use bridge BBF vendor extensions.
-
-config DHCPMNGR_VENDOR_PREFIX
-	string "Package specific datamodel Vendor Prefix for TR181 extensions"
-	default ""
-endif

dhcpmngr/Makefile

@@ -5,14 +5,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dhcpmngr
-PKG_VERSION:=1.1.6
+PKG_VERSION:=1.0.2
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/dhcpmngr.git
-PKG_SOURCE_VERSION:=74d96cd70119e4ea08767d68b45b4922162d0328
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.zst
+PKG_SOURCE_VERSION:=4c89a3f12686343e3cca23819255744ac06dfb22
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 
@@ -28,33 +28,13 @@ 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
-  DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service
-  DEPENDS+=+DNSMNGR_DNS_SD:umdns
-  DEPENDS+=+DNSMNGR_BACKEND_DNSMASQ:dnsmasq
-  DEPENDS+=+DNSMNGR_BACKEND_UNBOUND:odhcpd
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbfdm-api +dnsmasq
 endef
 
 define Package/dhcpmngr/description
   Package to add Device.DHCPv4. and Device.DHCPv6. data model support.
 endef
 
-define Package/$(PKG_NAME)/config
-        source "$(SOURCE)/Config.in"
-endef
-
-ifeq ($(CONFIG_DHCPMNGR_ENABLE_VENDOR_EXT),y)
-MAKE_FLAGS += DHCPMNGR_ENABLE_VENDOR_EXT=y
-endif
-
-ifeq ($(CONFIG_DHCPMNGR_VENDOR_PREFIX),"")
-VENDOR_PREFIX = $(CONFIG_BBF_VENDOR_PREFIX)
-else
-VENDOR_PREFIX = $(CONFIG_DHCPMNGR_VENDOR_PREFIX)
-endif
-
-TARGET_CFLAGS += -DBBF_VENDOR_PREFIX=\\\"$(VENDOR_PREFIX)\\\"
-
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
 	$(CP) -rf ~/git/dhcpmngr/* $(PKG_BUILD_DIR)/
@@ -64,11 +44,6 @@ 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_REGISTER_SERVICES) ./bbfdm_service.json $(1) $(PKG_NAME)
 	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/libdhcpmngr.so $(1) $(PKG_NAME)
 endef
 

dhcpmngr/bbfdm_service.json

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

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

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

dm-framework/Makefile

@@ -1,170 +0,0 @@
-#
-# Copyright (c) 2023 Genexis B.V. All rights reserved.
-# This Software and its content are protected by the Dutch Copyright Act
-# ('Auteurswet'). All and any copying and distribution of the software
-# and its content without authorization by Genexis B.V. is
-# prohibited. The prohibition includes every form of reproduction and
-# distribution.
-#
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=dm-framework
-PKG_VERSION:=1.0.0
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/lcm/dm-framework.git
-PKG_SOURCE_VERSION:=ba2ec403f08cc0d5401a1610517f17490c94a978
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-# Build directories for each component
-DMAPI_BUILD_DIR:=$(PKG_BUILD_DIR)/dm-api-build
-DMAGENT_BUILD_DIR:=$(PKG_BUILD_DIR)/dm-agent-build
-
-include $(INCLUDE_DIR)/package.mk
-include ../bbfdm/bbfdm.mk
-
-#
-# DM-API Package Definition
-#
-define Package/dm-api
-  CATEGORY:=Genexis
-  TITLE:=dm-api
-  DEPENDS:=+libsqlite3 \
-        +libjson-c +libstdcpp +quickjs \
-        +libubus +libubox +libuci
-  URL:=http://www.genexis.eu
-  PKG_LICENSE:=GENEXIS
-  PKG_LICENSE_URL:=
-endef
-
-define Package/dm-api/description
- This package contains api for the dm-framework
-endef
-
-#
-# DM-Agent Package Definition
-#
-define Package/dm-agent
-  DEPENDS:=+dm-api +libubox +libubus +ubus
-  CATEGORY:=Genexis
-  TITLE:=dm-framework agent
-  URL:=http://www.genexis.eu
-  PKG_LICENSE:=GENEXIS
-  PKG_LICENSE_URL:=
-endef
-
-define Package/dm-agent/description
- This package contains dm-framework agent.
-endef
-
-#
-# Build Preparation
-#
-define Build/Prepare
-	$(call Build/Prepare/Default)
-
-	# Prepare dm-api
-	mkdir -p $(DMAPI_BUILD_DIR)
-	$(CP) -rf $(PKG_BUILD_DIR)/dm-api/* $(DMAPI_BUILD_DIR)/
-
-	# Prepare dm-agent
-	mkdir -p $(DMAGENT_BUILD_DIR)
-	$(CP) -rf $(PKG_BUILD_DIR)/dm-agent/* $(DMAGENT_BUILD_DIR)/
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-#
-# Build Compilation
-#
-define Build/Compile
-	# Build dm-api
-	$(MAKE) -C $(DMAPI_BUILD_DIR)\
-		PROJECT_ROOT="$(DMAPI_BUILD_DIR)" \
-		CROSS_COMPILE="$(TARGET_CROSS)" \
-		ARCH="$(LINUX_KARCH)" \
-		EXTRA_CFLAGS="$(TARGET_CFLAGS) -I$(DMAPI_BUILD_DIR)" \
-		all
-
-	# Build dm-agent (depends on dm-api)
-	$(MAKE) -C $(DMAGENT_BUILD_DIR)\
-		PROJECT_ROOT="$(DMAGENT_BUILD_DIR)" \
-		CROSS_COMPILE="$(TARGET_CROSS)" \
-		ARCH="$(LINUX_KARCH)" \
-		EXTRA_CFLAGS="$(TARGET_CFLAGS) -I$(DMAGENT_BUILD_DIR)" \
-		all
-endef
-
-#
-# Development Installation (headers and libraries)
-#
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/lib
-
-	# DM-API development files - headers are now in dm-api/include/
-	$(CP) $(DMAPI_BUILD_DIR)/include/dm_types.h $(1)/usr/include/
-	$(CP) $(DMAPI_BUILD_DIR)/include/dm_node.h $(1)/usr/include/
-	$(CP) $(DMAPI_BUILD_DIR)/core/dm_api.h $(1)/usr/include/
-	$(CP) $(DMAPI_BUILD_DIR)/core/dm_linker.h $(1)/usr/include/
-	$(CP) $(DMAPI_BUILD_DIR)/core/dbmgr.h $(1)/usr/include/
-	$(CP) $(DMAPI_BUILD_DIR)/include/dm_log.h $(1)/usr/include/
-	$(CP) $(DMAPI_BUILD_DIR)/utils/dm_list.h $(1)/usr/include/
-	$(CP) $(DMAPI_BUILD_DIR)/libdmapi.so $(1)/usr/lib/
-
-	# Install json2code.js script and package.json to staging for other packages to use
-	$(INSTALL_DIR) $(1)/usr/lib/dm-framework/scripts
-	$(CP) $(PKG_BUILD_DIR)/scripts/json2code.js $(1)/usr/lib/dm-framework/scripts/
-	$(CP) $(PKG_BUILD_DIR)/scripts/package.json $(1)/usr/lib/dm-framework/scripts/
-endef
-
-#
-# Package Installation - DM-API
-#
-define Package/dm-api/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DIR) $(1)/sbin/
-	$(INSTALL_DIR) $(1)/etc/bbfdm/dmf
-
-	$(INSTALL_BIN) $(DMAPI_BUILD_DIR)/libdmapi.so $(1)/usr/lib/
-	$(CP) $(DMAPI_BUILD_DIR)/quickjs/uci.js $(1)/etc/bbfdm/dmf/
-	$(CP) $(DMAPI_BUILD_DIR)/quickjs/utils.js $(1)/etc/bbfdm/dmf/
-endef
-
-#
-# Package Installation - DM-Agent
-#
-define Package/dm-agent/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_DIR) $(1)/etc/config
-	$(BBFDM_REGISTER_SERVICES) ./dmf_service.json $(1) $(PKG_NAME)
-	$(INSTALL_BIN) $(DMAGENT_BUILD_DIR)/dm-agent $(1)/usr/sbin
-endef
-
-define Package/dm-framework
-  CATEGORY:=Genexis
-  TITLE:=DM Framework Meta Package
-  DEPENDS:=+dm-api +dm-agent
-  URL:=http://www.genexis.eu
-  PKG_LICENSE:=GENEXIS
-endef
-
-define Package/dm-framework/description
- This is a meta package that pulls in dm-api and dm-agent.
-endef
-
-define Package/dm-framework/install
-	true
-endef
-
-# Register all three packages
-$(eval $(call BuildPackage,dm-api))
-$(eval $(call BuildPackage,dm-agent))
-$(eval $(call BuildPackage,dm-framework))

dm-framework/dm-framework.mk

@@ -1,33 +0,0 @@
-# dm-framework.mk - Common rules for DM Framework
-
-DM_SCRIPT_DIR ?= $(STAGING_DIR)/usr/lib/dm-framework/scripts
-JSON2CODE = $(DM_SCRIPT_DIR)/json2code.js
-
-# Macro to generate code
-# $(1): Input directory (datamodels)
-# $(2): Output directory (where generated files go)
-# $(3): Vendor Prefix (optional)
-define Build/Compile/DM
-	$(INSTALL_DIR) $(2)
-	@# Install npm dependencies if not already installed
-	@if [ ! -d "$(DM_SCRIPT_DIR)/node_modules" ]; then \
-		cd $(DM_SCRIPT_DIR) && npm install --production; \
-	fi
-	node $(JSON2CODE) -i $(1) -o $(2) $(if $(3),--vendor-prefix $(3))
-	$(TARGET_CC) $(TARGET_CFLAGS) -I$(2) -I$(STAGING_DIR)/usr/include/ -fPIC -c $(2)/dm.c -o $(2)/dm.o
-	$(TARGET_CC) $(TARGET_LDFLAGS) -shared -o $(2)/lib$(PKG_NAME).so $(2)/dm.o
-endef
-
-# Macro to install DM
-# $(1): Input directory (datamodels)
-# $(2): Output directory (build dir)
-# $(3): Destination directory (rootfs)
-# $(4): Package Name (subdir in /etc/bbfdm/dmf)
-define Build/Install/DM
-	$(INSTALL_DIR) $(3)/etc/bbfdm/dmf/$(4)
-	$(CP) $(2)/lib$(PKG_NAME).so $(3)/etc/bbfdm/dmf/$(4)/
-	$(CP) $(1)/*.js $(3)/etc/bbfdm/dmf/$(4)/
-	$(CP) $(2)/default.db $(3)/etc/bbfdm/dmf/default_dm.db
-	$(CP) $(2)/exports.js $(3)/etc/bbfdm/dmf/$(4)/exports.js
-	$(CP) $(2)/dm_consts.js $(3)/etc/bbfdm/dmf/$(4)/dm_consts.js
-endef

dm-framework/dmf_service.json

@@ -1,17 +0,0 @@
-{
-  "daemon": {
-    "enable": "1",
-    "service_name": "dmf",
-    "dm-framework": true,
-    "unified_daemon": false,
-    "services": [
-      {
-        "parent_dm": "Device.",
-        "object": "Bridging"
-      }
-    ],
-    "config": {
-      "loglevel": "3"
-    }
-  }
-}

dmcli-plugins/Makefile

@@ -1,48 +0,0 @@
-#
-# Copyright (c) 2023 Genexis Netherlands B.V. All rights reserved.
-# This Software and its content are protected by the Dutch Copyright Act
-# ('Auteurswet'). All and any copying and distribution of the software
-# and its content without authorization by Genexis Netherlands B.V. is
-# prohibited. The prohibition includes every form of reproduction and
-# distribution.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=dmcli-plugins
-PKG_LICENSE:=PROPRIETARY GENEXIS
-PKG_VERSION:=2.2.6
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/gnx/dmcli-plugin-easydm.git
-PKG_SOURCE_VERSION:=bc8b8527e8a41bdba73cb277a3c6c3b42b045153
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
-PKG_MIRROR_HASH:=skip
-
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/dmcli-plugins
-  SECTION:=tools
-  CATEGORY:=Genexis
-  TITLE:=Easy-to-use data model on top of TR181
-  URL:=http://genexis.eu
-  DEPENDS:=+dmcli
-endef
-
-define Package/dmcli-plugins/description
-  EasyDM offers a user-friendly approach to configuring TR-181
-  simplifying the process with its intuitive interface.
-endef
-
-define Build/Compile
-	true
-endef
-
-define Package/dmcli-plugins/install
-	$(INSTALL_DIR) $(1)/usr/lib/dmcli/plugins
-	$(CP) $(PKG_BUILD_DIR)/src/*.js $(1)/usr/lib/dmcli/plugins/
-endef
-
-$(eval $(call BuildPackage,dmcli-plugins))

dmcli/Config.in

@@ -1,9 +0,0 @@
-if PACKAGE_dmcli
-
-config DMCLI_REMOTE_CONNECTION
-        bool "Add dmcli remote controller configuration"
-        default n
-        help
-                This adds a usp controller configuration for dmcli remote connection from different machine/laptop/server.
-
-endif

dmcli/Makefile

@@ -1,76 +0,0 @@
-#
-# Copyright (c) 2021 Genexis Netherlands B.V. All rights reserved.
-# This Software and its content are protected by the Dutch Copyright Act
-# ('Auteurswet'). All and any copying and distribution of the software
-# and its content without authorization by Genexis Netherlands B.V. is
-# prohibited. The prohibition includes every form of reproduction and
-# distribution.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=dmcli
-PKG_LICENSE:=PROPRIETARY GENEXIS
-PKG_VERSION:=1.9.6
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/gnx/dmcli.git
-PKG_SOURCE_VERSION:=f03188eff6c2cab59e4c8f18a435c940ff5043f5
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
-PKG_MIRROR_HASH:=skip
-
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/dmcli
-  SECTION:=tools
-  CATEGORY:=Genexis
-  TITLE:=DMCLI (datamodel-based CLI)
-  URL:=http://genexis.eu
-  DEPENDS:=+usp-js +DMCLI_REMOTE_CONNECTION:mosquitto-auth-plugin +shadow-utils +@BUSYBOX_CONFIG_ADDUSER
-endef
-
-define Package/dmcli/description
-  CLI to view and configure datamodels of CPE
-endef
-
-define Package/dmcli/conffiles
-/etc/dmcli/dmcli.conf
-endef
-
-define Package/dmcli/config
-	source "$(SOURCE)/Config.in"
-endef
-
-define Package/dmcli/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/dmcli $(1)/usr/bin/
-
-	$(INSTALL_DIR) $(1)/usr/lib/dmcli
-	$(CP) $(PKG_BUILD_DIR)/common $(1)/usr/lib/dmcli/
-	mv $(1)/usr/lib/dmcli/common/os_qjs.js $(1)/usr/lib/dmcli/common/os.js
-	rm $(1)/usr/lib/dmcli/common/os_node.js
-	$(CP) $(PKG_BUILD_DIR)/core $(1)/usr/lib/dmcli/
-	$(CP) $(PKG_BUILD_DIR)/cli $(1)/usr/lib/dmcli/
-	$(CP) $(PKG_BUILD_DIR)/data $(1)/usr/lib/dmcli/
-	$(CP) $(PKG_BUILD_DIR)/plugins $(1)/usr/lib/dmcli/
-
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
-	$(INSTALL_DATA) ./files/etc/uci-defaults/36-dmcli $(1)/etc/uci-defaults/
-ifeq ($(CONFIG_DMCLI_REMOTE_CONNECTION),y)
-	$(INSTALL_DATA) ./files/etc/uci-defaults/36-dmcli-remote $(1)/etc/uci-defaults/
-else
-	$(INSTALL_DATA) ./files/etc/uci-defaults/36-dmcli-remote-remove $(1)/etc/uci-defaults/
-endif
-
-	$(INSTALL_DIR) $(1)/etc/dmcli
-	$(CP) ./files/etc/dmcli/dmcli.acl $(1)/etc/dmcli/
-	$(CP) ./files/etc/dmcli/dmcli.conf $(1)/etc/dmcli/
-
-	$(INSTALL_DIR) $(1)/etc/users/roles/
-	$(INSTALL_DATA) ./files/etc/users/roles/operator.json $(1)/etc/users/roles/
-endef
-
-$(eval $(call BuildPackage,dmcli))

dmcli/files/etc/dmcli/dmcli.acl

@@ -1,4 +0,0 @@
-user operator
-topic read /usp/operator/controller/reply-to
-topic read /usp/operator/controller
-topic write /usp/operator/endpoint

dmcli/files/etc/dmcli/dmcli.conf

@@ -1,45 +0,0 @@
-{
-   "Settings": {
-      "USP": {
-         "ActiveConnectionProfile": "local",
-         "ConnectionProfile": [
-            {
-               "Name": "local",
-               "Host": "127.0.0.1",
-               "Port": 9002,
-               "Username": "operator",
-               "Protocol": "ws",
-               "FromId": "oui:000F94:device-controller-operator",
-               "PublishEndpoint": "/usp/operator/endpoint",
-               "SubscribeEndpoint": "/usp/operator/controller"
-            }
-         ],
-         "Session": {
-            "AutoStart": false
-         },
-         "Notification": {
-            "LogTo": "console",
-            "Format": "brief",
-            "LogFile": "usp-notification.log"
-         }
-      },
-      "CLI": {
-         "Home": "/",
-         "Color": "true",
-         "Mode": "Command",
-         "ShowCommandTime": false,
-         "SortDMTree": false
-      },
-      "Prompt": {
-         "Auto": true,
-         "Color": "default",
-         "SelectedBackgroundColor": "yellow",
-         "PageSize": "3",
-         "AutoPromptOnEmptyCommand": false,
-         "AutoPromptInstanceNumbers": false
-      },
-      "Log": {
-         "Level": "Error"
-      }
-   }
-}

dmcli/files/etc/uci-defaults/36-dmcli

@@ -1,120 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-. /lib/functions/iopsys-environment.sh
-. /usr/share/libubox/jshn.sh
-
-DMCLI_CONF="/etc/dmcli/dmcli.conf"
-CONTROLLER_ID='oui:000F94:device-controller-operator'
-DMCLI_RESP_TOPIC="/usp/operator/endpoint"
-DMCLI_CTRL_TOPIC="/usp/operator/controller"
-DMCLI_PORT="9002"
-
-grep -q "^operator:" /etc/passwd || {
-	adduser -g 'Operator' -D -H -s /usr/bin/dmcli --home '/usr/lib/dmcli' 'operator'
-	hash=""
-	if type get_operator_password_hash > /dev/null 2>&1; then
-		hash=$(get_operator_password_hash)
-	fi
-	if [ -z "$hash" ]; then
-		hash='$6$zP4Wk/VQJOLwwofC$teuhnYFQBcA8YUZo/Q0quDMi4SsOHmfBcyvt5VNchPnzgwF1nfNNliC3yBVW22NwmwttPEWeBEBfnMTBB0rYs/'
-	fi
-	echo "operator:${hash}" | chpasswd -e
-}
-
-grep -q "^/usr/bin/dmcli$" /etc/shells || {
-	echo '/usr/bin/dmcli' >> /etc/shells
-}
-
-uci -q del_list sshd.@sshd[0].AllowUsers='operator'
-uci -q add_list sshd.@sshd[0].AllowUsers='operator'
-
-uci -q delete users.operator
-uci -q set users.operator=user
-uci -q set users.operator.enabled=1
-uci -q set users.operator.shell='dmcli'
-uci -q set users.operator.member_roles='operator'
-
-if [ -f "/etc/config/mosquitto" ]; then
-	uci_add mosquitto listener dmcli_local
-	uci_set mosquitto dmcli_local enabled 1
-	uci_set mosquitto dmcli_local port "${DMCLI_PORT}"
-	uci_set mosquitto dmcli_local protocol 'websockets'
-	uci_set mosquitto dmcli_local acl_file '/etc/dmcli/dmcli.acl'
-	uci_set mosquitto dmcli_local no_remote_access '1'
-	uci_set mosquitto dmcli_local allow_anonymous '1'
-fi
-
-if [ -f "/etc/config/obuspa" ]; then
-	uci_add obuspa mqtt mqtt_operator
-	uci_set obuspa mqtt_operator BrokerAddress '127.0.0.1'
-	uci_set obuspa mqtt_operator BrokerPort '1883'
-	uci_set obuspa mqtt_operator TransportProtocol 'TCP/IP'
-
-	uci_add obuspa mtp mtp_operator
-	uci_set obuspa mtp_operator Protocol 'MQTT'
-	uci_set obuspa mtp_operator ResponseTopicConfigured "${DMCLI_RESP_TOPIC}"
-	uci_set obuspa mtp_operator mqtt 'mqtt_operator'
-
-	uci_add obuspa controller controller_operator
-	uci_set obuspa controller_operator EndpointID "${CONTROLLER_ID}"
-	uci_set obuspa controller_operator Protocol 'MQTT'
-	uci_set obuspa controller_operator Topic "${DMCLI_CTRL_TOPIC}"
-	uci_set obuspa controller_operator mqtt 'mqtt_operator'
-	uci_set obuspa controller_operator assigned_role_name 'operator'
-fi
-
-_get_endpoint_id() {
-	local id serial oui
-
-	id="$(uci -q get obuspa.localagent.EndpointID)"
-	if [ -n "${id}" ]; then
-		echo "${id}"
-		return 0
-	fi
-
-	serial="$(db -q get device.deviceinfo.SerialNumber)"
-	oui="$(db -q get device.deviceinfo.ManufacturerOUI)"
-
-	echo "os::${oui}-${serial//+/%2B}"
-}
-
-update_dmcli_conf() {
-	local endpointid confTmpFile
-	local port fromid publish subscribe toid
-
-	if [ -f "${DMCLI_CONF}" ]; then
-		endpointid="$(_get_endpoint_id)"
-		json_load_file "${DMCLI_CONF}" || return
-		json_select "Settings" || return
-			json_select "USP" || return
-				json_select "ConnectionProfile" || return
-					json_select "1" || return
-						json_get_var port "Port"
-						json_get_var fromid "FromId"
-						json_get_var publish "PublishEndpoint"
-						json_get_var subscribe "SubscribeEndpoint"
-						json_get_var toid "ToId"
-
-						json_add_int "Port" "${DMCLI_PORT}"
-						json_add_string "FromId" "${CONTROLLER_ID}"
-						json_add_string "PublishEndpoint" "${DMCLI_RESP_TOPIC}"
-						json_add_string "SubscribeEndpoint" "${DMCLI_CTRL_TOPIC}"
-						json_add_string "ToId" "${endpointid}"
-					json_select ..
-				json_select ..
-			json_select ..
-		json_select ..
-
-		if [ "${port}" != "${DMCLI_PORT}" ] || [ "${fromid}" != "${CONTROLLER_ID}" ] || \
-			[ "${publish}" != "${DMCLI_RESP_TOPIC}" ] || [ "${subscribe}" != "${DMCLI_CTRL_TOPIC}" ] || \
-			[ "${toid}" != "${endpointid}" ]; then
-			confTmpFile="$(mktemp -u -p "$(dirname "$DMCLI_CONF")" "$(basename "$DMCLI_CONF").XXXXXXX")"
-			json_pretty
-			json_dump > "${confTmpFile}" || return
-			mv -f "${confTmpFile}" "${DMCLI_CONF}" || return
-		fi
-	fi
-}
-
-update_dmcli_conf || exit

dmcli/files/etc/uci-defaults/36-dmcli-remote

@@ -1,14 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-if [ -f "/etc/config/mosquitto" ]; then
-	uci_add mosquitto listener dmcli
-	uci_set mosquitto dmcli enabled 1
-	uci_set mosquitto dmcli port '9003'
-	uci_set mosquitto dmcli protocol 'websockets'
-	uci_set mosquitto dmcli auth_plugin '/usr/lib/mosquitto_auth_plugin.so'
-	uci_set mosquitto dmcli acl_file '/etc/dmcli/dmcli.acl'
-fi
-
-exit 0

dmcli/files/etc/uci-defaults/36-dmcli-remote-remove

@@ -1,9 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-if [ -f "/etc/config/mosquitto" ]; then
-	uci_remove mosquitto dmcli
-fi
-
-exit 0

dmcli/files/etc/users/roles/operator.json

@@ -1,14 +0,0 @@
-{
-  "tr181": {
-    "name": "operator",
-    "instance": 6,
-    "permission": [
-      {
-        "object": "Device.",
-        "perm": [
-          "PERMIT_ALL"
-        ]
-      }
-    ]
-  }
-}

dmcli/src/Makefile

@@ -1,7 +0,0 @@
-all: dmcli
-
-dmcli: main.c
-	$(CC) $(CFLAGS) -Wall -Werror -o $@ $^
-
-clean:
-	rm -f dmcli

dmcli/src/main.c

@@ -1,32 +0,0 @@
-/*
-* Copyright (c) 2021 Genexis Netherlands B.V. All rights reserved.
-* This Software and its content are protected by the Dutch Copyright Act
-* ('Auteurswet'). All and any copying and distribution of the software
-* and its content without authorization by Genexis Netherlands B.V. is
-* prohibited. The prohibition includes every form of reproduction and
-* distribution.
-*/
-
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
-/* C Wrapper for operator to login to the CLI via ssh: the shell in
- * the passwd file cannot be a script that requires an interpreter. */
-int main(int argc, char *argv[])
-{
-	char *cmd[3 + (argc > 1 ? argc - 1 : 0)];
-
-	cmd[0] = "/usr/bin/qjs";
-	cmd[1] = "/usr/lib/dmcli/cli/main.js";
-	cmd[2] = NULL;
-
-	if (argc > 1) {
-		memcpy(&cmd[2], &argv[1], (argc - 1) * sizeof(char *));
-		cmd[2 + argc - 1] = NULL;
-	}
-
-	execv(cmd[0], cmd);
-	fprintf(stderr, "%s: command not found\n", cmd[0]);
-	return 127;
-}

dnsmngr/Config.in

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

@@ -5,14 +5,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dnsmngr
-PKG_VERSION:=1.0.20
+PKG_VERSION:=1.0.7
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/dnsmngr.git
-PKG_SOURCE_VERSION:=83e485fae8905f9061257264cf43ea41e47743a6
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.zst
+PKG_SOURCE_VERSION:=f6223f6034a57753ae9d1552ab1334194b1deaff
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 
@@ -27,53 +27,23 @@ MAKE_PATH:=src
 define Package/dnsmngr
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +odhcpd
-  DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service
-  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
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbfdm-api +dnsmasq +umdns
+  TITLE:=Package to add Device.DNS. datamodel support
 endef
 
 define Package/dnsmngr/description
-  Package to configure DNS backend and TR-181 support.
+  Package to add Device.DNS. datamodel 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
-	$(INSTALL_DIR) $(1)/etc/umdns
-	$(INSTALL_DIR) $(1)/etc/umdns/tmp
-	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
-	$(INSTALL_DATA) ./files/lib/upgrade/keep.d/dnsmngr $(1)/lib/upgrade/keep.d/dnsmngr
-	$(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) $(PKG_NAME)
 	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/libdnsmngr.so $(1) $(PKG_NAME)
 	$(BBFDM_INSTALL_SCRIPT) -d $(PKG_BUILD_DIR)/scripts/nslookup $(1)
-ifeq ($(CONFIG_DNSMNGR_DNS_SD),y)
-	$(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/src/libdns_sd.so $(1) $(PKG_NAME) 10
-endif
 endef
 
 $(eval $(call BuildPackage,dnsmngr))

dnsmngr/bbfdm_service.json

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

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

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

dslmngr/Makefile

@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dslmngr
-PKG_VERSION:=1.2.10
+PKG_VERSION:=1.2.6
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/hal/dslmngr.git
-PKG_SOURCE_VERSION:=8fb4093b4d26b3cb06603e110d424005e33cf5d6
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.zst
+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
@@ -30,8 +30,6 @@ include ../bbfdm/bbfdm.mk
 
 ifeq ($(CONFIG_TARGET_brcmbca),y)
   TARGET_PLATFORM=BROADCOM
-else ifneq ($(CONFIG_TARGET_airoha),)
-  TARGET_PLATFORM=AIROHA
 else
   $(info Unexpected CONFIG_TARGET)
 endif
@@ -42,8 +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+=+libbbfdm-api +libbbfdm-ubus +dm-service +TARGET_airoha:br2684ctl
+  DEPENDS:=+libdsl +libuci +libubox +ubus +libpthread +libnl-genl +libeasy +libbbfdm-api
 endef
 
 define Package/dslmngr/description
@@ -77,13 +74,9 @@ define Package/dslmngr/install
 	$(CP) ./files/common/* $(1)/
 ifeq ($(CONFIG_TARGET_brcmbca),y)
 	$(CP) ./files/broadcom/* $(1)/
-else ifneq ($(CONFIG_TARGET_airoha),)
-	$(CP) ./files/airoha/* $(1)/
 endif
-
 	$(INSTALL_DIR) $(1)/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/dslmngr $(1)/sbin/
-	$(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) $(PKG_NAME)
 	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/libbbfdsl.so $(1) $(PKG_NAME)
 endef
 

dslmngr/bbfdm_service.json

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

dslmngr/files/airoha/etc/init.d/xdsl_wan

@@ -1,26 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=99
-STOP=99
-USE_PROCD=1
-
-start_service() {
-	readonly need_xdsl="$(jsonfilter -i /etc/board.json -e @.dsl)"
-	[ -f /etc/board.json ] || return 0
-
-	if [ "$need_xdsl" != "" ]; then
-		procd_open_instance xdsl_wan
-		procd_set_param command /sbin/xdsl_wan
-		procd_set_param respawn
-		procd_close_instance
-	fi
-}
-
-boot() {
-	: # boot-up is handled from 'hsm' application
-}
-
-service_triggers()
-{
-	procd_add_reload_trigger "dsl"
-}

dslmngr/files/airoha/lib/dsl/airoha.sh

@@ -1,28 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-xtm_remove_devices() {
-	:
-}
-
-xtm_create_devices() {
-	:
-}
-
-xdsl_configure() {
-	# Support bridged WAN interface
-	ebtables --concurrent -t broute -D BROUTING -p 0xbeed -j DROP 2> /dev/null
-	ebtables --concurrent -t broute -I BROUTING -p 0xbeed -j DROP
-}
-
-xdsl_stop() {
-	return 0
-}
-
-xdsl_init() {
-	readonly need_xdsl="$(jsonfilter -i /etc/board.json -e @.dsl)"
-	[ "$need_xdsl" = "" ] && exit 0
-
-	echo "Starting DSL"
-}

dslmngr/files/airoha/sbin/xdsl_wan

@@ -1,270 +0,0 @@
-#!/bin/sh
-
-source "/lib/functions.sh"
-source "/lib/functions/network.sh"
-source "/lib/functions/system.sh"
-
-PREVLINK=""
-LINK=""
-LINKSPEED=""
-PREVWANMODE=""
-WANMODE=""
-CONFIGURED=0
-CINDEX=0
-WANPORT="$(jsonfilter -i /etc/board.json -e @.network.wan.device)"
-
-delete_atm_device() {
-	/userfs/bin/blapi_cmd xdsl atm_delete_interface $CINDEX
-	CINDEX=$((CINDEX+1))
-}
-
-delete_atm_devices() {
-	CINDEX=0
-	config_load dsl
-	config_foreach delete_atm_device atm-device
-}
-
-configure_atm_device() {
-	local vpi vci encapsulation qos_class pcr mbs scr
-	local encap qos ethmac
-
-	config_get vpi $1 vpi "8"
-	config_get vci $1 vci "35"
-	config_get encapsulation $1 encapsulation "llc"
-	config_get qos_class $1 qos_class "ubr"
-	config_get pcr $1 pcr "0"
-	config_get mbs $1 mbs "0"
-	config_get scr $1 scr "0"
-
-	case $encapsulation in # llc, vcmux
-		vcmux)
-			encap="1483 Bridged IP VC-Mux"
-		;;
-		*)
-			encap="1483 Bridged IP LLC"
-		;;
-
-	esac
-
-	ethmac="$(echo -n "$(macaddr_add 02:AA:BB:01:23:40 $((CINDEX+2)))" | sed 's#:##g')"
-
-	/userfs/bin/blapi_cmd xdsl create_device $CINDEX ATM "" "$ethmac"
-	/userfs/bin/blapi_cmd xdsl atm_create_interface $CINDEX ATM "$qos_class" "$encap" "$vpi" "$vci" "$pcr" "$scr" "$mbs" 0
-
-	CINDEX=$((CINDEX+1))
-}
-
-create_atm_devices() {
-	delete_atm_devices
-
-	CINDEX=0
-	config_foreach configure_atm_device atm-device
-}
-
-configure_line() {
-	local mode profile bitswap sra us0 sesdrop sos roc ginp gvector mod prof
-	local adsl1_flag=0 issue2_flag=0 Glite_flag=0 adsl2_flag=0 adsl2p_flag=0 vdsl2_flag=0
-	local pro_8a_flag=0 pro_8b_flag=0 pro_8c_flag=0 pro_8d_flag=0 pro_12a_flag=0 pro_12b_flag=0 pro_17a_flag=0 pro_30a_flag=0 pro_35b_flag=0
-
-	config_get mode $1 mode "vdsl2"
-	config_get profile $1 profile "35b"
-	config_get bitswap $1 bitswap "1"
-	config_get sra $1 sra "1"
-	config_get us0 $1 us0 "1"
-	config_get sos $1 sos "0"
-	config_get roc $1 roc "0"
-	config_get ginp $1 ginp "1"
-	config_get gvector $1 gvector "1"
-
-	for mod in $mode; do
-		[ "$mod" = "gdmt" ] && adsl1_flag=1
-		[ "$mod" = "glite" ] && Glite_flag=1
-		[ "$mod" = "t1413" ] && issue2_flag=1
-		[ "$mod" = "adsl2" ] && adsl2_flag=1
-		[ "$mod" = "adsl2p" ] && adsl2p_flag=1
-		[ "$mod" = "vdsl2" ] && vdsl2_flag=1
-	done
-
-	for prof in $profile; do
-		[ "$prof" = "8a" ] && pro_8a_flag=1
-		[ "$prof" = "8b" ] && pro_8b_flag=1
-		[ "$prof" = "8c" ] && pro_8c_flag=1
-		[ "$prof" = "8d" ] && pro_8d_flag=1
-		[ "$prof" = "12a" ] && pro_12a_flag=1
-		[ "$prof" = "12b" ] && pro_12b_flag=1
-		[ "$prof" = "17a" ] && pro_17a_flag=1
-		[ "$prof" = "30a" ] && pro_30a_flag=1
-		[ "$prof" = "35b" ] && pro_35b_flag=1
-	done
-
-	/userfs/bin/blapi_cmd xdsl set_adsl_profile "$pro_8a_flag" "$pro_8b_flag" "$pro_8c_flag" "$pro_8d_flag" "$pro_12a_flag" "$pro_12b_flag" "$pro_17a_flag" "$pro_30a_flag" "$pro_35b_flag"
-	/userfs/bin/blapi_cmd xdsl set_adsl_mode "$adsl1_flag" "$issue2_flag" "$Glite_flag" "$adsl2_flag" "$adsl2p_flag" "$vdsl2_flag"
-	/userfs/bin/blapi_cmd xdsl set_adsl_gvector "$((!gvector))"
-	/userfs/bin/blapi_cmd xdsl set_adsl_ginp "$((!ginp))"
-	/userfs/bin/blapi_cmd xdsl set_adsl_sos_roc "$((!sos))" "$((!roc))"
-	/userfs/bin/blapi_cmd xdsl set_adsl_us0 "$((!us0))"
-	/userfs/bin/blapi_cmd xdsl set_adsl_sra "$((!sra))"
-	/userfs/bin/blapi_cmd xdsl set_adsl_bitswap "$((!bitswap))"
-
-	CONFIGURED=1
-}
-
-configure_lines() {
-	config_load dsl
-	config_foreach configure_line dsl-line
-}
-
-call_wan_hotplug() {
-	# initializations
-	local updown="$1"
-	local ethwan="$2"
-
-	# ethernet hotlugs expect LINK and PORT environment variables set
-	env -i LINK="$updown" PORT="$ethwan" /sbin/hotplug-call ethernet
-}
-
-if [ "$WANPORT" = "ae_wan" -a -f /proc/device-tree/ae_wan/wan-dsl ]; then
-	/etc/init.d/br2684ctl stop
-else
-	/etc/init.d/br2684ctl start
-fi
-
-# Wait for nas0 interface to come up.
-while [ "$(devstatus "$WANPORT" | jsonfilter -e @.up)" != "true" ]; do
-	sleep 1
-done
-
-while [ true ]; do
-	LINK="$(awk '/ADSL link status:/{print $4}' /proc/tc3162/adsl_stats)"
-	[ \( "$LINK" = "down" -o "$LINK" = "up" \) ] && break
-	sleep 1
-done
-sleep 2
-
-/userfs/bin/blapi_cmd xdsl set_adsl_sysvid "26 00 47 4E 58 53 00 00" # GNXS vendor id
-/userfs/bin/blapi_cmd xdsl set_adsl_version "$(ubus call fwbank dump | jsonfilter -e "@.bank[@.active=true].swver" | cut -f1 -d'_' | cut -f1 -d'-' | hexdump -e '11/1 "%02x " "\n"' | head -n1)"
-/userfs/bin/blapi_cmd xdsl set_power_up_down 1
-/userfs/bin/blapi_cmd xdsl set_power_up_down 0
-sleep 1
-
-while [ true ]; do
-	LINK="$(awk '/ADSL link status:/{print $4}' /proc/tc3162/adsl_stats)"
-
-	if [ "$LINK" != "$PREVLINK" -a \( "$LINK" = "down" -o "$LINK" = "up" \) ]; then
-		if [ "$LINK" = "down" ]; then
-			if [ ! -s /tmp/qos/wan_link_shape_rate ]; then
-				rm -rf /tmp/qos/wan_link_shape_rate
-				rm -rf /tmp/qos/wan_link_speed
-				/usr/sbin/qos-uplink-bandwidth
-			fi
-
-			[ "$CONFIGURED" -eq 0 ] && configure_lines # Needs to be done once the slave SoC is in down state and we've not been able to auto-sync.
-			if [ -n "$WANMODE" ]; then
-				if [ "$WANMODE" = "PTM" ]; then
-					/userfs/bin/blapi_cmd xdsl ptm_do_reset_sequence 0 1
-				else
-					delete_atm_devices
-				fi
-			fi
-
-			call_wan_hotplug "down" "$WANPORT"
-		else
-			CONFIGURED=1
-			WANMODE="$(awk '/TPSTC type:/{print $4}' /proc/tc3162/adsl_stats)"
-			if [ "$WANMODE" != "$PREVWANMODE" ]; then
-				OLDWANPORT="$WANPORT"
-				network_defer_device "$OLDWANPORT"
-
-				if [ -f /proc/device-tree/ae_wan/wan-dsl ]; then
-					WANPORT="ae_wan"
-				else
-					WANPORT="nas10"
-				fi
-
-				if [ "$WANMODE" = "PTM" ]; then
-					/etc/init.d/br2684ctl stop
-					delete_atm_devices
-					/userfs/bin/blapi_cmd system set_wan_mode 1
-					/userfs/bin/blapi_cmd xdsl reload_ko 2
-					/userfs/bin/blapi_cmd xdsl ptm_do_reset_sequence 1 2
-
-					# Set extended TPID for PTM packet flow
-					sys memwl 1FB50000 81001839
-					# VLAN TPID - VLAN
-					sys memwl 1FB50F18 8100
-
-					ifconfig ${WANPORT} mtu 1500
-				else
-					/userfs/bin/blapi_cmd system set_wan_mode 0
-					/userfs/bin/blapi_cmd xdsl reload_ko 1
-					/etc/init.d/br2684ctl start
-
-					# Set extended TPID for ATM packet flow
-					sys memwl 1FB50000 884C1839
-					# VLAN TPID - MPOA
-					sys memwl 1FB50F18 884C
-
-					ifconfig ${WANPORT} mtu 1982
-					ifconfig ${WANPORT} down up
-
-					OLDWANPORT="$WANPORT"
-					ATMINDEX="$(cat /sys/class/atm/TSARM*/atmindex | tail -n1 2> /dev/null)"
-					WANPORT="nas$((ATMINDEX))"
-				fi
-
-				if [ "$OLDWANPORT" != "$WANPORT" ]; then
-					call_wan_hotplug "down" "$OLDWANPORT"
-
-					FILES="$(grep "$OLDWANPORT" /etc/config/* | cut -f1 -d: | uniq | cut -f4 -d/ | xargs)"
-					for FILE in $FILES; do
-						sed -i -e "s#${OLDWANPORT}#${WANPORT}#g" "/etc/config/${FILE}"
-						"/etc/init.d/${FILE}" restart
-					done
-				else
-					/etc/init.d/network restart
-				fi
-				ifconfig ${OLDWANPORT} down up
-			fi
-
-			if [ "$WANMODE" = "PTM" ]; then
-				: # ToDo
-			else
-				create_atm_devices
-			fi
-
-			call_wan_hotplug "up" "$WANPORT"
-			PREVWANMODE="$WANMODE"
-
-			if [ ! -s /tmp/qos/wan_link_shape_rate ]; then
-				LINKSPEED="$(awk '/far-end interleaved channel bit rate/{print $6}' /proc/tc3162/adsl_stats)"
-				LINKSPEED=$((LINKSPEED))
-				if [ "$LINKSPEED" -eq 0 ]; then
-					LINKSPEED="$(awk '/far-end fast channel bit rate/{print $6}' /proc/tc3162/adsl_stats)"
-					LINKSPEED=$((LINKSPEED))
-				fi
-
-				if [ "$LINKSPEED" -ne 0 ]; then
-					mkdir -p /tmp/qos
-					touch /tmp/qos/wan_link_shape_rate
-
-					/userfs/bin/qosrule discpline Rate uplink-bandwidth ${LINKSPEED}
-					hw_nat -! > /dev/null 2>&1
-				else
-					rm -rf /tmp/qos/wan_link_speed
-					/usr/sbin/qos-uplink-bandwidth
-				fi
-			fi
-		fi
-
-		# Toggle link state
-		network_defer_device "$WANPORT"
-		network_ready_device "$WANPORT"
-
-		# We are only interested in the transtion from init -> up/down and up/down -> down/up and vice versa.
-		# Since we poll the status via in-band signaling packets might get lost and the /procfs file is empty.
-		# This state we don't want to handle as it will toggle the link and do a re-setup which is totally unnecessary and unwanted.
-		PREVLINK="$LINK"
-	fi
-
-	sleep 5
-done

dslmngr/files/common/etc/config/dsl

@@ -25,7 +25,6 @@ config dsl-line line
 	list profile 12b
 	list profile 17a
 	list profile 30a
-	list profile 35b
 	option bitswap 1
 	option sra 1
 	option us0 1 # VDSL2 only

ebtables-extensions/Makefile

@@ -6,252 +6,75 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ebtables-extensions
-PKG_VERSION:=2.0.5
+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_VERSION:=7357622d806833d93d317164dc6673fbf5fd1629
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.zst
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 
 include $(INCLUDE_DIR)/package.mk
 
-define KernelPackage/ebt-vlantranslation
+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)
+  AUTOLOAD:=$(call AutoLoad,30,ebt_vlantranslation,1)
   KCONFIG:=
 endef
 
-define KernelPackage/ebt-dscp2pbit
+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)
+  AUTOLOAD:=$(call AutoLoad,30,ebt_dscp2pbit,1)
   KCONFIG:=
 endef
 
-define KernelPackage/ebt-dhcp
-  SUBMENU:=Other modules
-  TITLE:=Kernel module for ebtables DHCP snooping
-  FILES:=$(PKG_BUILD_DIR)/src/ebt_dhcp.ko
-  DEPENDS+=+kmod-ebtables
-  AUTOLOAD:=$(call AutoLoad,30,ebt_dhcp)
-  KCONFIG:=
-endef
-
-define KernelPackage/ebt-dhcpv6
-  SUBMENU:=Other modules
-  TITLE:=Kernel module for ebtables DHCPv6 snooping
-  FILES:=$(PKG_BUILD_DIR)/src/ebt_dhcpv6.ko
-  DEPENDS+=+kmod-ebtables
-  AUTOLOAD:=$(call AutoLoad,30,ebt_dhcpv6)
-  KCONFIG:=
-endef
-
-define KernelPackage/ebt-ra
-  SUBMENU:=Other modules
-  TITLE:=Kernel module for ebtables NDP/RA snooping
-  FILES:=$(PKG_BUILD_DIR)/src/ebt_ra.ko
-  DEPENDS+=+kmod-ebtables
-  AUTOLOAD:=$(call AutoLoad,30,ebt_ra)
-  KCONFIG:=
-endef
-
-define KernelPackage/ebt-dns
-  SUBMENU:=Other modules
-  TITLE:=Kernel module for ebtables DNS manipulation
-  FILES:=$(PKG_BUILD_DIR)/src/ebt_dns.ko
-  DEPENDS+=+kmod-ebtables
-  AUTOLOAD:=$(call AutoLoad,30,ebt_dns)
-  KCONFIG:=
-endef
-
-define KernelPackage/ebt-pppoe_disc
-  SUBMENU:=Other modules
-  TITLE:=Kernel module for ebtables PPPoE manipulation
-  FILES:=$(PKG_BUILD_DIR)/src/ebt_pppoe_disc.ko
-  DEPENDS+=+kmod-ebtables
-  AUTOLOAD:=$(call AutoLoad,30,ebt_pppoe_disc)
-  KCONFIG:=
-endef
-
-define KernelPackage/ebt-l2pt
-  SUBMENU:=Other modules
-  TITLE:=Kernel module for ebtables L2CP tunneling
-  FILES:=$(PKG_BUILD_DIR)/src/ebt_l2pt.ko
-  DEPENDS+=@TARGET_airoha +kmod-ebtables
-  AUTOLOAD:=$(call AutoLoad,30,ebt_l2pt)
-  KCONFIG:=
-endef
-
-define KernelPackage/ebt-xtarp
-  SUBMENU:=Other modules
-  TITLE:=Kernel module for ebtables extended ARP matching
-  FILES:=$(PKG_BUILD_DIR)/src/ebt_xtarp.ko
-  DEPENDS+=+kmod-ebtables
-  AUTOLOAD:=$(call AutoLoad,30,ebt_xtarp)
-  KCONFIG:=
-endef
-
-define KernelPackage/ebt-xtip
-  SUBMENU:=Other modules
-  TITLE:=Kernel module for ebtables extended IPv4 matching
-  FILES:=$(PKG_BUILD_DIR)/src/ebt_xtip.ko
-  DEPENDS+=+kmod-ebtables
-  AUTOLOAD:=$(call AutoLoad,30,ebt_xtip)
-  KCONFIG:=
-endef
-
-define KernelPackage/ebt-xtip6
-  SUBMENU:=Other modules
-  TITLE:=Kernel module for ebtables extended IPv6 matching
-  FILES:=$(PKG_BUILD_DIR)/src/ebt_xtip6.ko
-  DEPENDS+=+kmod-ebtables
-  AUTOLOAD:=$(call AutoLoad,30,ebt_xtip6)
-  KCONFIG:=
-endef
-
-define KernelPackage/ebt-igmpsnooping
-  SUBMENU:=Other modules
-  TITLE:=Kernel module for ebtables IGMP snooping
-  FILES:=$(PKG_BUILD_DIR)/src/ebt_igmpsnooping.ko
-  DEPENDS+=+kmod-ebtables
-  # AUTOLOAD:=$(call AutoLoad,30,ebt_igmpsnooping) - Will be loaded on demand
-  KCONFIG:=
-endef
-
-define KernelPackage/ebt-mldsnooping
-  SUBMENU:=Other modules
-  TITLE:=Kernel module for ebtables MLD snooping
-  FILES:=$(PKG_BUILD_DIR)/src/ebt_mldsnooping.ko
-  DEPENDS+=+kmod-ebtables
-  # AUTOLOAD:=$(call AutoLoad,30,ebt_mldsnooping) - Will be loaded on demand
-  KCONFIG:=
-endef
-
-define KernelPackage/ebt-dhcp/description
-	Kernel module to enable DHCP snooping for ebtables
-endef
-
-define KernelPackage/ebt-dhcpv6/description
-	Kernel module to enable DHCPv6 snooping for ebtables
-endef
-
-define KernelPackage/ebt-ra/description
-	Kernel module to enable NDP/RA snooping for ebtables
-endef
-
-define KernelPackage/ebt-dns/description
-	Kernel module to enable DNS manipulation for ebtables
-endef
-
-define KernelPackage/ebt-pppoe_disc/description
-	Kernel module to enable PPPoE manipulation for ebtables
-endef
-
-define KernelPackage/ebt-l2pt/description
-	Kernel module to enable L2CP tunneling for ebtables
-endef
-
-define KernelPackage/ebt-xtarp/description
-	Kernel module to enable extended ARP matching for ebtables
-endef
-
-define KernelPackage/ebt-xtip/description
-	Kernel module to enable extended IPv4 matching for ebtables
-endef
-
-define KernelPackage/ebt-xtip6/description
-	Kernel module to enable extended IPv6 matching for ebtables
-endef
-
-define KernelPackage/ebt-vlantranslation/description
+define KernelPackage/vlantranslation/description
 	Kernel module to enable VLAN translation for ebtables
 endef
 
-define KernelPackage/ebt-dscp2pbit/description
-	Kernel module to enable DSCP-to-Pbit mapping for ebtables
+define KernelPackage/dscp2pbit/description
+	Kernel module to enableDSCP-to-Pbit mapping for ebtables
 endef
 
-define KernelPackage/ebt-igmpsnooping/description
-	Kernel module to enable IGMP snooping for ebtables
-endef
-
-define KernelPackage/ebt-mldsnooping/description
-	Kernel module to enable MLD snooping for ebtables
-endef
-
--include ../../broadcom/bcmkernel/bcm-kernel-toolchain.mk
-
-define Build/Prepare
+ifeq ($(CONFIG_TARGET_brcmbca),y)
+	include ../../broadcom/bcmkernel/bcm-kernel-toolchain.mk
+endif
 
 ifeq ($(LOCAL_DEV),1)
-	$(CP) -rf ./ebtables-extensions/* $(PKG_BUILD_DIR)/
-else
-	$(Build/Prepare/Default)
-endif
+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/
-	$(CP) $(PKG_BUILD_DIR)/src/ebt_dhcp.h $(LINUX_DIR)/include/uapi/linux/netfilter_bridge/
-	$(CP) $(PKG_BUILD_DIR)/src/ebt_dhcpv6.h $(LINUX_DIR)/include/uapi/linux/netfilter_bridge/
-	$(CP) $(PKG_BUILD_DIR)/src/ebt_ra.h $(LINUX_DIR)/include/uapi/linux/netfilter_bridge/
-	$(CP) $(PKG_BUILD_DIR)/src/ebt_dns.h $(LINUX_DIR)/include/uapi/linux/netfilter_bridge/
-	$(CP) $(PKG_BUILD_DIR)/src/ebt_pppoe_disc.h $(LINUX_DIR)/include/uapi/linux/netfilter_bridge/
-ifeq ($(CONFIG_TARGET_airoha),y)
-	$(CP) $(PKG_BUILD_DIR)/src/ebt_l2pt.h $(LINUX_DIR)/include/uapi/linux/netfilter_bridge/
-endif
-	$(CP) $(PKG_BUILD_DIR)/src/ebt_xtarp.h $(LINUX_DIR)/include/uapi/linux/netfilter_bridge/
-	$(CP) $(PKG_BUILD_DIR)/src/ebt_xtip.h $(LINUX_DIR)/include/uapi/linux/netfilter_bridge/
-	$(CP) $(PKG_BUILD_DIR)/src/ebt_xtip6.h $(LINUX_DIR)/include/uapi/linux/netfilter_bridge/
-	$(CP) $(PKG_BUILD_DIR)/src/ebt_igmpsnooping.h $(LINUX_DIR)/include/uapi/linux/netfilter_bridge/
-	$(CP) $(PKG_BUILD_DIR)/src/ebt_mldsnooping.h $(LINUX_DIR)/include/uapi/linux/netfilter_bridge/
 endef
+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/
-	$(CP) $(PKG_BUILD_DIR)/src/ebt_dhcp.h $(1)/include/uapi/linux/netfilter_bridge/
-	$(CP) $(PKG_BUILD_DIR)/src/ebt_dhcpv6.h $(1)/include/uapi/linux/netfilter_bridge/
-	$(CP) $(PKG_BUILD_DIR)/src/ebt_ra.h $(1)/include/uapi/linux/netfilter_bridge/
-	$(CP) $(PKG_BUILD_DIR)/src/ebt_dns.h $(1)/include/uapi/linux/netfilter_bridge/
-	$(CP) $(PKG_BUILD_DIR)/src/ebt_pppoe_disc.h $(1)/include/uapi/linux/netfilter_bridge/
-ifeq ($(CONFIG_TARGET_airoha),y)
-	$(CP) $(PKG_BUILD_DIR)/src/ebt_l2pt.h $(1)/include/uapi/linux/netfilter_bridge/
-endif
-	$(CP) $(PKG_BUILD_DIR)/src/ebt_xtarp.h $(1)/include/uapi/linux/netfilter_bridge/
-	$(CP) $(PKG_BUILD_DIR)/src/ebt_xtip.h $(1)/include/uapi/linux/netfilter_bridge/
-	$(CP) $(PKG_BUILD_DIR)/src/ebt_xtip6.h $(1)/include/uapi/linux/netfilter_bridge/
-	$(CP) $(PKG_BUILD_DIR)/src/ebt_igmpsnooping.h $(1)/include/uapi/linux/netfilter_bridge/
-	$(CP) $(PKG_BUILD_DIR)/src/ebt_mldsnooping.h $(1)/include/uapi/linux/netfilter_bridge/
 endef
 
-ifeq ($(CONFIG_TARGET_airoha),y)
-  KERNEL_MAKE_FLAGS += PLATFORM="ECONET"
-endif
+KERNEL_MAKE_FLAGS += -I$(LINUX_DIR)/include
 
 define Build/Compile
 	$(KERNEL_MAKE) M="$(PKG_BUILD_DIR)/src" modules
 endef
 
-$(eval $(call KernelPackage,ebt-vlantranslation))
-$(eval $(call KernelPackage,ebt-dscp2pbit))
-$(eval $(call KernelPackage,ebt-dhcp))
-$(eval $(call KernelPackage,ebt-dhcpv6))
-$(eval $(call KernelPackage,ebt-ra))
-$(eval $(call KernelPackage,ebt-dns))
-$(eval $(call KernelPackage,ebt-pppoe_disc))
-$(eval $(call KernelPackage,ebt-l2pt))
-$(eval $(call KernelPackage,ebt-xtarp))
-$(eval $(call KernelPackage,ebt-xtip))
-$(eval $(call KernelPackage,ebt-xtip6))
-$(eval $(call KernelPackage,ebt-igmpsnooping))
-$(eval $(call KernelPackage,ebt-mldsnooping))
+$(eval $(call KernelPackage,vlantranslation))
+$(eval $(call KernelPackage,dscp2pbit))

emctrl2/Makefile

@@ -0,0 +1,29 @@
+#
+# Copyright (C) 2020-2024 iopsys
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=emctrl2
+PKG_VERSION:=1.0.0
+
+PKG_LICENSE:=BSD-3-Clause
+
+include $(INCLUDE_DIR)/package.mk
+include ../bbfdm/bbfdm.mk
+
+define Package/emctrl2
+ CATEGORY:=Utilities
+ TITLE:= EasyMesh Controller V2
+ DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libbbfdm-api
+endef
+
+define Package/emctrl2/description
+	Em Controller to provide extended WiFi DataElement features
+endef
+
+define Package/emctrl2/install
+	$(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/libemctrl2.so $(1) wifidmd
+endef
+
+$(eval $(call BuildPackage,emctrl2))

emctrl2/src/Makefile

@@ -0,0 +1,21 @@
+LIBOUT := libemctrl2.so
+
+LIBOBJS := datamodel_override.o
+
+PROG_CFLAGS = $(CFLAGS) -Wno-unused-parameter -fstrict-aliasing -g
+LIB_LDFLAGS = $(LDFLAGS)
+
+FPIC := -fPIC
+
+.PHONY: all
+
+%.o: %.c
+	$(CC) $(PROG_CFLAGS) $(FPIC) -c -o $@ $<
+
+all: $(LIBOUT)
+
+$(LIBOUT): $(LIBOBJS)
+	$(CC) $(PROG_CFLAGS) $(LIB_LDFLAGS) -shared -o $@ $^
+
+clean:
+	rm -f *.o $(LIBOUT)

emctrl2/src/datamodel_override.c

@@ -0,0 +1,546 @@
+/*
+ * Copyright (C) 2023 iopsys Software Solutions AB
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 2.1
+ * as published by the Free Software Foundation
+ *
+ *	Author: <Name> <Surname> <name.surname@iopsys.eu>
+ */
+
+#include <libbbfdm-api/dmcommon.h>
+
+
+/*************************************************************
+* ENTRY METHOD
+**************************************************************/
+static int browseWiFiDataElementsNetworkSSIDInst(struct dmctx *dmctx, DMNODE *parent_node, void *prev_data, char *prev_instance)
+{
+	//TODO
+	struct dm_data *curr_data = NULL;
+	char *inst = NULL, *mld_id = NULL;
+
+	// loop to create multiple multi-instance objects
+	for(int i=0; i<=1; i++) {
+		char inst[3] = {0};
+
+		// inst is instance number for the object
+		snprintf(inst, sizeof(inst), "%d", i+1);
+		// This API creates instance, curr_data is to pass some instance specific information to child object, children can access this info from *prev_data
+		if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)curr_data, inst) == DM_STOP)
+			break;
+	}
+	return 0;
+}
+
+static int browseWiFiDataElementsNetworkDeviceDefault8021QInst(struct dmctx *dmctx, DMNODE *parent_node, void *prev_data, char *prev_instance)
+{
+	//TODO
+	BBF_ERR("Debug print");
+	// Instances can be created statically as well
+	DM_LINK_INST_OBJ(dmctx, parent_node, prev_data, "1");
+	return 0;
+}
+
+static int browseWiFiDataElementsNetworkDeviceRadioBSSSTAMultiAPSTASteeringHistoryInst(struct dmctx *dmctx, DMNODE *parent_node, void *prev_data, char *prev_instance)
+{
+	//TODO
+	BBF_ERR("Debug print");
+	return 0;
+}
+
+/*************************************************************
+* ADD & DEL OBJ
+**************************************************************/
+static int addObjWiFiDataElementsNetworkDeviceDefault8021Q(char *refparam, struct dmctx *ctx, void *data, char **instance)
+{
+	//TODO
+	return 0;
+}
+
+static int delObjWiFiDataElementsNetworkDeviceDefault8021Q(char *refparam, struct dmctx *ctx, void *data, char *instance, unsigned char del_action)
+{
+	//TODO
+	return 0;
+}
+
+/*************************************************************
+* GET & SET PARAM
+**************************************************************/
+static int get_WiFiDataElementsNetwork_SSIDNumberOfEntries(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
+{
+	int cnt = get_number_of_entries(ctx, data, instance, browseWiFiDataElementsNetworkSSIDInst);
+	dmasprintf(value, "%d", cnt);
+	return 0;
+}
+
+static int get_WiFiDataElementsNetworkSSID_SSID(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
+{
+	//TODO
+	return 0;
+}
+
+static int get_WiFiDataElementsNetworkSSID_Band(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
+{
+	//TODO
+	return 0;
+}
+
+static int get_WiFiDataElementsNetworkSSID_Enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
+{
+	//TODO
+	return 0;
+}
+
+static int get_WiFiDataElementsNetworkSSID_AKMsAllowed(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
+{
+	//TODO
+	return 0;
+}
+
+static int get_WiFiDataElementsNetworkSSID_SuiteSelector(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
+{
+	//TODO
+	return 0;
+}
+
+static int get_WiFiDataElementsNetworkSSID_AdvertisementEnabled(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
+{
+	//TODO
+	return 0;
+}
+
+static int get_WiFiDataElementsNetworkSSID_MFPConfig(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
+{
+	//TODO
+	return 0;
+}
+
+static int get_WiFiDataElementsNetworkSSID_MobilityDomain(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
+{
+	//TODO
+	return 0;
+}
+
+static int get_WiFiDataElementsNetworkSSID_HaulType(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
+{
+	//TODO
+	return 0;
+}
+
+static int get_WiFiDataElementsNetworkDevice_TrafficSeparationAllowed(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
+{
+	//TODO
+	return 0;
+}
+
+static int get_WiFiDataElementsNetworkDevice_Default8021QNumberOfEntries(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
+{
+	int cnt = get_number_of_entries(ctx, data, instance, browseWiFiDataElementsNetworkDeviceDefault8021QInst);
+	dmasprintf(value, "%d", cnt);
+	return 0;
+}
+
+static int get_WiFiDataElementsNetworkDeviceDefault8021Q_Enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
+{
+	//TODO
+	return 0;
+}
+
+static int set_WiFiDataElementsNetworkDeviceDefault8021Q_Enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)
+{
+	switch (action)	{
+		case VALUECHECK:
+			if (bbfdm_validate_boolean(ctx, value))
+				return FAULT_9007;
+			break;
+		case VALUESET:
+			//TODO
+			break;
+	}
+	return 0;
+}
+
+static int get_WiFiDataElementsNetworkDeviceDefault8021Q_PrimaryVID(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
+{
+	//TODO
+	return 0;
+}
+
+static int set_WiFiDataElementsNetworkDeviceDefault8021Q_PrimaryVID(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)
+{
+	switch (action)	{
+		case VALUECHECK:
+			if (bbfdm_validate_unsignedInt(ctx, value, RANGE_ARGS{{NULL,"4095"}}, 1))
+				return FAULT_9007;
+			break;
+		case VALUESET:
+			//TODO
+			break;
+	}
+	return 0;
+}
+
+static int get_WiFiDataElementsNetworkDeviceDefault8021Q_DefaultPCP(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
+{
+	//TODO
+	return 0;
+}
+
+static int set_WiFiDataElementsNetworkDeviceDefault8021Q_DefaultPCP(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)
+{
+	switch (action)	{
+		case VALUECHECK:
+			if (bbfdm_validate_unsignedInt(ctx, value, RANGE_ARGS{{NULL,"7"}}, 1))
+				return FAULT_9007;
+			break;
+		case VALUESET:
+			//TODO
+			break;
+	}
+	return 0;
+}
+
+static int get_WiFiDataElementsNetworkDeviceRadioBSSSTAMultiAPSTASteeringHistory_Time(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
+{
+	//TODO
+	return 0;
+}
+
+static int get_WiFiDataElementsNetworkDeviceRadioBSSSTAMultiAPSTASteeringHistory_APOrigin(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
+{
+	//TODO
+	return 0;
+}
+
+static int get_WiFiDataElementsNetworkDeviceRadioBSSSTAMultiAPSTASteeringHistory_TriggerEvent(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
+{
+	//TODO
+	return 0;
+}
+
+static int get_WiFiDataElementsNetworkDeviceRadioBSSSTAMultiAPSTASteeringHistory_SteeringApproach(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
+{
+	//TODO
+	return 0;
+}
+
+static int get_WiFiDataElementsNetworkDeviceRadioBSSSTAMultiAPSTASteeringHistory_APDestination(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
+{
+	//TODO
+	return 0;
+}
+
+static int get_WiFiDataElementsNetworkDeviceRadioBSSSTAMultiAPSTASteeringHistory_SteeringDuration(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
+{
+	//TODO
+	return 0;
+}
+
+static int get_WiFiDataElementsNetworkDeviceRadioBSSSTAMultiAPSTA_SteeringHistoryNumberOfEntries(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
+{
+	int cnt = get_number_of_entries(ctx, data, instance, browseWiFiDataElementsNetworkDeviceRadioBSSSTAMultiAPSTASteeringHistoryInst);
+	dmasprintf(value, "%d", cnt);
+	return 0;
+}
+
+/*************************************************************
+* OPERATE COMMANDS
+**************************************************************/
+static operation_args wifidataelementsnetwork_settrafficseparation_args = {
+    .in = (const char *[]) {
+        "Enable",
+        NULL
+    },
+    .out = (const char *[]) {
+        "Status",
+        NULL
+    }
+};
+
+static int get_operate_args_WiFiDataElementsNetwork_SetTrafficSeparation(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
+{
+    *value = (char *)&wifidataelementsnetwork_settrafficseparation_args;
+    return 0;
+}
+
+static int operate_WiFiDataElementsNetwork_SetTrafficSeparation(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)
+{
+    //TODO
+    return 0;
+}
+
+static operation_args wifidataelementsnetwork_setpreferredbackhauls_args = {
+    .in = (const char *[]) {
+        NULL
+    },
+    .out = (const char *[]) {
+        "Status",
+        NULL
+    }
+};
+
+static int get_operate_args_WiFiDataElementsNetwork_SetPreferredBackhauls(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
+{
+    *value = (char *)&wifidataelementsnetwork_setpreferredbackhauls_args;
+    return 0;
+}
+
+static int operate_WiFiDataElementsNetwork_SetPreferredBackhauls(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)
+{
+    //TODO
+    return 0;
+}
+
+static operation_args wifidataelementsnetwork_setssid_args = {
+    .in = (const char *[]) {
+        "SSID",
+        "Enable",
+        "AddRemoveChange",
+        "PassPhrase",
+        "Band",
+        "AKMsAllowed",
+        "SuiteSelector",
+        "AdvertisementEnabled",
+        "MFPConfig",
+        "MobilityDomain",
+        "HaulType",
+        NULL
+    },
+    .out = (const char *[]) {
+        "Status",
+        NULL
+    }
+};
+
+static int get_operate_args_WiFiDataElementsNetwork_SetSSID(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
+{
+    *value = (char *)&wifidataelementsnetwork_setssid_args;
+    return 0;
+}
+
+static int operate_WiFiDataElementsNetwork_SetSSID(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)
+{
+    //TODO
+    return 0;
+}
+
+static operation_args wifidataelementsnetwork_setmscsdisallowed_args = {
+    .in = (const char *[]) {
+        "MSCSDisallowedStaList",
+        NULL
+    },
+    .out = (const char *[]) {
+        "Status",
+        NULL
+    }
+};
+
+static operation_args wifidataelementsnetworkdevice_setstasteeringstate_args = {
+    .in = (const char *[]) {
+        "Disallowed",
+        NULL
+    },
+    .out = (const char *[]) {
+        "Status",
+        NULL
+    }
+};
+
+static int get_operate_args_WiFiDataElementsNetworkDevice_SetSTASteeringState(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
+{
+    *value = (char *)&wifidataelementsnetworkdevice_setstasteeringstate_args;
+    return 0;
+}
+
+static int operate_WiFiDataElementsNetworkDevice_SetSTASteeringState(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)
+{
+    //TODO
+    return 0;
+}
+
+static operation_args wifidataelementsnetworkdevicemultiapdevicebackhaul_steerwifibackhaul_args = {
+    .in = (const char *[]) {
+        "TargetBSS",
+        "Channel",
+        "TimeOut",
+        NULL
+    },
+    .out = (const char *[]) {
+        "Status",
+        NULL
+    }
+};
+
+static int get_operate_args_WiFiDataElementsNetworkDeviceMultiAPDeviceBackhaul_SteerWiFiBackhaul(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
+{
+    *value = (char *)&wifidataelementsnetworkdevicemultiapdevicebackhaul_steerwifibackhaul_args;
+    return 0;
+}
+
+static int operate_WiFiDataElementsNetworkDeviceMultiAPDeviceBackhaul_SteerWiFiBackhaul(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)
+{
+    //TODO
+    return 0;
+}
+
+static operation_args wifidataelementsnetworkdeviceradio_channelscanrequest_args = {
+    .in = (const char *[]) {
+        "OpClass",
+        "ChannelList",
+        "ScanType",
+        "DwellTime",
+        "DFSDwellTime",
+        "HomeTime",
+        NULL
+    },
+    .out = (const char *[]) {
+        "Status",
+        NULL
+    }
+};
+
+static int get_operate_args_WiFiDataElementsNetworkDeviceRadio_ChannelScanRequest(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
+{
+    *value = (char *)&wifidataelementsnetworkdeviceradio_channelscanrequest_args;
+    return 0;
+}
+
+static int operate_WiFiDataElementsNetworkDeviceRadio_ChannelScanRequest(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)
+{
+    //TODO
+    return 0;
+}
+
+static operation_args wifidataelementsnetworkdeviceradiobssstamultiapsta_btmrequest_args = {
+    .in = (const char *[]) {
+        "DisassociationImminent",
+        "DisassociationTimer",
+        "BSSTerminationDuration",
+        "ValidityInterval",
+        "SteeringTimer",
+        "TargetBSS",
+        NULL
+    },
+    .out = (const char *[]) {
+        "Status",
+        NULL
+    }
+};
+
+static int get_operate_args_WiFiDataElementsNetworkDeviceRadioBSSSTAMultiAPSTA_BTMRequest(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
+{
+    *value = (char *)&wifidataelementsnetworkdeviceradiobssstamultiapsta_btmrequest_args;
+    return 0;
+}
+
+static int operate_WiFiDataElementsNetworkDeviceRadioBSSSTAMultiAPSTA_BTMRequest(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)
+{
+    //TODO
+    return 0;
+}
+/**********************************************************************************************************************************
+*                                            OBJ & PARAM DEFINITION
+***********************************************************************************************************************************/
+DMLEAF tWiFiDataElementsNetworkParams[] = {
+/* PARAM, permission, type, getvalue, setvalue, bbfdm_type */
+{"SSIDNumberOfEntries", &DMREAD, DMT_UNINT, get_WiFiDataElementsNetwork_SSIDNumberOfEntries, NULL, BBFDM_BOTH},
+{"SetTrafficSeparation()", &DMASYNC, DMT_COMMAND, get_operate_args_WiFiDataElementsNetwork_SetTrafficSeparation, operate_WiFiDataElementsNetwork_SetTrafficSeparation, BBFDM_USP},
+{"SetPreferredBackhauls()", &DMASYNC, DMT_COMMAND, get_operate_args_WiFiDataElementsNetwork_SetPreferredBackhauls, operate_WiFiDataElementsNetwork_SetPreferredBackhauls, BBFDM_USP},
+{"SetSSID()", &DMASYNC, DMT_COMMAND, get_operate_args_WiFiDataElementsNetwork_SetSSID, operate_WiFiDataElementsNetwork_SetSSID, BBFDM_USP},
+{0}
+};
+
+/* *** Device.WiFi.DataElements.Network.SSID.{i}. *** */
+DMLEAF tWiFiDataElementsNetworkSSIDParams[] = {
+/* PARAM, permission, type, getvalue, setvalue, bbfdm_type */
+{"SSID", &DMREAD, DMT_STRING, get_WiFiDataElementsNetworkSSID_SSID, NULL, BBFDM_BOTH},
+{"Band", &DMREAD, DMT_STRING, get_WiFiDataElementsNetworkSSID_Band, NULL, BBFDM_BOTH},
+{"Enable", &DMREAD, DMT_BOOL, get_WiFiDataElementsNetworkSSID_Enable, NULL, BBFDM_BOTH},
+{"AKMsAllowed", &DMREAD, DMT_STRING, get_WiFiDataElementsNetworkSSID_AKMsAllowed, NULL, BBFDM_BOTH},
+{"SuiteSelector", &DMREAD, DMT_HEXBIN, get_WiFiDataElementsNetworkSSID_SuiteSelector, NULL, BBFDM_BOTH},
+{"AdvertisementEnabled", &DMREAD, DMT_BOOL, get_WiFiDataElementsNetworkSSID_AdvertisementEnabled, NULL, BBFDM_BOTH},
+{"MFPConfig", &DMREAD, DMT_STRING, get_WiFiDataElementsNetworkSSID_MFPConfig, NULL, BBFDM_BOTH},
+{"MobilityDomain", &DMREAD, DMT_STRING, get_WiFiDataElementsNetworkSSID_MobilityDomain, NULL, BBFDM_BOTH},
+{"HaulType", &DMREAD, DMT_STRING, get_WiFiDataElementsNetworkSSID_HaulType, NULL, BBFDM_BOTH},
+{0}
+};
+
+/* *** Device.WiFi.DataElements.Network. *** */
+DMOBJ tWiFiDataElementsNetworkObj[] = {
+/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, nextdynamicobj, dynamicleaf, nextobj, leaf, linker, bbfdm_type, uniqueKeys */
+{"SSID", &DMREAD, NULL, NULL, NULL, browseWiFiDataElementsNetworkSSIDInst, NULL, NULL, NULL, tWiFiDataElementsNetworkSSIDParams, NULL, BBFDM_BOTH, NULL},
+{0}
+};
+
+DMLEAF tWiFiDataElementsNetworkDeviceParams[] = {
+/* PARAM, permission, type, getvalue, setvalue, bbfdm_type */
+{"TrafficSeparationAllowed", &DMREAD, DMT_BOOL, get_WiFiDataElementsNetworkDevice_TrafficSeparationAllowed, NULL, BBFDM_BOTH},
+{"SetSTASteeringState()", &DMASYNC, DMT_COMMAND, get_operate_args_WiFiDataElementsNetworkDevice_SetSTASteeringState, operate_WiFiDataElementsNetworkDevice_SetSTASteeringState, BBFDM_USP},
+{"Default8021QNumberOfEntries", &DMREAD, DMT_UNINT, get_WiFiDataElementsNetworkDevice_Default8021QNumberOfEntries, NULL, BBFDM_BOTH},
+{0}
+};
+
+/* *** Device.WiFi.DataElements.Network.Device.{i}.Default8021Q.{i}. *** */
+DMLEAF tWiFiDataElementsNetworkDeviceDefault8021QParams[] = {
+/* PARAM, permission, type, getvalue, setvalue, bbfdm_type */
+{"Enable", &DMWRITE, DMT_BOOL, get_WiFiDataElementsNetworkDeviceDefault8021Q_Enable, set_WiFiDataElementsNetworkDeviceDefault8021Q_Enable, BBFDM_BOTH},
+{"PrimaryVID", &DMWRITE, DMT_UNINT, get_WiFiDataElementsNetworkDeviceDefault8021Q_PrimaryVID, set_WiFiDataElementsNetworkDeviceDefault8021Q_PrimaryVID, BBFDM_BOTH},
+{"DefaultPCP", &DMWRITE, DMT_UNINT, get_WiFiDataElementsNetworkDeviceDefault8021Q_DefaultPCP, set_WiFiDataElementsNetworkDeviceDefault8021Q_DefaultPCP, BBFDM_BOTH},
+{0}
+};
+
+DMOBJ tWiFiDataElementsNetworkDeviceObj[] = {
+/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, nextdynamicobj, dynamicleaf, nextobj, leaf, linker, bbfdm_type, uniqueKeys, version*/
+{"Default8021Q", &DMWRITE, addObjWiFiDataElementsNetworkDeviceDefault8021Q, delObjWiFiDataElementsNetworkDeviceDefault8021Q, NULL, browseWiFiDataElementsNetworkDeviceDefault8021QInst, NULL, NULL, NULL, tWiFiDataElementsNetworkDeviceDefault8021QParams, NULL, BBFDM_BOTH, NULL},
+{0}
+};
+
+DMLEAF tWiFiDataElementsNetworkDeviceMultiAPDeviceBackhaulParams[] = {
+/* PARAM, permission, type, getvalue, setvalue, bbfdm_type */
+{"SteerWiFiBackhaul()", &DMASYNC, DMT_COMMAND, get_operate_args_WiFiDataElementsNetworkDeviceMultiAPDeviceBackhaul_SteerWiFiBackhaul, operate_WiFiDataElementsNetworkDeviceMultiAPDeviceBackhaul_SteerWiFiBackhaul, BBFDM_USP},
+{0}
+};
+
+
+DMLEAF tWiFiDataElementsNetworkDeviceRadioParams[] = {
+/* PARAM, permission, type, getvalue, setvalue, bbfdm_type */
+{"ChannelScanRequest()", &DMASYNC, DMT_COMMAND, get_operate_args_WiFiDataElementsNetworkDeviceRadio_ChannelScanRequest, operate_WiFiDataElementsNetworkDeviceRadio_ChannelScanRequest, BBFDM_USP},
+{0}
+};
+
+/* *** Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.MultiAPSTA.SteeringHistory.{i}. *** */
+DMLEAF tWiFiDataElementsNetworkDeviceRadioBSSSTAMultiAPSTASteeringHistoryParams[] = {
+/* PARAM, permission, type, getvalue, setvalue, bbfdm_type */
+{"Time", &DMREAD, DMT_TIME, get_WiFiDataElementsNetworkDeviceRadioBSSSTAMultiAPSTASteeringHistory_Time, NULL, BBFDM_BOTH},
+{"APOrigin", &DMREAD, DMT_STRING, get_WiFiDataElementsNetworkDeviceRadioBSSSTAMultiAPSTASteeringHistory_APOrigin, NULL, BBFDM_BOTH},
+{"TriggerEvent", &DMREAD, DMT_STRING, get_WiFiDataElementsNetworkDeviceRadioBSSSTAMultiAPSTASteeringHistory_TriggerEvent, NULL, BBFDM_BOTH},
+{"SteeringApproach", &DMREAD, DMT_STRING, get_WiFiDataElementsNetworkDeviceRadioBSSSTAMultiAPSTASteeringHistory_SteeringApproach, NULL, BBFDM_BOTH},
+{"APDestination", &DMREAD, DMT_STRING, get_WiFiDataElementsNetworkDeviceRadioBSSSTAMultiAPSTASteeringHistory_APDestination, NULL, BBFDM_BOTH},
+{"SteeringDuration", &DMREAD, DMT_UNINT, get_WiFiDataElementsNetworkDeviceRadioBSSSTAMultiAPSTASteeringHistory_SteeringDuration, NULL, BBFDM_BOTH},
+{0}
+};
+
+/* *** Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.MultiAPSTA. *** */
+DMOBJ tWiFiDataElementsNetworkDeviceRadioBSSSTAMultiAPSTAObj[] = {
+/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, nextdynamicobj, dynamicleaf, nextobj, leaf, linker, bbfdm_type, uniqueKeys */
+{"SteeringHistory", &DMREAD, NULL, NULL, NULL, browseWiFiDataElementsNetworkDeviceRadioBSSSTAMultiAPSTASteeringHistoryInst, NULL, NULL, NULL, tWiFiDataElementsNetworkDeviceRadioBSSSTAMultiAPSTASteeringHistoryParams, NULL, BBFDM_BOTH, NULL},
+{0}
+};
+
+DMLEAF tWiFiDataElementsNetworkDeviceRadioBSSSTAMultiAPSTAParams[] = {
+/* PARAM, permission, type, getvalue, setvalue, bbfdm_type */
+{"SteeringHistoryNumberOfEntries", &DMREAD, DMT_UNINT, get_WiFiDataElementsNetworkDeviceRadioBSSSTAMultiAPSTA_SteeringHistoryNumberOfEntries, NULL, BBFDM_BOTH},
+{"BTMRequest()", &DMASYNC, DMT_COMMAND, get_operate_args_WiFiDataElementsNetworkDeviceRadioBSSSTAMultiAPSTA_BTMRequest, operate_WiFiDataElementsNetworkDeviceRadioBSSSTAMultiAPSTA_BTMRequest, BBFDM_USP},
+{0}
+};
+
+DM_MAP_OBJ tDynamicObj[] = {
+/* parentobj, nextobject, parameter */
+{"Device.WiFi.DataElements.Network.", tWiFiDataElementsNetworkObj, tWiFiDataElementsNetworkParams},
+{"Device.WiFi.DataElements.Network.Device.{i}.", tWiFiDataElementsNetworkDeviceObj, tWiFiDataElementsNetworkDeviceParams},
+{"Device.WiFi.DataElements.Network.Device.{i}.MultiAPDevice.Backhaul.", NULL, tWiFiDataElementsNetworkDeviceMultiAPDeviceBackhaulParams},
+{"Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.", NULL, tWiFiDataElementsNetworkDeviceRadioParams},
+{"Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.MultiAPSTA.", tWiFiDataElementsNetworkDeviceRadioBSSSTAMultiAPSTAObj,tWiFiDataElementsNetworkDeviceRadioBSSSTAMultiAPSTAParams},
+{0}
+};

ethmngr/Config.in

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

ethmngr/Makefile

@@ -5,29 +5,29 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ethmngr
-PKG_VERSION:=3.1.4
+PKG_VERSION:=2.1.9
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/hal/ethmngr.git
-PKG_SOURCE_VERSION:=0283fb5cb74a7baca46c4360da680757c57c86ac
+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 $(TOPDIR)/feeds/iopsys/bbfdm/bbfdm.mk
+include ../bbfdm/bbfdm.mk
 
 define Package/ethmngr
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=Ethernet status and configration utility
-  DEPENDS:=+libethernet +libuci +libubox +ubus +libpthread +libnl-genl +libeasy
-  DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service +libblobmsg-json +libjson-c +libc +libubus
+  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
@@ -40,39 +40,39 @@ define Package/$(PKG_NAME)/config
        source "$(SOURCE)/Config.in"
 endef
 
-TARGET_CFLAGS += \
-	-I$(STAGING_DIR)/usr/include \
-	-I$(STAGING_DIR)/usr/include/libnl3 \
-	-D_GNU_SOURCE
-
-ifeq ($(CONFIG_ETHMNGR_VENDOR_PREFIX),"")
-VENDOR_PREFIX = $(CONFIG_BBF_VENDOR_PREFIX)
-else
-VENDOR_PREFIX = $(CONFIG_ETHMNGR_VENDOR_PREFIX)
-endif
-
-TARGET_CFLAGS += -DBBF_VENDOR_PREFIX=\\\"$(VENDOR_PREFIX)\\\"
-
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
-        $(CP) -rf ~/git/ethmngr/* $(PKG_BUILD_DIR)/
+        $(CP) -rf ./ethmngr/* $(PKG_BUILD_DIR)/
 endef
 endif
 
+TARGET_CFLAGS += \
+	-I$(STAGING_DIR)/usr/include \
+	-I$(STAGING_DIR)/usr/include/libnl3 \
+	-D_GNU_SOURCE \
+	-DBBF_VENDOR_PREFIX=\\\"$(CONFIG_BBF_VENDOR_PREFIX)\\\"
 
-ifeq ($(CONFIG_ETHMNGR_MACVLAN_EXTENSION),y)
-TARGET_CFLAGS += -DETHMNGR_MACVLAN_EXTENSION
+ifeq ($(CONFIG_TR181_VENDOR_EXTENSIONS_MACVLAN),y)
+TARGET_CFLAGS += -DTR181_VENDOR_EXTENSIONS_MACVLAN
 endif
 
-ifeq ($(CONFIG_ETHMNGR_EXPOSE_ETHERNET_OBJECT),y)
-TARGET_CFLAGS += -DETHMNGR_EXPOSE_ETHERNET_OBJECT
+ifeq ($(CONFIG_TARGET_brcmbca)$(CONFIG_TARGET_airoha)$(CONFIG_TARGET_ipq95xx)$(CONFIG_TARGET_ipq53xx)$(CONFIG_TARGET_mediatek),)
+define Build/Compile
+endef
 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/
-	$(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) $(PKG_NAME)
+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
 
 $(eval $(call BuildPackage,ethmngr))

ethmngr/bbfdm_service.json

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

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

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

ethmngr/files/etc/ruleng/ethport.json

@@ -2,10 +2,7 @@
 	"ethport_update": {
 		"if" : [
 			{
-				"event": "network.device",
-				"match": {
-					"wireless": false
-				}
+				"event": "network.device"
 			}
 		],
 		"then" : [

fatrace/Makefile

@@ -16,7 +16,7 @@ PKG_SOURCE_VERSION:=98af6019a4a1b478a6fa35f74528cb3cd404ae40
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://git.launchpad.net/fatrace
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.zst
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 

fdtextract/Makefile

@@ -10,15 +10,20 @@ PKG_NAME:=fdtextract
 PKG_RELEASE:=1
 PKG_VERSION:=1.0
 
-PKG_SOURCE_URL:=https://dev.iopsys.eu/system/fdtextract.git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/fdtextract.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=7917dbcb29724476cd46164eec29848df1e5fb67
+PKG_SOURCE_VERSION:=e3cefda3b26c9aea3021b20725ce7b31b33eebc4
 PKG_MIRROR_HASH:=skip
 
 PKG_LICENSE:=GPLv2
 PKG_LICENSE_FILES:=LICENSE
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.zst
+RSTRIP:=true
+export BUILD_DIR
+
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
@@ -35,7 +40,9 @@ endef
 
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/sbin
+
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/fdtextract $(1)/usr/sbin/
+	$(STRIP) $(1)/usr/sbin/fdtextract
 endef
 
 $(eval $(call BuildPackage,$(PKG_NAME)))

firewallmngr/Makefile

@@ -5,14 +5,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=firewallmngr
-PKG_VERSION:=1.0.12
+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:=30319c67fb4db285a2bcd272b1c10bc040eecf19
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.zst
+PKG_SOURCE_VERSION:=94246676dc2e2db29b94fcffec1be3cee3ec8e9f
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 
@@ -28,10 +28,9 @@ 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 +firewall
-  DEPENDS+=+FIREWALLMNGR_PORT_TRIGGER:iptables-mod-trigger
+  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
-  DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service
 endef
 
 define Package/firewallmngr/description
@@ -69,7 +68,6 @@ endif
 	$(INSTALL_BIN) ./files/firewall.service $(1)/etc/
 	$(INSTALL_DATA) ./files/etc/uci-defaults/97-firewall-service $(1)/etc/uci-defaults/
 
-	$(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) $(PKG_NAME)
 	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/libfirewallmngr.so $(1) $(PKG_NAME)
 endef
 

firewallmngr/bbfdm_service.json

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

firewallmngr/files/firewall.portmap

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

firewallmngr/files/firewall.service

@@ -2,14 +2,12 @@
 
 . /lib/functions.sh
 
-ZONE_NAME_FILE="/tmp/service_fw_zone"
-
 log() {
 	echo "${@}"|logger -t firewall.service -p info
 }
 
 exec_cmd() {
-	if ! "$@"; then
+	if ! eval "$*"; then
 		log "Failed to run [$*]"
 		echo "-1"
 		return 0
@@ -19,37 +17,6 @@ exec_cmd() {
 	return 0
 }
 
-collect_zone_name() {
-	local name network
-
-	config_get name "${1}" name ""
-	if [ -z "${name}" ]; then
-		return
-	fi
-
-	config_get network "${1}" network ""
-	for i in ${network}; do
-		var="${i}_zone"
-		echo "${var}=${name}" >> "${ZONE_NAME_FILE}"
-	done
-}
-
-load_zone_names() {
-	rm -f "${ZONE_NAME_FILE}"
-	config_foreach collect_zone_name zone
-}
-
-get_firewall_zone() {
-	if [ ! -f "${ZONE_NAME_FILE}" ]; then
-		echo ""
-		return
-	fi
-
-	var="${1}_zone="
-	name="$(cat ${ZONE_NAME_FILE} | grep ${var} | head -n 1 | cut -d'=' -f 2)"
-	echo "${name}"
-}
-
 add_iptable_rule() {
 	chain_name=$1
 	protocol=$2
@@ -106,7 +73,7 @@ add_iptable_rule() {
 		fi
 
 		if [ -z "${src_prefix}" ]; then
-			res=$(exec_cmd iptables -w ${cmd} -m comment --comment IPtables_service_rule -j "${action}")
+			res=$(exec_cmd "iptables ${cmd} -m comment --comment IPtables_service_rule -j ${action}")
 		else
 			#Add ipv4 sources if any
 			src_list=""
@@ -119,7 +86,7 @@ add_iptable_rule() {
 
 			if [ -n "$src_list" ]; then
 				src_list=$(echo "${src_list}" | sed "s/,$//")
-				res=$(exec_cmd iptables -w -s "$src_list" ${cmd} -m comment --comment IPtables_service_rule -j "${action}")
+				res=$(exec_cmd "iptables -s $src_list ${cmd} -m comment --comment IPtables_service_rule -j ${action}")
 			fi
 		fi
 	fi
@@ -130,7 +97,7 @@ add_iptable_rule() {
 		fi
 
 		if [ -z "${src_prefix}" ]; then
-			res=$(exec_cmd ip6tables -w ${cmd} -m comment --comment IP6tables_service_rule -j "${action}")
+			res=$(exec_cmd "ip6tables ${cmd} -m comment --comment IP6tables_service_rule -j ${action}")
 		else
 			#Add ipv6 sources if any
 			src_list=""
@@ -143,7 +110,7 @@ add_iptable_rule() {
 
 			if [ -n "$src_list" ]; then
 				src_list=$(echo "${src_list}" | sed "s/,$//")
-				res=$(exec_cmd ip6tables -w -s "$src_list" ${cmd} -m comment --comment IP6tables_service_rule -j "${action}")
+				res=$(exec_cmd "ip6tables -s $src_list ${cmd} -m comment --comment IP6tables_service_rule -j ${action}")
 			fi
 		fi
 	fi
@@ -168,14 +135,9 @@ add_service() {
 	fi
 
 	action=$(echo "${target}" | tr a-z A-Z)
-	zone_name="$(get_firewall_zone ${interface})"
-	if [ -z "${zone_name}" ]; then
-		log "Rule can not be added without zone name for interface ${interface}"
-		return
-	fi
-
-	chain_name="zone_${zone_name}_input"
+	chain_name="zone_${interface}_input"
 	res=0
+
 	count=$(echo "${proto}" | sed -n "/-1/p" | wc -l)
 
 	if [ "${count}" -eq 0 ]; then
@@ -198,9 +160,4 @@ add_service() {
 }
 
 config_load firewall
-
-load_zone_names
-
 config_foreach add_service "service"
-
-rm -f "${ZONE_NAME_FILE}"

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

@@ -7,11 +7,7 @@ USE_PROCD=1
 . /lib/port-trigger/port_trigger.sh
 
 start_service() {
-	port_trigger_add
-}
-
-stop_service() {
-	port_trigger_clean
+	port_trigger_handling
 }
 
 service_triggers()
@@ -21,6 +17,5 @@ service_triggers()
 }
 
 reload_service() {
-	stop
 	start
 }

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

@@ -119,12 +119,18 @@ process_port_trigger() {
 	fi
 }
 
-port_trigger_add() {
+port_trigger_handling() {
 	rm /tmp/port_trigger_iptables 2> /dev/null
 	rm /tmp/port_trigger_ip6tables 2> /dev/null
 	touch /tmp/port_trigger_iptables
 	touch /tmp/port_trigger_ip6tables
 
+	echo "iptables -w -t nat -F prerouting_porttrigger 2> /dev/null">>/tmp/port_trigger_iptables
+	echo "iptables -w -t filter -F forwarding_wan_porttrigger 2> /dev/null">>/tmp/port_trigger_iptables
+	echo "iptables -w -t nat -F prerouting_wan_porttrigger 2> /dev/null">>/tmp/port_trigger_iptables
+	echo "ip6tables -w -t nat -F prerouting_porttrigger 2> /dev/null">>/tmp/port_trigger_ip6tables
+	echo "ip6tables -w -t filter -F forwarding_wan_porttrigger 2> /dev/null">>/tmp/port_trigger_ip6tables
+
 	echo "iptables -w -t nat -N prerouting_porttrigger 2> /dev/null">>/tmp/port_trigger_iptables
 	ret=$?
 	[ $ret -eq 0 ] && echo "iptables -w -t nat -I PREROUTING -j prerouting_porttrigger 2> /dev/null">>/tmp/port_trigger_iptables
@@ -133,7 +139,7 @@ port_trigger_add() {
 	[ $ret -eq 0 ] && echo "iptables -w -t filter -I forwarding_wan_rule -j forwarding_wan_porttrigger 2> /dev/null">>/tmp/port_trigger_iptables
 	echo "iptables -w -t nat -N prerouting_wan_porttrigger 2> /dev/null">>/tmp/port_trigger_iptables
 	ret=$?
-	[ $ret -eq 0 ] && echo "iptables -w -t nat -A prerouting_wan_rule -j prerouting_wan_porttrigger 2> /dev/null">>/tmp/port_trigger_iptables
+	[ $ret -eq 0 ] && echo "iptables -w -t nat -I prerouting_wan_rule -j prerouting_wan_porttrigger 2> /dev/null">>/tmp/port_trigger_iptables
 
 	echo "ip6tables -w -t nat -N prerouting_porttrigger 2> /dev/null">>/tmp/port_trigger_ip6tables
 	ret=$?
@@ -149,21 +155,3 @@ port_trigger_add() {
 	sh /tmp/port_trigger_iptables
 	sh /tmp/port_trigger_ip6tables
 }
-
-port_trigger_clean() {
-	iptables -w -t nat -D PREROUTING -j prerouting_porttrigger 2> /dev/null
-	iptables -w -t nat -F prerouting_porttrigger 2> /dev/null
-	iptables -w -t nat -X prerouting_porttrigger 2> /dev/null
-	iptables -w -t nat -D prerouting_wan_rule -j prerouting_wan_porttrigger 2> /dev/null
-	iptables -w -t nat -F prerouting_wan_porttrigger 2> /dev/null
-	iptables -w -t nat -X prerouting_wan_porttrigger 2> /dev/null
-	iptables -w -t filter -D forwarding_wan_rule -j forwarding_wan_porttrigger 2> /dev/null
-	iptables -w -t filter -F forwarding_wan_porttrigger 2> /dev/null
-	iptables -w -t filter -X forwarding_wan_porttrigger 2> /dev/null
-	ip6tables -w -t nat -D PREROUTING -j prerouting_porttrigger 2> /dev/null
-	ip6tables -w -t nat -F prerouting_porttrigger 2> /dev/null
-	ip6tables -w -t nat -X prerouting_porttrigger 2> /dev/null
-	ip6tables -w -t filter -D forwarding_wan_rule -j forwarding_wan_porttrigger 2> /dev/null
-	ip6tables -w -t filter -F forwarding_wan_porttrigger 2> /dev/null
-	ip6tables -w -t filter -X forwarding_wan_porttrigger 2> /dev/null
-}

fluent-bit/Makefile

@@ -1,20 +1,19 @@
 #
-# Copyright (C) 2024-2025 IOPSYS
+# Copyright (C) 2024 IOPSYS
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fluent-bit
-PKG_VERSION:=4.0.4
-PKG_RELEASE:=$(AUTORELEASE)
+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_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.zst
-PKG_MIRROR_HASH:=skip
+PKG_MIRROR_HASH:=9bedfabf859b88a2cfcf51cc17669b83a170e85427ce562131366cb1542b52ae
 endif
 
 PKG_LICENSE:=Apache-2.0
@@ -25,7 +24,7 @@ include $(INCLUDE_DIR)/cmake.mk
 
 define Package/fluent-bit
 	CATEGORY:=Utilities
-	DEPENDS:= +libyaml +libopenssl +libcurl +libatomic +musl-fts +flex +bison +libstdcpp +@OPENSSL_WITH_NPN
+	DEPENDS:= +libyaml +libopenssl +libcurl +libatomic +musl-fts +flex +bison
 	TITLE:=Fluent-Bit
 	URL:=https://fluentbit.io/
 endef
@@ -47,14 +46,13 @@ CMAKE_OPTIONS+= \
 	-DFLB_RELEASE=Yes \
 	-DFLB_SMALL=No \
 	-DEXCLUDE_FROM_ALL=true \
-	-DFLB_SHARED_LIB=Yes \
+	-DFLB_SHARED_LIBS=Yes \
 	-DFLB_DEBUG=Yes \
 	-DFLB_ALL=No \
 	-DFLB_JEMALLOC=No \
 	-DFLB_EXAMPLES=No \
 	-DFLB_CHUNK_TRACE=No \
 	-DFLB_BACKTRACE=No \
-	-DFLB_KAFKA=No \
 	-DFLB_WASM=No \
 	-DFLB_LUAJIT=No
 
@@ -66,15 +64,15 @@ CMAKE_OPTIONS += \
 	-DFLB_IN_DISK=Yes \
 	-DFLB_IN_EXEC=Yes \
 	-DFLB_IN_HEAD=Yes \
-	-DFLB_IN_KMSG=Yes \
-	-DFLB_IN_TAIL=Yes \
 	-DFLB_IN_FORWARD=No \
+	-DFLB_IN_KMSG=No \
 	-DFLB_IN_PROC=No \
 	-DFLB_IN_RANDOM=No \
 	-DFLB_IN_SERIAL=No \
 	-DFLB_IN_MQTT=No \
 	-DFLB_IN_STDIN=No \
 	-DFLB_IN_SYSTEMD=No \
+	-DFLB_IN_TAIL=No \
 	-DFLB_IN_TCP=No \
 	-DFLB_IN_THERMAL=No \
 	-DFLB_IN_UDP=No \
@@ -103,7 +101,7 @@ CMAKE_OPTIONS += \
 
 
 # Filter options
-CMAKE_OPTIONS += \
+CMAKE_OPTIONS += 
 	-DFLB_FILTER_AWS=No \
 	-DFLB_FILTER_ECS=No \
 	-DFLB_FILTER_KUBERNETES=No \
@@ -141,7 +139,6 @@ CMAKE_OPTIONS += \
 	-DFLB_OUT_ES=No \
 	-DFLB_OUT_GELF=No \
 	-DFLB_OUT_INFLUXDB=No \
-	-DFLB_OUT_KAFKA=No \
 	-DFLB_OUT_NRLOGS=No \
 	-DFLB_OUT_OPENSEARCH=No \
 	-DFLB_OUT_TD=No \
@@ -171,7 +168,6 @@ CMAKE_OPTIONS += \
 define Package/fluent-bit/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/etc/fluent-bit
-	$(INSTALL_DIR) $(1)/etc/fluent-bit/conf.d
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/fluent-bit $(1)/usr/sbin/
 	$(INSTALL_DATA) ./files/fluent-bit.conf $(1)/etc/fluent-bit/fluent-bit.conf
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/conf/parsers.conf $(1)/etc/fluent-bit/parsers.conf

fluent-bit/files/fluent-bit.conf

@@ -9,10 +9,6 @@
     tag             syslog
     path            /dev/log
 
-[INPUT]
-    name            kmsg
-    tag             kernel
-
 [OUTPUT]
     name            null
     match           *

fluent-bit/patches/0002-file_out_time.patch

@@ -1,27 +0,0 @@
-diff --git a/plugins/out_file/file.c b/plugins/out_file/file.c
-index 77baf6be8..04c519d5a 100644
---- a/plugins/out_file/file.c
-+++ b/plugins/out_file/file.c
-@@ -238,10 +238,20 @@ static int template_output_write(struct flb_file_conf *ctx,
- 
-     /*
-      * Right now we treat "{time}" specially and fill the placeholder
--     * with the metadata timestamp (formatted as float).
-+     * with the metadata timestamp.
-      */
-     if (!strncmp(key, "time", size)) {
--        fprintf(fp, "%f", flb_time_to_double(tm));
-+        struct tm tm_local;
-+        char buf[32];
-+        if (localtime_r(&tm->tm.tv_sec, &tm_local) == NULL) {
-+            flb_plg_error(ctx->ins, "localtime_r failed");
-+            return -1;
-+        }
-+        if (strftime(buf, sizeof(buf), "%b %d %H:%M:%S", &tm_local) == 0) {
-+            flb_plg_error(ctx->ins, "strftime failed");
-+            return -1;
-+        }
-+        fputs(buf, fp);
-         return 0;
-     }
- 

fluent-bit/patches/0003-prepend_length_in_syslog_output.patch

@@ -1,47 +0,0 @@
-diff --git a/plugins/out_syslog/syslog.c b/plugins/out_syslog/syslog.c
-index 4ecc7c4ac..cfe568245 100644
---- a/plugins/out_syslog/syslog.c
-+++ b/plugins/out_syslog/syslog.c
-@@ -776,12 +776,42 @@ static flb_sds_t syslog_format(struct flb_syslog *ctx, msgpack_object *o,
-         }
- 
-         if (ctx->parsed_mode != FLB_SYSLOG_UDP) {
-+            unsigned int msg_len = 0;
-+
-+            /* Create new SDS for length prefix */
-+            flb_sds_t prefix = flb_sds_create_size(ctx->maxsize + 32);
-+            if (!prefix) {
-+                ret_sds = NULL;
-+                goto clean;
-+            }
-+
-+            /* Add newline also to make behaviour similar to syslog-ng */
-             tmp = flb_sds_cat(*s, "\n", 1);
-             if (!tmp) {
-+                flb_sds_destroy(prefix);
-                 ret_sds = NULL;
-                 goto clean;
-             }
-             *s = tmp;
-+
-+            msg_len = flb_sds_len(*s);
-+            tmp = flb_sds_printf(&prefix, "%u ", msg_len);
-+            if (!tmp) {
-+                flb_sds_destroy(prefix);
-+                ret_sds = NULL;
-+                goto clean;
-+            }
-+            prefix = tmp;
-+
-+            tmp = flb_sds_cat(prefix, *s, msg_len);
-+            if (!tmp) {
-+                flb_sds_destroy(prefix);
-+                ret_sds = NULL;
-+                goto clean;
-+            }
-+
-+            flb_sds_destroy(*s);
-+            *s = tmp;
-         }
-     }
-     else {

fluent-bit/patches/0020-fix_kmsg.patch

@@ -1,73 +0,0 @@
-diff --git a/plugins/in_kmsg/in_kmsg.c b/plugins/in_kmsg/in_kmsg.c
-index cd5c4cd17..15f105451 100644
---- a/plugins/in_kmsg/in_kmsg.c
-+++ b/plugins/in_kmsg/in_kmsg.c
-@@ -36,7 +36,6 @@
- #include <sys/stat.h>
- #include <sys/time.h>
- #include <inttypes.h>
--#include <time.h>
- 
- #include "in_kmsg.h"
- 
-@@ -123,12 +122,17 @@ static inline int process_line(const char *line,
-     ctx->buffer_id++;
- 
-     errno = 0;
--    val = strtol(p, &end, 10);
--    if ((errno == ERANGE && (val == INT_MAX || val == INT_MIN))
-+    val = strtoul(p, &end, 10);
-+    if ((errno == ERANGE && val == ULONG_MAX)
-         || (errno != 0 && val == 0)) {
-         goto fail;
-     }
- 
-+    /* ensure something was consumed */
-+    if (end == p) {
-+        goto fail;
-+    }
-+
-     /* Priority */
-     priority = FLB_KLOG_PRI(val);
- 
-@@ -144,24 +148,35 @@ static inline int process_line(const char *line,
-     }
-     p++;
- 
--    val = strtoul(p, &end, 10);
--    if ((errno == ERANGE && (val == INT_MAX || val == INT_MIN))
-+    val = strtoull(p, &end, 10);
-+    if ((errno == ERANGE && val == ULLONG_MAX)
-         || (errno != 0 && val == 0)) {
-         goto fail;
-     }
- 
-+    /* make sure strtoull consumed something */
-+    /* after the sequence number, the next char must be ',' */
-+    if (end == p || *end != ',') {
-+        goto fail;
-+    }
-+
-     sequence = val;
-     p = ++end;
- 
-     /* Timestamp */
--    val = strtoul(p, &end, 10);
--    if ((errno == ERANGE && (val == INT_MAX || val == INT_MIN))
-+    val = strtoull(p, &end, 10);
-+    if ((errno == ERANGE && val == ULLONG_MAX)
-         || (errno != 0 && val == 0)) {
-         goto fail;
-     }
- 
-+    /* ensure something was consumed */
-+    if (end == p) {
-+        goto fail;
-+    }
-+
-     tv.tv_sec  = val/1000000;
--    tv.tv_usec = val - (tv.tv_sec * 1000000);
-+    tv.tv_usec = val - ((uint64_t)tv.tv_sec * 1000000);
- 
-     flb_time_set(&ts, ctx->boot_time.tv_sec + tv.tv_sec, tv.tv_usec * 1000);
- 

gateway-info/Makefile

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

gateway-info/files/bbfdm_service.json

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