#IQRV #comment modify vtm_uuid to VtmUuid

Framework/RvcLogSdk/log_builder.c

@@ -204,7 +204,7 @@ int add_log(log_group_builder* bder, long start_time, uint32_t pack_index, log_i
     int32_t totalBufferSize;
     build_item* grp_log;
     long now;
-    char nowTime[64] = { 0 }, local_ip_str[64] = { 0 }, unitedNowTime[64] = { 0 };
+    char nowTime[64] = { 0 }, unitedNowTime[64] = { 0 };
 
     if (bder->grp->n_logs >= MAX_LOG_COUNT) {
         return -1;
@@ -213,7 +213,6 @@ int add_log(log_group_builder* bder, long start_time, uint32_t pack_index, log_i
     memset(bder->grp->logs[bder->grp->n_logs].uuid, 0, MAX_UUID_LEN);
     get_format_uuid(bder->grp->logs[bder->grp->n_logs].uuid, MAX_UUID_LEN);
     aos_debug_log((LB, "add_log 1"));
-    GetLocalIP(local_ip_str);
     aos_debug_log((LB, "add_log 2"));
     now = record_time;
     aos_debug_log((LB, "add_log 3"));
@@ -264,7 +263,6 @@ int add_log(log_group_builder* bder, long start_time, uint32_t pack_index, log_i
 
             cJSON_AddItemToObject(skyeye_content, "BeginTime", cJSON_CreateNumber(log->BeginTime));
             cJSON_AddItemToObject(skyeye_content, "EndTime", cJSON_CreateNumber(log->EndTime));
-            cJSON_AddItemToObject(skyeye_content, "ClientIP", cJSON_CreateString(local_ip_str));
         }
         else{
             if (log->Level == LOG_LEVEL_DEBUG) {
@@ -299,11 +297,9 @@ int add_log(log_group_builder* bder, long start_time, uint32_t pack_index, log_i
                 cJSON_AddItemToObject(skyeye_content, "BeginTime", cJSON_CreateNumber(log->BeginTime));
                 cJSON_AddItemToObject(skyeye_content, "EndTime", cJSON_CreateNumber(log->EndTime));
             }
-            if (strlen(local_ip_str))
-                cJSON_AddItemToObject(skyeye_content, "ClientIP", cJSON_CreateString(local_ip_str));
         }
         cJSON_AddItemToObject(skyeye_content, "CostTime", cJSON_CreateNumber(log->CostTime));
-        cJSON_AddItemToObject(skyeye_content, "vtm_uuid", cJSON_CreateString(bder->grp->logs[bder->grp->n_logs].uuid));
+        cJSON_AddItemToObject(skyeye_content, "VtmUuid", cJSON_CreateString(bder->grp->logs[bder->grp->n_logs].uuid));
         cJSON_AddItemToObject(skyeye_content, "Version", cJSON_CreateString(bder->config->skyeyeVersion));
         cJSON_AddItemToObject(skyeye_content, "DateTime", cJSON_CreateString(nowTime));
         cJSON_AddItemToObject(skyeye_content, "ResultCode", cJSON_CreateString(log->ResultCode));
@@ -587,7 +583,7 @@ static uint32_t _log_pack(log_group_builder* bder, log_buf* buf)
     return totalBufferSize;
 }
 
-void add_log_terminal_sn(log_group_builder* bder, char* sn) {
+void add_log_terminal_sn_other(log_group_builder* bder, char* sn, char* clientIP) {
 
     int32_t totalBufferSize;
     build_item* grp_log;
@@ -614,6 +610,10 @@ void add_log_terminal_sn(log_group_builder* bder, char* sn) {
                         cJSON_AddItemToObject(content, "SN", cJSON_CreateString(sn));
                         changed = 1;
                     }
+                    if (!cJSON_HasObjectItem(content, "ClientIP")) {
+                        cJSON_AddItemToObject(content, "ClientIP", cJSON_CreateString(clientIP));
+                        changed = 1;
+                    }
                 }
             }
 

Framework/RvcLogSdk/log_builder.h

@@ -85,7 +85,7 @@ extern int add_log_raw(log_group_builder* bder, build_item* log);
 extern int add_log_serialize_buf(log_group_builder* bder, serialize_buf* buffer);
 extern void add_log_terminal_no(log_group_builder* bder, char* no);
 extern void clear_errJson_msg(log_group_builder* bder);
-extern void add_log_terminal_sn(log_group_builder* bder, char* sn);
+extern void add_log_terminal_sn_other(log_group_builder* bder, char* sn, char *clientIP);//add other params, decrease create new functions
 extern build_item* log_group_get_last(log_group_builder* bder);
 extern void log_group_clear_last(log_group_builder* bder);
 extern lz4_log_buf* serialize_to_proto_buf_with_malloc_lz4(log_group_builder* bder);

Framework/RvcLogSdk/log_producer_manager.c

@@ -147,7 +147,13 @@ void* log_producer_read_persistent_thread(void* param)
                         add_log_terminal_no(builder, config->skyeyeTerminalNo);
                     }
                     if (config->skyeyeSn != NULL) {
-                        add_log_terminal_sn(builder, config->skyeyeSn);
+                        static char local_ip_str[64] = "0.0.0.0";
+                        static long ipInit = 0;
+                        //get ip every 1000 times
+                        if (ipInit % 1000 == 0)
+                            GetLocalIP(local_ip_str);
+                        ipInit++;
+                        add_log_terminal_sn_other(builder, config->skyeyeSn, local_ip_str);
                     }
 
                     clear_errJson_msg(builder);

Framework/RvcLogSdk/log_util.cpp

@@ -150,26 +150,15 @@ int GetLocalIP(char* ip_str)
 {
 	
 #ifdef _WIN32
-	static char exist_ip_str[32] = "";
 	struct hostent* ent;
-	char tmp[256];
+	char tmp[256] = "";
 	int i;
 
-	//set to 0.0.0.0 temperatorily, need to be fixed later
-	strcpy(ip_str, "0.0.0.0");
-	return 0;
-
-	if (strlen(exist_ip_str) != 0)
-	{
-		strcpy(ip_str, exist_ip_str);
-		return 0;
-	}
 	__try {
 		ent = gethostbyname(tmp);
 	}
 	__except (EXCEPTION_EXECUTE_HANDLER) {
 		strcpy(ip_str, "0.0.0.0");
-		strcpy(exist_ip_str, "0.0.0.0");
 		return -1;
 	}
 
@@ -179,7 +168,6 @@ int GetLocalIP(char* ip_str)
 				struct in_addr* in = (struct in_addr*)ent->h_addr_list[i];
 				char* p = inet_ntoa(*in);
 				if (p[0] != '0') {
-					strcpy(exist_ip_str, p);
 					strcpy(ip_str, p);
 					return 0;
 				}