Mirrors/OpenBK7231T_App
2
0
Fork 0
mirror of https://github.com/openshwprojects/OpenBK7231T_App.git synced 2026-02-20 00:32:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

http get - add cmd to run on done

Browse Source
This commit is contained in:
Tester23
2025-12-28 12:49:52 +01:00
parent d233b5515f
commit 5eb375c3a4
3 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/cmnds/cmd_send.c
View File

@@ -14,12 +14,19 @@
// Following command will send get and save result to file:
// SendGet http://example.com/ myFile.html
// test code: addRepeatingEvent 30 -1 SendGet http://example.com/ myFile.html
// You can also run returned value as command
// SendGet http://example.com/ cmd
// test code: addRepeatingEvent 30 -1 SendGet http://example.com/ cmd
// You can also set command to run after it's done
// alias myCommandAlias echo this is working
// SendGet http://example.com/ myFile.html myCommandAlias
// test code: addRepeatingEvent 30 -1 SendGet http://example.com/ myFile.html myCommandAlias
static commandResult_t CMD_SendGET(const void* context, const char* cmd, const char* args, int cmdFlags) {
ADDLOG_INFO(LOG_FEATURE_CMD, " CMD_SendGET received with args %s", args);
Tokenizer_TokenizeString(args, TOKENIZER_ALLOW_QUOTES | TOKENIZER_ALLOW_ESCAPING_QUOTATIONS);
HTTPClient_Async_SendGet(Tokenizer_GetArg(0), Tokenizer_GetArg(1));
HTTPClient_Async_SendGet(Tokenizer_GetArg(0), Tokenizer_GetArg(1), Tokenizer_GetArg(2));
return CMD_RES_OK;
}

22
src/httpclient/http_client.c
View File

@@ -929,6 +929,9 @@ void httpclient_freeMemory(httprequest_t *request)
if(request->flags & HTTPREQUEST_FLAG_FREE_URLONDONE) {
free((void*)request->url);
}
if (request->flags & HTTPREQUEST_FLAG_FREE_CMDONDONE) {
free((void*)request->cmdToRun);
}
if (request->flags & HTTPREQUEST_FLAG_FREE_RESPONSEBUF) {
free((void*)request->client_data.response_buf);
}
@@ -1194,16 +1197,19 @@ int HTTPClient_CB_Data(struct httprequest_t_tag *request) {
request->client_data.userCounter++;
}
if (request->cmdToRun && *request->cmdToRun) {
CMD_ExecuteCommand(request->cmdToRun, 0);
}
return 0;
}
return 0;
}
int HTTPClient_Async_SendGet(const char *url_in, const char *tgFile){
int HTTPClient_Async_SendGet(const char *url_in, const char *tgFile, const char *postGetCommand) {
httprequest_t *request;
httpclient_t *client;
httpclient_data_t *client_data;
char *url;
char *cmd = 0;
// TEST
//url_in = "http://192.168.0.104/cm?cmnd=POWER%20TOGGLE";
@@ -1217,27 +1223,29 @@ int HTTPClient_Async_SendGet(const char *url_in, const char *tgFile){
url = CMD_ExpandingStrdup(url_in);
//url = strdup(url_in);
#endif
if(url==0) {
if(url == 0) {
ADDLOG_ERROR(LOG_FEATURE_HTTP_CLIENT, "HTTPClient_Async_SendGet for %s, failed to alloc URL memory\r\n");
return 1;
}
if (postGetCommand && *postGetCommand) {
cmd = strdup(postGetCommand);
}
#if DBG_HTTPCLIENT_MEMLEAK
request = &testreq;
#else
request = (httprequest_t *) malloc(sizeof(httprequest_t));
#endif
if(url==0) {
if(request == 0) {
ADDLOG_ERROR(LOG_FEATURE_HTTP_CLIENT, "HTTPClient_Async_SendGet for %s, failed to alloc request memory\r\n");
return 1;
}
ADDLOG_INFO(LOG_FEATURE_HTTP_CLIENT, "HTTPClient_Async_SendGet for %s, sizeof(httprequest_t) == %i!\r\n",
url_in,sizeof(httprequest_t));
memset(request, 0, sizeof(*request));
request->flags |= HTTPREQUEST_FLAG_FREE_SELFONDONE;
request->flags |= HTTPREQUEST_FLAG_FREE_URLONDONE;
request->flags |= HTTPREQUEST_FLAG_FREE_CMDONDONE;
client = &request->client;
client_data = &request->client_data;
@@ -1250,6 +1258,7 @@ int HTTPClient_Async_SendGet(const char *url_in, const char *tgFile){
request->data_callback = 0;
request->port = 80;//HTTP_PORT;
request->url = url;
request->cmdToRun = cmd;
request->method = HTTPCLIENT_GET;
request->timeout = 10000;
if (tgFile && *tgFile) {
@@ -1291,6 +1300,7 @@ int HTTPClient_Async_SendPost(const char *url_in, int http_port, const char *con
memset(request, 0, sizeof(*request));
request->flags |= HTTPREQUEST_FLAG_FREE_SELFONDONE;
request->flags |= HTTPREQUEST_FLAG_FREE_URLONDONE;
request->flags |= HTTPREQUEST_FLAG_FREE_CMDONDONE;
client = &request->client;
client_data = &request->client_data;

4
src/httpclient/http_client.h
View File

@@ -97,12 +97,14 @@ typedef struct {
#define HTTPREQUEST_FLAG_FREE_HEADER 8
#define HTTPREQUEST_FLAG_FREE_POST_CONTENT_TYPE 16
#define HTTPREQUEST_FLAG_FREE_RESPONSEBUF 32
#define HTTPREQUEST_FLAG_FREE_CMDONDONE 64
typedef struct httprequest_t_tag{
int state;
int (*data_callback)(struct httprequest_t_tag *request);
httpclient_t client;
const char *url;
const char *cmdToRun;
// This will be freed if HTTPREQUEST_FLAG_FREE_HEADER flag is set
char *header;
int port;
@@ -161,7 +163,7 @@ typedef struct httprequest_t_tag{
* @endcode
*/
int HTTPClient_Async_SendGeneric(httprequest_t *request);
int HTTPClient_Async_SendGet(const char *url_in, const char *tgFile);
int HTTPClient_Async_SendGet(const char *url_in, const char *tgFile, const char *postGetCommand);
int HTTPClient_Async_SendPost(const char *url_in, int http_port, const char *content_type, const char *post_content, const char *post_header);
void HTTPClient_SetCustomHeader(httpclient_t *client, const char *header);