From da511f5e7712ad508e044eef60850c0eb035ebf6 Mon Sep 17 00:00:00 2001
From: zhangsheng <zhangs1125@sina.com>
Date: Thu, 13 Feb 2025 11:16:57 +0800
Subject: [PATCH] fix bugs

---
 jsonparse/cmt_parse.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/jsonparse/cmt_parse.cpp b/jsonparse/cmt_parse.cpp
index 21ccbcc..eb48e68 100644
--- a/jsonparse/cmt_parse.cpp
+++ b/jsonparse/cmt_parse.cpp
@@ -24,16 +24,20 @@ void JsonData::CmtCmd_80(char* send_data,int& send_length)
     memcpy(gateway_ver.ip,GlobalConfig::IpAddr_G.c_str(),sizeof(gateway_ver.ip));
     memcpy(gateway_ver.gateway_type,ReadStrByOpt(SYSTEMINFOFILE, "Version", "GateWayProduct").c_str(),sizeof(gateway_ver.gateway_type));
     memcpy(gateway_ver.gateway_hw_ver,ReadStrByOpt(SYSTEMINFOFILE, "Version", "GateWayHwVesion").c_str(),sizeof(gateway_ver.gateway_hw_ver));
+    memcpy(gateway_ver.comm_mode,"以太网",sizeof(gateway_ver.comm_mode));
 #ifdef  NR5G_MODULE
+    memset(gateway_ver.comm_mode,0,sizeof(gateway_ver.comm_mode));
     memcpy(gateway_ver.comm_mode,"5G",sizeof(gateway_ver.comm_mode));
 #endif
 #ifdef  Q4G_MODULE
+    memset(gateway_ver.comm_mode,0,sizeof(gateway_ver.comm_mode));
     memcpy(gateway_ver.comm_mode,"4G",sizeof(gateway_ver.comm_mode));
 #endif
 #ifdef  WIFI_MODULE
+    memset(gateway_ver.comm_mode,0,sizeof(gateway_ver.comm_mode));
     memcpy(gateway_ver.comm_mode,"WiFi",sizeof(gateway_ver.comm_mode));
 #endif
-    memcpy(gateway_ver.comm_mode,"以太网",sizeof(gateway_ver.comm_mode));
+    
     std::string gatewayLocation = sqlite_db_ctrl::instance().GetData(T_GATEWAY_INFO(TNAME), "gatewayLocation", NULL);
     memcpy(gateway_ver.terminal_name,gatewayLocation.c_str(),sizeof(gateway_ver.terminal_name));
     GetSysStatusCMT(gateway_ver.cpu_use,gateway_ver.memory_use,gateway_ver.disk_remain,gateway_ver.temperature);