diff --git a/http/restful.c b/http/restful.c index 7151f68..7461894 100644 --- a/http/restful.c +++ b/http/restful.c @@ -22,6 +22,7 @@ typedef struct { OnHttpResponse onRspCb; CURL *pCurl; int errCode; + void* pData; } HTTP_REQ_PARAMS, *PHTTP_REQ_PARAMS; static size_t __writeDataCb(void *pData, size_t size, size_t nmemb, void *pParams) @@ -91,6 +92,7 @@ int http_post_request(const char *pURL, const char *pPost, OnHttpResponse onResp if(pPost != NULL && strlen(pPost) > 0) { curl_easy_setopt(pCurl, CURLOPT_POSTFIELDS, pPost); curl_easy_setopt(pCurl, CURLOPT_POSTFIELDSIZE, (long)strlen(pPost)); + pParams->pData = (void*)pPost; } #ifdef SKIP_PEER_VERIFICATION @@ -132,7 +134,7 @@ int http_post_request(const char *pURL, const char *pPost, OnHttpResponse onResp if(onRespCb) { onRespCb(pParams->reqResult, pParams->dlSize, pParams->pReqUrl, pParams->sPath, - NULL, -pParams->errCode, NULL); + NULL, -pParams->errCode, pParams->pData); } if(pParams->pReqUrl) { diff --git a/ztp_main.c b/ztp_main.c index 09bdf3e..048f597 100644 --- a/ztp_main.c +++ b/ztp_main.c @@ -20,8 +20,12 @@ void __onPost(void *pData, unsigned int size, const char *pReqUrl, UNUSED(iFinished); UNUSED(pUserData); - LOG_EX(LOG_Info, "Post URL: %s\n", pReqUrl); - LOG_EX(LOG_Info, "Post Result: %s\n", (char *)pData); + LOG_EX(LOG_Info, "Post URL: [%s]\n", pReqUrl); + + if(pUserData && strlen(pUserData) > 0) { + LOG_EX(LOG_Info, "Post Data: [%s]\n", pUserData); + } + LOG_EX(LOG_Info, "Post Result: [%s]\n", (char *)pData); } int main(int argc, char **argv) @@ -42,7 +46,7 @@ int main(int argc, char **argv) if(pJson && ret == ERR_OK) { //http_post_request("https://xajhuang.com:3006/post", pJson, __onPost); - http_post_request("http://172.28.73.43:8088/device/esn?ESN=1", pJson, __onPost); + http_post_request("http://172.28.73.43:8088/device/esn", pJson, __onPost); } else { LOG_EX(LOG_Error, "Create JSON error: %d\n", ret); }