From 7ab286753d3bececfec56bc1915e9ea0d055bc82 Mon Sep 17 00:00:00 2001
From: Vivek Kumar Dutta <vivek.dutta@iopsys.eu>
Date: Tue, 1 Oct 2024 16:25:22 +0530
Subject: [PATCH] obuspa: 9.0.0.6

- Added back firewall hook to force re-connect mqtt client on firewall reload
- Added wait for apply handler
---
 obuspa/Makefile                |  6 ++++--
 obuspa/files/etc/config/obuspa |  6 +++---
 obuspa/files/etc/firewall.usp  | 16 ++++++++++++++++
 3 files changed, 23 insertions(+), 5 deletions(-)
 create mode 100644 obuspa/files/etc/firewall.usp

diff --git a/obuspa/Makefile b/obuspa/Makefile
index f39ec5134..d36c2f34e 100644
--- a/obuspa/Makefile
+++ b/obuspa/Makefile
@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspa
-PKG_VERSION:=9.0.0.5
+PKG_VERSION:=9.0.0.6
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/obuspa.git
-PKG_SOURCE_VERSION:=ea6c8363472221d56d4c7e76a75a263bae486539
+PKG_SOURCE_VERSION:=4aba89c67ba57322d112d11e038bc6071252cbd8
 PKG_MAINTAINER:=Vivek Dutta <vivek.dutta@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -124,6 +124,8 @@ define Package/obuspa/install
 	$(INSTALL_BIN) ./files/etc/uci-defaults/01-fix-upgrade-uci $(1)/etc/uci-defaults/
 	$(INSTALL_BIN) ./files/etc/uci-defaults/60-generate-ctrust-defaults $(1)/etc/uci-defaults/
 	$(INSTALL_BIN) ./files/etc/uci-defaults/obuspa-set-dhcp-option $(1)/etc/uci-defaults/
+	$(INSTALL_BIN) ./files/etc/uci-defaults/92-obuspa_firewall $(1)/etc/uci-defaults/
+	$(INSTALL_BIN) ./files/etc/firewall.usp $(1)/etc/
 	$(INSTALL_BIN) ./files/etc/udhcpc.user.d/udhcpc_obuspa_opt125.user $(1)/etc/udhcpc.user.d/udhcpc_obuspa_opt125.user
 	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/libuspagentdm.so $(1) $(PKG_NAME)
 ifeq ($(CONFIG_OBUSPA_ENABLE_TEST_CONTROLLER),y)
diff --git a/obuspa/files/etc/config/obuspa b/obuspa/files/etc/config/obuspa
index ca53ef08a..55a39f2b0 100644
--- a/obuspa/files/etc/config/obuspa
+++ b/obuspa/files/etc/config/obuspa
@@ -5,9 +5,9 @@ config obuspa 'global'
 	option log_level '2'
 	option prototrace '0'
 	option db_file '/etc/obuspa/usp.db'
-	option max_group_sep '2'
-	option ipc_timeout '30'
-	option max_cache_time '600'
+	#option max_group_sep '2'
+	#option ipc_timeout '30'
+	#option max_cache_time '600'
 	option dm_caching_exclude '/etc/obuspa/dmcaching_exclude.json'
 	#option trust_cert '/etc/obuspa/ca.pem'
 	#option client_cert '/etc/obuspa/client.pem'
diff --git a/obuspa/files/etc/firewall.usp b/obuspa/files/etc/firewall.usp
new file mode 100644
index 000000000..9df074d51
--- /dev/null
+++ b/obuspa/files/etc/firewall.usp
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+log() {
+	echo "$*"|logger -t obuspa.firewall -p debug
+}
+
+config_load obuspa
+config_get_bool enable_obuspa global enabled 1
+
+if [ "$enable_obuspa" = "0" ]; then
+	return 0;
+fi
+
+sleep 1
+log "ForceReconnect MQTT clients, due firewall reload"
+obuspa -c operate "Device.MQTT.Client.*.ForceReconnect()"