firewallmngr: Fix for new issue identified

* Added firewallmngr module with firewallmngr uci
* added compile time flag to include/exclude module
* script library to conver firewallmngr uci to firewall uci
* include files of some modules removed and handling added to
  add rule entry in uci file of firewallmngr

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,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bbfdm
-PKG_VERSION:=1.18.15
+PKG_VERSION:=1.9.6
 
 USE_LOCAL:=0
 ifneq ($(USE_LOCAL),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bbfdm.git
-PKG_SOURCE_VERSION:=8f72146f0f42b76b43ef545136548dd2ca1b0388
+PKG_SOURCE_VERSION:=6730d2784bbac93d87705db83a5157eaeb436f7d
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -19,8 +19,6 @@ 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,113 +85,88 @@ 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
 	$(CP) $(PKG_BUILD_DIR)/utilities/files/usr/libexec/rpcd/bbf.diag $(1)/usr/libexec/rpcd/bbf.diag
-
-	$(INSTALL_DIR) $(1)/usr/share/bbfdm/scripts/
-	$(CP) $(PKG_BUILD_DIR)/utilities/files/usr/share/bbfdm/scripts/bbf_api $(1)/usr/share/bbfdm/scripts/
-
+	$(INSTALL_DIR) $(1)/etc/bbfdm
 	$(INSTALL_DIR) $(1)/etc/bbfdm/certificates
 	echo "$(CONFIG_BBF_OBFUSCATION_KEY)" > $(1)/etc/bbfdm/.secure_hash
 endef
 
-define Package/libbbfdm-ubus/install
+define Package/libbbfdm/install
 	$(INSTALL_DIR) $(1)/lib
-	$(CP) $(PKG_BUILD_DIR)/libbbfdm-ubus/libbbfdm-ubus.so $(1)/lib/
+	$(INSTALL_DIR) $(1)/etc/bbfdm
+	$(INSTALL_DIR) $(1)/etc/bbfdm/dmmap
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
+	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
+	$(INSTALL_DIR) $(1)/usr/share/bbfdm/
+	$(CP) $(PKG_BUILD_DIR)/libbbfdm/libbbfdm.so $(1)/usr/share/bbfdm/libbbfdm.so
+	$(INSTALL_DATA) ./files/lib/upgrade/keep.d/bbf $(1)/lib/upgrade/keep.d/bbf
+	$(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)/libbbfdm/scripts/* $(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"
 			]
 		}

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

bridgemngr/Config.in

@@ -1,23 +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 ""
+endmenu
 endif

bridgemngr/Makefile

@@ -5,13 +5,14 @@
 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_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
@@ -25,8 +26,7 @@ include ../bbfdm/bbfdm.mk
 define Package/bridgemngr
  CATEGORY:=Utilities
  TITLE:=Bridge Manager
- DEPENDS:=+libuci +libubox +libubus +libblobmsg-json
- DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service
+ DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libbbfdm-api
 endef
 
 define Package/bridgemngr/description
@@ -39,35 +39,17 @@ endef
 
 MAKE_PATH:=src
 
-ifeq ($(CONFIG_BRIDGEMNGR_BRIDGE_VENDOR_PREFIX),"")
-VENDOR_PREFIX = $(CONFIG_BBF_VENDOR_PREFIX)
-else
-VENDOR_PREFIX = $(CONFIG_BRIDGEMNGR_BRIDGE_VENDOR_PREFIX)
-endif
-
-TARGET_CFLAGS += -DBBF_VENDOR_PREFIX=\\\"$(VENDOR_PREFIX)\\\"
+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
-
 define Package/bridgemngr/install
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_DIR) $(1)/etc/config
-
-	$(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) $(PKG_NAME)
 	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/libbridgemngr.so $(1) $(PKG_NAME)
-ifeq ($(CONFIG_BRIDGEMNGR_BRIDGE_VENDOR_EXT), y)
-	$(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/src/libbridgeext.so $(1) $(PKG_NAME) 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
-
-	$(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/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,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bulkdata
-PKG_VERSION:=2.1.23
+PKG_VERSION:=2.1.10
 
 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_VERSION:=e472e90feec31d9f318ea8c732ab564002e25db1
 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,26 @@ 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"
+	[ "$enable" -eq "1" ] && {
+		procd_open_instance "bulkdata"
+		procd_set_param command "$PROG"
+		procd_set_param respawn
+		procd_close_instance "bulkdata"
+	}
 }
 
 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

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,13 +5,13 @@
 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_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.8
+PKG_VERSION:=6.0.0.13
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=8396091a83aefaf8423dfd41a957b04f3ed821e7
+PKG_SOURCE_VERSION:=d75639d9ae82538103123b32fc0de9280e84cabb
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/decollector.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@genexis.eu>
+PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 
 
 PKG_LICENSE:=BSD-3-Clause
 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.6
 
 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:=85c173d1fac535726b2e750be8c282b74fb7dbca
 PKG_MIRROR_HASH:=skip
 endif
 
@@ -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,13 +5,13 @@
 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_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

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,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dnsmngr
-PKG_VERSION:=1.0.20
+PKG_VERSION:=1.0.6
 
 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_VERSION:=03d8d79c1221adb92b5789c03e2489d26c6ae184
 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,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dslmngr
-PKG_VERSION:=1.2.10
+PKG_VERSION:=1.2.5
 
 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_VERSION:=4a6f6f829006e481eeb20bcb121f7938d12c60ec
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MAINTAINER:=Rahul Thakur <rahul.thakur@iopsys.eu>
 PKG_MIRROR_HASH:=skip
@@ -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.3
 PKG_LICENSE:=GPL-2.0
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=d3de8b0ac52ce9f96ef5a0a6277a6730879fc793
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/ebtables-extensions.git
-PKG_SOURCE_VERSION:=7357622d806833d93d317164dc6673fbf5fd1629
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 
 include $(INCLUDE_DIR)/package.mk
 
-define KernelPackage/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))

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

fdtextract/Makefile

@@ -10,14 +10,19 @@ 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
 
+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
 
@@ -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/Config.in

@@ -8,5 +8,11 @@ config FIREWALLMNGR_PORT_TRIGGER
 	help
 	   Set this option to include support for PortTrigger object.
 
+config FIREWALLMNGR_BACKEND_FIREWALLMNGR
+	bool "Include Firewallmanager uci"
+	default n
+	help
+	   Set this option to include support for firewallmngr uci.
+
 endmenu
 endif

firewallmngr/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=firewallmngr
-PKG_VERSION:=1.0.12
+PKG_VERSION:=1.0.4
 
 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_VERSION:=d4bdd162cf37b3373df2448a70dcb4fbc1113535
 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
@@ -44,13 +43,17 @@ endef
 
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
-	$(CP) -rf ~/git/firewallmngr/* $(PKG_BUILD_DIR)/
+	$(CP) -rf ./firewallmngr/* $(PKG_BUILD_DIR)/
 endef
 endif
 
 ifeq ($(CONFIG_FIREWALLMNGR_PORT_TRIGGER),y)
 	TARGET_CFLAGS += -DINCLUDE_PORT_TRIGGER
 endif
+ifeq ($(CONFIG_FIREWALLMNGR_BACKEND_FIREWALLMNGR),y)
+	TARGET_CFLAGS += -DINCLUDE_BACKEND_FIREWALLMNGR
+
+endif
 
 define Package/firewallmngr/install
 	$(INSTALL_DIR) $(1)/etc/config
@@ -63,14 +66,32 @@ ifeq ($(CONFIG_FIREWALLMNGR_PORT_TRIGGER),y)
 	$(INSTALL_DATA) ./files/port-trigger/etc/config/port-trigger $(1)/etc/config/
 	$(INSTALL_DATA) ./files/port-trigger/lib/port-trigger/port_trigger.sh $(1)/lib/port-trigger/
 endif
+ifeq ($(CONFIG_FIREWALLMNGR_BACKEND_FIREWALLMNGR),y)
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
+	$(INSTALL_DIR) $(1)/lib/fwmngr
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) ./files/firewallmngr_backend_firewallmngr/etc/uci-defaults/00-firewallmngr $(1)/etc/uci-defaults/00-firewallmngr
+	$(INSTALL_DATA) ./files/firewallmngr_backend_firewallmngr/etc/config/firewallmngr  $(1)/etc/config/
+	$(INSTALL_BIN) ./files/firewallmngr_backend_firewallmngr/etc/init.d/firewallmngr  $(1)/etc/init.d/
+	$(INSTALL_DATA) ./files/firewallmngr_backend_firewallmngr/lib/fwmngr/fwmngr.sh  $(1)/lib/fwmngr/
+	$(INSTALL_DATA) ./files/firewallmngr_backend_firewallmngr/lib/fwmngr/fwmngr_functions.sh  $(1)/lib/fwmngr/
+	$(INSTALL_DATA) ./files/firewallmngr_backend_firewallmngr/lib/fwmngr/uci_migration.sh  $(1)/lib/fwmngr/
+	$(INSTALL_BIN) ./files/firewallmngr_backend_firewallmngr/lib/fwmngr/is_intf_bridge  $(1)/lib/fwmngr/
+	$(INSTALL_BIN) ./files/firewallmngr_backend_firewallmngr/lib/fwmngr/firewallmngr_preconfig  $(1)/lib/fwmngr/
+	$(INSTALL_DATA) ./files/firewallmngr_backend_firewallmngr/lib/fwmngr/fwmngr_twamp.sh  $(1)/lib/fwmngr/
+
+	$(BBFDM_INSTALL_MS_DM) ./files/firewallmngr_backend_firewallmngr/etc/firewallmngr/firewallmngr.json $(1) $(PKG_NAME)
+	$(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/src/libfirewallmngr.so $(1) $(PKG_NAME)
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/firewallmngr $(1)/usr/sbin
+else
 	$(INSTALL_BIN) ./files/firewall.portmap $(1)/etc/
 	$(INSTALL_DATA) ./files/etc/uci-defaults/95-portmap-firewall $(1)/etc/uci-defaults/
 
 	$(INSTALL_BIN) ./files/firewall.service $(1)/etc/
 	$(INSTALL_DATA) ./files/etc/uci-defaults/97-firewall-service $(1)/etc/uci-defaults/
-
-	$(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) $(PKG_NAME)
 	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/libfirewallmngr.so $(1) $(PKG_NAME)
+endif
 endef
 
 $(eval $(call BuildPackage,firewallmngr))

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/firewallmngr_backend_firewallmngr/etc/bbfdm/micro_services/firewallmngr.json

@@ -0,0 +1,18 @@
+{
+	"daemon": {
+		"config": {
+			"loglevel": "4"
+		},
+		"input": {
+			"type": "JSON",
+			"name": "/etc/firewallmngr/firewallmngr.json",
+			"plugin_dir": "/etc/firewallmngr/plugins"
+		},
+		"output": {
+			"type": "UBUS",
+			"parent_dm": "Device.",
+			"root_obj": "bbfdm",
+			"multiple_objects": ["Firewall","NAT"]
+		}
+	}
+}

firewallmngr/files/firewallmngr_backend_firewallmngr/etc/config/firewallmngr

@@ -0,0 +1,160 @@
+config firewall 'firewall'
+	option enable '1'
+	option config 'Advanced'
+	option advanced_level 'level1'
+
+config level 'level1'
+	option name 'level1'
+	option chain 'chain1'
+	option port_mapping_enabled '1'
+	option default_policy 'reject'
+	option default_log_policy '0'
+	option enable '1'
+
+config chain 'chain1'
+	option enable '1'
+	option name 'chain1'
+
+config rule 'default_rule_0'
+	option chain 'chain1'
+	option enable '1'
+	option order '1'
+	option name 'Allow-DHCP-Renew'
+	option target 'Accept'
+	option src 'wan'
+	option family '4'
+	option proto '17'
+	option dest_port '68'
+
+config rule 'default_rule_1'
+	option chain 'chain1'
+	option enable '1'
+	option order '2'
+	option name 'Allow-Ping'
+	option target 'Accept'
+	option src 'wan'
+	list icmp_type 'echo-request'
+	option family '4'
+	option proto '1'
+
+config rule 'default_rule_2'
+	option chain 'chain1'
+	option enable '1'
+	option order '3'
+	option name 'Allow-IGMP'
+	option target 'Accept'
+	option src 'wan'
+	option family '4'
+	option proto '2'
+
+config rule 'default_rule_3'
+	option chain 'chain1'
+	option enable '1'
+	option order '4'
+	option name 'Allow-DHCPv6'
+	option target 'Accept'
+	option src 'wan'
+	option family '6'
+	option proto '17'
+	option dest_port '546'
+
+config rule 'default_rule_4'
+	option chain 'chain1'
+	option enable '1'
+	option order '5'
+	option name 'Allow-MLD'
+	option target 'Accept'
+	option src 'wan'
+	option family '6'
+	option src_ip 'fe80::'
+	option source_mask 'fe80::/10'
+	list icmp_type '130/0'
+	list icmp_type '131/0'
+	list icmp_type '132/0'
+	list icmp_type '143/0'
+	option proto '1'
+
+config rule 'default_rule_5'
+	option chain 'chain1'
+	option enable '1'
+	option order '6'
+	option name 'Allow-ICMPv6-Input'
+	option target 'Accept'
+	option src 'wan'
+	option family '6'
+	list icmp_type  'echo-request'
+	list icmp_type  'echo-reply'
+	list icmp_type  'destination-unreachable'
+	list icmp_type  'packet-too-big'
+	list icmp_type  'time-exceeded'
+	list icmp_type  'bad-header'
+	list icmp_type  'unknown-header-type'
+	list icmp_type  'router-solicitation'
+	list icmp_type  'neighbour-solicitation'
+	list icmp_type  'router-advertisement'
+	list icmp_type  'neighbour-advertisement'
+	option limit  '1000/sec'
+	option proto '1'
+
+config rule 'default_rule_6'
+	option chain 'chain1'
+	option enable '1'
+	option order '7'
+	option name 'Allow-ICMPv6-Forward'
+	option target 'Accept'
+	option src 'wan'
+	option dest_all_interfaces '1'
+	option family '6'
+	list icmp_type 'echo-request'
+	list icmp_type 'echo-reply'
+	list icmp_type 'destination-unreachable'
+	list icmp_type 'packet-too-big'
+	list icmp_type 'time-exceeded'
+	list icmp_type 'bad-header'
+	list icmp_type 'unknown-header-type'
+	option limit  '1000/sec'
+	option proto '1'
+
+config rule 'default_rule_7'
+	option chain 'chain1'
+	option enable '1'
+	option order '8'
+	option name 'Allow-IPSec-ESP'
+	option target 'Accept'
+	option src 'wan'
+	option dest 'lan'
+	option proto '50'
+
+config rule 'default_rule_8'
+	option chain 'chain1'
+	option enable '1'
+	option order '9'
+	option name 'Allow-ISAKMP'
+	option target 'Accept'
+	option src 'wan'
+	option dest 'lan'
+	option proto '17'
+	option dest_port '500'
+
+config rule 'default_rule_9'
+	option chain 'chain1'
+	option enable '0'
+	option order '10'
+	option name 'Support-UDP-Traceroute'
+	option target 'Reject'
+	option src 'wan'
+	option family '4'
+	option proto '17'
+	option dest_port '33434'
+	option dest_port_range_max '33689'
+
+config rule 'default_forward_rule'
+	option chain 'chain1'
+	option enable '1'
+	option order '65535'
+	option name 'forward-rule'
+	option src 'lan'
+	option dest 'wan'
+	option proto '-1'
+	option target 'Accept'
+

firewallmngr/files/firewallmngr_backend_firewallmngr/etc/init.d/firewallmngr

@@ -0,0 +1,27 @@
+#!/bin/sh /etc/rc.common
+
+START=18
+USE_PROCD=1
+
+USE_PROCD=1
+NAME=firewallmngr
+PROG=/usr/sbin/firewallmngr
+
+. /lib/fwmngr/fwmngr.sh
+
+
+start_service() {
+	configure_firewall
+	procd_open_instance firewallmngr
+	procd_set_param command ${PROG}
+	procd_set_param respawn
+	procd_close_instance
+}
+
+boot() {
+	start
+}
+
+service_triggers() {
+	procd_add_reload_trigger firewallmngr
+}

firewallmngr/files/firewallmngr_backend_firewallmngr/etc/uci-defaults/00-firewallmngr

@@ -0,0 +1,28 @@
+#!/bin/sh
+
+. /lib/fwmngr/fwmngr_functions.sh
+. /lib/fwmngr/uci_migration.sh
+
+
+rule_sec=$(uci show firewall | grep "=rule")
+[ -z "$rule_sec" ] && return
+rule_sec=$(echo $rule_sec | grep "fwmngr")
+
+if [ -z "$rule_sec" ]; then
+	generate_firewallmngr_config
+fi
+if [ -f /etc/firewall.ddos ]; then
+        uci -q get firewall.ddos || {
+                uci -q set firewall.ddos=include
+                uci -q set firewall.ddos.path="/etc/firewall.ddos"
+                uci -q set firewall.ddos.reload=1
+fi
+if [ -f /etc/firewall.protect_port ]; then
+        uci -q get firewall.protect_port || {
+                uci -q set firewall.protect_port='include'
+                uci -q set firewall.protect_port.path='/etc/firewall.protect_port'
+                uci -q set firewall.protect_port.reload='1'
+        }
+fi
+
+

firewallmngr/files/firewallmngr_backend_firewallmngr/lib/fwmngr/firewallmngr_preconfig

@@ -0,0 +1,76 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+rule_max_order_val=0
+config_load firewallmngr
+
+firewallmngr_generate_nat_interface_setting() {
+	local intf="$1"
+	local is_bridge="false"
+	local masq="0"
+	local intf_dev
+	local type=""
+	local nat_intf_setting=""
+
+
+	type=$(uci -q get firewallmngr."$intf")
+	[ "$type" = "natif" ] && return
+
+	nat_intf_setting=$(uci  add "firewallmngr" "natif")
+	uci set firewallmngr."$nat_intf_setting".interface="$intf"
+
+	if [ $(/lib/fwmngr/is_intf_bridge "$intf") -eq 1 ]; then
+		uci set firewallmngr."$nat_intf_setting".enabled="0"
+	else
+		uci set firewallmngr."$nat_intf_setting".enabled="1"
+	fi
+
+	uci rename firewallmngr."$nat_intf_setting"="$intf"
+}
+
+firewallmngr_process_rule_interface() {
+	local rule="$1"
+	local src_intf=""
+	local dest_intf=""
+
+	config_get src_intf "$rule" "src"
+	config_get dest_intf "$rule" "dest"
+
+	[ -z "$src_intf" ] || firewallmngr_generate_nat_interface_setting "$src_intf"
+	[ -z "$dest_intf" ] || firewallmngr_generate_nat_interface_setting "$dest_intf"
+}
+
+firewallmngr_process_rule_param() {
+	local order=""
+	config_get order "$1" order
+
+	if [ -z "$order" ] || [ "$order" = "65535" ]; then
+		return
+	fi
+	rule_max_order_val=$(( rule_max_order_val + 1 ))
+	if [ ${order} -gt ${rule_max_order_val} ]; then
+		uci -q set firewallmngr."$1".order="$rule_max_order_val"
+		uci -q reorder firewallmngr."$1"=${rule_max_order_val}
+	fi
+
+	firewallmngr_process_rule_interface "$1"
+}
+
+firewallmngr_set_rule_order() {
+	local order=""
+	config_get order "$1" order
+
+	if [ -n "$order" ]; then
+		uci -q reorder firewallmngr."$1"=${order}
+		return
+	fi
+	rule_max_order_val=$(( rule_max_order_val + 1 ))
+	uci -q set firewallmngr."$1".order="$rule_max_order_val"
+	uci -q reorder firewallmngr."$1"=${rule_max_order_val}
+}
+
+config_foreach firewallmngr_process_rule_param rule
+config_foreach firewallmngr_set_rule_order rule
+
+uci commit firewallmngr

firewallmngr/files/firewallmngr_backend_firewallmngr/lib/fwmngr/fwmngr.sh

@@ -0,0 +1,195 @@
+#!/bin/sh
+#set -x
+
+. /lib/functions.sh
+. /lib/fwmngr/fwmngr_functions.sh
+
+
+fw_rule_sections=""
+fw_redirect_sections=""
+fw_include_sections=""
+
+clean_expiry() {
+	[ -f "/tmp/fw3.atjobs" ] || return
+	for job in $(cat /tmp/fw3.atjobs); do
+		atrm $job 2>/dev/null
+	done
+	rm -f /tmp/fw3.atjobs
+}
+
+schedule_expiry() {
+
+        [ -f "/usr/bin/at" ] || return
+
+        expire_at() {
+                local cfg=$1
+                local expiry atdate
+
+                config_get expiry $cfg expiry
+
+                [ -n "$expiry" ] || return
+
+                atdate="$(date +'%Y%m%d%H%M.%S' -d @$expiry)"
+
+                [ -n "$atdate" ] || return
+
+                sec=$(echo $atdate | cut -d. -f2)
+                at_date=$(echo $atdate | cut -d. -f1)
+
+                echo "sleep $sec && uci -q delete firewallmngr.$cfg; ubus call uci commit '{\"config\":\"firewallmngr\"}'" | \
+                        at -t $at_date 2>&1 | grep job | awk '{print$2}' >> /tmp/fw3.atjobs
+        }
+
+        config_foreach expire_at rule
+        config_foreach expire_at redirect
+}
+
+firewall_cleanup() {
+	local count=1
+
+	list=$(uci show firewall)
+        section_list=$(echo "$list" | grep "fwmngr")
+
+        section_list=$(echo "$section_list" | awk -F. '{ print $2 }')
+        section_list=$(echo "$section_list" | awk -F= '{ print $1 }')
+
+        fw_rule_sections=$(echo "$list" | grep -v fwmngr | grep "=rule")
+        fw_rule_sections=$(echo "$fw_rule_sections" | awk -F= '{ print $1 }')
+        fw_rule_sections=$(echo "$fw_rule_sections" | awk -F. '{ print $2 }')
+        fw_redirect_sections=$(echo "$list" | grep -v fwmngr | grep "=redirect")
+        fw_redirect_sections=$(echo "$fw_redirect_sections" | awk -F= '{ print $1 }')
+        fw_redirect_sections=$(echo "$fw_redirect_sections" | awk -F. '{ print $2 }')
+        fw_include_sections=$(echo "$list" | grep -v fwmngr | grep "=include")
+        fw_include_sections=$(echo "$fw_include_sections" | awk -F= '{ print $1 }')
+        fw_include_sections=$(echo "$fw_include_sections" | awk -F. '{ print $2 }')
+
+        for sec in $section_list; do
+                uci -q delete firewall."$sec"
+        done
+	uci commit firewall
+}
+
+firewallmngr_preload() {
+	firewall_cleanup
+
+	/lib/fwmngr/firewallmngr_preconfig
+}
+
+firewall_handle_section_dmz() {
+	local dmz_cfg="$1"
+	local dest_uci="$2"
+	local dmz_sec=""
+	local enable=""
+	local origin=""
+	local description=""
+	local interface=""
+	local dest_ip=""
+	local source_prefix=""
+	
+	config_get enable "$dmz_cfg" "enabled" 0
+	[ "$enable" = "1" ] || return
+	config_get dest_ip "$dmz_cfg" "dest_ip"
+	config_get interface "$dmz_cfg" "interface"
+	if [ -z "$dest_ip" ] || [ -z "$interface" ]; then
+		return
+	fi
+	config_get origin "$dmz_cfg" "origin"
+	config_get description "$dmz_cfg" "description"
+	config_get source_prefix "$dmz_cfg" "source_prefix"
+
+	if [ "$dest_uci" = "firewall" ]; then
+		zones=$(uci show firewall | grep "=zone")
+		for zn in zones; do
+			zn_arg=$(echo $zn | awk -F= '{ print $1 }')
+			if [ "$interface" = "$(uci -q get $zn_arg.network)" ]; then
+				zn_name=$(uci -q get "$zn_arg".name)
+			fi
+		done
+	fi
+
+	dmz_sec=$(uci add "$dest_uci" redirect)
+	uci set "$dest_uci"."$dmz_sec".src="$zn_name"
+	uci set "$dest_uci"."$dmz_sec".enabled="1"
+	uci set "$dest_uci"."$dmz_sec".dest_ip="$dest_ip"
+	uci set "$dest_uci"."$dmz_sec".origin="$origin"
+	uci set "$dest_uci"."$dmz_sec".src_ip="$source_prefix"
+	uci set "$dest_uci"."$dmz_sec".target="DNAT"
+
+       	uci rename "$dest_uci"."$dmz_sec"="fwmngr_$dmz_cfg"
+}
+
+handle_section_nat_interface_setting() {
+	local nat_intf_cfg="$1"
+	local interface=""
+	local enable=""
+
+	config_get enable "$nat_intf_cfg" "enabled"
+	[ -z "$enable" ] && return
+	config_get interface "$nat_intf_cfg" "interface"
+	if [ -n "$interface" ]; then
+		create_firewall_zone_config "$interface" "$enable"
+	fi
+}
+
+generate_firewall_config() {
+	local minus_one
+
+
+	firewallmngr_preload
+	uci commit firewallmngr
+	fw_config="$(uci -q get firewallmngr.firewall.config)"
+	[ -z "$fw_config" ] && return
+	[ "$fw_config" = "Advanced" ] || return
+
+#get active chain name
+	chain_name=$(firewallmngr_get_active_chain)
+
+#configure firewall global config
+	global_exist=$(uci -q get firewall.globals)
+	if [ -z "$global_exist" ]; then
+		global_sec=$(uci   add firewall globals)
+		uci   set firewall."$global_sec".enabled="1"
+		uci   rename firewall."$global_sec"="globals"
+	fi
+
+#configure firewall default config
+	default_sec=$(uci  add firewall defaults)
+	uci   set firewall."$default_sec".syn_flood="1"
+	uci   set firewall."$default_sec".input="$INPUT"
+	uci   set firewall."$default_sec".output="$OUTPUT"
+	uci   set firewall."$default_sec".forward="$FORWARD"
+        uci   rename firewall."$default_sec"="fwmngr_default"
+
+	config_load firewallmngr
+	config_foreach handle_section_nat_interface_setting natif
+	uci commit firewall
+#loop through rules in firewallmngr uci and write rule in firewall
+	config_foreach handle_section_firewall_rule rule "$chain_name" "firewall"
+	uci commit firewall
+
+	config_foreach handle_section_nat_port_mapping nat_portmapping "firewall"
+	config_foreach firewall_handle_section_dmz dmz "firewall"
+	config_foreach handle_section_service service "firewall"
+
+#reorder sections to place rule created by user at the end
+	minus_one=$((2**16))
+	for sec in $fw_rule_sections; do
+		uci -q reorder firewall."$sec"=${minus_one}
+	done
+	for sec in $fw_redirect_sections; do
+		uci -q reorder firewall."$sec"=${minus_one}
+	done
+	for sec in $fw_include_sections; do
+		uci -q reorder firewall."$sec"=${minus_one}
+	done
+
+	ubus call uci commit '{"config":"firewall"}'
+	schedule_expiry
+}
+
+configure_firewall () {
+	if ! [ -f "/etc/config/firewall" ]; then
+		touch /etc/config/firewall
+	fi
+	generate_firewall_config
+}

firewallmngr/files/firewallmngr_backend_firewallmngr/lib/fwmngr/fwmngr_functions.sh

@@ -0,0 +1,627 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+INPUT="REJECT"
+OUTPUT="ACCEPT"
+FORWARD="REJECT"
+
+firewallmngr_get_active_chain() {
+	local fw_level=""
+	local chain_name=""
+	local fw_level=""
+	local chain=""
+
+	fw_level="$(uci -q get firewallmngr.firewall.advanced_level)"
+	[ -z "$fw_level" ] && return
+	enabled="$(uci -q get firewallmngr."${fw_level}".enable)"
+
+	[ "$enabled" = "1" ] || exit
+
+	chain="$(uci -q get firewallmngr."${fw_level}".chain)"
+	[ -z "$chain" ] && exit
+
+	enabled="$(uci -q get firewallmngr."${chain}".enable)"
+	chain_name="$(uci -q get firewallmngr."${chain}".name)"
+	echo "$chain_name"
+}
+
+
+create_firewall_zone_config() {
+	local intf="$1"
+	local masq="$2"
+	local is_bridge="false"
+	local intf_dev=""
+	local ntwrk=""
+	local interface=$(echo "$intf" | awk -F" " '{ print $1 }')
+
+	type=$(uci -q get firewall."$interface")
+	[ "$type" = "zone" ] && return
+
+	zone_sec=$(uci add "firewall" "zone")
+	uci set firewall."$zone_sec".masq="$masq"
+	uci set firewall."$zone_sec".name="$interface"
+	uci set firewall."$zone_sec".output="$OUTPUT"
+
+	if [ $(/lib/fwmngr/is_intf_bridge "$interface") -eq 1 ]; then
+		uci set firewall."$zone_sec".input="ACCEPT"
+		uci set firewall."$zone_sec".forward="ACCEPT"
+	else
+		if [ "$(uci -q get firewallmngr.globals.enabled)" = "0" ]; then
+			uci set firewall."$zone_sec".input="ACCEPT"
+		else
+			uci set firewall."$zone_sec".input="REJECT"
+		fi
+		uci set firewall."$zone_sec".forward="REJECT"
+	fi
+	for ntwrk in $intf; do
+		uci add_list firewall."$zone_sec".network="$ntwrk"
+	done
+	uci rename firewall."$zone_sec"="$interface"
+}
+
+firewallmngr_set_ip() {
+	local rule_sec="$1"
+	local src_ip="$2"
+	local dest_ip="$3"
+
+	mask=$(echo "$src_ip"|grep "/")
+	if [ -z "$src_ip" ]; then
+		uci set firewallmngr."$rule_sec".src_ip="$src_ip"
+	else
+		ip=$(echo "$src_ip" | awk -F"/" '{ print $0 }')
+		mask=$(echo "$src_ip" | awk -F"/" '{ print $2 }')
+		uci set firewallmngr."$rule_sec".src_ip="$ip"
+		uci set firewallmngr."$rule_sec".source_mask="$mask"
+	fi
+
+	mask=$(echo "$src_ip"|grep "/")
+	if [ -z "$dest_ip" ]; then
+		uci set firewallmngr."$rule_sec".dest_ip="$dest_ip"
+	else
+		ip=$(echo "$dest_ip" | awk -F"/" '{ print $0 }')
+		mask=$(echo "$dest_ip" | awk -F"/" '{ print $2 }')
+		uci set firewallmngr."$rule_sec".dest_ip="$ip"
+		uci set firewallmngr."$rule_sec".dest_mask="$mask"
+	fi
+}
+
+firewall_set_ip() {
+	local rule_sec="$1"
+	local src_ip="$2"
+	local dest_ip="$3"
+
+	uci set firewall."$rule_sec".src_ip="$src_ip"
+	uci set firewall."$rule_sec".dest_ip="$dest_ip"
+}
+
+firewallmngr_set_port() {
+	local rule_sec="$1"
+	local src_port="$2"
+	local dest_port="$3"
+	local src_port_range_max="$4"
+	local dest_port_range_max="$5"
+
+	range=$(echo "$src_port" | grep ":")
+	if [ -z "$range" ]; then
+		uci set firewallmngr."$rule_sec".src_port="$src_port"
+	else
+		min_port=$(echo "$src_port" | awk -F":" '{ print $1 }')
+		max_port=$(echo "$src_port" | awk -F":" '{ print $2 }')
+
+		uci set firewallmngr."$rule_sec".src_port="$min_port"
+		uci set firewallmngr."$rule_sec".src_port_range_max="$max_port"
+	fi
+	range=$(echo "$dest_port" | grep ":")
+	if [ -z "$range" ]; then
+		uci set firewallmngr."$rule_sec".dest_port="$dest_port"
+	else
+		min_port=$(echo "$dest_port" | awk -F":" '{ print $1 }')
+		max_port=$(echo "$dest_port" | awk -F":" '{ print $2 }')
+
+		uci set firewallmngr."$rule_sec".dest_port="$min_port"
+		uci set firewallmngr."$rule_sec".dest_port_range_max="$max_port"
+	fi
+
+}
+
+firewall_set_port() {
+	local rule_sec="$1"
+	local src_port="$2"
+	local dest_port="$3"
+	local src_port_range_max="$4"
+	local dest_port_range_max="$5"
+
+	if [ -z "$dest_port_range_max" ] || [ "$dest_port_range_max" = "-1" ]; then
+		[ "$dest_port" == "-1" ] || uci set firewall."$rule_sec".dest_port="$dest_port"
+	else
+		uci set firewall."$rule_sec".dest_port="$dest_port:$dest_port_range_max"
+	fi
+
+	if [ -z "$src_port_range_max" ] || [ "$src_port_range_max" = "-1" ]; then
+		[ "$src_port" == "-1" ] || uci set firewall."$rule_sec".src_port="$src_port"
+	else
+		uci set firewall."$rule_sec".src_port="$src_port:$src_port_range_max"
+	fi
+}
+
+firewallmngr_set_interface() {
+	local rule_sec="$1"
+	local src_intf="$2"
+	local dest_intf="$3"
+
+	if [ "$src_intf" = "*" ]; then
+		uci set firewallmngr."$rule_sec".source_all_interfaces="1"
+	else
+		uci set firewallmngr."$rule_sec".source_all_interfaces="0"
+		uci set firewallmngr."$rule_sec".src="$src_intf"
+	fi
+	if [ "$dest_intf" = "*" ]; then
+		uci set firewallmngr."$rule_sec".dest_all_interfaces="1"
+	else
+		uci set firewallmngr."$rule_sec".dest_all_interfaces="0"
+		uci set firewallmngr."$rule_sec".dest="$dest_intf"
+	fi
+
+}
+
+firewall_set_interface() {
+	local rule_sec="$1"
+	local src_intf="$2"
+	local dest_intf="$3"
+	uci set firewall."$rule_sec".src="$src_intf"
+	uci set firewall."$rule_sec".dest="$dest_intf"
+}
+
+
+firewallmngr_get_rule_ip_family() {
+	local version="$1"
+
+	if [ "$version" == "ipv4" ]; then
+		echo "4"
+	elif [ "$version" == "ipv6" ]; then
+		echo "6"
+	else
+		echo "-1"
+	fi
+}
+
+firewall_get_rule_ip_family() {
+	local version="$1"
+
+	if [ "$version" == "4" ]; then
+		echo "ipv4"
+	elif [ "$version" == "6" ]; then
+		echo "ipv6"
+	else
+		echo "-1"
+	fi
+}
+
+firewallmngr_set_ip_family() {
+	local rule_sec="$1"
+	local ip_family="$2"
+
+	if [ -z "$ip_family" ]; then
+		uci set firewallmngr."$rule_sec".family="-1"
+		return
+	fi
+	uci set firewallmngr."$rule_sec".family="$ip_family"
+}
+
+firewall_set_ip_family() {
+	local rule_sec="$1"
+	local ip_family="$2"
+
+	[ "$ip_family" == "-1" ] ||  uci set firewall."$rule_sec".family="$ip_family"
+}
+
+firewallmngr_set_rule_target() {
+	local rule_sec="$1"
+	local target="$2"
+	local targetchain="$3"
+	local action
+	if [ "$target" = "MARK" ]; then
+		uci set firewallmngr."$rule_sec".target="Return"
+	elif [ "$target" = "TargetChain" ]; then
+		uci set firewallmngr."$rule_sec".target="$targetchain"
+	else
+		action=$(echo "$target" | awk '{for(i=1;i<=NF;i++){$i=toupper(substr($i,1,1)) substr($i,2)}} 1')
+		uci set firewallmngr."$rule_sec".target="$action"
+	fi
+}
+
+firewall_set_rule_target() {
+	local rule_sec="$1"
+	local target="$2"
+	local targetchain="$3"
+
+	target="$(echo $target | awk '{ print toupper($0) }')"
+	if [ "$target" = "ACCEPT" ] || [ "$target" = "REJECT" ] || [ "$target" = "DROP" ]; then
+		uci set firewall."$rule_sec".target="$(echo $target | awk '{ print toupper($0) }')"
+	elif [ "$target" = "Retrun" ]; then
+		uci set firewall."$rule_sec".target="MARK"
+	elif [ "$target" = "TargetChain" ]; then
+		uci set firewall."$rule_sec".target="$targetchain"
+	else
+		uci set firewall."$rule_sec".target="DROP"
+	fi
+}
+
+set_rule_protocol() {
+	local rule_sec="$1"
+	local protocol="$2"
+	local rule_rd="$3"
+	local dest_uci="$4"
+
+	set_icmp_type() {
+		uci add_list "$dest_uci"."$rule_sec".icmp_type="$1"
+	}
+
+	if [ -z "$protocol" ] || [ "$protocol" = "0" ] || [ "$protocol" = "all" ] || [ "$protocol" = "-1" ]; then
+		uci set "$dest_uci"."$rule_sec".proto="all"
+		return
+	fi
+
+	if [ "$dest_uci" = "firewallmngr" ]; then
+		protocol=$(grep -m 1 "$protocol" "/etc/protocols" | awk -F" " '{ print $2 }')
+	fi
+	uci set "$dest_uci"."$rule_sec".proto="$protocol"
+	if [ "$protocol" = "1" ] || [ "$protocol" = "icmp" ]; then
+		config_list_foreach "$rule_rd" "icmp_type" set_icmp_type
+	fi
+}
+
+handle_section_firewall_rule() {
+	local rule="$1"
+	local chain_name="$2"
+	local dest_uci="$3"
+	local chain=""
+	local is_enable=""
+	local src_intf=""
+	local ip_version=""
+	local ip_family=""
+	local protocol=""
+	local dest_intf=""
+	local target=""
+	local targetchain=""
+	local desc=""
+	local dest_port=""
+	local src_port=""
+	local src_port_range_max=""
+	local dest_port_range_max=""
+	local src_ip=""
+	local dest_ip=""
+	local source_mac=""
+	local source_all_interfaces=""
+	local dest_all_interfaces=""
+	local source_mask=""
+	local dest_mask=""
+	local limit=""
+	local expiry=""
+	local order=""
+
+	config_get is_enable "$rule" "enable" 1
+	[ "$is_enable" = "1" ] || return
+
+	if [ "$dest_uci" = "firewall" ]; then
+		config_get chain "$rule" "chain"
+		[ "$chain" = "$chain_name" ] || return
+	fi
+
+	config_get desc "$rule" "name"
+	config_get src_intf "$rule" "src"
+	config_get dest_intf "$rule" "dest"
+	config_get ip_version "$rule" "family"
+	function="$dest_uci"_get_rule_ip_family
+	ip_family="$($function $ip_version)"
+	config_get protocol "$rule" "proto"
+	config_get src_port "$rule" "src_port"
+	config_get dest_port "$rule" "dest_port"
+	config_get src_ip "$rule" "src_ip"
+	config_get source_mask "$rule" "source_mask"
+	[ -n "$source_mask" ] && src_ip="${src_ip}/$(echo $source_mask | awk -F/ '{ print $2 }')"
+	config_get dest_ip "$rule" "dest_ip"
+	config_get dest_mask "$rule" "dest_mask"
+	[ -n "$dest_mask" ] && dest_ip="${dest_ip}/$(echo $dest_mask | awk -F/ '{ print $2 }')"
+	config_get dest_port_range_max "$rule" "dest_port_range_max"
+	config_get src_port_range_max "$rule" "src_port_range_max"
+	config_get target "$rule" "target"
+	config_get targetchain "$rule" "targetchain"
+	config_get source_mac "$rule" "src_mac"
+	config_get order "$rule" "order"
+	config_get limit "$rule" "limit"
+	config_get expiry "$rule" "expiry"
+	config_get source_all_interfaces "$rule" "source_all_interfaces"
+	[ "$source_all_interfaces" = "1" ] && src_intf="*"
+	config_get dest_all_interfaces "$rule" "dest_all_interfaces"
+	[ "$dest_all_interfaces" = "1" ] && dest_intf="*"
+
+	rule_sec=$(uci add "$dest_uci" rule)
+	uci set "$dest_uci"."$rule_sec".chain="$chain_name"
+	uci set "$dest_uci"."$rule_sec".enabled="1"
+	uci set "$dest_uci"."$rule_sec".name="$desc"
+
+	"$dest_uci"_set_interface "$rule_sec" "$src_intf" "$dest_intf"
+	"$dest_uci"_set_ip_family "$rule_sec" "$ip_family"
+	"$dest_uci"_set_rule_target "$rule_sec" "$target" "$targetchain"
+	set_rule_protocol "$rule_sec" "$protocol" "$rule" "$dest_uci"
+
+	"$dest_uci"_set_port "$rule_sec" "$src_port" "$dest_port" "$src_port_range_max" "$dest_port_range_max"
+
+	"$dest_uci"_set_ip "$rule_sec" "$src_ip" "$dest_ip"
+
+	uci set "$dest_uci"."$rule_sec".src_mac="$source_mac"
+	uci set "$dest_uci"."$rule_sec".order="$order"
+	uci set "$dest_uci"."$rule_sec".limit="$limit"
+	uci set "$dest_uci"."$rule_sec".expiry="$expiry"
+
+	if [ "$dest_uci" = "firewall" ]; then
+        	uci rename "$dest_uci"."$rule_sec"="fwmngr_$rule"
+	else
+        	uci rename "$dest_uci"."$rule_sec"="$rule"
+	fi
+}
+
+firewallmngr_configure_service_rule() {
+	local interface="$1"
+	local dest_port="$2"
+	local ip_family="$3"
+	local protocol="$4"
+	local icmp_type="$5"
+	local source_prefix="$6"
+	local action="$7"
+	local service_cfg="$8"
+	local service_sec
+	
+	service_sec_add_list_value() {
+		for value in $1; do
+			uci add_list firewallmngr."$service_sec"."$2"="$value"
+		done
+	}
+
+	service_sec=$(uci add firewall service)
+	uci set firewallmngr."$service_sec".enabled="1"
+	uci set firewallmngr."$service_sec".name="service rule"
+	uci set firewallmngr."$service_sec".src="$interface"
+	uci set firewallmngr."$service_sec".icmp_type="$icmp_type"
+	uci set firewallmngr."$service_sec".family=$(firewallmngr_get_rule_ip_family "$ip_family")
+	firewallmngr_set_rule_target "$service_sec" "$action" ""
+
+	service_sec_add_list_value "$dest_port" "dest_port"
+	service_sec_add_list_value "$protocol" "protocol"
+	service_sec_add_list_value "$source_prefix" "src_prefix"
+
+	uci rename firewallmngr."$service_sec"="${service_cfg}"
+}
+
+firewall_configure_service_rule() {
+	local interface="$1"
+	local dest_port="$2"
+	local ip_family="$3"
+	local protocol="$4"
+	local icmp_type="$5"
+	local source_prefix="$6"
+	local action="$7"
+	local service_cfg="$8"
+	local service_sec
+
+	service_sec=$(uci add firewall rule)
+	uci set firewall."$service_sec".enabled="1"
+	uci set firewall."$service_sec".name="service rule"
+	uci set firewall."$service_sec".src="$interface"
+	[ "$dest_port" == "-1" ] || uci set firewall."$service_sec".dest_port="$dest_port"
+	uci set firewall."$service_sec".family=$(firewall_get_rule_ip_family "$ip_family")
+	[ "$protocol" == "-1" ] || uci set firewall."$service_sec".proto="$protocol"
+	[ "$icmp_type"  == "-1" ] || uci set firewall."$service_sec".icmp_type="$icmp_type"
+	uci set firewall."$service_sec".src_ip="$source_prefix"
+	firewall_set_rule_target "$service_sec" "$action" ""
+
+	[ -z "$service_cfg" ] || uci rename firewall."$service_sec"="fwmngr_${service_cfg}"
+}
+
+handle_section_service() {
+	local service_cfg="$1"
+	local dest_uci="$2"
+	local service_sec=""
+	local enable=""
+	local interface=""
+	local dest_port=""
+	local protocol=""
+	local icmp_type=""
+	local source_prefix=""
+	local action=""
+	local ip_family=""
+
+	get_service_proto_list() {
+		protocol="$protocol $1"
+	}
+	get_service_src_prefix_list() {
+		source_prefix="$source_prefix $1"
+	}
+	get_service_dest_port_list() {
+		dest_port="$dest_port $1"
+	}
+
+	config_get enable "$service_cfg" "enable" 0
+	[ "$enable" == "1" ] || return
+	config_get interface "$service_cfg" "interface"
+	[ -z "$interface" ] && return
+	config_get ip_family "$service_cfg" "family"
+
+	config_list_foreach "$service_cfg" "proto" get_service_proto_list
+	config_list_foreach "$service_cfg" "dest_port" get_service_dest_port_list
+	config_list_foreach "$service_cfg" "src_prefix" get_service_src_prefix_list
+
+	config_get icmp_type "$service_cfg" "icmp_type"
+	config_get action "$service_cfg" "target"
+
+	"$dest_uci"_configure_service_rule "$interface" "$dest_port" "$ip_family" "$protocol" "$icmp_type" "$source_prefix" "$action" "$service_cfg"
+
+}
+
+firewallmngr_set_all_intf_src_dip() {
+	local redirect_section="$1"
+	local zn_name="$2"
+	local all_interface="$3"
+
+	config_get src_dip "$redirect_section" "src_dip"
+
+	if [ "$src_dip" = "*" ]; then
+		uci set firewallmngr."$redirect_sec".all_interface="1"
+	else
+		uci set firewallmngr."$redirect_sec".all_interface="0"
+	fi
+}
+
+firewall_set_all_intf_src_dip() {
+	local redirect_section="$1"
+	local zn_name="$2"
+	local all_interface="$3"
+
+	if [ "$all_interface" = "1" ]; then
+		if [ -z "$zn_name" ]; then
+			uci set firewall."$redirect_sec".src="wan"
+		else
+			uci set firewall."$redirect_sec".src="$zn_name"
+		fi
+		uci set firewall."$redirect_sec".src_dip="*"
+	else
+		uci set firewall."$redirect_sec".src="$zn_name"
+		uci set firewall."$redirect_sec".src_dip=""
+	fi
+}
+
+firewallmngr_set_src_dport() {
+        local redirect_sec="$1"
+        lodcal external_port="$2"
+        local external_port_end="$3"
+
+	range=$(echo "$external_port" | grep "-")
+	if [ -z "$range" ]; then
+		uci set firewallmngr."$redirect_sec".src_dport="$external_port"
+	else
+		min_port=$(echo "$external_port" | awk -F"-" '{ print $1 }')
+		max_port=$(echo "$external_port" | awk -F"-" '{ print $2 }')
+
+		uci set firewallmngr."$redirect_sec".src_dport="$min_port"
+		uci set firewallmngr."$redirect_sec".src_dport_end="$max_port"
+	fi
+} 
+
+firewall_set_src_dport() {
+        local redirect_sec="$1"
+        local external_port="$2"
+        local external_port_end="$3"
+
+	if [ "$external_port_end" = "0" ]; then
+		if ! [ "$external_port" = "0" ]; then
+			uci set firewall."$redirect_sec".src_dport="$external_port"
+		fi
+	else
+		uci set firewall."$redirect_sec".src_dport="$external_port-$external_port_end"
+	fi
+} 
+
+
+# handling for firewallmngr to firewall
+handle_section_nat_port_mapping() {
+	local nat_port_cfg="$1"
+	local dest_uci="$2"
+	local enable=""
+	local interface=""
+	local all_interface=""
+	local lease_duration=""
+	local remote_host=""
+	local external_port=""
+	local external_port_end=""
+	local internal_port=""
+	local protocol=""
+	local internal_client=""
+	local description=""
+	local redirect_sec=""
+	local epoch_sec=""
+	local stop_epoch=""
+	local stop_ymd=""
+	local stop_hms=""
+	local zn_name=""
+
+	config_get enable "$nat_port_cfg" "enabled"
+	config_get interface "$nat_port_cfg" "src"
+
+	if [ "$dest_uci" = "firewall" ]; then
+		zones=$(uci show firewall | grep "=zone")
+		for zn in zones; do
+			zn_arg=$(echo $zn | awk -F= '{ print $1 }')
+			if [ "$interface" = "$(uci -q get $zn_arg.network)" ]; then
+				zn_name=$(uci -q get "$zn_arg".name)
+				masq=$(uci -q get "$zn_arg".masq)
+			fi
+		done
+		if [ -z "$enable" ] && ! [ "$masq" = "1" ]; then
+			return
+		fi
+	fi
+
+	config_get internal_client "$nat_port_cfg" "dest_ip"
+	config_get all_interface "$nat_port_cfg" "all_interface"
+	config_get lease_duration "$nat_port_cfg" "lease_duration"
+	config_get remote_host "$nat_port_cfg" "src_ip"
+	config_get external_port "$nat_port_cfg" "src_dport" "0"
+	config_get external_port_end "$nat_port_cfg" "src_dport_end" "0"
+	config_get internal_port "$nat_port_cfg" "dest_port"
+	config_get protocol "$nat_port_cfg" "proto"
+	protocol=$(echo $protocol | awk '{ print tolower($0) }')
+	config_get description "$nat_port_cfg" "name"
+
+	redirect_sec=$(uci add "$dest_uci" redirect)
+
+	"dest_uci"_set_all_intf_src_dip "$redirect_sec" "$zn_name" "$all_interface"
+
+	if [ "$dest_uci" = "firewall" ]; then
+		if [ -n "$lease_duration" ] && ! [ "$lease_duration" == "0" ]; then
+			epoch_sec=$(date +%s)
+			stop_epoch=$(( epoch_sec + lease_duration ))
+			stop_ymd=$(date -d @${stop_epoh} +%Y-%m-%d)
+			stop_hms=$(date -d @${stop_epoch} +%H:%M:%S)
+			uci set "$dest_uci"."$redirect_sec".stop_date="$stop_ymd"
+			uci set "$dest_uci"."$redirect_sec".stop_time="$stop_hms"
+		fi
+	fi
+
+	"$dest_uci"_set_src_dport "$redirect_section" "$external_port" "$external_port_end"
+
+	uci  set "$dest_uci"."$redirect_sec".enabled="1"
+	uci  set "$dest_uci"."$redirect_sec".target="DNAT"
+	uci  set "$dest_uci"."$redirect_sec".dest_ip="$internal_client"
+	[ -z "$protocol" ] || uci set "$dest_uci"."$redirect_sec".proto="$protocol"
+	[ -z "$remote_host" ] || uci  set "$dest_uci"."$redirect_sec".src_ip="$remote_host"
+	[ -z "$internal_port" ] || uci set "$dest_uci"."$redirect_sec".dest_port="$internal_port"
+	[ -z "$description" ] || uci set "$dest_uci"."$redirect_sec".name="$description"
+
+	if [ "$dest_uci" = "firewall" ]; then
+        	uci rename "$dest_uci"."$redirect_sec"="fwmngr_$nat_port_cfg"
+	else
+        	uci rename "$dest_uci"."$redirect_sec"="$nat_port_cfg"
+	fi
+}
+
+handle_include_section() {
+	local include_sec="$1"
+	local dest_uci="$2"
+
+	config_get path "$include_sec" "path"
+	config_get reload "$include_sec" "reload"
+	config_get include_type "$include_sec" "type"
+
+	sec=$(uci   add "$dest_uci" include)
+	[ -z "$path" ] || uci   set "$dest_uci"."$sec".path="$path"
+	[ -z "$reload" ] || uci   set "$dest_uci"."$sec".reload="$reload"
+	[ -z "$include_type" ] || uci   set "$dest_uci"."$sec".type="$include_type"
+	if [ "$dest_uci" = "firewall" ]; then
+        	uci   rename "$dest_uci"."$sec"="fwmngr_$include_sec"
+	else
+        	uci   rename "$dest_uci"."$sec"="$include_sec"
+	fi
+	
+}

firewallmngr/files/firewallmngr_backend_firewallmngr/lib/fwmngr/fwmngr_twamp.sh

@@ -0,0 +1,60 @@
+#! /bin/sh
+
+active_chain=""
+remove_twamp_reflector_rules() {
+	config_get name "$1" name
+
+	if [ "$name" = "Twamp Reflector Rule" ]; then
+		uci delete firewallmngr."$1"
+	fi
+
+}
+
+handle_twamp_reflector_rules() {
+	local twamp_cfg="$1"
+	local sec_name=""
+	local action="Acept"
+
+	config_get enable "$twamp_cfg" enable "1"
+	config_get port "$twamp_cfg" port
+	config_get interface "$twamp_cfg" interface
+
+	if [ "${enable}" -eq 0 ] || [ -z "$port" ] || [ -z "$interface" ]; then
+		return
+	fi
+	sec_name="twamp_${interface}_${port}"
+	rule_twamp=$(uci add firewallmngr rule)
+	uci set firewallmngr."$rule_twamp".enable="1"
+	uci set firewallmngr."$rule_twamp".chain="$active_chain"
+	uci set firewallmngr."$rule_twamp".dest_port="$port"
+	uci set firewallmngr."$rule_twamp".name="Twamp Reflector Rule"
+	uci set firewallmngr."$rule_twamp".interface="$interface"
+	uci set firewallmngr."$rule_twamp".ip_version="4"
+	uci set firewallmngr."$rule_twamp".protocol="17"
+	uci set firewallmngr."$rule_twamp".target="$action"
+	uci rename firewallmngr."$rule_twamp"="fwmngr_$sec_name"
+}
+
+firewallmngr_get_active_chain() {
+	config_get creator "$1" creator
+	[ "$creator" = "PortMapping" ] && return
+
+	config_get enable "$1" enable
+	if [ -n "$enable" ] && [ "$enable" = "1" ]; then
+		config_get active_chain "$1" name
+	fi
+}
+
+handle_twamp_rules() {
+	twamp_enable=$(uci -q get twamp.twamp.enable)
+
+	config_load firewallmngr
+	config_foreach firewallmngr_get_active_chain chain
+
+	config_foreach remove_twamp_reflector_rules rule
+	config_load twamp
+	if [ -n "$twamp_enable" ] && [ "$twamp_enable" == "1" ]; then
+		config_foreach handle_twamp_reflector_rules twamp_reflector
+	fi
+	uci commit firewallmngr
+}

firewallmngr/files/firewallmngr_backend_firewallmngr/lib/fwmngr/is_intf_bridge

@@ -0,0 +1,23 @@
+#!/bin/sh
+. /lib/functions.sh
+
+interface=$1
+intf_dev=""
+is_bridge=0
+
+is_device_type_bridge() {
+	local dev
+	local dev_type
+
+	config_get dev "$1" "name"
+	config_get dev_type "$1" "type"
+	if [ "$dev" = "$intf_dev" ] && [ "$dev_type" = "bridge" ]; then
+		is_bridge=1
+	fi
+}
+
+intf_dev=$(uci -q get network."$interface".device)
+config_load network
+config_foreach is_device_type_bridge device 
+
+echo $is_bridge

firewallmngr/files/firewallmngr_backend_firewallmngr/lib/fwmngr/uci_migration.sh

@@ -0,0 +1,158 @@
+#!/bin/sh
+
+. /lib/functions.sh
+. /lib/fwmngr/fwmngr_functions.sh
+
+uci_mig_include_sections=""
+include_deprecated_list="hosts cwmp dmz mcast twamp portmap service"
+final_include_cfg=""
+
+
+firewallmngr_zone_to_nat_interface_setting() {
+	zone="$1"
+
+	config_get interface "$zone" "network"
+	[ -n "$interface" ] || return
+	config_get enable "$zone" "masq" "0"
+	nat_intf_setting=$(uci add "firewallmngr" "natif")
+	uci set firewallmngr."$nat_intf_setting".enabled="$enable"
+	uci set firewallmngr."$nat_intf_setting".interface="$interface"
+
+	uci rename firewallmngr."$nat_intf_setting"=$(echo "$interface" | awk -F" " '{ print $1 }')
+}
+
+handle_section_forwarding_rule() {
+	local fwd="$1"
+	local chain="$2"
+
+	config_get src_intf "$fwd" "src" 
+	config_get dest_intf "$fwd" "dest"
+
+	rule_sec=$(uci add "firewallmngr" rule)
+	firewallmngr_set_interface "$rule_sec" "$src_intf" "$dest_intf"
+	uci set firewallmngr."$rule_sec".chain="$chain"
+	uci set firewallmngr."$rule_sec".name="$fwd"
+	uci set firewallmngr."$rule_sec".target="accept"
+       	uci rename firewallmngr."$rule_sec"="fwmngr_$fwd"
+}
+
+firewallmngr_handle_section_dmz() {
+	local dmz_cfg="$1"
+	local dest_uci="$2"
+	local dmz_sec=""
+	local enabled=""
+	local origin=""
+	local description=""
+	local interface=""
+	local dest_ip=""
+	local source_prefix=""
+	
+	config_get dest_ip "$dmz_cfg" "dest_ip"
+	config_get interface "$dmz_cfg" "interface"
+	config_get origin "$dmz_cfg" "origin"
+	config_get source_prefix "$dmz_cfg" "source_prefix"
+	config_get description "$dmz_cfg" "description"
+	config_get enabled "$dmz_cfg" "enabled"
+
+	dmz_sec=$(uci add firewallmngr dmz)
+
+	uci set firewallmngr."$dmz_sec".enabled="$enabled"
+	uci set firewallmngr."$dmz_sec".dest_ip="$dest_ip"
+	uci set firewallmngr."$dmz_sec".interface="$interface"
+	uci set firewallmngr."$dmz_sec".origin="$origin"
+	uci set firewallmngr."$dmz_sec".description="$description"
+	uci set firewallmngr."$dmz_sec".source_prefix="$source_prefix"
+
+       	uci rename firewallmngr."$dmz_sec"="$dmz_cfg"
+}
+
+#This call must be triggered from procd boot function
+cleanup_firewallmngr_rule_section() {
+	rule_sec=$(uci show firewallmngr | grep "=rule")
+	for sec in $rule_sec; do
+		rule=$(echo "$sec" | awk -F= '{ print $1 }')
+		uci delete "$rule"
+	done
+	uci commit firewallmngr
+}
+
+firewallmngr_delete_install_dmz_rule() {
+	local dmz_cfgs
+
+	dmz_cfgs=$(uci show firewall | grep "=dmz")
+	for dmz in $dmz_cfgs; do
+		dmz=$(echo $dmz | awk -F= '{ print $1 }')
+		uci del "$dmz"
+	done
+	uci commit firewall
+}
+
+firewall_delete_deprecated_include_section() {
+	new_inc_list=""
+
+	inc_list=$(uci show firewall | grep "=include")
+	for inc in $inc_list; do
+		inc=$(echo "$inc"| awk -F"=" '{ print $1 }')
+
+		inc_name=$(echo "$inc" | awk -F. '{ print $2 }')
+		inc_path=$(uci -q get "$inc".path | awk -F/ '{ print $NF }')
+		inc_file=$(echo "$inc_path" | awk -F. '{ print $2 }')
+
+		inc_ignore=$(echo "$include_deprecated_list"| grep -w "$inc_name")
+		if [ -z "$inc_ignore" ]; then
+			inc_ignore=$(echo "$include_deprecated_list"| grep -w "$inc_file")
+		fi
+		[ -z "$inc_ignore" ] || uci delete "$inc"
+
+	done
+	uci commit firewall
+
+
+}
+
+firewall_backup_include_section() {
+	list=$(uci show firewall)
+        uci_mig_include_sections=$(echo "$list" | grep "=include")
+        uci_mig_include_sections=$(echo "$fw_include_sections" | awk -F= '{ print $1 }')
+        uci_mig_include_sections=$(echo "$fw_include_sections" | awk -F. '{ print $2 }')
+}
+
+firewall_uci_cleanup() {
+# cleanup all sections of firewall uci, firewall uci will be generated by firewallmngr init
+	section_cleanup () {
+		local sec="$1"
+
+		rule_sec=$(uci show firewall | grep "$sec")
+		for rule in $rule_sec; do
+			rule=$(echo "$rule" | awk -F= '{ print $1 }')
+			uci delete "$rule"
+		done
+	}
+
+	section_cleanup "=rule"
+	section_cleanup "=zone"
+	section_cleanup "=redirect"
+	section_cleanup "=dmz"
+	section_cleanup "=service"
+	section_cleanup "=forwarding"
+	section_cleanup "=defaults"
+	section_cleanup "=globals"
+	uci commit firewall
+}
+
+generate_firewallmngr_config() {
+	chain_name=$(firewallmngr_get_active_chain)
+	cleanup_firewallmngr_rule_section
+	config_load firewall
+	config_foreach handle_section_firewall_rule rule "$chain_name" "firewallmngr"
+	config_foreach firewallmngr_zone_to_nat_interface_setting zone 
+	config_foreach handle_section_nat_port_mapping redirect "firewallmngr"
+	config_foreach firewallmngr_handle_section_dmz dmz "firewallmngr"
+	config_foreach handle_section_service service "firewallmngr"
+	config_foreach handle_section_forwarding_rule forwarding "$chain_name"
+
+	uci commit firewallmngr
+
+	firewall_uci_cleanup
+	firewall_delete_deprecated_include_section
+}

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/files/fluent-bit.conf

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

fluent-bit/patches/0001-fix_out_file_plugin.patch

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

fluent-bit/patches/0002-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);
- 

fluentbit/Makefile

@@ -1,21 +1,18 @@
 #
-# Copyright (C) 2024-2025 IOPSYS
+# Copright (C) 2018 The Internet Foundation In Sweden
 #
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=fluent-bit
-PKG_VERSION:=4.0.4
-PKG_RELEASE:=$(AUTORELEASE)
+PKG_NAME:=fluentbit
+PKG_VERSION:=1.0.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.gz
+PKG_SOURCE_VERSION:=v3.0.5
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
-endif
 
 PKG_LICENSE:=Apache-2.0
 PKG_LICENSE_FILES:=LICENSE
@@ -23,38 +20,30 @@ PKG_LICENSE_FILES:=LICENSE
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
-define Package/fluent-bit
+define Package/fluentbit
 	CATEGORY:=Utilities
-	DEPENDS:= +libyaml +libopenssl +libcurl +libatomic +musl-fts +flex +bison +libstdcpp +@OPENSSL_WITH_NPN
-	TITLE:=Fluent-Bit
-	URL:=https://fluentbit.io/
+	DEPENDS:= +libyaml +libopenssl +libcurl +libatomic +musl-fts
+	TITLE:=FluentBit
 endef
 
-define Package/fluent-bit/description
+define Package/fluentbit/description
 	Fluent Bit is a super fast, lightweight, and highly scalable logging and metrics processor and forwarder.
 endef
 
-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-        $(CP) -rf ./fluent-bit/* $(PKG_BUILD_DIR)/
-endef
-endif
-
 # General options
-TARGET_LDFLAGS +=-lfts -latomic
+TARGET_LDFLAGS+=-lfts -latomic
 
 CMAKE_OPTIONS+= \
 	-DFLB_RELEASE=Yes \
-	-DFLB_SMALL=No \
+	-DFLB_SMALL=Yes \
 	-DEXCLUDE_FROM_ALL=true \
-	-DFLB_SHARED_LIB=Yes \
-	-DFLB_DEBUG=Yes \
+	-DBUILD_SHAREDD_LIBS=Yes \
+	-DFLB_DEBUG=No \
 	-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 +55,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 +92,7 @@ CMAKE_OPTIONS += \
 
 
 # Filter options
-CMAKE_OPTIONS += \
+CMAKE_OPTIONS += 
 	-DFLB_FILTER_AWS=No \
 	-DFLB_FILTER_ECS=No \
 	-DFLB_FILTER_KUBERNETES=No \
@@ -141,7 +130,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 \
@@ -168,13 +156,10 @@ CMAKE_OPTIONS += \
 	-DFLB_OUT_CHRONICLE=No \
 	-DFLB_OUT_PGSQL=No
 
-define Package/fluent-bit/install
+define Package/fluentbit/install
+	$(INSTALL_DIR) $(1)/etc/init.d
 	$(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
 endef
 
-$(eval $(call BuildPackage,fluent-bit))
+$(eval $(call BuildPackage,fluentbit))

gateway-info/Makefile

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

gateway-info/files/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"
-    }
-  }
-}

gateway-info/files/etc/config/gateway

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

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

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