From cfad5f2223a125167c988cfd6757ef023a9bbe80 Mon Sep 17 00:00:00 2001
From: suvendhu <suvendhu.hansa@iopsys.eu>
Date: Tue, 30 May 2023 20:00:15 +0530
Subject: [PATCH] icwmp:bbfdm: optimize runtime config handling

---
 bbfdm/Makefile                   |  4 ++--
 icwmp/Makefile                   |  4 ++--
 icwmp/files/etc/firewall.cwmp    | 12 ++++++------
 icwmp/files/etc/icwmpd/update.sh |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/bbfdm/Makefile b/bbfdm/Makefile
index fa9aaed8e..c7eaa399a 100644
--- a/bbfdm/Makefile
+++ b/bbfdm/Makefile
@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bbfdm
-PKG_VERSION:=1.0.19
+PKG_VERSION:=1.0.20
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bbfdm.git
-PKG_SOURCE_VERSION:=6d8b66092adf184f6e4f1f85a91dcc4e1f8f29e5
+PKG_SOURCE_VERSION:=4a8d286201efdff814f106e92147c697c32a94a9
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 
diff --git a/icwmp/Makefile b/icwmp/Makefile
index b6817f454..e5ba2ccd4 100755
--- a/icwmp/Makefile
+++ b/icwmp/Makefile
@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=9.3.4
+PKG_VERSION:=9.3.5
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/icwmp.git
-PKG_SOURCE_VERSION:=74d10bef9770da4a8f5bfdcdccdcba7720ec36b7
+PKG_SOURCE_VERSION:=caa4ac86b91b698e73e09a3ba8b60add36ea4b62
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 
diff --git a/icwmp/files/etc/firewall.cwmp b/icwmp/files/etc/firewall.cwmp
index 4e9e66b22..aea64c2b2 100644
--- a/icwmp/files/etc/firewall.cwmp
+++ b/icwmp/files/etc/firewall.cwmp
@@ -5,14 +5,14 @@ log() {
 	echo "${@}"|logger -t firewall.cwmp -p info
 }
 
-if [ ! -f "/var/state/cwmp" ]; then
+if [ ! -f "/var/state/icwmp" ]; then
 	exit 0;
 fi
 
-zone_name=$(uci -c /var/state -q get cwmp.acs.zonename)
+zone_name=$(uci -c /var/state -q get icwmp.acs.zonename)
 port=$(uci -q get cwmp.cpe.port)
-ipaddr=$(uci -c /var/state -q get cwmp.acs.ip)
-ip6addr=$(uci -c /var/state -q get cwmp.acs.ip6)
+ipaddr=$(uci -c /var/state -q get icwmp.acs.ip)
+ip6addr=$(uci -c /var/state -q get icwmp.acs.ip6)
 incoming_rule=$(uci -q get cwmp.cpe.incoming_rule|tr 'A-Z' 'a-z')
 
 if [ -z "${zone_name}" ]; then
@@ -76,5 +76,5 @@ if [ "$?" -eq 0 ]; then
 	${cmd6}
 fi
 
-uci -c /var/state -q set cwmp.cpe.firewall_restart="init"
-uci -c /var/state -q commit cwmp
+uci -c /var/state -q set icwmp.cpe.firewall_restart="init"
+uci -c /var/state -q commit icwmp
diff --git a/icwmp/files/etc/icwmpd/update.sh b/icwmp/files/etc/icwmpd/update.sh
index 1b5fe5445..4300847bd 100644
--- a/icwmp/files/etc/icwmpd/update.sh
+++ b/icwmp/files/etc/icwmpd/update.sh
@@ -17,8 +17,8 @@ handle_icwmp_update() {
 	ret=$(ubus call service list '{"name":"icwmpd"}' | jsonfilter -qe '@.icwmpd.instances.icwmp.running')
 
 	if [ "$ret" = "true" ]; then
-		# read status from var/state/cwmp
-		status=$(uci -q -c /var/state get cwmp.sess_status.current_status)
+		# read status from var/state/icwmp
+		status=$(uci -q -c /var/state get icwmp.sess_status.current_status)
 		if [ "$status" != "running" ]; then
 			log "Trigger out of bound inform, since last inform status was failure"
 			ubus -t 10 call tr069 inform >/dev/null 2>&1