diff --git a/main.c b/main.c index 2c55d24..5cc891b 100644 --- a/main.c +++ b/main.c @@ -80,6 +80,9 @@ int searchTimeOld=0; int searchTimeNew=0; int lightsnNum=0; int mqtt_port=1883; + +int getLedOtaVersion(char *filename); +int getApOtaVersion(char *filename,char *modename); /*================================================================================*/ void doCommand_help(int argc, char *argv[]) { @@ -1022,6 +1025,7 @@ void getDevRawPassword(char *devsn){ LOG_I("devsn:%s\n",devsn); json_object *root = NULL; const char *payload = NULL; + char payload_copy[256]={0}; char send_request[256]={0}; char signbase64[256]={0}; char signtmp[256]={0}; @@ -1037,14 +1041,15 @@ void getDevRawPassword(char *devsn){ json_object_object_add(root, "deviceId",json_object_new_string(devsn)); json_object_object_add(root, "oldPassword",json_object_new_string("12345")); payload = json_object_to_json_string(root); - removeSpaces(payload); + strncpy(payload_copy, payload, sizeof(payload_copy)-1); + removeSpaces(payload_copy); strcpy(signtmp,payload); strcat(signtmp,appSecret); //LOG_I("signtmp:%s\n",signtmp); get_base64_md5_from_string(signbase64, sizeof(signbase64), signtmp, strlen(signtmp)); //LOG_I("signbase64:%s\n",signbase64); - sprintf(send_request,"curl -X POST -H 'x-appKey:%s' -H 'x-datadigest:%s' -H 'Content-Type: application/json' -d '%s' %s", - appKey,signbase64,payload,getDevRawPasswordUrl); + snprintf(send_request, sizeof(send_request), "curl -X POST -H 'x-appKey:%s' -H 'x-datadigest:%s' -H 'Content-Type: application/json' -d '%s' %s", + appKey, signbase64, payload_copy, getDevRawPasswordUrl); LOG_I("send_request:%s\n",send_request); fp=popen(send_request,"r"); fgets(buffer,sizeof(buffer),fp); @@ -1801,10 +1806,10 @@ void *thread_mqtt_recv(void *arg){ get_string_from_json_string_by_key_unescape(msg_data, "sound", mqtt_parm.msg_sound, sizeof(mqtt_parm.msg_sound)); LOG_I("sound:%s\n",mqtt_parm.msg_sound); - strcpy(mqtt_parm.msg_sound, "0"); + //strcpy(mqtt_parm.msg_sound, "0"); get_string_from_json_string_by_key_unescape(msg_data, "flash", mqtt_parm.msg_flash, sizeof(mqtt_parm.msg_flash)); - strcpy(mqtt_parm.msg_flash, "0"); + //strcpy(mqtt_parm.msg_flash, "0"); LOG_I("flash:%s\n",mqtt_parm.msg_flash); get_string_from_json_string_by_key_unescape(msg_data, "flashInterval", mqtt_parm.msg_flashInterval,