mirror/OpenBK7231T_App
3
0
Fork 0
mirror of https://github.com/openshwprojects/OpenBK7231T_App.git synced 2026-02-08 21:55:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

EXPERIMENT: buffer tcp chunks up to 1kb and send them as about 1kb chunks, it seems to fix http server unresponsive in some rare cases. TODO: check on more cases if it really helps in general

Browse Source
This commit is contained in:
openshwprojects
2022-08-23 00:58:33 +02:00
parent d8ccb05fad
commit 03a29f4882
4 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/httpserver/http_fns.c
View File

@ -99,6 +99,12 @@ int http_fn_empty_url(http_request_t *request) {
int http_fn_testmsg(http_request_t *request) {
poststr(request,"This is just a test msg\n\n");
poststr(request, NULL);
return 0;
}
int http_fn_index(http_request_t *request) {
int j, i;
char tmpA[128];

1
src/httpserver/http_fns.h
View File

@ -22,6 +22,7 @@ int http_fn_cfg(http_request_t *request);
int http_fn_cfg_pins(http_request_t *request);
int http_fn_cfg_ping(http_request_t *request);
int http_fn_index(http_request_t *request);
int http_fn_testmsg(http_request_t *request);
int http_fn_ota_exec(http_request_t *request);
int http_fn_ota(http_request_t *request);
int http_fn_empty_url(http_request_t *request);

5
src/httpserver/http_tcp_server.c
View File

@ -7,7 +7,7 @@
#include "new_http.h"
#define HTTP_SERVER_PORT 80
#define REPLY_BUFFER_SIZE 10000
#define REPLY_BUFFER_SIZE 1000
#define INCOMING_BUFFER_SIZE 1024
@ -96,9 +96,10 @@ static void tcp_client_thread( beken_thread_arg_t arg )
//addLog( "TCP received string %s\n",buf );
// returns length to be sent if any
ADDLOG_DEBUG(LOG_FEATURE_HTTP, "TCP will process packet of len %i\n", request.receivedLen );
int lenret = HTTP_ProcessPacket(&request);
if (lenret > 0){
//ADDLOG_DEBUG(LOG_FEATURE_HTTP, "TCP sending reply len %i\n",lenret );
ADDLOG_DEBUG(LOG_FEATURE_HTTP, "TCP sending reply len %i\n",lenret );
send( fd, reply, lenret, 0 );
}

26
src/httpserver/new_http.c
View File

@ -20,6 +20,7 @@ const char httpMimeTypeText[] = "text/plain" ; // TEXT MIME type
const char httpMimeTypeJson[] = "application/json" ; // TEXT MIME type
const char httpMimeTypeBinary[] = "application/octet-stream" ; // binary/file MIME type
const char htmlHeader[] = "<!DOCTYPE html><html><head><style>div,fieldset,input,select{padding:5px;font-size:1em;margin: 0 0 0.2em 0}fieldset{background:#4f4f4f;}p{margin:0.5em 0;}input{width:100%;box-sizing:border-box;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;background:#dddddd;color:#000000;}form{margin-bottom:0.5em}input[type=checkbox],input[type=radio]{width:1em;margin-right:6px;vertical-align:-1px;}input[type=range]{width:99%;}select{width:100%;background:#dddddd;color:#000000;}textarea{resize:vertical;width:98%;height:318px;padding:5px;overflow:auto;background:#1f1f1f;color:#65c115;}body{text-align:center;font-family:verdana,sans-serif;background:#21333e; color:#eaeaea}h1 a{background:#21333e; color:#eaeaea}td{padding:0px;}input[type=submit]{border:0;border-radius:0.3rem;background:#1fa3ec;color:#faffff;line-height:2.4rem;font-size:1.2rem;width:100%;-webkit-transition-duration:0.4s;transition-duration:0.4s;cursor:pointer;margin-buttom:0.5em}input[type=submit]:hover{background:#0e70a4;}.bred{background:#d43535 !important;}.bred:hover{background:#931f1f !important;}.bgrn{background:#47c266 !important;}.bgrn:hover{background:#5aaf6f !important;}a{color:#1fa3ec;text-decoration:none;}.p{float:left;text-align:left;}.q{float:right;text-align:right;}.r{border-radius:0.3em;padding:2px;margin:6px 2px;}.hf{display:none;}.hdiv{width:95%;white-space:nowrap;}.hele{width:210px;display:inline-block;margin-left:2px;}</style></head><body><div style=\"text-align:left; display:inline-block; color:#eaeaea; min-width:340px;max-width:800px;\">" ;
//const char htmlHeader[] = "<!DOCTYPE html><html><body>" ;
const char htmlEnd[] = "</div></body></html>" ;
const char htmlReturnToMenu[] = "<a href=\"index\">Return to menu</a>";
const char htmlRefresh[] = "<a href=\"index\">Refresh</a>";
@ -337,7 +338,9 @@ int postany(http_request_t *request, const char *str, int len){
int addlen = len;
if (NULL == str){
send(request->fd, request->reply, request->replylen, 0);
if(request->replylen > 0) {
send(request->fd, request->reply, request->replylen, 0);
}
request->reply[0] = 0;
request->replylen = 0;
return 0;
@ -350,12 +353,20 @@ int postany(http_request_t *request, const char *str, int len){
request->replylen = 0;
currentlen = 0;
}
if (addlen > request->replymaxlen){
ADDLOGF_ERROR("won't fit");
} else {
memcpy( request->reply+request->replylen, str, addlen );
request->replylen += addlen;
while (addlen >= request->replymaxlen){
if(request->replylen > 0) {
send(request->fd, request->reply, request->replylen, 0);
request->replylen = 0;
}
send(request->fd, str, (request->replymaxlen-1), 0);
addlen -= (request->replymaxlen-1);
str += (request->replymaxlen-1);
rtos_delay_milliseconds(1);
}
memcpy( request->reply+request->replylen, str, addlen );
request->replylen += addlen;
return (currentlen + addlen);
#endif
}
@ -405,7 +416,7 @@ void misc_formatUpTimeString(int totalSeconds, char *o) {
int hprintf128(http_request_t *request, const char *fmt, ...){
va_list argList;
//BaseType_t taken;
char tmp[128];
char tmp[256];
va_start(argList, fmt);
vsprintf(tmp, fmt, argList);
va_end(argList);
@ -534,6 +545,7 @@ int HTTP_ProcessPacket(http_request_t *request) {
}
if(http_checkUrlBase(urlStr,"")) return http_fn_empty_url(request);
if(http_checkUrlBase(urlStr,"testmsg")) return http_fn_testmsg(request);
if(http_checkUrlBase(urlStr,"index")) return http_fn_index(request);
if(http_checkUrlBase(urlStr,"about")) return http_fn_about(request);