【修改内容】优化程序

【提交人】huang.zhenling

common/api/com_api.h

@@ -40,7 +40,7 @@ typedef enum {
 
 typedef void ipc_cb(void* data, int len, char* chalMark);
 int kk_ipc_init(ipc_type type, ipc_cb cb, char* chalMark, char* ip);
-int kk_ipc_deinit();
+int kk_ipc_deinit(ipc_type type);
 int kk_ipc_send(ipc_type type, void* data, int len);
 int kk_ipc_send_ex(ipc_type type, void* data, int len, char* chalMark);
 

common/api/tcp_channel.c

@@ -338,7 +338,7 @@ static void read_cb(struct ev_loop *loop, struct ev_io *watcher, int revents)
         free(watcher);
     } else {
         //intf("READ:\r\n    %s\r\n", buffer);
-        printf("read_cb deviceCode ip sock [%s][%s][%d]",tcp_ctrl->deviceCode,tcp_ctrl->ip, tcp_ctrl->sock);
+        //printf("read_cb deviceCode ip sock [%s][%s][%d] \n",tcp_ctrl->deviceCode,tcp_ctrl->ip, tcp_ctrl->sock);
 		if (g_cb != NULL){
 			g_cb(buffer,bytes,tcp_ctrl->deviceCode);
 		}

platform/zigbee/app/builder/Z3GatewayHost/rpc_api/src/rpc_interface_parse.c

@@ -459,17 +459,25 @@ int search_ccu(char devcode[33], char ip[16], int* port){
 void* _msg_topo_add(){
     char msgFmt[] = "{\"info\":{\"msgtype\":\"/thing/topo/add\",\"productCode\":\"%s\",\"deviceCode\":\"%s\"},\
                         \"payload\":{\"msgId\":\"%d\",\"version\":\"1.0\",\"params\":{\"deviceCode\":\"%s\",\"productCode\":\"%s\",\"mac\":\"%s\"}}}";
-    char msg[520] = {0};
+    //char msg[520] = {0};
+    char* msg = NULL;
 	char* macString = kk_get_gw_mac();
 	if (macString == NULL){
         printf("[%s] get mac fail\n",__FUNCTION__);
         return NULL;
 	}	
+	msg = malloc(520);
+    if (msg == NULL){
+        printf("[%s] msg malloc fail\n",__FUNCTION__);
+        return NULL;
+	}
+	
     sprintf(msg, msgFmt, GW_PRODUCT_CODE, macString, 1, macString, GW_PRODUCT_CODE,macString);
-    cJSON* msgObj = cJSON_Parse(msg);
-    char* outbuf = cJSON_Print(msgObj);
-    cJSON_Delete(msgObj);
-    return outbuf;
+    //cJSON* msgObj = cJSON_Parse(msg);
+    //char* outbuf = cJSON_Print(msgObj);
+    //cJSON_Delete(msgObj);
+    //return outbuf;
+    return msg;
    
 }
 
@@ -480,18 +488,27 @@ void* _msg_event_property_post(char ip[16], int port){
                         \"OnlineDetectionState\":%d,\"SN\":\"%s\",\"IPAddress\":\"%s\",\"MACAddress\":\"%s\",\"Port\":%d},\
                         \"time\":1524448722000,\"method\":\"thing.event.property.post\"}\
                      }";
-    char msg[620] = {0};
+    //char msg[620] = {0};
+    char* msg = NULL;
 	char* macString = kk_get_gw_mac();
     if (macString == NULL){
         printf("[%s] get mac fail\n",__FUNCTION__);
         return NULL;
 	}
+
+	msg = malloc(620);
+    if (msg == NULL){
+        printf("[%s] msg malloc fail\n",__FUNCTION__);
+        return NULL;
+	}
+	
     sprintf(msg, msgFmt, GW_PRODUCT_CODE, macString,
                         1, 0, 0, 0, "12345", ip,macString,port);
-    cJSON* msgObj = cJSON_Parse(msg);
-    char* outbuf = cJSON_Print(msgObj);
-    cJSON_Delete(msgObj);
-    return outbuf;
+    //cJSON* msgObj = cJSON_Parse(msg);
+    //char* outbuf = cJSON_Print(msgObj);
+    //cJSON_Delete(msgObj);
+    //return outbuf;
+    return msg;
 }