HTTP server tuned sockets and urls, changed payload handlers select and

call
This commit is contained in:
Bogdan Pilyugin 2023-10-15 19:59:46 +02:00
parent 32c8a42b89
commit 44152875b1
3 changed files with 11 additions and 25 deletions

View File

@ -37,6 +37,12 @@
#define VAR_MAX_NAME_LENGTH MAX_DYNVAR_NAME_LENGTH #define VAR_MAX_NAME_LENGTH MAX_DYNVAR_NAME_LENGTH
#define VAR_MAX_VALUE_LENGTH (2048) #define VAR_MAX_VALUE_LENGTH (2048)
#define PAYLOAD_ERROR 0
#define PAYLOAD_DEFAULT 1
#define PAYLOAD_IO_STATE 2
#define PAYLOAD_BUTTON_EVENT 3
typedef enum typedef enum
{ {
SYS_OK_DATA = 0, SYS_OK_DATA = 0,
@ -95,7 +101,6 @@ typedef struct
time_t time; time_t time;
int msgType; int msgType;
int payloadType; int payloadType;
char payloadTypeStr[16];
void *payload; void *payload;
unsigned char sha256[32]; unsigned char sha256[32];
} parsedData; } parsedData;

View File

@ -429,6 +429,8 @@ static httpd_handle_t start_webserver(void)
config.lru_purge_enable = true; config.lru_purge_enable = true;
config.uri_match_fn = httpd_uri_match_wildcard; config.uri_match_fn = httpd_uri_match_wildcard;
config.max_open_sockets = 5; config.max_open_sockets = 5;
config.max_resp_headers = 4;
config.max_uri_handlers = 4;
config.stack_size = (4096 + 2048); config.stack_size = (4096 + 2048);
// Start the httpd server // Start the httpd server

View File

@ -59,19 +59,6 @@ void regCustomSaveConf(void (*custom_saveconf)(void))
CustomSaveConf = custom_saveconf; CustomSaveConf = custom_saveconf;
} }
static sys_error_code PayloadType1000Handler(data_message_t *MSG)
{
return SYS_ERROR_HANDLER_NOT_SET;
}
static sys_error_code PayloadType1001Handler(data_message_t *MSG)
{
return SYS_ERROR_HANDLER_NOT_SET;
}
static sys_error_code PayloadType1002Handler(data_message_t *MSG)
{
return SYS_ERROR_HANDLER_NOT_SET;
}
static sys_error_code PayloadDefaultTypeHandler(data_message_t *MSG) static sys_error_code PayloadDefaultTypeHandler(data_message_t *MSG)
{ {
struct jReadElement result; struct jReadElement result;
@ -292,7 +279,6 @@ static sys_error_code DataHeaderParser(data_message_t *MSG)
if (result.elements == 1) if (result.elements == 1)
{ {
MSG->parsedData.payloadType = atoi((char*) result.pValue); MSG->parsedData.payloadType = atoi((char*) result.pValue);
jRead_string(MSG->inputDataBuffer, "{'data'{'payloadtype'", MSG->parsedData.payloadTypeStr, 16, 0);
} }
else else
return SYS_ERROR_PARSE_PAYLOADTYPE; return SYS_ERROR_PARSE_PAYLOADTYPE;
@ -302,18 +288,11 @@ static sys_error_code DataHeaderParser(data_message_t *MSG)
//ToDo move payload type from integer to string //ToDo move payload type from integer to string
switch (MSG->parsedData.payloadType) switch (MSG->parsedData.payloadType)
{ {
case 1000: case PAYLOAD_DEFAULT:
err = PayloadType1000Handler(MSG); err = CustomPayloadTypeHandler(MSG);
break;
case 1001:
err = PayloadType1001Handler(MSG);
break;
case 1002:
err = PayloadType1002Handler(MSG);
break; break;
} }
if (err != SYS_ERROR_HANDLER_NOT_SET) if (err != SYS_ERROR_HANDLER_NOT_SET)
return err; return err;