【修改内容】1. 修改nanomsg（使用pipe和subpub组合使用）支持多个网关连接；2. 主机和网关连接协议（tcp广播）

common/zlog/kk_log.h

@@ -4,6 +4,7 @@
 
 extern zlog_category_t *g_zlogC;
 
+#define DEBUG_PRINT(info,...)  zlog_debug(g_zlogC, info, ##__VA_ARGS__)
 #define INFO_PRINT(info,...)  zlog_info(g_zlogC, info, ##__VA_ARGS__)
 #define ERROR_PRINT(info,...) zlog_error(g_zlogC, info, ##__VA_ARGS__)
 #define WARNING_PRINT(info,...) zlog_warn(g_zlogC, info, ##__VA_ARGS__)

midware/midware/dm/kk_dm_mng.c

@@ -390,10 +390,13 @@ int dm_mgr_init(void)
 		_dm_init_tsl_params(devId);
 	}
 
-	res = dm_mgr_device_create(KK_DM_DEVICE_GATEWAY,KK_DM_GW_DEVICE_PRODUCT_TYPE,KK_DM_GW_DEVICE_PRODUCT_CODE,"588E81FFFED3834A",deviceCode,&devId);
-	if (res != SUCCESS_RETURN) {
-		goto ERROR;
-	}	
+	//res = dm_mgr_device_create(KK_DM_DEVICE_GATEWAY,KK_DM_GW_DEVICE_PRODUCT_TYPE,KK_DM_GW_DEVICE_PRODUCT_CODE,"1122334455667788",deviceCode,&devId);
+	//if (res != SUCCESS_RETURN) {
+	//	goto ERROR;
+	//}
+	//sleep(3);
+    //kk_dm_subdev_topo_add(devId);
+
     return SUCCESS_RETURN;
 
 ERROR:
@@ -722,10 +725,13 @@ int dm_mgr_upstream_thing_topo_add(_IN_ int devid)
     }
 
     res = dm_mgr_search_dev_by_devid(devid, &node);
+    
     if (res != SUCCESS_RETURN) {
+        ERROR_PRINT("ERROR res:%d\n",res);
         return FAIL_RETURN;
     }
 	res = dm_mgr_get_device_by_mac(node->fatherMac,&gw_node);
+	
     if (res != SUCCESS_RETURN) {
 		ERROR_PRINT("ERROR [%s][%d] res:%d\n",__FUNCTION__,__LINE__,res);
         return FAIL_RETURN;
@@ -1102,3 +1108,16 @@ int dm_mgr_subdev_create(_IN_ char productType[PRODUCT_TYPE_MAXLEN],
 	}
     return res;
 }
+
+ int dm_mgr_gw_create(_IN_ char productType[PRODUCT_TYPE_MAXLEN],
+                          _IN_ char productCode[PRODUCT_CODE_MAXLEN], _IN_ char deviceCode[DEVICE_CODE_MAXLEN],_IN_ char fatherMac[DEVICE_MAC_MAXLEN], _OU_ int *devid){
+     int res = 0;
+     
+     res = dm_mgr_device_create(KK_DM_DEVICE_GATEWAY,productType,productCode,deviceCode,fatherMac, devid);
+     if(TSL_ALREADY_EXIST == res)
+     {
+         ERROR_PRINT("GATEWAY ALREADY EXIST!!!\n");
+     }
+     return res;
+ }
+

midware/midware/midware.c

@@ -17,7 +17,7 @@
 #include "kk_tsl_api.h"
 #include "kk_dm_api.h"
 #include "kk_log.h"
-
+#include "kk_dm_queue.h"
 
 
 void mid_cb(void* data, int len){
@@ -103,10 +103,10 @@ void mid2p_cb(void* data, int len, char* chalMark){
 		}
 		
         memcpy(buf, data, len);
-        queue_msg.data = buf;
-        memset(queue_msg.chalMark, 0, sizeof(queue_msg.chalMark));
+        queue_msg->data = buf;
+        memset(queue_msg->chalMark, 0, sizeof(queue_msg->chalMark));
         if(chalMark != NULL){
-            memcpy(queue_msg.chalMark, chalMark, sizeof(chalMark));
+            memcpy(queue_msg->chalMark, chalMark, sizeof(chalMark));
         }
         res = dm_queue_msg_insert2((void *)queue_msg);
         if (res != SUCCESS_RETURN) {
@@ -204,9 +204,11 @@ typedef struct {
     void *g_mid_dispatch_thread;
     void *g_ota_dispatch_thread;
     void *g_ccuProChg_dispatch_thread;	
+	void *g_udp_dispatch_thread;
     int g_mid_dispatch_thread_running;
     int g_ota_dispatch_thread_running;
     int g_ccuProChg_dispatch_thread_running;	
+	int g_udp_dispatch_thread_running;
 } mid_ctx_t;
 #define MID_YIELD_TIMEOUT_MS (200)
 
@@ -241,6 +243,208 @@ void *ota_dispatch_yield(void *args)
     return NULL;
 }
 
+
+#define UDP_LAN_PORT 25556
+#define UDP_LAN_PORT_HOST 25555
+
+void *udp_dispatch_yield(void *args){  
+    
+
+    INFO_PRINT("udp_dispatch_yield udp thread create\n");    
+
+    // 绑定地址 
+    struct sockaddr_in addrto; 
+    bzero(&addrto, sizeof(struct sockaddr_in)); 
+    addrto.sin_family = AF_INET; 
+    addrto.sin_addr.s_addr = htonl(INADDR_ANY); 
+    addrto.sin_port = htons(UDP_LAN_PORT); 
+
+     // 发送地址
+    struct sockaddr_in addrto_host; 
+    bzero(&addrto_host, sizeof(struct sockaddr_in)); 
+    addrto_host.sin_family = AF_INET; 
+    addrto_host.sin_addr.s_addr = htonl(INADDR_ANY); 
+    //addrto_host.sin_port = htons(UDP_LAN_PORT); 
+ 
+    // 接收到的广播地址 
+    struct sockaddr_in from; 
+    bzero(&from, sizeof(struct sockaddr_in)); 
+   
+    
+    int sock = -1; 
+     int sock_host = -1; 
+    if ((sock = socket(AF_INET, SOCK_DGRAM, 0)) == -1) 
+    { 
+        ERROR_PRINT("socket error\n"); 
+    } 
+
+     if ((sock_host = socket(AF_INET, SOCK_DGRAM, 0)) == -1) 
+    { 
+        ERROR_PRINT("socket error\n"); 
+    } 
+
+
+#if 0
+    const int opt = 1; 
+    //设置该套接字为广播类型， 
+    int nb = 0; 
+    nb = setsockopt(sock, SOL_SOCKET, SO_BROADCAST| SO_REUSEADDR, (char *)&opt, sizeof(opt)); 
+    if(nb == -1) 
+    { 
+        DEBUG("set socket error...\n"); 
+    } 
+#endif
+    
+    if(bind(sock,(struct sockaddr *)&(addrto), sizeof(struct sockaddr_in)) == -1) 
+    { 
+        ERROR_PRINT("bind error...\n"); 
+    } 
+ 
+    socklen_t len = sizeof(struct sockaddr_in); 
+    cJSON* json = NULL;
+    cJSON* info = NULL;
+    cJSON* payload = NULL;
+    cJSON* infoObj = NULL;
+    cJSON* payloadObj = NULL;
+    cJSON* msgtype = NULL;
+    cJSON* proType = NULL;
+    cJSON* proCode = NULL;
+    cJSON* devCode = NULL;
+    cJSON* params = NULL;
+    cJSON* macstr = NULL;
+    char szOut[128] = {0};
+    char szDec[1024] = {0}; 
+    char host_ip[32] = {0};
+    char mac[32] = {0};
+    int devId = 0;
+
+    while(1) 
+    { 
+            
+        
+        //从广播地址接受消息 
+        memset(szDec, 0 , sizeof(szDec));
+        int size=recvfrom(sock, szDec, sizeof(szDec), 0, (struct sockaddr*)&from,(socklen_t*)&len); 
+        if(size<=0) 
+        { 
+            WARNING_PRINT("read error....\n"); 
+        } 
+        else 
+        { 
+                
+            DEBUG_PRINT("lan recmsg: %s\n", szDec); 
+            //DEBUG_PRINT("udp client ip:%s ,port is :%d htons(UDP_LAN_PORT)=%d \n",inet_ntoa(from.sin_addr),from.sin_port, htons(UDP_LAN_PORT)); 
+            json=cJSON_Parse(szDec);
+        	if (!json) {
+                ERROR_PRINT("Error before: [%s]\n","cJSON_Parse");
+            }
+        	else
+        	{
+                
+                infoObj = cJSON_GetObjectItem(json, "info");
+                payloadObj = cJSON_GetObjectItem(json, "payload");
+                
+                if (infoObj != NULL && payloadObj != NULL){
+
+                    msgtype = cJSON_GetObjectItem(infoObj, "msgtype");
+                    if (msgtype == NULL || strstr(msgtype->valuestring, "/thing/topo/add") == NULL){
+                        ERROR_PRINT("msgtype parameter is error \n");
+                        cJSON_Delete(json);
+                        continue;
+                    }
+
+                    proType = cJSON_GetObjectItem(infoObj, "productType");
+                    proCode = cJSON_GetObjectItem(infoObj, "productCode");
+                    devCode = cJSON_GetObjectItem(infoObj, "deviceCode");
+                    params = cJSON_GetObjectItem(payloadObj, "params");
+                    if (proType == NULL ||  proCode == NULL || devCode == NULL || params == NULL){
+                        ERROR_PRINT("productType productCode deviceCode params parameters are error \n");
+                        cJSON_Delete(json);
+                        continue;
+                    }
+                    
+                    macstr = cJSON_GetObjectItem(params, "mac");
+
+                    if (macstr == NULL){
+                        ERROR_PRINT("mac parameter is error \n");
+                        cJSON_Delete(json);
+                        continue;
+                    }
+                    
+                    INFO_PRINT("productType productCode deviceCode mac: [%s][%s][%s][%s] \n",proType->valuestring, proCode->valuestring,
+                                devCode->valuestring, macstr->valuestring);
+                    int res = dm_mgr_gw_create(proType->valuestring,proCode->valuestring,devCode->valuestring,macstr->valuestring,&devId);
+                	if (res != SUCCESS_RETURN) {
+                        WARNING_PRINT("dm_mgr_gw_create error");
+                	}
+                    
+                    kk_ipc_send(IPC_MID2APP, szDec, size);
+
+                    memset(host_ip, 0, sizeof(host_ip));
+                    memset(mac, 0, sizeof(mac));
+                    memset(szOut, 0, sizeof(szOut));
+                    HAL_Get_IP(host_ip,"ens33");
+                    HAL_Get_mac(mac);
+                    
+                    sprintf(szOut,"/thing/topo/add_reply|mac=%s;ip=%s",mac,host_ip);
+                    DEBUG_PRINT("szOut:%s\n",szOut); 
+                    DEBUG_PRINT("udp client ip:%s ,port is :%d \n",inet_ntoa(from.sin_addr),from.sin_port); 
+                    //sendto(sock, szOut, strlen(szOut), 0, (struct sockaddr*)&from,len); 
+
+                    addrto_host.sin_addr.s_addr = inet_addr(inet_ntoa(from.sin_addr)); 
+                    addrto_host.sin_port = htons(UDP_LAN_PORT_HOST); 
+                    //addrto_host.sin_port = from.sin_port; 
+                    if(strcmp(host_ip,inet_ntoa(from.sin_addr)) == 0)
+                    {
+                        sendto(sock_host, szOut, strlen(szOut), 0, (struct sockaddr*)&addrto_host,sizeof(addrto_host)); 
+                    }
+                    else
+                    {
+                        DEBUG_PRINT("udp client is not local ip  , refused send ack to it\n");
+                    }
+                    
+                }else{
+                    INFO_PRINT("error format json: [%s]\n",szDec);
+                
+                }
+                
+                cJSON_Delete(json);
+                
+            }
+
+       
+           /*if(strcmp(szDec,"search_kk_gw|null") == 0){
+                HAL_Get_IP(host_ip,"ens33");
+                HAL_Get_mac(mac);
+                sprintf(szOut,"search_kk_gw_ack|mac=%s;ip=%s",mac,host_ip);
+                DEBUG_PRINT("szOut:%s\n",szOut); 
+                DEBUG_PRINT("udp client ip:%s ,port is :%d htons(UDP_LAN_PORT)=%d \n",inet_ntoa(from.sin_addr),from.sin_port, htons(UDP_LAN_PORT)); 
+                //sendto(sock, szOut, strlen(szOut), 0, (struct sockaddr*)&from,len); 
+
+                addrto_host.sin_addr.s_addr = inet_addr(inet_ntoa(from.sin_addr)); 
+                //addrto_host.sin_port = htons(UDP_LAN_PORT_HOST); 
+                addrto_host.sin_port = from.sin_port; 
+                if(strcmp(host_ip,inet_ntoa(from.sin_addr)) == 0)
+                {
+                    sendto(sock_host, szOut, strlen(szOut), 0, (struct sockaddr*)&addrto_host,sizeof(addrto_host)); 
+                }
+                else
+                {
+                    DEBUG_PRINT("udp client is not local ip  , refused send ack to it\n");
+                }
+                    
+            }else{
+                DEBUG_PRINT("strmp error\n"); 
+            }*/
+             
+        }
+        usleep(100000); 
+    } 
+
+            
+    close(sock);
+    close(sock_host);
+}
 void *ccu_property_monitor(void *args)
 {
     mid_ctx_t *mid_ctx = kk_mid_get_ctx();
@@ -297,8 +501,6 @@ void *ccu_property_monitor(void *args)
     return NULL;
 }
 
-
-
 static int kk_set_product_info(void)
 {
 	HAL_SetProduct_Type(PRODUCT_TPYE);
@@ -338,17 +540,26 @@ int main(const int argc, const char **argv)
         mid_ctx->g_mid_dispatch_thread_running = 1;
         res = pthread_create(&mid_ctx->g_mid_dispatch_thread, NULL, mid_dispatch_yield, NULL);
         if (res < 0) {
-            ERROR_PRINT("HAL_ThreadCreate Failed\n");
-            IOT_Linkkit_Close(mid_ctx->master_devid);
+            ERROR_PRINT("HAL_ThreadCreate mid Failed\n");
+            //IOT_Linkkit_Close(mid_ctx->master_devid);
             return -1;
         }
         mid_ctx->g_ota_dispatch_thread_running = 1;
         res = pthread_create(&mid_ctx->g_ota_dispatch_thread, NULL, ota_dispatch_yield, NULL);
         if (res < 0) {
-            ERROR_PRINT("HAL_ThreadCreate Failed\n");
-            IOT_Linkkit_Close(mid_ctx->master_devid);
+            ERROR_PRINT("HAL_ThreadCreate ota Failed\n");
+            //IOT_Linkkit_Close(mid_ctx->master_devid);
             return -1;
         }
+        
+        // recv gateway add cmd and ack to gateway
+        res = pthread_create(&mid_ctx->g_udp_dispatch_thread, NULL, udp_dispatch_yield, NULL);
+        if (res < 0) {
+            ERROR_PRINT("HAL_ThreadCreate udp Failed\n");
+            //IOT_Linkkit_Close(mid_ctx->master_devid);
+            return -1;
+        }
+		
 		mid_ctx->g_ccuProChg_dispatch_thread_running = 1;
         res = pthread_create(&mid_ctx->g_ccuProChg_dispatch_thread, NULL, ccu_property_monitor, NULL);
         if (res < 0) {
@@ -356,14 +567,15 @@ int main(const int argc, const char **argv)
             return -1;
         }	
 		
+
         int ct = 0;
 		for (;;) {
                 usleep(200000);
                 kk_platMsg_dispatch();
                 /*if (ct == 0){
                     ct =1;
-                    void* buf = "{        \"msgId\":        \"7\", \"version\":      \"1.0\", \"mac\":  \"588E81FFFED3834A\", \"method\":       \"thing.topo.add\",    \"params\":       {          \"AppVersion\":   \"10\",  \"deviceCode\":   \"1212121212121212\",   \"productType\":  \"curtain\",   \"productCode\":  \"24\"  }}";
-                    kk_platMsg_handle(buf);
+                    void* buf = "{        \"msgId\":        \"7\", \"version\":      \"1.0\", \"mac\":  \"588E81FFFED3834A\", \"method\":       \"thing.topo.add\",    \"params\":       {          \"AppVersion\":   \"10\",  \"deviceCode\":   \"588E81FFFED3834A\",   \"productType\":  \"curtain\",   \"productCode\":  \"24\"  }}";
+                    kk_platMsg_handle(buf, "1122334455667788");
                     //kk_set_tsl_by_productKey("a1OYuSallan","model.json");
                     //kk_mid_subdev_add("a1OYuSallan","allanWno8yDdsjCX15iq","","aabbccddeeff1122");
                 }*/

platform/zigbee/app/builder/Z3GatewayHost/com_api.h

@@ -56,17 +56,18 @@ typedef enum{
 }kk_msg_type_t;
 
 #define MSG_TYPE_STR              "msgtype"
-#define MSG_PRODUCT_TYPE_STR      "product_type"
-#define MSG_DEVICE_NAME_STR       "device_name"
+#define MSG_PRODUCT_TYPE_STR      "productType"
+#define MSG_PRODUCT_CODE_STR      "productCode"
+#define MSG_DEVICE_CODE_STR       "deviceCode"
 #define MSG_PAYLOAD_STR           "payload"
 #define MSG_INFO_STR              "info"
 #define MSG_INDENTIFIER_STR              "identifier"
 
-typedef void ipc_cb(void* data, int len, char* chlMark);
-int kk_ipc_init(ipc_type type, ipc_cb cb, char* mac, char* ip);
+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_dinit();
 int kk_ipc_send(ipc_type type, void* data, int len);
-int kk_ipc_send_ex(ipc_type type, void* data, int len, char* filter);
+int kk_ipc_send_ex(ipc_type type, void* data, int len, char* chalMark);
 
 #if defined(__cplusplus)
 }

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

@@ -11,6 +11,7 @@
 #include <sys/wait.h>
 #include <signal.h>
 #include <time.h>
+#include <fcntl.h>
 
 #include "RPC_API.h"
 #include "./rpc_api/inc/rpc_interface_parse.h"
@@ -236,11 +237,133 @@ int _init_param(struct jrpc_server *server) {
 	return 0;
 }
 
+
+int addGW_and_getIP(char* ip){
+    
+    //char rgMessage[128] = "search_kk_gw|null";
+    char revMessage[128] = {0};
+    int sock;
+    int sk_recv;
+    int iSendbytes;
+    int iOptval = 1;
+    int flag;
+    int iAddrLength;
+    int recvLen = 0;
+    struct sockaddr_in Addrto;
+    struct sockaddr_in AddrRev;
+
+    if ((sock = socket(AF_INET, SOCK_DGRAM, 0)) == -1)
+    {
+        printf("addGW_and_getIP socket fail\n");
+        return -1;
+    }
+
+    if ((sk_recv = socket(AF_INET, SOCK_DGRAM, 0)) == -1)
+    {
+        printf("addGW_and_getIP socket sk_recv fail\n");
+        close(sock);
+        return -1;
+    }
+    
+    if (setsockopt(sock, SOL_SOCKET, SO_BROADCAST | SO_REUSEADDR, &iOptval, sizeof(int)) < 0)
+    {
+        printf("addGW_and_getIP setsockopt failed!");
+        close(sock);
+        close(sk_recv);
+        return -1;
+    }
+
+    if (setsockopt(sk_recv, SOL_SOCKET, SO_REUSEADDR, &iOptval, sizeof(int)) < 0)
+    {
+        printf("addGW_and_getIP setsockopt failed!");
+        close(sock);
+        close(sk_recv);
+        return -1;
+    }
+    
+    flag = fcntl(sk_recv, F_GETFL, 0);
+    if (flag < 0)
+    {
+        printf("addGW_and_getIP fcntl failed.\n");
+        close(sock);
+        close(sk_recv);
+        return -1;;
+    }
+    flag |= O_NONBLOCK;
+    if (fcntl(sk_recv, F_SETFL, flag) < 0)
+    {
+        printf("addGW_and_getIP fcntl failed.\n");
+        close(sock);
+        close(sk_recv);
+        return -1;
+    }
+    memset(&Addrto, 0, sizeof(struct sockaddr_in));
+    Addrto.sin_family = AF_INET;
+    Addrto.sin_addr.s_addr = inet_addr("255.255.255.255");
+    Addrto.sin_port = htons(25556);
+
+    memset(&AddrRev, 0, sizeof(struct sockaddr_in));
+    AddrRev.sin_family = AF_INET;
+    AddrRev.sin_addr.s_addr = INADDR_ANY;
+    AddrRev.sin_port = htons(25555);
+    iAddrLength = sizeof(struct sockaddr);
+
+    
+    if (bind(sk_recv, (struct sockaddr *)&AddrRev, sizeof(AddrRev)) == -1)
+    {
+        printf("addGW_and_getIP bind failed!\n");
+        close(sock);
+        close(sk_recv);
+        return -1;
+    }
+    printf("addGW_and_getIP allan ==============\n");
+    char info[] = "{\"msgtype\":\"/thing/topo/add\",\"productType\":\"gw\",\"productCode\":\"2\",\"deviceCode\":\"1122334455667788\"}";
+    char payload[] = "{\"msgId\":\"1\",\"version\":\"1.0\",\"params\":{\"deviceCode\":\"1122334455667788\",\"productCode\":\"2\",\"mac\":\"1122334455667788\"}}";
+    cJSON* root = cJSON_CreateObject();
+    cJSON* infoObj = cJSON_Parse(info);
+    cJSON* payloadObj = cJSON_Parse(payload);
+    cJSON_AddItemToObject(root, "info", infoObj);
+    cJSON_AddItemToObject(root, "payload",payloadObj);
+    char* outbuf = cJSON_Print(root);
+    cJSON_Delete(root);
+    printf("addGW_and_getIP allan ===========111111===\n");
+    while (1)
+    {
+        if ((iSendbytes = sendto(sock, outbuf, strlen(outbuf)+1, 0, (struct sockaddr*)&Addrto, sizeof(struct sockaddr))) == -1)
+        {
+            printf("addGW_and_getIP sendto fail, errno=%d\n", errno);
+            close(sock);
+            close(sk_recv);
+            free(outbuf);
+            return -1;
+        }
+
+        sleep(1);
+        recvLen = recvfrom(sk_recv, revMessage, sizeof(revMessage), 0, (struct sockaddr *)&AddrRev, &iAddrLength);
+        if (recvLen > 0){
+            printf("addGW_and_getIP recv:%s\n", revMessage);
+            if (strstr(revMessage, "/thing/topo/add_reply") != NULL){
+                memcpy(ip, inet_ntoa(AddrRev.sin_addr), strlen(inet_ntoa(AddrRev.sin_addr)));
+                printf(" recv ip:%s\n", ip);
+                break;
+            }
+        }
+        
+    }
+    close(sock);
+    close(sk_recv);
+    free(outbuf);
+    return 0;
+    
+}
+
 void ipcHandle(void)
 {
+    char ip[16] = {0};
 	emberAfAppPrint( "Thread rpc Interface Parse create\n" );
+	addGW_and_getIP(ip);
     _init_param(&my_server);
-    kk_ipc_init(IPC_PLAT2MID, _cb, "1122334455667788","127.0.0.1");
+    kk_ipc_init(IPC_PLAT2MID, _cb, "1122334455667788",ip);
 	emberAfAppPrint("sizeof(rpc_table)=%d,sizeof(rpc_table_s)=%d,%d\n",sizeof(rpc_table),sizeof(rpc_table_s),sizeof(rpc_table)/sizeof(rpc_table_s));
 	for(int i=0;i<sizeof(rpc_table)/sizeof(rpc_table_s);i++){
 		emberAfAppPrint("i=%d,%s\r\n",i,rpc_table[i].name);

zlog.conf

@@ -30,7 +30,7 @@ normal = "%d  %-6V (%f:%L) %m%n"
 
 [rules]
 
-*.INFO                >stdout; normal
+*.DEBUG                >stdout; normal
 
 *.*                     "/home/kk/share/%c.log", 1MB*2; normal