From 4015982a87745a329ead465f150126aad08b13ea Mon Sep 17 00:00:00 2001
From: Suvendhu Hansa <suvendhu.hansa@iopsys.eu>
Date: Thu, 20 Mar 2025 17:12:14 +0530
Subject: [PATCH] gateway-info: Added enable option

---
 gateway-info/files/etc/config/gateway                        | 1 +
 .../files/etc/uci-defaults/86-set-gateway-device-info        | 5 +++++
 .../files/etc/udhcpc.user.d/udhcpc_gateway_info.user         | 5 +++++
 icwmp/Makefile                                               | 2 +-
 .../uci-defaults/{95-migrate-gw-info => 85-migrate-gw-info}  | 2 +-
 5 files changed, 13 insertions(+), 2 deletions(-)
 rename icwmp/files/etc/uci-defaults/{95-migrate-gw-info => 85-migrate-gw-info} (86%)

diff --git a/gateway-info/files/etc/config/gateway b/gateway-info/files/etc/config/gateway
index 79e61a09a..40b39c60e 100644
--- a/gateway-info/files/etc/config/gateway
+++ b/gateway-info/files/etc/config/gateway
@@ -1,3 +1,4 @@
 config global 'global'
+	option enable '1'
 	option wan_interface 'wan'
 	option lan_interface 'lan'
diff --git a/gateway-info/files/etc/uci-defaults/86-set-gateway-device-info b/gateway-info/files/etc/uci-defaults/86-set-gateway-device-info
index 6a51a5c22..49cd71c3d 100644
--- a/gateway-info/files/etc/uci-defaults/86-set-gateway-device-info
+++ b/gateway-info/files/etc/uci-defaults/86-set-gateway-device-info
@@ -268,9 +268,14 @@ configure_gateway_device_info() {
 	lan_intf=""
 
 	config_load gateway
+	config_get_bool enable global enable '1'
 	config_get wan_intf global wan_interface "wan"
 	config_get lan_intf global lan_interface "lan"
 
+	if [ "${enable}" -eq 0 ]; then
+		return 0
+	fi
+
 	# Set dhcp_option 125 for device info if not already configured
 	enable_dhcp_option125 "${wan_intf}"
 
diff --git a/gateway-info/files/etc/udhcpc.user.d/udhcpc_gateway_info.user b/gateway-info/files/etc/udhcpc.user.d/udhcpc_gateway_info.user
index f5defa664..a8fec5209 100644
--- a/gateway-info/files/etc/udhcpc.user.d/udhcpc_gateway_info.user
+++ b/gateway-info/files/etc/udhcpc.user.d/udhcpc_gateway_info.user
@@ -280,8 +280,13 @@ send_usp_gw_event() {
 }
 
 config_load gateway
+config_get_bool enable global enable '1'
 config_get wan_intf global wan_interface "wan"
 
+if [ "${enable}" -eq 0 ]; then
+	return 0
+fi
+
 if [ "${wan_intf}" == "${INTERFACE}" ]; then
 	if [ "${1}" == "deconfig" ]; then
 		rm -rf /var/state/gwinfo
diff --git a/icwmp/Makefile b/icwmp/Makefile
index b90dfa093..cf45e36bc 100755
--- a/icwmp/Makefile
+++ b/icwmp/Makefile
@@ -72,7 +72,7 @@ define Package/icwmp/install
 	$(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/uci-defaults/95-migrate-gw-info $(1)/etc/uci-defaults/
+	$(INSTALL_BIN) ./files/etc/uci-defaults/85-migrate-gw-info $(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
diff --git a/icwmp/files/etc/uci-defaults/95-migrate-gw-info b/icwmp/files/etc/uci-defaults/85-migrate-gw-info
similarity index 86%
rename from icwmp/files/etc/uci-defaults/95-migrate-gw-info
rename to icwmp/files/etc/uci-defaults/85-migrate-gw-info
index 745540fa6..972ae83d3 100644
--- a/icwmp/files/etc/uci-defaults/95-migrate-gw-info
+++ b/icwmp/files/etc/uci-defaults/85-migrate-gw-info
@@ -7,7 +7,7 @@ fi
 
 val="$(uci -q get cwmp.cpe.disable_gatewayinfo)"
 
-if [ "$val" -eq 1 ]; then
+if [ -n "$val" ] && [ "$val" -eq 1 ]; then
 	uci -q set gateway.global.enable=0
 fi