parental-control: add procd one shot script

Needs headers to be copied so we can build all files.

bbfdm/Config_bbfdmd.in

@@ -1,10 +1,8 @@
-config BBF_VENDOR_LIST
-	string "Vendor List"
-	default "iopsys"
+if PACKAGE_bbfdmd
 
 config BBF_VENDOR_PREFIX
 	string "Vendor Prefix"
-	default "X_IOPSYS_EU_"
+	default "X_IOWRT_EU_"
 
 config BBF_OBFUSCATION_KEY
 	string "Obfuscation key"
@@ -13,3 +11,4 @@ config BBF_OBFUSCATION_KEY
 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.8.26
+PKG_VERSION:=1.14.3
 
 USE_LOCAL:=0
 ifneq ($(USE_LOCAL),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bbfdm.git
-PKG_SOURCE_VERSION:=6df8fecbcc72e55f2ba06ae933dcddb6f725b204
+PKG_SOURCE_VERSION:=31d8d5d28eff2153a1425f3a8e51e7b45e3e2441
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -32,32 +32,64 @@ define Package/libbbfdm-api
   ABI_VERSION:=1.0
 endef
 
-define Package/libbbfdm
+define Package/libbbfdm-ubus
   SECTION:=utils
   CATEGORY:=Utilities
   SUBMENU:=TRx69
-  TITLE:=Library for broadband forum data model support
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbfdm-api +libopenssl
+  TITLE:=BBF datamodel ubus library, provides API to expose datamodel over ubus
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbfdm-api
 endef
 
 define Package/bbfdmd
   SECTION:=utils
   CATEGORY:=Utilities
   SUBMENU:=TRx69
-  TITLE:=Datamodel ubus backend
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libbbfdm-api +libbbfdm +jq
+  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/libbbfdm/config
-	source "$(SOURCE)/Config_bbfdm.in"
+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
+endef
+
+define Package/bbf_configmngr
+  SECTION:=utils
+  CATEGORY:=Utilities
+  SUBMENU:=TRx69
+  TITLE:= BBF Config Manager
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json
+endef
+
+define Package/bbfdmd/config
+	source "$(SOURCE)/Config_bbfdmd.in"
+endef
+
+define Package/bbf_configmngr/config
+	source "$(SOURCE)/bbf_configmngr.in"
 endef
 
 define Package/libbbfdm-api/description
  Library contains the API(UCI, UBUS, JSON, CLI and Browse) of libbbfdm
 endef
 
-define Package/libbbfdm/description
- Library contains the data model tree. It includes TR181, TR143 data models
+define Package/libbbfdm-ubus/description
+ Library contains the APIs to expose data model over ubus
+endef
+
+define Package/bbfdmd/description
+ Daemon to expose Datamodel core tree
+endef
+
+define Package/dm-service/description
+ Daemon to expose Datamodel micro-service tree
+endef
+
+define Package/bbf_configmngr/description
+ Daemon for handling bbf reload services via ubus bbf.config
 endef
 
 ifeq ($(USE_LOCAL),1)
@@ -67,82 +99,106 @@ endef
 endif
 
 CMAKE_OPTIONS += \
-	-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 += \
+	-DBBF_MAX_OBJECT_INSTANCES:Integer=$(CONFIG_BBF_MAX_OBJECT_INSTANCES) \
 	-DBBFDMD_MAX_MSG_LEN:Integer=10485760
-endif
 
 define Package/libbbfdm-api/install
 	$(INSTALL_DIR) $(1)/lib
-	$(CP) $(PKG_BUILD_DIR)/libbbfdm-api/libbbfdm-api.so $(1)/lib/
-	$(INSTALL_DIR) $(1)/usr/libexec/rpcd
-	$(CP) $(PKG_BUILD_DIR)/libbbfdm-api/scripts/bbf.secure $(1)/usr/libexec/rpcd/bbf.secure
-	$(CP) $(PKG_BUILD_DIR)/libbbfdm-api/scripts/bbf.config $(1)/usr/libexec/rpcd/bbf.config
-	$(INSTALL_DIR) $(1)/etc/bbfdm
-	echo "$(CONFIG_BBF_OBFUSCATION_KEY)" > $(1)/etc/bbfdm/.secure_hash
-	$(INSTALL_DIR) $(1)/etc/bbfdm/certificates
-endef
+	$(CP) $(PKG_BUILD_DIR)/libbbfdm-api/legacy/libbbfdm-api.so $(1)/lib/
+	$(CP) $(PKG_BUILD_DIR)/libbbfdm-api/version-2/libbbfdm-api-v2.so $(1)/lib/
+
+	$(INSTALL_DIR) $(1)/usr/libexec/rpcd
+	$(CP) $(PKG_BUILD_DIR)/utilities/files/usr/libexec/rpcd/bbf.secure $(1)/usr/libexec/rpcd/bbf.secure
+	$(CP) $(PKG_BUILD_DIR)/utilities/files/usr/libexec/rpcd/bbf.diag $(1)/usr/libexec/rpcd/bbf.diag
 
-define Package/libbbfdm/install
-	$(INSTALL_DIR) $(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/95-portmap-firewall $(1)/etc/uci-defaults/95-portmap-firewall
-	$(INSTALL_BIN) ./files/etc/uci-defaults/97-firewall-service $(1)/etc/uci-defaults/97-firewall-service
-	$(INSTALL_BIN) ./files/etc/uci-defaults/99-link-core-plugins $(1)/etc/uci-defaults/99-link-core-plugins
-	$(INSTALL_BIN) ./files/etc/uci-defaults/90-remove-nonexisting-microservices $(1)/etc/uci-defaults/
-	$(INSTALL_BIN) ./files/etc/uci-defaults/91-fix-bbfdmd-enabled-option $(1)/etc/uci-defaults/
-	$(INSTALL_BIN) ./files/etc/firewall.portmap $(1)/etc/firewall.portmap
-	$(INSTALL_BIN) ./files/etc/firewall.service $(1)/etc/firewall.service
-ifeq ($(findstring iopsys,$(CONFIG_BBF_VENDOR_LIST)),iopsys)
-	$(BBFDM_INSTALL_CORE_PLUGIN) $(PKG_BUILD_DIR)/libbbfdm/dmtree/vendor/iopsys/libbbfdm_iopsys_ext.so $(1)
-endif
 	$(INSTALL_DIR) $(1)/usr/share/bbfdm/scripts/
-	$(INSTALL_DIR) $(1)/usr/libexec/rpcd
-	$(CP) $(PKG_BUILD_DIR)/libbbfdm/scripts/* $(1)/usr/share/bbfdm/scripts/
-	$(LN) /usr/share/bbfdm/scripts/bbf.diag $(1)/usr/libexec/rpcd/bbf.diag
+	$(CP) $(PKG_BUILD_DIR)/utilities/files/usr/share/bbfdm/scripts/bbf_api $(1)/usr/share/bbfdm/scripts/
+
+	$(INSTALL_DIR) $(1)/etc/bbfdm/certificates
+	echo "$(CONFIG_BBF_OBFUSCATION_KEY)" > $(1)/etc/bbfdm/.secure_hash
 endef
 
-define Package/libbbfdm/prerm
-	#!/bin/sh
-	rm -rf /etc/bbfdm/dmmap/*
-	exit 0
+define Package/libbbfdm-ubus/install
+	$(INSTALL_DIR) $(1)/lib
+	$(CP) $(PKG_BUILD_DIR)/libbbfdm-ubus/libbbfdm-ubus.so $(1)/lib/
 endef
 
 define Package/bbfdmd/install
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
+	$(INSTALL_DIR) $(1)/etc/bbfdm/dmmap
+	$(INSTALL_DIR) $(1)/usr/share/bbfdm
+
 	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DIR) $(1)/etc/bbfdm
+	$(INSTALL_CONF) ./files/etc/config/bbfdm $(1)/etc/config/bbfdm
+	$(INSTALL_CONF) ./files/etc/config/schedules $(1)/etc/config/schedules
+
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbfdmd/ubus/bbfdmd $(1)/usr/sbin/
-	$(INSTALL_DATA) ./files/etc/bbfdm/input.json $(1)/etc/bbfdm/
+
+	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/etc/init.d/bbfdmd $(1)/etc/init.d/bbfdmd
-	$(INSTALL_BIN) ./files/etc/init.d/bbfdm.services $(1)/etc/init.d/
-	$(INSTALL_CONF) ./files/etc/config/bbfdm $(1)/etc/config/bbfdm
+
+	$(INSTALL_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/
+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/
+endef
+
+define Package/bbf_configmngr/install
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_DIR) $(1)/etc/bbfdm/
+ifeq ($(CONFIG_BBF_CONFIGMNGR_C_BACKEND),y)
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/utilities/bbf_configd $(1)/usr/sbin/
+	$(INSTALL_BIN) ./files/etc/init.d/bbf_configd $(1)/etc/init.d/bbf_configd
+	$(INSTALL_DIR) $(1)/usr/share/bbfdm/scripts
+	$(CP) $(PKG_BUILD_DIR)/utilities/files/usr/share/bbfdm/scripts/bbf_config_notify.sh $(1)/usr/share/bbfdm/scripts/
+endif
+ifeq ($(CONFIG_BBF_CONFIGMNGR_SCRIPT_BACKEND),y)
+	$(INSTALL_DIR) $(1)/usr/libexec/rpcd
+	$(CP) $(PKG_BUILD_DIR)/utilities/files/usr/libexec/rpcd/bbf.config $(1)/usr/libexec/rpcd/bbf.config
+endif
+	$(INSTALL_DATA) ./files/etc/bbfdm/critical_services.json $(1)/etc/bbfdm/
+endef
+
+define Package/bbfdmd/prerm
+	#!/bin/sh
+	rm -rf /etc/bbfdm/dmmap/*
+	exit 0
 endef
 
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/include
 	$(INSTALL_DIR) $(1)/usr/include/libbbfdm-api
-	$(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/
+	$(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
 endef
 
+$(eval $(call BuildPackage,bbf_configmngr))
 $(eval $(call BuildPackage,libbbfdm-api))
-$(eval $(call BuildPackage,libbbfdm))
+$(eval $(call BuildPackage,libbbfdm-ubus))
 $(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

@@ -47,7 +47,6 @@ BBFDM_INSTALL_CORE_PLUGIN:=$(BBFDM_DIR)/tools/bbfdm.sh -p
 # Note:
 # - There could be only one main plugin file, so its bind to PKG_NAME
 # - Micro-service input.json will be auto generated with this call
-# - Use -u (optional argument) to overwrite ubus object name
 #
 # Example:
 #  BBFDM_INSTALL_MS_DM $(PKG_BUILD_DIR)/libcwmp.so $(1) $(PKG_NAME)
@@ -88,6 +87,9 @@ BBFDM_INSTALL_MS_PLUGIN:=$(BBFDM_DIR)/tools/bbfdm.sh -m -p
 #
 BBFDM_INSTALL_SCRIPT:=$(BBFDM_DIR)/tools/bbfdm.sh -s
 
+
+BBFDM_REGISTER_SERVICES:=$(BBFDM_DIR)/tools/bbfdm.sh -t
+
 # Deprecated functions errors
 define BbfdmInstallPluginInMicroservice
 	$(warning # BbfdmInstallPluginInMicroservice function is deprecated, use BBFDM_INSTALL_MS_PLUGIN macro #)

bbfdm/files/etc/bbfdm/critical_services.json

@@ -0,0 +1,18 @@
+{
+	"usp": [
+			"firewall",
+			"network",
+			"dhcp",
+			"wireless",
+			"time"
+	],
+	"cwmp": [
+			"firewall",
+			"network",
+			"dhcp",
+			"stunc",
+			"xmpp",
+			"wireless",
+			"time"
+	]
+}

bbfdm/files/etc/bbfdm/input.json

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

bbfdm/files/etc/config/schedules

@@ -0,0 +1,2 @@
+config global 'global'
+	option enable '1'

bbfdm/files/etc/init.d/bbf_configd

@@ -0,0 +1,41 @@
+#!/bin/sh /etc/rc.common
+
+START=80
+STOP=10
+
+USE_PROCD=1
+PROG=/usr/sbin/bbf_configd
+
+log() {
+	echo "${@}"|logger -t bbf.config -p info
+}
+
+create_needed_directories()
+{
+	mkdir -p /tmp/bbfdm/.cwmp
+	mkdir -p /tmp/bbfdm/.usp
+	mkdir -p /tmp/bbfdm/.bbfdm
+}
+
+start_service()
+{
+	local log_level
+
+	create_needed_directories
+
+	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
+	done
+}

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

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

bbfdm/files/etc/init.d/bbfdmd

@@ -1,14 +1,11 @@
 #!/bin/sh /etc/rc.common
 
-START=65
+START=97
 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() {
@@ -19,17 +16,13 @@ validate_bbfdm_bbfdmd_section()
 {
 	uci_validate_section bbfdm bbfdmd "bbfdmd" \
 		'enable:bool:true' \
-		'sock:string' \
 		'debug:bool:false' \
-		'loglevel:uinteger:1' \
-		'refresh_time:uinteger:0' \
-		'transaction_timeout:uinteger:30' \
-		'subprocess_level:uinteger'
+		'loglevel:uinteger:4'
 }
 
 configure_bbfdmd()
 {
-	local enable debug sock
+	local enable debug
 	local jlog jrefresh jtimeout jlevel
 
 	config_load bbfdm
@@ -40,25 +33,17 @@ configure_bbfdmd()
 
 	[ "${enable}" -eq 0 ] && return 0
 
-	if [ -f "${BBFDM_JSON_INPUT}" ]; then
-		echo "$(jq --arg log ${loglevel} --arg tran ${transaction_timeout} --arg refresh ${refresh_time} --arg level ${subprocess_level} '.daemon.config += {"loglevel": $log, "refresh_time": $refresh, "transaction_timeout": $tran, "subprocess_level": $level}' ${BBFDM_JSON_INPUT})" > "${BBFDM_TEMP_DIR}/input.json"
-	fi
-
 	procd_set_param command ${PROG}
+	procd_append_param command -l "${loglevel}"
+
 	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/uci-defaults/90-remove-nonexisting-microservices

@@ -1,18 +0,0 @@
-#!/bin/sh
-. /lib/functions.sh
-
-remove_nonexisting_microservice() {
-	local input_json
-
-	config_get input_json "$1" input_json ""
-
-	if [ -z "${input_json}" ]; then
-		uci_remove bbfdm "${1}"
-	fi
-}
-
-config_load bbfdm
-config_foreach remove_nonexisting_microservice "micro_service"
-
-exit 0
-

bbfdm/files/etc/uci-defaults/99-link-core-plugins

@@ -1,34 +0,0 @@
-#!/bin/sh
-
-UNIFIED_PATH="/usr/share/bbfdm/plugins/"
-
-log() {
-	echo "$@" | logger -t bbfdm.uci-default -p info
-}
-
-# Link JSON plugins
-for f in `ls -1 /etc/bbfdm/json/*.json`; do
-	log "# BBFDM JSON plugin ${f} not aligned #"
-	ln -s ${f} "${UNIFIED_PATH}"
-done
-
-# Link DotSo plugins
-for f in `ls -1 /usr/lib/bbfdm/*.so`; do
-	log "# BBFDM DotSO plugin ${f} not aligned #"
-	ln -s ${f} "${UNIFIED_PATH}"
-done
-
-# Link JSON plugins
-for f in `ls -1 /etc/bbfdm/plugins/*.json`; do
-	log "# BBFDM JSON plugin ${f} not aligned #"
-	ln -s ${f} "${UNIFIED_PATH}"
-done
-
-# Link DotSo plugins
-for f in `ls -1 /etc/bbfdm/plugins/*.so`; do
-	log "# BBFDM DotSO plugin ${f} not aligned #"
-	ln -s ${f} "${UNIFIED_PATH}"
-done
-
-exit 0
-

bbfdm/tools/bbfdm.sh

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

bbfdm/tools/validate_plugins.py

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

blkpg-part/Makefile

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

bridgemngr/Config.in

@@ -0,0 +1,17 @@
+if PACKAGE_bridgemngr
+
+config BRIDGEMNGR_BRIDGE_VLAN
+	bool "Use bridge-vlan backend"
+	help
+	   Set this option to use bridge-vlan as backend for VLAN objects.
+
+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 ""
+endif

bridgemngr/Makefile

@@ -5,14 +5,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bridgemngr
-PKG_VERSION:=1.0.2
+PKG_VERSION:=1.0.11
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/bridgemngr
-PKG_SOURCE_VERSION:=9cddf87b527ef1614a8a39db67e6578ff1810031
+PKG_SOURCE_VERSION:=18c2921a1cf5bfa027c11c5e6ca605ef69fd1168
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -26,22 +26,45 @@ include ../bbfdm/bbfdm.mk
 define Package/bridgemngr
  CATEGORY:=Utilities
  TITLE:=Bridge Manager
- DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libbbfdm-api
+ DEPENDS:=+libuci +libubox +libubus +libblobmsg-json
+ DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service
 endef
 
 define Package/bridgemngr/description
 	Package to add Device.Bridging. data model support.
 endef
 
+define Package/$(PKG_NAME)/config
+	source "$(SOURCE)/Config.in"
+endef
+
 MAKE_PATH:=src
 
-TARGET_CFLAGS += -DBBF_VENDOR_PREFIX=\\\"$(CONFIG_BBF_VENDOR_PREFIX)\\\"
+ifeq ($(CONFIG_BRIDGEMNGR_BRIDGE_VENDOR_PREFIX),"")
+VENDOR_PREFIX = $(CONFIG_BBF_VENDOR_PREFIX)
+else
+VENDOR_PREFIX = $(CONFIG_BRIDGEMNGR_BRIDGE_VENDOR_PREFIX)
+endif
+
+TARGET_CFLAGS += -DBBF_VENDOR_PREFIX=\\\"$(VENDOR_PREFIX)\\\"
+
+ifeq ($(CONFIG_BRIDGEMNGR_BRIDGE_VLAN),y)
+	TARGET_CFLAGS += -DBRIDGE_VLAN_BACKEND
+endif
 
 define Package/bridgemngr/install
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_DIR) $(1)/etc/config
+
+	$(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) $(PKG_NAME)
 	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/libbridgemngr.so $(1) $(PKG_NAME)
-ifeq ($(findstring iopsys,$(CONFIG_BBF_VENDOR_LIST)),iopsys)
+ifeq ($(CONFIG_BRIDGEMNGR_BRIDGE_VENDOR_EXT), y)
 	$(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/src/libbridgeext.so $(1) $(PKG_NAME)
+	$(BBFDM_INSTALL_MS_PLUGIN) -v ${VENDOR_PREFIX} ./files/VLAN_Filtering_Extension.json $(1) $(PKG_NAME)
 endif
+
+	$(INSTALL_BIN) ./files/etc/init.d/bridging $(1)/etc/init.d/
+	$(INSTALL_DATA) ./files/etc/config/bridging $(1)/etc/config/
 endef
 
 ifeq ($(LOCAL_DEV),1)

bridgemngr/bbfdm_service.json

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

bridgemngr/files/VLAN_Filtering_Extension.json

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

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

bridgemngr/files/etc/init.d/bridging

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

bulkdata/Makefile

@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bulkdata
-PKG_VERSION:=2.1.10
+PKG_VERSION:=2.1.19
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bulkdata.git
-PKG_SOURCE_VERSION:=e472e90feec31d9f318ea8c732ab564002e25db1
+PKG_SOURCE_VERSION:=628525b02ae9ccd39f4bc85cf616ed4a102bca48
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -24,12 +24,17 @@ PKG_LICENSE_FILES:=LICENSE
 include $(INCLUDE_DIR)/package.mk
 include $(TOPDIR)/feeds/iopsys/bbfdm/bbfdm.mk
 
-define Package/$(PKG_NAME)
+define Package/bulkdata
   SECTION:=utils
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=BBF BulkData Collection
-  DEPENDS:=+libubus +libuci +libubox +libjson-c +libcurl +libblobmsg-json +zlib
+  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.
 endef
 
 TARGET_CFLAGS += \
@@ -42,16 +47,15 @@ define Build/Prepare
 endef
 endif
 
-define Package/$(PKG_NAME)/install
+define Package/bulkdata/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/
-	$(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)
+
+	$(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) $(PKG_NAME)
 endef
 
-$(eval $(call BuildPackage,$(PKG_NAME)))
+$(eval $(call BuildPackage,bulkdata))

bulkdata/bbfdm_service.json

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

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

@@ -1,960 +0,0 @@
-{
-	"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: Error=1, Warning=2, Info=3, Debug=4
-	option log_level '3'
+	#Log levels: As per syslog 0-7, default 6=>LOG_INFO
+	option loglevel '3'
 

bulkdata/files/etc/init.d/bulkdatad

@@ -6,26 +6,36 @@ 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
+	local enable loglevel
 
-	config_load bulkdata
-	config_get_bool enable bulkdata enable 1
+	validate_global_section
 
-	[ "$enable" -eq "1" ] && {
-		procd_open_instance "bulkdata"
-		procd_set_param command "$PROG"
-		procd_set_param respawn
-		procd_close_instance "bulkdata"
-	}
+	procd_open_instance "bulkdata"
+	procd_set_param command "$PROG"
+	procd_append_param command -l ${loglevel}
+	procd_set_param respawn
+	procd_close_instance "bulkdata"
 }
 
 reload_service() {
-	stop
-	start 
+	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
 }
 
-service_triggers()
-{
+service_triggers() {
 	procd_add_reload_trigger bulkdata
 }

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

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

@@ -0,0 +1,52 @@
+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.5
+PKG_VERSION:=1.0.10
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/ddnsmngr.git
-PKG_SOURCE_VERSION:=f3c818322747922035a9eafe5de05d148ce15b4b
+PKG_SOURCE_VERSION:=5144e73fad92d23ae706894a4357436c3fe89355
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -28,7 +28,8 @@ define Package/$(PKG_NAME)
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=Dynamic DNS manager
-  DEPENDS:=+libbbfdm-api +DDNSMNGR_BACKEND_DDNSSCRIPT:ddns-scripts +DDNSMNGR_BACKEND_INADYN:inadyn
+  DEPENDS:=+DDNSMNGR_BACKEND_DDNSSCRIPT:ddns-scripts +DDNSMNGR_BACKEND_INADYN:inadyn
+  DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service
   MENU:=1
 endef
 
@@ -70,6 +71,7 @@ ifeq ($(CONFIG_DDNSMNGR_BACKEND_INADYN),y)
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/files/inadyn/server/* $(1)/etc/ddnsmngr/servers
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/inadyn/usr/libexec/rpcd/ddnsmngr $(1)/usr/libexec/rpcd/ddnsmngr
 endif
+	$(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) $(PKG_NAME)
 	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/libddnsmngr.so $(1) $(PKG_NAME)
 endef
 

ddnsmngr/bbfdm_service.json

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

decollector/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=decollector
-PKG_VERSION:=6.0.0.9
+PKG_VERSION:=6.1.0.7
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=08cd179438b8085c19e7d7523c9b26adfcb93129
+PKG_SOURCE_VERSION:=db4eae19a3f716eec5a37aa2786b9bbbe3160b54
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/decollector.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

dectmngr/Makefile

@@ -2,13 +2,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dectmngr
 PKG_RELEASE:=3
-PKG_VERSION:=3.6.6
+PKG_VERSION:=3.7.3
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=85c173d1fac535726b2e750be8c282b74fb7dbca
+PKG_SOURCE_VERSION:=393dfd7637fdeccc24ef286c3daec9a232896b98
 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
+	DEPENDS:= +libubox +ubus +uci +libxml2 +libjson-c +gpiod-tools +voicemngr
 endef
 
 define Package/$(PKG_NAME)/description

dhcpmngr/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dhcpmngr
-PKG_VERSION:=1.0.1
+PKG_VERSION:=1.0.5
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/dhcpmngr.git
-PKG_SOURCE_VERSION:=d15d21766c1a1e5054b2391de1cfc4708be7a14c
+PKG_SOURCE_VERSION:=2a517188211849bcc324a9f9727eeb34d076c032
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -28,7 +28,11 @@ define Package/dhcpmngr
   SECTION:=net
   CATEGORY:=Network
   TITLE:=Package to add Device.DHCPv4 and v6 data model support.
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbfdm-api +dnsmasq
+  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
 endef
 
 define Package/dhcpmngr/description
@@ -44,6 +48,11 @@ 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

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

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

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

dnsmngr/Config.in

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

dnsmngr/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dnsmngr
-PKG_VERSION:=1.0.6
+PKG_VERSION:=1.0.14
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/dnsmngr.git
-PKG_SOURCE_VERSION:=03d8d79c1221adb92b5789c03e2489d26c6ae184
+PKG_SOURCE_VERSION:=e64ec01b57d8b32e5230b34f6a3866250b1a8faf
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -27,23 +27,49 @@ MAKE_PATH:=src
 define Package/dnsmngr
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbfdm-api +dnsmasq +umdns
-  TITLE:=Package to add Device.DNS. datamodel support
+  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
 endef
 
 define Package/dnsmngr/description
-  Package to add Device.DNS. datamodel support.
+  Package to configure DNS backend and TR-181 support.
 endef
 
+define Package/$(PKG_NAME)/config
+	source "$(SOURCE)/Config.in"
+endef
+
+ifeq ($(CONFIG_DNSMNGR_DNS_SD),y)
+define Build/Compile
+	$(call Build/Compile/Default,all)
+endef
+else
+define Build/Compile
+	$(call Build/Compile/Default,dns)
+endef
+endif
+
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
 	$(CP) -rf ~/git/dnsmngr/* $(PKG_BUILD_DIR)/
 endef
 endif
 
+ifeq ($(CONFIG_DNSMNGR_BACKEND_DNSMASQ),y)
+        TARGET_CFLAGS += -DDNSMASQ_BACKEND
+endif
+
 define Package/dnsmngr/install
+	$(BBFDM_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)
+endif
 endef
 
 $(eval $(call BuildPackage,dnsmngr))

dnsmngr/bbfdm_service.json

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

dslmngr/Makefile

@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dslmngr
-PKG_VERSION:=1.2.4
+PKG_VERSION:=1.2.9
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/hal/dslmngr.git
-PKG_SOURCE_VERSION:=d71bef278b8222dee1c278723f8264aa8faf5e40
+PKG_SOURCE_VERSION:=5340cb31f759301f5aca3fd848fc3a63b0b4663f
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MAINTAINER:=Rahul Thakur <rahul.thakur@iopsys.eu>
 PKG_MIRROR_HASH:=skip
@@ -40,7 +40,8 @@ define Package/dslmngr
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=XDSL status and configration utility
-  DEPENDS:=+libdsl +libuci +libubox +ubus +libpthread +libnl-genl +libeasy +libbbfdm-api
+  DEPENDS:=+libdsl +libuci +libubox +ubus +libpthread +libnl-genl +libeasy
+  DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service
 endef
 
 define Package/dslmngr/description
@@ -77,6 +78,7 @@ ifeq ($(CONFIG_TARGET_brcmbca),y)
 endif
 	$(INSTALL_DIR) $(1)/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/dslmngr $(1)/sbin/
+	$(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) $(PKG_NAME)
 	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/libbbfdsl.so $(1) $(PKG_NAME)
 endef
 

dslmngr/bbfdm_service.json

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

easy-qos/Makefile

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

easy-qos/files/etc/firewall.easyqos

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

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

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

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

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

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

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

ebtables-extensions/Makefile

@@ -6,75 +6,255 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ebtables-extensions
-PKG_VERSION:=1.0.2
+PKG_VERSION:=2.0.4
 PKG_LICENSE:=GPL-2.0
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=a23a70f5518a42d663156a156c1e3356f695b5ad
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/ebtables-extensions.git
+PKG_SOURCE_VERSION:=9a2af49b455ee25ca0694274e004ced7c09855a0
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 
 include $(INCLUDE_DIR)/package.mk
 
-define KernelPackage/vlantranslation
+define KernelPackage/ebt-vlantranslation
   SUBMENU:=Other modules
   TITLE:=Kernel module for ebtables VLAN translation
   FILES:=$(PKG_BUILD_DIR)/src/ebt_vlantranslation.ko
   DEPENDS+=+kmod-ebtables
-  AUTOLOAD:=$(call AutoLoad,30,ebt_vlantranslation,1)
+  AUTOLOAD:=$(call AutoLoad,30,ebt_vlantranslation)
   KCONFIG:=
 endef
 
-define KernelPackage/dscp2pbit
+define KernelPackage/ebt-dscp2pbit
   SUBMENU:=Other modules
   TITLE:=Kernel module for DSCP-to-Pbit mapping
   DEPENDS+=+kmod-ebtables
   FILES:=$(PKG_BUILD_DIR)/src/ebt_dscp2pbit.ko
-  AUTOLOAD:=$(call AutoLoad,30,ebt_dscp2pbit,1)
+  AUTOLOAD:=$(call AutoLoad,30,ebt_dscp2pbit)
   KCONFIG:=
 endef
 
-define KernelPackage/vlantranslation/description
+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
 	Kernel module to enable VLAN translation for ebtables
 endef
 
-define KernelPackage/dscp2pbit/description
-	Kernel module to enableDSCP-to-Pbit mapping for ebtables
+define KernelPackage/ebt-dscp2pbit/description
+	Kernel module to enable DSCP-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
 
 ifeq ($(CONFIG_TARGET_brcmbca),y)
 	include ../../broadcom/bcmkernel/bcm-kernel-toolchain.mk
 endif
 
+define Build/Prepare
+
 ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-	$(CP) -rf ./src/* $(PKG_BUILD_DIR)/
-	$(CP) $(PKG_BUILD_DIR)/src/ebt_vlantranslation.h $(LINUX_DIR)/include/uapi/linux/netfilter_bridge/
-	$(CP) $(PKG_BUILD_DIR)/src/ebt_dscp2pbit.h $(LINUX_DIR)/include/uapi/linux/netfilter_bridge/
-endef
+	$(CP) -rf ./ebtables-extensions/* $(PKG_BUILD_DIR)/
 else
-define Build/Prepare
 	$(Build/Prepare/Default)
+endif
 	$(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
+	$(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
 
 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
 
 KERNEL_MAKE_FLAGS += -I$(LINUX_DIR)/include
+ifeq ($(CONFIG_TARGET_airoha),y)
+  KERNEL_MAKE_FLAGS += PLATFORM="ECONET"
+endif
 
 define Build/Compile
 	$(KERNEL_MAKE) M="$(PKG_BUILD_DIR)/src" modules
 endef
 
-$(eval $(call KernelPackage,vlantranslation))
-$(eval $(call KernelPackage,dscp2pbit))
+$(eval $(call KernelPackage,ebt-vlantranslation))
+$(eval $(call KernelPackage,ebt-dscp2pbit))
+$(eval $(call KernelPackage,ebt-dhcp))
+$(eval $(call KernelPackage,ebt-dhcpv6))
+$(eval $(call KernelPackage,ebt-ra))
+$(eval $(call KernelPackage,ebt-dns))
+$(eval $(call KernelPackage,ebt-pppoe_disc))
+$(eval $(call KernelPackage,ebt-l2pt))
+$(eval $(call KernelPackage,ebt-xtarp))
+$(eval $(call KernelPackage,ebt-xtip))
+$(eval $(call KernelPackage,ebt-xtip6))
+$(eval $(call KernelPackage,ebt-igmpsnooping))
+$(eval $(call KernelPackage,ebt-mldsnooping))

ethmngr/Config.in

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

ethmngr/Makefile

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

ethmngr/bbfdm_service.json

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

ethmngr/files/etc/init.d/ethmngr

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

ethmngr/files/etc/ruleng/ethport.json

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

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

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

firewallmngr/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=firewallmngr
-PKG_VERSION:=1.0.1
+PKG_VERSION:=1.0.9
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/firewallmngr.git
-PKG_SOURCE_VERSION:=f5c3e2c93a8a992ab24291eb2c67adf77de7f896
+PKG_SOURCE_VERSION:=77ad8425b73a3ac63f6160dc217635394ac87907
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -28,9 +28,10 @@ define Package/firewallmngr
   SECTION:=net
   CATEGORY:=Network
   TITLE:=Package to add Device.Firewall and Device.NAT. data model support.
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbfdm-api +firewall
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +firewall
   DEPENDS+=+FIREWALLMNGR_PORT_TRIGGER:kmod-ipt-trigger +FIREWALLMNGR_PORT_TRIGGER:kmod-ip6t-trigger
   DEPENDS+=+FIREWALLMNGR_PORT_TRIGGER:iptables-mod-nfqueue
+  DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service
 endef
 
 define Package/firewallmngr/description
@@ -53,15 +54,22 @@ endif
 
 define Package/firewallmngr/install
 	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
 ifeq ($(CONFIG_FIREWALLMNGR_PORT_TRIGGER),y)
 	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/lib/port-trigger
 
 	$(INSTALL_BIN) ./files/port-trigger/etc/init.d/port-trigger $(1)/etc/init.d/
 	$(INSTALL_DATA) ./files/port-trigger/etc/config/port-trigger $(1)/etc/config/
 	$(INSTALL_DATA) ./files/port-trigger/lib/port-trigger/port_trigger.sh $(1)/lib/port-trigger/
 endif
+	$(INSTALL_BIN) ./files/firewall.portmap $(1)/etc/
+	$(INSTALL_DATA) ./files/etc/uci-defaults/95-portmap-firewall $(1)/etc/uci-defaults/
+
+	$(INSTALL_BIN) ./files/firewall.service $(1)/etc/
+	$(INSTALL_DATA) ./files/etc/uci-defaults/97-firewall-service $(1)/etc/uci-defaults/
+
+	$(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) $(PKG_NAME)
 	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/libfirewallmngr.so $(1) $(PKG_NAME)
 endef
 

firewallmngr/bbfdm_service.json

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

fluent-bit/Makefile

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

fluent-bit/files/fluent-bit.conf

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

fluent-bit/patches/0001-fix_out_file_plugin.patch

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

fluent-bit/patches/0002-add_hostname_to_log_dump.patch

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

hostmngr/Config.in

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

hostmngr/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hostmngr
-PKG_VERSION:=1.2.5
+PKG_VERSION:=1.2.14
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=20402c9fb60afa0678d844b0401e1b89699ff8b3
+PKG_SOURCE_VERSION:=6ea9fdb38a8e067b850841d6e7f7266bf76c363a
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/hostmngr.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
@@ -24,6 +24,7 @@ PKG_LICENSE_FILES:=LICENSE
 include $(INCLUDE_DIR)/package.mk
 include $(TOPDIR)/feeds/iopsys/bbfdm/bbfdm.mk
 
+
 define Package/hostmngr
   SECTION:=utils
   CATEGORY:=Utilities
@@ -31,9 +32,8 @@ define Package/hostmngr
   DEPENDS= +libubox +libuci +libubus +ubus +libeasy +libnl-genl \
 	   +libjson-c +libblobmsg-json +libnfnetlink +libmnl \
 	   +libnetfilter-conntrack \
-	   +HOSTMNGR_PLATFORM_HAS_WIFI:libwifi +libbbfdm-api \
-	   +libwifiutils
-
+	   +HOSTMNGR_PLATFORM_HAS_WIFI:libwifi +libwifiutils
+  DEPENDS+= +libbbfdm-api +libbbfdm-ubus +dm-service
 endef
 
 define Package/hostmngr/config
@@ -55,6 +55,15 @@ ifeq ($(CONFIG_HOSTMNGR_PLATFORM_HAS_WIFI),y)
 TARGET_CFLAGS += -DHAS_WIFI
 endif
 
+ifeq ($(CONFIG_HOSTMNGR_DATAMODEL_EXT),y)
+TARGET_CFLAGS += -DHAS_VENDOR_EXT
+ifeq ($(CONFIG_HOSTMNGR_VENDOR_PREFIX),"")
+TARGET_CFLAGS += -DCUSTOM_PREFIX=\\\"$(CONFIG_BBF_VENDOR_PREFIX)\\\"
+else
+TARGET_CFLAGS += -DCUSTOM_PREFIX=\\\"$(CONFIG_HOSTMNGR_VENDOR_PREFIX)\\\"
+endif
+endif
+
 MAKE_PATH:=src
 
 define Package/hostmngr/install
@@ -63,7 +72,14 @@ define Package/hostmngr/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/hostmngr $(1)/usr/sbin/
 	$(INSTALL_DIR) $(1)/usr/share/hostmngr
 	$(INSTALL_DATA) ./files/scripts/hosts_acl.sh $(1)/usr/share/hostmngr/
+
+	$(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) $(PKG_NAME)
 	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/bbf_plugin/libhostmngr.so $(1) $(PKG_NAME)
+
+ifeq ($(CONFIG_HOSTMNGR_DATAMODEL_EXT),y)
+	$(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/src/bbf_plugin/libhostext.so $(1) $(PKG_NAME)
+endif
+
 endef
 
 ifeq ($(LOCAL_DEV),1)

hostmngr/bbfdm_service.json

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

hostmngr/files/scripts/hosts_acl.sh

@@ -114,16 +114,16 @@ ip_rule_east_zone() {
 
 add_access_rule() {
 	local rule="$1"
-	echo "iptables -w -A hosts_forward ${rule}" >> $ACL_FILE
-	echo "ip6tables -w -A hosts_forward ${rule}" >> $ACL_FILE
+	echo "iptables -w -A hosts_forward ${rule}" >> "$ACL_FILE"
+	echo "ip6tables -w -A hosts_forward ${rule}" >> "$ACL_FILE"
 }
 
 handle_day_list() {
 	local value=$1
 
-	val=$(echo $value | cut -c 1-3)
-	next_day_val=$(get_next_day $val)
-	prev_day_val=$(get_previous_day $val)
+	val=$(echo "$value" | cut -c 1-3)
+	next_day_val=$(get_next_day "$val")
+	prev_day_val=$(get_previous_day "$val")
 	if [ -z $day ]; then
 		day="$val"
 		next_days="$next_day_val"
@@ -137,8 +137,6 @@ handle_day_list() {
 
 handle_schedule() {
 	local schd_section="$1"
-	local ac_section="$2"
-	local acs_id
 	local start_time
 	local duration
 
@@ -148,11 +146,7 @@ handle_schedule() {
 	next_days=""
 	prev_days=""
 
-	config_get acs_id "$schd_section" "dm_parent"
-
-	if [ "$acs_id" != "$ac_section" ]; then
-		return # schedule not for this access control section
-	fi
+	config_load schedules
 
 	local is_enabled
 	config_get is_enabled "$schd_section" "enable" 0
@@ -166,7 +160,7 @@ handle_schedule() {
 
 	IFS=" "
 	for d in $day_config; do
-		handle_day_list $d
+		handle_day_list "$d"
 	done
 
 	config_get start_time "$schd_section" "start_time" "00:00"
@@ -174,8 +168,8 @@ handle_schedule() {
 
 	zone=$(date +%z | cut -c 1)
 	local_start_time=$start_time
-	hh=$(echo $local_start_time | awk -F: '{ print $1 }')
-	mm=$(echo $local_start_time | awk -F: '{ print $2 }')
+	hh=$(echo "$local_start_time" | awk -F: '{ print $1 }')
+	mm=$(echo "$local_start_time" | awk -F: '{ print $2 }')
 	hh_s=`expr $hh \* 3600`
 	mm_s=`expr $mm \* 60`
 	ss=$(( hh_s + mm_s ))
@@ -197,12 +191,12 @@ handle_schedule() {
 
 	utc_start_time=$(date -u -d @$(date "+%s" -d "$local_start_time") +%H:%M)
 	utc_stop_time=$(date -u -d @$(date "+%s" -d "$local_stop_time") +%H:%M)
-	utc_start_hh=$(echo $utc_start_time | awk -F: '{ print $1 }')
-	utc_stop_hh=$(echo $utc_stop_time | awk -F: '{ print $1 }')
+	utc_start_hh=$(echo "$utc_start_time" | awk -F: '{ print $1 }')
+	utc_stop_hh=$(echo "$utc_stop_time" | awk -F: '{ print $1 }')
 	if [ "$zone" == "-" ]; then
-		ip_rule_west_zone $utc_start_hh $utc_stop_hh $local_start_hh $local_stop_hh $utc_start_time $utc_stop_time
+		ip_rule_west_zone "$utc_start_hh" "$utc_stop_hh" "$local_start_hh" "$local_stop_hh" "$utc_start_time" "$utc_stop_time"
 	else
-		ip_rule_east_zone $utc_start_hh $utc_stop_hh $local_start_hh $local_stop_hh $utc_start_time $utc_stop_time
+		ip_rule_east_zone "$utc_start_hh" "$utc_stop_hh" "$local_start_hh" "$local_stop_hh" "$utc_start_time" "$utc_stop_time"
 	fi
 
 	IP_RULE="$IP_RULE -j ACCEPT"
@@ -258,7 +252,7 @@ handle_access_control() {
 	schedule_added="0"
 	# check if schedule is defined for this access_control instance
 	# and if yes, create rule accordingly
-	config_foreach handle_schedule  ac_schedule "$ac_section"
+	config_list_foreach "$ac_section" access_control_schedule handle_schedule
 
 	# for access rule to work, need to have default drop rule as last rule
 	if [ "$schedule_added" == "1" ]; then

icwmp/Config.in

@@ -0,0 +1,10 @@
+menu "Configuration"
+
+config ICWMP_MGMT_FROM_USP
+	bool "Support configuration of ManagementServer from USP"
+	default y
+
+config ICWMP_BACKUP_EVENTS
+	bool "Create backup of session events to persistent storage after each successful session"
+	default y
+endmenu

icwmp/Makefile

@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=9.7.15
+PKG_VERSION:=9.8.28
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/icwmp.git
-PKG_SOURCE_VERSION:=fb3c8833f3fce7fe3659395cab48e7078f2007d5
+PKG_SOURCE_VERSION:=6c11ce31e4e959b54e32e1fcb70625cec19e672b
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -31,9 +31,27 @@ define Package/icwmp
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=TR069 CWMP client
-  DEPENDS:=+libuci +libubox +libblobmsg-json +libubus +libjson-c +libcurl +mxml +libuuid +libbbfdm-api +libopenssl
+  DEPENDS:=+libuci +libubox +libblobmsg-json +libubus +libjson-c +libcurl +mxml +libuuid +libopenssl
+  DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service +sysmngr
+  MENU:=1
 endef
 
+define Package/icwmp/description
+ TR069 client implementation with bbfdm backend for TR181 support
+endef
+
+define Package/icwmp/config
+	source "$(SOURCE)/Config.in"
+endef
+
+ifeq ($(CONFIG_ICWMP_MGMT_FROM_USP),y)
+EXTRA_CFLAGS += -DCWMP_DUAL_SUPPORT=BBFDM_BOTH
+endif
+
+ifeq ($(CONFIG_ICWMP_BACKUP_EVENTS),y)
+EXTRA_CFLAGS += -DPERSIST_BACKUP_SESSION_EVENTS
+endif
+
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
 	$(CP) -rf ~/git/icwmp/* $(PKG_BUILD_DIR)/
@@ -50,14 +68,16 @@ define Package/icwmp/install
 	$(INSTALL_DIR) $(1)/etc/udhcpc.user.d
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/icwmpd $(1)/usr/sbin/icwmpd
 	$(INSTALL_DATA) ./files/etc/config/cwmp $(1)/etc/config/cwmp
-	$(INSTALL_BIN) ./files/etc/firewall.cwmp $(1)/etc/firewall.cwmp
 	$(INSTALL_BIN) ./files/etc/init.d/icwmpd $(1)/etc/init.d/icwmpd
 	$(INSTALL_BIN) ./files/etc/uci-defaults/85-cwmp-set-userid $(1)/etc/uci-defaults/
 	$(INSTALL_BIN) ./files/etc/uci-defaults/90-cwmpfirewall $(1)/etc/uci-defaults/
 	$(INSTALL_BIN) ./files/etc/uci-defaults/95-set-random-inform-time $(1)/etc/uci-defaults/
+	$(INSTALL_BIN) ./files/etc/icwmpd/vendor_log.sh $(1)/etc/icwmpd/vendor_log.sh
+	$(INSTALL_BIN) ./files/etc/icwmpd/firewall.cwmp $(1)/etc/icwmpd/firewall.cwmp
 	$(INSTALL_DATA) ./files/lib/upgrade/keep.d/icwmp $(1)/lib/upgrade/keep.d/icwmp
 	$(INSTALL_BIN) ./files/etc/udhcpc.user.d/udhcpc_icwmp_opt125.user $(1)/etc/udhcpc.user.d/udhcpc_icwmp_opt125.user
 	$(INSTALL_BIN) ./files/etc/udhcpc.user.d/udhcpc_icwmp_opt43.user $(1)/etc/udhcpc.user.d/udhcpc_icwmp_opt43.user
+	$(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) $(PKG_NAME)
 	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/libcwmpdm.so $(1) $(PKG_NAME)
 	$(BBFDM_INSTALL_MS_PLUGIN) ./files/etc/bbfdm/json/CWMPManagementServer.json $(1) $(PKG_NAME)
 endef

icwmp/bbfdm_service.json

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

icwmp/files/etc/config/cwmp

@@ -20,9 +20,8 @@ config cpe 'cpe'
 	option default_lan_interface 'lan'
 	option log_to_console 'disable'
 	option log_to_file 'disable'
-	# log_severity: INFO (Default)	
 	# log_severity possible configs: EMERG, ALERT, CRITIC ,ERROR, WARNING, NOTICE, INFO, DEBUG
-	option log_severity 'ERROR'
+	option log_severity 'WARNING'
 	option log_file_name '/var/log/icwmpd.log'
 	option log_max_size '102400'
 	option userid '' #$OUI-$SER
@@ -41,6 +40,7 @@ config cpe 'cpe'
 	option active_notif_throttle '0'
 	option disable_gatewayinfo '0'
 	option fw_upgrade_keep_settings '1'
+	option clock_sync_timeout '128'
 	
 config lwn 'lwn'
 	option enable '0'

icwmp/files/etc/icwmpd/firewall.cwmp

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

icwmp/files/etc/icwmpd/vendor_log.sh

@@ -0,0 +1,29 @@
+#!/bin/sh
+# This script handles '2 Vendor Log File' of Download RPC
+# Vendors can replace this file if they need to collect more logs
+
+VENDOR_LOG_FILE="/tmp/icwmp/2_vendor_log"
+ret=""
+
+if [ -n "$(which logread)" ]; then
+	mkdir -p /tmp/icwmp
+
+	logread > "${VENDOR_LOG_FILE}"
+
+	arch_file="${VENDOR_LOG_FILE}.tar"
+
+	if [ -f "${arch_file}" ]; then
+		rm -f ${arch_file}
+	fi
+
+	if [ -f "${VENDOR_LOG_FILE}" ]; then
+		tar -cf "${arch_file}" "${VENDOR_LOG_FILE}"  2> /dev/null
+		if [ -f "${arch_file}" ]; then
+			ret="${arch_file}"
+		fi
+
+		rm -rf "${VENDOR_LOG_FILE}"
+	fi
+fi
+
+echo "${ret}"

icwmp/files/etc/uci-defaults/90-cwmpfirewall

@@ -3,7 +3,7 @@
 uci -q batch <<-EOT
         delete firewall.cwmp
         set firewall.cwmp=include
-        set firewall.cwmp.path=/etc/firewall.cwmp
+        set firewall.cwmp.path=/etc/icwmpd/firewall.cwmp
         set firewall.cwmp.reload=1
         commit firewall
 EOT

ieee1905/Config.in

@@ -21,6 +21,10 @@ config IEEE1905_WIFI_EASYMESH
 config IEEE1905_CMDU_FRAGMENT_TLV_BOUNDARY
 	bool "Fragment large CMDU frame at TLV boundary instead of octet boundary"
 
+config IEEE1905_BUILD_TR181_PLUGIN
+	bool "Build TR-181 mapping module (responsible for Device.IEEE1905.)"
+	default y
+
 endmenu
 
 endif

ieee1905/Makefile

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

ieee1905/bbfdm_service.json

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

iop/Config.in

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

iop/Makefile

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

iop/iop.completion

@@ -36,7 +36,7 @@ _iop()
              feeds_update genconfig \
              generate_tarballs install_key \
              scp_changes setup_host ssh_install_key status \
-             update_feed_branches ssh_upgrade smoketest"
+             ssh_upgrade smoketest"
 
     if [ $COMP_CWORD -eq 1 ] ; then
 

iop/scripts/annexconfig.sh

@@ -1,72 +0,0 @@
-#!/bin/bash
-
-function disable_add_config () {
-	local COPTION="$1"
-
-	HAVE_OPTION=`grep $COPTION .config | wc -l`
-	HAVE_OPTION_DISABLED=`grep "# $COPTION" .config | wc -l`
-	if [ "$HAVE_OPTION" = "1" ]
-	then
-		if [ "$HAVE_OPTION_DISABLED" = "0" ]
-		then
-			sed -i -e "s,$COPTION=y,# $COPTION is not set,g" .config
-		fi
-	else
-		echo "# $COPTION is not set" >> .config
-	fi
-}
-
-function enable_option () {
-	local COPTION="$1"
-#	cat .config| grep DSL
-	sed -i -e "s,# $COPTION is not set,$COPTION=y,g" .config
-#	cat .config| grep DSL
-}
-
-function annexconfig {
-
-	v() {
-		[ "$VERBOSE" -ge 1 ] && echo "$@"
-	}
-
-	local ANNEX="$1"
-
-	disable_add_config CONFIG_TARGET_NO_DSL
-	disable_add_config CONFIG_TARGET_DSL_ANNEX_A
-	disable_add_config CONFIG_TARGET_DSL_ANNEX_B
-	disable_add_config CONFIG_TARGET_DSL_ANNEX_C
-	disable_add_config CONFIG_TARGET_DSL_SADSL
-	disable_add_config CONFIG_TARGET_DSL_GFAST
-
-
-	if [ "$ANNEX" = "no" ]
-	then
-		echo "No DSL"
-		enable_option CONFIG_TARGET_NO_DSL
-	elif [ "$ANNEX" = "a" ]
-	then
-		echo "Annex A"
-		enable_option CONFIG_TARGET_DSL_ANNEX_A
-	elif [ "$ANNEX" = "b" ]
-	then
-		echo "Annex B"
-		enable_option CONFIG_TARGET_DSL_ANNEX_B
-	elif [ "$ANNEX" = "c" ]
-	then
-		echo "Annex C"
-		enable_option CONFIG_TARGET_DSL_ANNEX_C
-	elif [ "$ANNEX" = "sadsl" ]
-	then
-		echo "sadsl"
-		enable_option CONFIG_TARGET_DSL_SADSL
-	elif [ "$ANNEX" = "gfast" ]
-	then
-		echo "G.fast"
-		enable_option CONFIG_TARGET_DSL_GFAST
-	else
-		echo "Only option no,a,b,c,sadsl,gfast supported"
-	fi
-
-}
-
-register_command "annexconfig" "Select configuration annex"

iop/scripts/cfe_upgrade.sh

@@ -1,42 +0,0 @@
-# this is a developer helper script to install firmware on a remote host running in CFE mode
-
-function usage {
-	echo "usage: $0 cfe_upgrade <host> <file>"
-}
-
-function cfe_upgrade {
-	if [ -z "$1" ] ; then
-		usage
-		echo "Error: host required"
-		exit 1
-	fi
-	if [ -z "$2" ] ; then
-		usage
-		echo "Error: firmware filename required"
-		exit 1
-	fi
-	if [ ! -e $2 ] ; then
-		usage
-		echo "Error: firmware file does not exist"
-		exit 1
-	fi
-	IMAGE=`basename $2`
-	echo "CFE upgrade host: $1 with file $IMAGE"
-	[ "$2" ] && [ -e "$2" ] &&  curl -i -F filedata=@$2  http://$1/upload.cgi && echo "upgrade done!"
-}
-
-register_command "cfe_upgrade" "<host> <file>  Install firmware on remote host in CFE mode"
-
-function cfe_upgrade_latest {
-	if [ -z "$1" ] ; then
-		echo "usage: $0 cfe_upgrade_latest <host>"
-		echo "Error: host required"
-		exit 1
-	fi
-	{ cd `dirname $0`
-		IMAGE=`ls -Art bin/*/*.w | tail -n1`
-		[ "$IMAGE" ] && [ -e "$IMAGE" ] && ./iop cfe_upgrade $1 $IMAGE
-	}
-}
-
-register_command "cfe_upgrade_latest" "<host>  Install latest firmware on remote host in CFE mode"

iop/scripts/feeds_update.sh

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

iop/scripts/genconfig_wrap.sh

@@ -1,29 +0,0 @@
-#!/bin/bash
-
-# Function to convert parameters to lowercase
-function to_lowercase {
-    local params=()
-    for param in "$@"; do
-        params+=("$(tr '[:upper:]' '[:lower:]' <<< "$param")")
-    done
-    echo "${params[@]}"
-}
-
-function genconfig {
-    target_script="./scripts/gen_config.py"
-
-    # First convert all to lowercase
-    args=$(to_lowercase "$@")
-
-    # Check if an option is provided
-    if [[ ${args[0]} == -* ]]; then
-      # Convert options for target script
-      if [[ ${args[0]}  == "-b" || ${args[0]}  == "--boards" ]]; then
-        args=("--list")
-      fi
-    fi
-
-    ${target_script} ${args[@]}
-}
-
-register_command "genconfig" "Generate configuration for board and customer"

iop/scripts/iopupgrade.sh

@@ -1,283 +0,0 @@
-# this is a developer helper script to install firmware on a remote host with SSH
-
-function upd_usage {
-	echo "usage: $0 ssh_upgrade [-t <host>] [-f <file>] [opts] "
-	echo ""
-	echo "   Default host is 192.168.1.1"
-	echo "   Default firmware file is the latest one (last.{itb,pkgtb})"
-	echo "   Default is to not keep configuration"
-	echo "opts:"
-	echo ""
-	echo "	-i	Interactive use, allows to select firmware file"
-	echo "	-n	Do not do the final reboot of the target board"
-	echo "	-c	Keep configuration"
-	echo "	-x	Force install even if firmware is not for this board"
-	echo "	-b	Force install of bootloader regardless of version installed"
-}
-
-function set_config_string {
-	eval $(grep $1 .config)
-}
-
-function upd_ask_ok {
-	echo "Will continue with the following settings:"
-	echo "-----------------------------------------"
-	printf "%20s: %s\n" "Firmware file" "$upd_fw_base"
-	printf "%20s: %s\n" "Host IP" "$upd_host"
-	printf "%20s: " "Reboot"
-	if [ "$upd_noreboot" == "0" ]; then printf "Yes\n"; else printf "No\n"; fi
-	printf "%20s: " "Keep config"
-	if [ "$upd_keepconf" == "1" ]; then printf "Yes\n"; else printf "No\n"; fi
-	printf "%20s: " "Force bootloader"
-	if [ "$upd_forceboot" == "1" ]; then printf "Yes\n"; else printf "No\n"; fi
-	printf "%20s: " "Force image upgrade"
-	if [ "$upd_forceimage" == "1" ]; then printf "Yes\n"; else printf "No\n"; fi
-	echo "-----------------------------------------"
-
-	echo -n "Continue? [Y/n/q]:"
-	read answer
-
-	case $answer in
-	n | N)
-		return 1
-		;;
-	q | Q)
-		exit 1
-		;;
-	y | Y | *)
-		return 0
-		;;
-	esac
-}
-
-function upd_select_file {
-	dialog --keep-tite --title "To select a file, use TAB/ARROW to highlight then press SPACEBAR -> RETURN" \
-		--fselect "${upd_fw:-bin/targets/$CONFIG_TARGET_BOARD/$CONFIG_TARGET_SUBTARGET/}" \
-		$((lines - 10)) $((cols - 5)) \
-		2>$tempfile
-
-	new_file=$(cat $tempfile)
-	if [ -n "$new_file" ]; then
-		upd_fw="$new_file"
-		upd_fw_base=$(basename $upd_fw)
-	fi
-}
-
-function upd_select_target {
-	dialog --keep-tite --title "Input the hostname/IP of the target board" \
-		--inputbox "Name/IP" \
-		$((lines - 10)) $((cols - 5)) \
-		"$upd_host" \
-		2>$tempfile
-
-	new_file=$(cat $tempfile)
-	if [ -n "$new_file" ]; then
-		upd_host="$new_file"
-	fi
-}
-
-function upd_select_reboot {
-	dialog --keep-tite --radiolist "Should the board reboot after download finished" \
-		$((lines - 5)) $((cols - 5)) $((lines - 5 - 5)) \
-		"Reboot" "Restart board after done" $(if [ "$upd_noreboot" == "0" ]; then echo "ON"; else echo "OFF"; fi) \
-		"No reboot" "Continue running old system" $(if [ "$upd_noreboot" == "1" ]; then echo "ON"; else echo "OFF"; fi) \
-		2>$tempfile
-
-	res=$(cat $tempfile)
-	case $res in
-	"No reboot")
-		upd_noreboot=1
-		;;
-	"Reboot")
-		upd_noreboot=0
-		;;
-	esac
-}
-
-function upd_select_config {
-	dialog --keep-tite --radiolist "Should the configuration be kept" \
-		$((lines - 5)) $((cols - 5)) $((lines - 5 - 5)) \
-		"Keep" "Keep the config from old system" $(if [ "$upd_keepconf" == "1" ]; then echo "ON"; else echo "OFF"; fi) \
-		"Default" "Use default config for new system" $(if [ "$upd_keepconf" == "0" ]; then echo "ON"; else echo "OFF"; fi) \
-		2>$tempfile
-
-	res=$(cat $tempfile)
-	case $res in
-	"Keep")
-		upd_keepconf=1
-		;;
-	"Default")
-		upd_keepconf=0
-		;;
-	esac
-}
-
-function upd_select_forceboot {
-	dialog --keep-tite --radiolist "Should the boot loader be updated regardless of the version installed" \
-		$((lines - 5)) $((cols - 5)) $((lines - 5 - 5)) \
-		"Force" "Always update boot loader" $(if [ "$upd_forceboot" == "1" ]; then echo "ON"; else echo "OFF"; fi) \
-		"Version check" "Only upgrade if version is newer" $(if [ "$upd_forceboot" == "0" ]; then echo "ON"; else echo "OFF"; fi) \
-		2>$tempfile
-
-	res=$(cat $tempfile)
-	case $res in
-	"Force")
-		upd_forceboot=1
-		;;
-	"Version check")
-		upd_forceboot=0
-		;;
-	esac
-}
-
-function upd_select_forceimage {
-	dialog --keep-tite --radiolist "Should the image be stored in flash even if sanity checks would reject it" \
-		$((lines - 5)) $((cols - 5)) $((lines - 5 - 5)) \
-		"Force" "Disable sanity check and force use of image (dangerous)" $(if [ "$upd_forceimage" == "1" ]; then echo "ON"; else echo "OFF"; fi) \
-		"Only compatible" "Normal checks apply" $(if [ "$upd_forceimage" == "0" ]; then echo "ON"; else echo "OFF"; fi) \
-		2>$tempfile
-
-	res=$(cat $tempfile)
-	case $res in
-	"Force")
-		upd_forceimage=1
-		;;
-	"Only compatible")
-		upd_forceimage=0
-		;;
-	esac
-}
-
-function upd_select {
-	dialog --keep-tite --ok-label "Select" --cancel-label "Done" --menu "Select item to change" \
-		$((lines - 5)) $((cols - 5)) $((lines - 5 - 5)) \
-		"Firmware file" "$upd_fw_base" \
-		"Host IP" "$upd_host" \
-		"Reboot" $(if [ "$upd_noreboot" == "0" ]; then printf "Yes\n"; else printf "No\n"; fi) \
-		"Keep config" $(if [ "$upd_keepconf" == "1" ]; then printf "Yes\n"; else printf "No\n"; fi) \
-		"Force bootloader" $(if [ "$upd_forceboot" == "1" ]; then printf "Yes\n"; else printf "No\n"; fi) \
-		"Force image upgrade" $(if [ "$upd_forceimage" == "1" ]; then printf "Yes\n"; else printf "No\n"; fi) \
-		2>$tempfile
-
-	case $(cat $tempfile) in
-	"Firmware file")
-		upd_select_file
-		;;
-	"Host IP")
-		upd_select_target
-		;;
-	"Reboot")
-		upd_select_reboot
-		;;
-	"Keep config")
-		upd_select_config
-		;;
-	"Force bootloader")
-		upd_select_forceboot
-		;;
-	"Force image upgrade")
-		upd_select_forceimage
-		;;
-	*)
-		return
-		;;
-	esac
-	upd_select
-}
-function upd_select_start {
-	lines=$(tput lines)
-	cols=$(tput cols)
-	tempfile="$(mktemp)"
-	trap "rm -f $tempfile" 0 1 2 5 15
-	upd_select
-
-}
-
-function ssh_upgrade {
-	upd_noreboot=0
-	upd_forceboot=0
-	upd_keepconf=0
-	upd_forceimage=0
-	upd_fw_base=""
-	upd_fw=""
-	upd_host="192.168.1.1"
-	do_dialog=0
-
-	while getopts "f:hnxt:icb" opt; do
-		case $opt in
-		n)
-			upd_noreboot=1
-			;;
-		x)
-			upd_forceimage=1
-			;;
-		b)
-			upd_forceboot=1
-			;;
-		c)
-			upd_keepconf=1
-			;;
-		v)
-			verbose=$OPTARG
-			;;
-		f)
-			upd_fw=$OPTARG
-			;;
-		t)
-			upd_host=$OPTARG
-			;;
-		i)
-			do_dialog=1
-			;;
-		h)
-			upd_usage
-			exit 1
-			;;
-		\?)
-			echo "Invalid option: -$OPTARG" >&2
-			exit 1
-			;;
-		esac
-	done
-
-	if [ -z "$upd_fw" ]; then
-		set_config_string CONFIG_TARGET_BOARD
-		set_config_string CONFIG_TARGET_SUBTARGET
-		upd_fw="$(realpath -q --canonicalize-existing --relative-to=. "bin/targets/$CONFIG_TARGET_BOARD/$CONFIG_TARGET_SUBTARGET/"last.{pkgtb,itb})"
-		if [ -z "$upd_fw" ] && [ $do_dialog -eq 0 ]; then
-			echo "Could not find image. Check that last.{itb,pkgtb} exists or specify an image using -f <image> or -i (interactive)." >&2
-			return 1
-		fi
-	fi
-	upd_fw_base="$(basename "$upd_fw")"
-
-	[ $do_dialog -eq 1 ] && upd_select_start
-
-	if ! upd_ask_ok; then
-		upd_select_start
-		if ! upd_ask_ok; then
-			exit 1
-		fi
-	fi
-
-	if [ ! -f $upd_fw ]; then
-		echo "Firmware file $firmware does not exist."
-		exit 1
-	fi
-
-	extra_args=""
-	[ $upd_noreboot -eq 1 ] && extra_args="$extra_args --no-reboot"
-	[ $upd_forceimage -eq 1 ] && extra_args="$extra_args --force"
-	[ $upd_keepconf -eq 0 ] && extra_args="$extra_args -n"
-	[ $upd_forceboot -eq 1 ] && extra_args="$extra_args --force-loader-upgrade"
-
-	pv "$upd_fw" |
-		ssh \
-			-o ConnectTimeout=60 \
-			-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \
-			root@"$upd_host" \
-			sh -c "cat > '/tmp/$upd_fw_base' && (set -x && sysupgrade -v $extra_args /tmp/$upd_fw_base)" ||
-		echo "Sysupgrade failed" >&2 && return 1
-}
-
-register_command "ssh_upgrade" "-t <host> -f <file> [opts]  Install firmware on remote host with SSH"

iop/scripts/licenses_gen.sh

@@ -1,35 +0,0 @@
-#!/bin/sh
-function license_report {
-    LICDIR="/tmp/licenses-generator/"
-    LICBIN="${LICDIR}/bin"
-
-
-    dpkg -s python3 python3-requests python3-yaml python3-mako python3-six &> /dev/null
-    if [ $? -ne 0 ]
-        then
-            echo "Missing dependencies"
-            sudo apt-get update
-            sudo apt-get install python3 python3-requests python3-yaml python3-mako python3-six
-
-        else
-            echo    "Dependecy check passed"
-    fi
-
-
-if [ -d "$LICDIR" ]; then
-  ### Take action if $DIR exists ###
-  echo "Creating json licences file and html formated report"
-else
-  ###  Control will jump here if $DIR does NOT exists ###
-  echo "Error: licenses-generator not found. getting from iopsys repo"
-  git clone git@dev.iopsys.eu:iopsys/licenses-generator.git $LICDIR
-fi
-  LICGET=`${LICBIN}/licenses-generator  gen-License bin/`
-  echo $LICGET
-  ${LICBIN}/licenses-generator gen-licrprt $LICGET
-exit 0
-
-}
-
-
-register_command "license_report" "Generate a Licence report on latest build in json format and html under reports"

iop/scripts/taas.sh

@@ -1,89 +0,0 @@
-
-# Shorthand command for doing a HIL runtime smoketest on the
-# latest built image. Does the image boot up correctly?
-# More info here:
-# https://dev.iopsys.eu/iopsys/iopsys-taas
-
-
-#--------------------------------------------------------------
-function taas-init() {
-	local f
-
-	# Path to TaaS binarys. Try some likely ones.
-	if ! which taas-smoketest >/dev/null; then
-		PATH="${PATH}:${PWD}/../iopsys-taas/bin"
-		PATH="${PATH}:${PWD}/../taas/bin"
-		PATH="${PATH}:${HOME}/iopsys-taas/bin"
-		PATH="${PATH}:${HOME}/taas/bin"
-		PATH="${PATH}:${HOME}/bin"
-		PATH="${PATH}:/opt/iopsys-taas/bin"
-		PATH="${PATH}:/opt/taas/bin"
-	fi
-
-	if ! which taas-smoketest >/dev/null; then
-		echo "Error; TaaS is missing! Install it with:"
-		echo "git clone git@dev.iopsys.eu:iopsys/iopsys-taas.git ../iopsys-taas"
-		exit 1
-	fi
-
-	# Create a list of all images which might be of use.
-	for f in ${PWD}/bin/targets/iopsys-*/generic/last.*; do
-		[[ -s "$f" ]] && images+=("$f")
-	done
-
-	# Convert Iopsys target name to the TaaS product name format
-	# according to what is available in the remote lab for HIL.
-	# Also find a suitable image.
-	product=$(grep CONFIG_TARGET_PROFILE .config | \
-		tr -s "=\"" " " | cut -d " " -f 2) || exit
-	case "$product" in
-		smarthub3)
-			export product="SmartHub3a"
-			;;
-		dg400prime|eg400|ex600)
-			export product=$(echo -n "$product" | tr [[:lower:]] [[:upper:]])
-			;;
-		*)
-			echo "Unsupported target; skipping!"
-			exit 0
-			;;
-	esac
-
-	if [[ ${#images[@]} -eq 0 ]]; then
-		echo "No image found"
-		exit 1
-	fi
-}
-
-
-
-#--------------------------------------------------------------
-function taas-smoketest {
-	declare -a images
-
-	taas-init || return
-	echo "Testing a $product with ${images[@]}..."
-	command taas-smoketest "${images[@]}" "$product" "$@"
-}
-
-
-
-#--------------------------------------------------------------
-function taas-bootstrap {
-	declare -a images
-
-	if [[ -n "$1" ]]; then
-		taas-init || return
-		echo "Flashing $1..."
-		command taas-bootstrap "${images[@]}" "$@"
-	else
-		echo "Usage: ./iop taas-bootstrap dutX"
-		exit 1
-	fi
-}
-
-
-
-register_command "taas-bootstrap" "Write image to a remote lab device."
-register_command "taas-smoketest" "Write image to a remote lab device and test it."
-

iop/scripts/update_feed_branches.sh

@@ -1,61 +0,0 @@
-#!/bin/sh
-
-# Exported interface
-function update_feed_branches {
-	local release="$1"
-	local ipath="$(pwd)"
-	local branch="$2"
-	local curbranch
-
-	[ -n "$release" ] || {
-		echo "Usage: ./update_feeds <RELEASE> <BRANCH>"
-		echo ""
-		echo "If you do not give a branch as argument,"
-		echo "<RELEASE> branch will be updated to commit"
-		echo "hash given in feeds.conf for each feed repo"
-		exit 1
-	}
-
-	if [ -n "$branch" ]; then
-		echo "Updating release branch $release to specific commit hash given in feeds.conf for each feed repo at branch $branch"
-		if git diff-index --quiet HEAD; then
-			curbranch=`git symbolic-ref HEAD 2>/dev/null`
-			curbranch=${curbranch##refs/heads/}
-			if [ -z $curbranch ]; then
-				curbranch=`git log -1 --pretty=format:"%H"`
-			fi
-			git checkout $branch || {
-				echo "couldn't checkout branch $branch"
-				exit 99
-			}
-		else
-			echo "You have unsaved changes."
-			exit 99
-		fi
-	else
-		echo "Updating release branch $release to specific commit hash given in feeds.conf for each feed repo"
-	fi
-
-	ifeeds="$(grep -r 'dev.iopsys.eu' feeds.conf | awk '{print$2}' | tr '\n' ' ')"
-
-	for f in $ifeeds; do
-		commith=$(grep $f feeds.conf | cut -d'^' -f2)
-		cd $ipath/feeds/$f
-		git branch -D $release 2>/dev/null
-		echo "$f: updating release branch $release to commit $commith"
-		git checkout $commith
-		git push origin :$release
-		git checkout -b $release
-		git push --set-upstream origin $release
-		cd $ipath
-	done
-
-	if [ -n "$branch" ]; then
-		echo "Release branch $release is updated to specific commit hash given in feeds.conf in in branch $branch for each feed repo"
-		git checkout $curbranch
-	else
-		echo "Release branch $release is updated to specific commit hash given in feeds.conf for each feed repo"
-	fi
-}
-
-register_command "update_feed_branches" "<release> [branch] Update branches in feeds from the current top level commit or specified top level branch"

iopsys-analytics/Makefile

@@ -4,7 +4,7 @@ PKG_NAME:=iopsys-analytics
 PKG_RELEASE:=$(COMMITCOUNT)
 PKG_LICENSE:=PROPRIETARY
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=fb84c1019a8a0fbfb624d9df8eb3604806645510
+PKG_SOURCE_VERSION:=00189cea0a78b7a30dbfdd363b6d8e836437d1bc
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/iopsys-analytics.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip

ipt-trigger/Makefile

@@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ipt-trigger
-PKG_VERSION:=1.0.1
+PKG_VERSION:=1.0.2
 PKG_LICENSE:=GPL-2.0
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=8d4b4520a2935a5717a27f486a3fc78357b2a0cd
+PKG_SOURCE_VERSION:=4f3d4427403e0a9be7653c1b92907ae8ae5f21ae
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/ipt-trigger.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

libdpp/Makefile

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

libdsl/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libdsl
-PKG_VERSION:=7.2.99
+PKG_VERSION:=7.2.100
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=f9f3fcd0f4140540db5bd41059bcca7ded083024
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libdsl.git
+PKG_SOURCE_VERSION:=20875ec79fcc7c546c2f1253c867d6afbc8bff75
+PKG_SOURCE_URL:=https://dev.iopsys.eu/hal/libdsl.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
 endif
@@ -27,6 +27,8 @@ ifeq ($(CONFIG_TARGET_brcmbca),y)
   CONFIG_ID=$(SUBTARGET:bcm%=BCM%)
   CHIP_ID=$(CONFIG_ID:BCM9%=%)
   TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCHIP_$(CHIP_ID) -DCONFIG_$(CONFIG_ID) \
+	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/broadcom/include/bcm963xx \
+	-I$(STAGING_DIR)/usr/include/bcm963xx/shared/opensource/include/bcm963xx \
 	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx \
 	-I$(STAGING_DIR)/usr/include/bcm963xx/userspace/public/include
 else ifeq ($(CONFIG_TARGET_x86),y)
@@ -55,12 +57,19 @@ define Package/libdsl
   SUBMENU:=IOPSYS HAL libs
   MENU:=1
   TITLE:= xDSL library (libdsl)
+  DEPENDS+=TARGET_brcmbca:bcm963xx-bsp
 endef
 
 define Package/libdsl/description
   Library provides xDSL/GFAST HAL APIs
 endef
 
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+        $(CP) -rf ./libdsl/* $(PKG_BUILD_DIR)/
+endef
+endif
+
 define Package/libdsl/config
   if PACKAGE_libdsl
 	  config LIBDSL_DEBUG

libethernet/Makefile

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

libqos/Makefile

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

libvoice-broadcom/Makefile

@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libvoice-broadcom
 PKG_RELEASE:=1
-PKG_VERSION:=1.0.13
+PKG_VERSION:=1.0.15
 PKG_LICENSE:=PROPRIETARY
 PKG_LICENSE_FILES:=LICENSE
 
@@ -17,7 +17,7 @@ LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/$(PKG_NAME).git
-PKG_SOURCE_VERSION:=f1509651217d027376b5b7fc3f64ca86662e9b2d
+PKG_SOURCE_VERSION:=baf5ebfb45404714bbfcc3068080f93265934d8a
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -38,7 +38,7 @@ define Package/$(PKG_NAME)
 	CATEGORY:=Utilities
 	TITLE:=IOPSYS libvoice for Broadcom
 	URL:=
-	DEPENDS:=
+	DEPENDS:=+bcm963xx-voice
 endef
 
 define Package/$(PKG_NAME)/description
@@ -56,4 +56,3 @@ define Package/$(PKG_NAME)/install
 endef
 
 $(eval $(call BuildPackage,$(PKG_NAME)))
-

libvoice-d2/Makefile

@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libvoice-d2
 PKG_RELEASE:=1
-PKG_VERSION:=1.1.11
+PKG_VERSION:=1.1.14
 PKG_LICENSE:=PROPRIETARY
 PKG_LICENSE_FILES:=LICENSE
 
@@ -17,7 +17,7 @@ LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/$(PKG_NAME).git
-PKG_SOURCE_VERSION:=95fb29a31f7665abbe87af4a74cf52b7e5f22a29
+PKG_SOURCE_VERSION:=0b2bef862fb5aea0b285e339459f46779224e2d0
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

libwifi/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libwifi
-PKG_VERSION:=7.4.69
+PKG_VERSION:=7.8.9
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=8a5d8b5defb7cedc5876bb5fbee5c1ad185de889
+PKG_SOURCE_VERSION:=1ec400727ec9bc2bae6289f71d8a28e70e9aa28e
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libwifi.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
@@ -41,24 +41,22 @@ else ifeq ($(CONFIG_TARGET_armvirt),y)
   TARGET_CFLAGS +=-DIOPSYS_TEST
 else ifeq ($(CONFIG_TARGET_airoha),y)
   TARGET_PLATFORM=ECONET
-  TARGET_WIFI_TYPE=MEDIATEK MAC80211
+  TARGET_WIFI_TYPE=MEDIATEK
   TARGET_CFLAGS +=-DIOPSYS_ECONET
+  ifeq ($(CONFIG_TARGET_airoha_an7581),y)
+    TARGET_CFLAGS +=-DCONFIG_MTK
+  endif
 else ifeq ($(CONFIG_TARGET_ipq95xx),y)
   TARGET_PLATFORM=IPQ95XX
-  TARGET_WIFI_TYPE=QUALCOMM MAC80211
+  TARGET_WIFI_TYPE=QUALCOMM
   TARGET_CFLAGS +=-DIPQ95XX
 else ifeq ($(CONFIG_TARGET_ipq53xx),y)
   TARGET_PLATFORM=IPQ53XX
-  TARGET_WIFI_TYPE=QUALCOMM MAC80211
+  TARGET_WIFI_TYPE=QUALCOMM
   TARGET_CFLAGS +=-DIPQ53XX
-else ifeq ($(CONFIG_TARGET_mediatek),y)
-  TARGET_PLATFORM=LINUX
-  TARGET_WIFI_TYPE=MEDIATEK MAC80211
-  TARGET_CFLAGS +=-DIOPSYS_LINUX
 else
   $(info Unexpected CONFIG_TARGET, use default MAC80211)
   TARGET_PLATFORM=MAC80211
-  TARGET_WIFI_TYPE=MAC80211
   TARGET_CFLAGS +=-DIOPSYS_MAC80211
 endif
 
@@ -76,6 +74,10 @@ ifeq ($(CONFIG_LIBWIFI_USE_CTRL_IFACE),y)
   TARGET_CFLAGS +=-DLIBWIFI_USE_CTRL_IFACE
 endif
 
+ifeq ($(CONFIG_LIBWIFI_SKIP_PROBES),y)
+  TARGET_CFLAGS +=-DLIBWIFI_BRCM_SKIP_PROBES
+endif
+
 TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include \
 	-I$(STAGING_DIR)/usr/include/openssl \
@@ -144,6 +146,11 @@ define Package/libwifi/config
 	config LIBWIFI_USE_CTRL_IFACE
 		bool "Create UNIX sockets to interface with hostapd/wpa_supplicant"
 		default y
+
+	config LIBWIFI_SKIP_PROBES
+		bool "Don't create probe-req events"
+		default y
+
   endif
 endef
 

logmngr/Config.in

@@ -0,0 +1,34 @@
+if PACKAGE_logmngr
+choice
+	prompt "Select backend for syslog management"
+	default LOGMNGR_BACKEND_FLUENTBIT
+	depends on PACKAGE_logmngr
+	help
+		Select which backend daemon to use for syslog management
+
+config LOGMNGR_BACKEND_FLUENTBIT
+	bool "Use fluent-bit for log management"
+	help
+		Enable this option to use fluent-bit for log management.
+
+config LOGMNGR_BACKEND_SYSLOG_NG
+	bool "Use syslog-ng for log management"
+	help
+		Enable this option to use syslog-ng for log management.
+
+endchoice
+
+config LOGMNGR_LOGROTATE
+	bool "Logrotate support"
+	depends on PACKAGE_logmngr
+	default y
+	help
+		It adds support for logrotate functionality.
+
+config LOGMNGR_VENDOR_LOG_FILE
+	bool "Enable Device.DeviceInfo.VendorLogFile. Object"
+	depends on PACKAGE_logmngr
+	default y
+	help
+		It adds support for Device.DeviceInfo.VendorLogFile. Object.
+endif

logmngr/Makefile

@@ -0,0 +1,79 @@
+#
+# Copyright (C) 2024 iopsys
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=logmngr
+PKG_VERSION:=1.0.8
+
+LOCAL_DEV:=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/system/logmngr.git
+PKG_SOURCE_VERSION:=7c2056c9f5dc23fd1260846c72210365ec69c882
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
+endif
+
+PKG_LICENSE:=GPL-2.0-only
+PKG_LICENSE_FILES:=LICENSE
+
+include $(INCLUDE_DIR)/package.mk
+include ../bbfdm/bbfdm.mk
+
+MAKE_PATH:=bbf_plugin
+
+define Package/logmngr
+ SECTION:=utils
+ CATEGORY:=Utilities
+ TITLE:=Logging Manager
+ DEPENDS:=+LOGMNGR_BACKEND_FLUENTBIT:fluent-bit +LOGMNGR_LOGROTATE:logrotate
+ DEPENDS+=+LOGMNGR_BACKEND_SYSLOG_NG:syslog-ng
+ DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service
+endef
+
+define Package/logmngr/description
+	Configure log management. This package has the datamodel as well as the
+	the backend implementation for handling syslog.
+endef
+
+define Package/$(PKG_NAME)/config
+        source "$(SOURCE)/Config.in"
+endef
+
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+	$(CP) -rf ~/git/logmngr/* $(PKG_BUILD_DIR)/
+endef
+endif
+
+define Package/logmngr/install
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/logmngr.init $(1)/etc/init.d/logmngr
+
+	$(INSTALL_DIR) $(1)/usr/sbin
+
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
+	$(INSTALL_BIN) ./files/10-logmngr_config_generate $(1)/etc/uci-defaults/
+
+	$(INSTALL_DIR) $(1)/lib/logmngr
+ifeq ($(CONFIG_LOGMNGR_BACKEND_FLUENTBIT),y)
+	$(INSTALL_DATA) ./files/lib/logmngr/fluent-bit.sh $(1)/lib/logmngr/
+	$(INSTALL_BIN) ./files/logread $(1)/usr/sbin
+endif
+ifeq ($(CONFIG_LOGMNGR_BACKEND_SYSLOG_NG),y)
+	$(INSTALL_DATA) ./files/lib/logmngr/syslog-ng.sh $(1)/lib/logmngr/
+endif
+	$(BBFDM_INSTALL_CORE_PLUGIN) $(PKG_BUILD_DIR)/bbf_plugin/libbbfsyslog.so $(1)
+ifeq ($(CONFIG_LOGMNGR_LOGROTATE),y)
+	$(INSTALL_BIN) ./files/11-logmngr_logrotate_config_generate $(1)/etc/uci-defaults/
+	$(INSTALL_DATA) ./files/lib/logmngr/logrotate.sh $(1)/lib/logmngr/
+	$(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/bbf_plugin/libbbflogrotate.so $(1) sysmngr
+endif
+ifeq ($(CONFIG_LOGMNGR_VENDOR_LOG_FILE),y)
+	$(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/bbf_plugin/libbbfvendorlog.so $(1) sysmngr
+endif
+endef
+
+$(eval $(call BuildPackage,logmngr))