【修改内容】修改主机注册的IP

【提交人】陈伟灿

application/kcloud/kcloud_config.h

@@ -12,7 +12,7 @@
 #define PASSWORD    "2ca1442865ff4cb99870f60f2c646190"
 #define AUTO_CONN   1
 #define CONNECT_TIMEOUT   3
-#define IPSTR "172.25.240.122"
+#define IPSTR "172.25.240.194"
 #define PORT 8092
 #define GET_KEY_CMD "/usr/sbin/fw_printenv key -n"
 typedef enum {

application/kcloud/kcloud_main.c

@@ -65,12 +65,13 @@ int main(int argc, char* argv[])
 	open("kcloud",LOG_PID,LOG_USER);
 	/*set the callback to get the device date to cloud*/
 	kk_ipc_init(IPC_APP2MID,(ipc_cb*)KK_Data_FromDev,NULL,NULL);
-	kk_info_report_start();
+	//kk_info_report_start();
 again:	
 	rc = kk_start_ccu_register();
 	if(rc == 0){
 		rc = mqtt_start();
 	}else{
+		sleep(2);
 		goto again;
 	}
 	return rc;

application/kcloud/kk_register.c

@@ -16,7 +16,7 @@
 #include "kk_hal.h"
 #include "kk_product.h"
 #include "kcloud_config.h"
-
+#include "infra_sha256.h"
 #define BUFSIZE 1024
 #define PRODUCTSECRET  "123456"
 
@@ -85,8 +85,8 @@ int kk_parse_token(char *info){
 	fp = fopen("/usr/kk/kk_token.txt", "w+");
     if(fp != NULL){
         fwrite(jwt->valuestring,strlen(jwt->valuestring),1,fp);
-        fsync(fp);
 	    fclose(fp);
+        system("sync");
     }  
 	//cJSON *ccuid = cJSON_GetObjectItem(infoObj,"ccu_id");
 	//if(ccuid == NULL) return -1;	
@@ -203,7 +203,7 @@ static char * kk_create_register_info()
     char mac[16] = {0};
     char ramdonId[16] = {0};
     unsigned char sign_hex[32] = {0};   
-    unsigned char sign_hex_str[65] = {0}; 
+    char sign_hex_str[65] = {0}; 
     uint8_t productSecret[64] = {0};
     int productSecret_len = 0;        
 	root=cJSON_CreateObject();
@@ -214,9 +214,9 @@ static char * kk_create_register_info()
     signSource = kk_dictionary_order(KK_CCU_ID,productCode,KK_CCU_RANDOM);
     kk_execel_cmd(GET_KEY_CMD,(char *)productSecret,sizeof(productSecret),&productSecret_len);
     if(productSecret_len == 0){
-        utils_hmac_sha256(signSource, strlen(signSource), PRODUCTSECRET, strlen(PRODUCTSECRET), sign_hex);
+        utils_hmac_sha256((const uint8_t *)signSource, strlen(signSource), (const uint8_t *)PRODUCTSECRET, strlen(PRODUCTSECRET), sign_hex);
     }else{
-        utils_hmac_sha256(signSource, strlen(signSource), productSecret, strlen(productSecret), sign_hex);
+        utils_hmac_sha256((const uint8_t *)signSource, strlen(signSource), (const uint8_t *)productSecret, strlen((const char*)productSecret), sign_hex);
     }
 
     arrayToStr(sign_hex,32,sign_hex_str);
@@ -284,7 +284,9 @@ static int kk_send_register_info(int sockfd,const char * path,int type)
     memset(tmp, 0, sizeof(tmp));   
     sprintf(tmp, "POST %s HTTP/1.1\n", path);     
     strcat(str1, tmp);
-    strcat(str1, "Host: 172.25.240.122:8092\n");
+    memset(tmp, 0, sizeof(tmp)); 
+    sprintf(tmp, "Host: %s:%d\n",IPSTR, PORT);  
+    strcat(str1, tmp);
     strcat(str1, "Content-Type: application/json\n");
     strcat(str1, "Content-Length: ");
     strcat(str1, str);
@@ -310,6 +312,7 @@ int kk_start_ccu_register(void)
     bzero(&servaddr, sizeof(servaddr));
     servaddr.sin_family = AF_INET;
     servaddr.sin_port = htons(PORT);
+
     if (inet_pton(AF_INET, IPSTR, &servaddr.sin_addr) <= 0 ){
         printf("--inet_pton error!\n");
         return -1;
@@ -322,7 +325,7 @@ int kk_start_ccu_register(void)
     printf("connect successful\n");
     ret = kk_send_register_info(sockfd,"/deviceRegister/register",0);
     if (ret < 0) {
-            printf("send fail'%s'\n",errno, strerror(errno));
+            printf("send fail\n");
             close(sockfd);
             return -1;
     }else{
@@ -361,7 +364,7 @@ int kk_start_ccu_register(void)
                         if(ret == 0){
                             ret = kk_send_register_info(sockfd,"/auth/generateJwt",1);
                             if (ret < 0) {
-                                printf("send fail'%s'\n",errno, strerror(errno));
+                                printf("send fail'\n");
                                 close(sockfd);
                                 return -1;
                             }else{

application/kcloud/mqtt_api.c

@@ -286,6 +286,7 @@ int KK_MQTT_SendMsg(char *topicName,const char *payload)
 	}
 	return rc;
 }
+extern void KK_Sendto_DevData(const char *topic,const char *data);
 int KK_MQTT_RecvMsg(const char *topicName,const char *payload)
 {
 	if(topicName == NULL || payload ==NULL)