From 8da27926a12ca8fa2dd22da6816f1a28c083bac2 Mon Sep 17 00:00:00 2001
From: Suvendhu Hansa <suvendhu.hansa@iopsys.eu>
Date: Fri, 4 Oct 2024 19:28:26 +0530
Subject: [PATCH] icwmp: 9.8.16

- External script to handle '2 Vendor Log File'
- Align with VendorLogFile
---
 icwmp/Makefile                                |  9 +++---
 .../etc/{ => icwmpd}/critical_services.json   |  0
 icwmp/files/etc/{ => icwmpd}/firewall.cwmp    |  0
 icwmp/files/etc/icwmpd/vendor_log.sh          | 29 +++++++++++++++++++
 icwmp/files/etc/uci-defaults/90-cwmpfirewall  |  2 +-
 5 files changed, 35 insertions(+), 5 deletions(-)
 rename icwmp/files/etc/{ => icwmpd}/critical_services.json (100%)
 rename icwmp/files/etc/{ => icwmpd}/firewall.cwmp (100%)
 create mode 100644 icwmp/files/etc/icwmpd/vendor_log.sh

diff --git a/icwmp/Makefile b/icwmp/Makefile
index 516312e8f..12e25e674 100755
--- a/icwmp/Makefile
+++ b/icwmp/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=9.8.15
+PKG_VERSION:=9.8.16
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/icwmp.git
-PKG_SOURCE_VERSION:=78e522060b0f1adf563cd709215532508db6e9f8
+PKG_SOURCE_VERSION:=c9d3ba0a1ac80cdc0dc71a2cf9db29a7b2ac1593
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -64,12 +64,13 @@ 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/critical_services.json $(1)/etc/icwmpd/critical_services.json
 	$(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_BIN) ./files/etc/icwmpd/critical_services.json $(1)/etc/icwmpd/critical_services.json
 	$(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
diff --git a/icwmp/files/etc/critical_services.json b/icwmp/files/etc/icwmpd/critical_services.json
similarity index 100%
rename from icwmp/files/etc/critical_services.json
rename to icwmp/files/etc/icwmpd/critical_services.json
diff --git a/icwmp/files/etc/firewall.cwmp b/icwmp/files/etc/icwmpd/firewall.cwmp
similarity index 100%
rename from icwmp/files/etc/firewall.cwmp
rename to icwmp/files/etc/icwmpd/firewall.cwmp
diff --git a/icwmp/files/etc/icwmpd/vendor_log.sh b/icwmp/files/etc/icwmpd/vendor_log.sh
new file mode 100644
index 000000000..d0f031dae
--- /dev/null
+++ b/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}"
diff --git a/icwmp/files/etc/uci-defaults/90-cwmpfirewall b/icwmp/files/etc/uci-defaults/90-cwmpfirewall
index 7d47cc396..8a67c9fc5 100644
--- a/icwmp/files/etc/uci-defaults/90-cwmpfirewall
+++ b/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