From 8b58c1382383b494e129da2ffdb592c59bfe8108 Mon Sep 17 00:00:00 2001
From: Vivek Kumar Dutta <vivek.dutta@iopsys.eu>
Date: Tue, 19 Nov 2024 11:06:30 +0530
Subject: [PATCH] bbfdm: Add support for proto based critical services

---
 bbfdm/Makefile                               |  6 ++++--
 bbfdm/files/etc/bbfdm/critical_services.json | 18 ++++++++++++++++++
 bbfdm/files/etc/config/bbfdm                 |  4 ++++
 bbfdm/files/etc/init.d/bbf_configd           |  9 +++++++--
 4 files changed, 33 insertions(+), 4 deletions(-)
 create mode 100644 bbfdm/files/etc/bbfdm/critical_services.json

diff --git a/bbfdm/Makefile b/bbfdm/Makefile
index c5e56f4f5..f188f9e2c 100644
--- a/bbfdm/Makefile
+++ b/bbfdm/Makefile
@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bbfdm
-PKG_VERSION:=1.12.21
+PKG_VERSION:=1.12.22
 
 USE_LOCAL:=0
 ifneq ($(USE_LOCAL),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bbfdm.git
-PKG_SOURCE_VERSION:=062c13e83387e3ad37d6caaffd47cf57a1db7c7f
+PKG_SOURCE_VERSION:=4eaec4e6d2e012ff6880d0c76a57b44bce62fe98
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -157,6 +157,7 @@ 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/
@@ -168,6 +169,7 @@ 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
diff --git a/bbfdm/files/etc/bbfdm/critical_services.json b/bbfdm/files/etc/bbfdm/critical_services.json
new file mode 100644
index 000000000..591c4dd89
--- /dev/null
+++ b/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"
+	]
+}
diff --git a/bbfdm/files/etc/config/bbfdm b/bbfdm/files/etc/config/bbfdm
index b537f0cc3..1d3e60cda 100644
--- a/bbfdm/files/etc/config/bbfdm
+++ b/bbfdm/files/etc/config/bbfdm
@@ -6,3 +6,7 @@ config bbfdmd 'bbfdmd'
 config micro_services 'micro_services'
 	option enable '1'
 	option enable_core '0'
+
+
+config reload_handler 'reload_handler'
+	option log_level '1'
diff --git a/bbfdm/files/etc/init.d/bbf_configd b/bbfdm/files/etc/init.d/bbf_configd
index c994a681f..2210adadb 100644
--- a/bbfdm/files/etc/init.d/bbf_configd
+++ b/bbfdm/files/etc/init.d/bbf_configd
@@ -19,11 +19,16 @@ create_needed_directories()
 
 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 -ddd
+	procd_append_param command -l "${log_level}"
 	procd_set_param respawn
 	procd_close_instance "bbf_configd"
 }
@@ -33,4 +38,4 @@ service_triggers() {
 		config_name=$(basename "$config_file")
 		procd_add_config_trigger "config.change" "$config_name" /usr/share/bbfdm/scripts/bbf_config_notify.sh
 	done
-}
\ No newline at end of file
+}