wirtz
/
esp-link
mirror of https://github.com/jeelabs/esp-link.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Refactored web-server

Browse Source
pull/193/head
cskarai 8 years ago committed by Thorsten von Eicken
parent 22664fa55f
commit 9e6d9932d3
2 changed files with 343 additions and 275 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 230
      web-server/web-server.c
  2. 20
      web-server/web-server.h

230
web-server/web-server.c
Unescape View File

@ -8,14 +8,31 @@
#include "cmd.h" #include "cmd.h"
#include "serbridge.h" #include "serbridge.h"
// the file is responsible for handling user defined web-pages
// - collects HTML files from user image, shows them on the left frame
// - handles JSON data coming from the browser
// - handles SLIP messages coming from MCU
#define WEB_CB "webCb" #define WEB_CB "webCb"
#define MAX_ARGUMENT_BUFFER_SIZE 1024
#define MAX_VARS 20 struct ArgumentBuffer
{
char argBuffer[MAX_ARGUMENT_BUFFER_SIZE];
int argBufferPtr;
int numberOfArgs;
};
static char* web_server_reasons[] = { static char* web_server_reasons[] = {
"load", "refresh", "button", "submit" "load", // readable name for RequestReason::LOAD
"refresh", // readable name for RequestReason::REFRESH
"button", // readable name for RequestReason::BUTTON
"submit" // readable name for RequestReason::SUBMIT
}; };
// this variable contains the names of the user defined pages
// this information appears at the left frame below of the built in URL-s
// format: ,"UserPage1", "/UserPage1.html", "UserPage2", "/UserPage2.html",
char * webServerPages = NULL; char * webServerPages = NULL;
char * ICACHE_FLASH_ATTR WEB_UserPages() char * ICACHE_FLASH_ATTR WEB_UserPages()
@ -23,6 +40,7 @@ char * ICACHE_FLASH_ATTR WEB_UserPages()
return webServerPages; return webServerPages;
} }
// generates the content of webServerPages variable (called at booting/web page uploading)
void ICACHE_FLASH_ATTR WEB_BrowseFiles() void ICACHE_FLASH_ATTR WEB_BrowseFiles()
{ {
char buffer[1024]; char buffer[1024];
@ -34,37 +52,35 @@ void ICACHE_FLASH_ATTR WEB_BrowseFiles()
espFsIteratorInit(userPageCtx, &it); espFsIteratorInit(userPageCtx, &it);
while( espFsIteratorNext(&it) ) while( espFsIteratorNext(&it) )
{ {
int nlen = os_strlen(it.name); int nameLen = os_strlen(it.name);
if( nlen >= 6 ) if( nameLen >= 6 )
{ {
if( os_strcmp( it.name + nlen-5, ".html" ) == 0 ) // fetch HTML files
if( os_strcmp( it.name + nameLen-5, ".html" ) == 0 )
{ {
char sh_name[17]; int slashPos = nameLen - 5;
int spos = nlen-5; // chop path and .html from the name
while( slashPos > 0 && it.name[slashPos-1] != '/' )
slashPos--;
while( spos > 0 ) // here we check buffer overrun
{ int maxLen = 10 + os_strlen( it.name ) + (nameLen - slashPos -5);
if( it.name[spos+1] == '/' ) if( maxLen >= sizeof(buffer) )
break; break;
spos--;
}
int ps = nlen-5-spos;
if( ps > 16 )
ps = 16;
os_memcpy(sh_name, it.name + spos, ps);
sh_name[ps] = 0;
os_strcat(buffer, ", \""); os_strcat(buffer, ", \"");
os_strcat(buffer, sh_name);
int writePos = os_strlen(buffer);
for( int i=slashPos; i < nameLen-5; i++ )
buffer[writePos++] = it.name[i];
buffer[writePos] = 0; // terminating zero
os_strcat(buffer, "\", \"/"); os_strcat(buffer, "\", \"/");
os_strcat(buffer, it.name); os_strcat(buffer, it.name);
os_strcat(buffer, "\""); os_strcat(buffer, "\"");
} }
} }
if( os_strlen(buffer) > 600 )
break;
} }
} }
@ -76,6 +92,7 @@ void ICACHE_FLASH_ATTR WEB_BrowseFiles()
os_memcpy( webServerPages, buffer, len ); os_memcpy( webServerPages, buffer, len );
} }
// initializer
void ICACHE_FLASH_ATTR WEB_Init() void ICACHE_FLASH_ATTR WEB_Init()
{ {
espFsInit(userPageCtx, (void *)getUserPageSectionStart(), ESPFS_FLASH); espFsInit(userPageCtx, (void *)getUserPageSectionStart(), ESPFS_FLASH);
@ -83,17 +100,62 @@ void ICACHE_FLASH_ATTR WEB_Init()
os_printf("Valid user file system found!\n"); os_printf("Valid user file system found!\n");
else else
os_printf("No user file system found!\n"); os_printf("No user file system found!\n");
WEB_BrowseFiles(); WEB_BrowseFiles(); // collect user defined HTML files
} }
int ICACHE_FLASH_ATTR WEB_CgiJsonHook(HttpdConnData *connData) // initializes the argument buffer
static void WEB_argInit(struct ArgumentBuffer * argBuffer)
{ {
if (connData->conn==NULL) return HTTPD_CGI_DONE; // Connection aborted. Clean up. argBuffer->numberOfArgs = 0;
argBuffer->argBufferPtr = 0;
}
void * cgiData = connData->cgiData; // adds an argument to the argument buffer (returns 0 if successful)
static int WEB_addArg(struct ArgumentBuffer * argBuffer, char * arg, int argLen )
{
if( argBuffer->argBufferPtr + argLen + sizeof(int) >= MAX_ARGUMENT_BUFFER_SIZE )
return -1; // buffer overflow
if( cgiData == NULL ) os_memcpy(argBuffer->argBuffer + argBuffer->argBufferPtr, &argLen, sizeof(int));
if( argLen != 0 )
{ {
os_memcpy( argBuffer->argBuffer + argBuffer->argBufferPtr + sizeof(int), arg, argLen );
argBuffer->numberOfArgs++;
}
argBuffer->argBufferPtr += argLen + sizeof(int);
return 0;
}
// creates and sends a SLIP message from the argument buffer
static void WEB_sendArgBuffer(struct ArgumentBuffer * argBuffer, HttpdConnData *connData, int id, RequestReason reason)
{
cmdResponseStart(CMD_WEB_REQ_CB, id, 4 + argBuffer->numberOfArgs);
uint16_t r = (uint16_t)reason;
cmdResponseBody(&r, sizeof(uint16_t)); // 1st argument: reason
cmdResponseBody(&connData->conn->proto.tcp->remote_ip, 4); // 2nd argument: IP
cmdResponseBody(&connData->conn->proto.tcp->remote_port, sizeof(uint16_t)); // 3rd argument: port
cmdResponseBody(connData->url, os_strlen(connData->url)); // 4th argument: URL
int p = 0;
for( int j=0; j < argBuffer->numberOfArgs; j++ )
{
int argLen;
os_memcpy( &argLen, argBuffer->argBuffer + p, sizeof(int) );
char * arg = argBuffer->argBuffer + p + sizeof(int);
cmdResponseBody(arg, argLen);
p += argLen + sizeof(int);
}
cmdResponseEnd();
}
// this method processes SLIP data from MCU and converts to JSON
// this method receives JSON from the browser, sends SLIP data to MCU
static int ICACHE_FLASH_ATTR WEB_handleJSONRequest(HttpdConnData *connData)
{
if( !flashConfig.slip_enable ) if( !flashConfig.slip_enable )
{ {
errorResponse(connData, 400, "Slip processing is disabled!"); errorResponse(connData, 400, "Slip processing is disabled!");
@ -107,7 +169,7 @@ int ICACHE_FLASH_ATTR WEB_CgiJsonHook(HttpdConnData *connData)
} }
if( serbridgeInProgramming() ) if( serbridgeInProgramming() )
{ {
errorResponse(connData, 500, "Slip disabled at programming mode!"); errorResponse(connData, 500, "Slip disabled at uploading program onto the MCU!");
return HTTPD_CGI_DONE; return HTTPD_CGI_DONE;
} }
@ -133,23 +195,27 @@ int ICACHE_FLASH_ATTR WEB_CgiJsonHook(HttpdConnData *connData)
return HTTPD_CGI_DONE; return HTTPD_CGI_DONE;
} }
char body[1024]; struct ArgumentBuffer argBuffer;
int bodyPtr = 0; WEB_argInit( &argBuffer );
int argNum = 0;
char *argPos[MAX_VARS];
int argLen[MAX_VARS];
switch(reason) switch(reason)
{ {
case BUTTON: case BUTTON:
argLen[0] = httpdFindArg(connData->getArgs, "id", body, sizeof(body)); {
if( argLen[0] <= 0 ) char id_buf[40];
int id_len = httpdFindArg(connData->getArgs, "id", id_buf, sizeof(id_buf));
if( id_len <= 0 )
{ {
errorResponse(connData, 400, "No button ID specified!"); errorResponse(connData, 400, "No button ID specified!");
return HTTPD_CGI_DONE; return HTTPD_CGI_DONE;
} }
argPos[0] = body; if( WEB_addArg(&argBuffer, id_buf, id_len) )
argNum++; {
errorResponse(connData, 400, "Post too large!");
return HTTPD_CGI_DONE;
}
}
break; break;
case SUBMIT: case SUBMIT:
{ {
@ -163,12 +229,6 @@ int ICACHE_FLASH_ATTR WEB_CgiJsonHook(HttpdConnData *connData)
while( bptr < connData->post->len ) while( bptr < connData->post->len )
{ {
if( argNum >= MAX_VARS )
{
errorResponse(connData, 400, "Too many variables!");
return HTTPD_CGI_DONE;
}
char * line = connData->post->buff + bptr; char * line = connData->post->buff + bptr;
char * eo = os_strchr(line, '&' ); char * eo = os_strchr(line, '&' );
@ -200,24 +260,20 @@ int ICACHE_FLASH_ATTR WEB_CgiJsonHook(HttpdConnData *connData)
int namLen = os_strlen(name); int namLen = os_strlen(name);
int valLen = os_strlen(value); int valLen = os_strlen(value);
int totallen = namLen + valLen + 2; char arg[namLen + valLen + 3];
if( bodyPtr + totallen > sizeof(body) - 10 ) int argPtr = 0;
arg[argPtr++] = (char)WEB_STRING;
os_strcpy( arg + argPtr, name );
argPtr += namLen;
arg[argPtr++] = 0;
os_strcpy( arg + argPtr, value );
argPtr += valLen;
if( WEB_addArg(&argBuffer, arg, argPtr) )
{ {
errorResponse(connData, 400, "Post too large!"); errorResponse(connData, 400, "Post too large!");
return HTTPD_CGI_DONE; return HTTPD_CGI_DONE;
} }
argPos[argNum] = body + bodyPtr;
body[bodyPtr++] = (char)WEB_STRING;
os_strcpy( body + bodyPtr, name );
bodyPtr += namLen;
body[bodyPtr++] = 0;
os_strcpy( body + bodyPtr, value );
bodyPtr += valLen;
argLen[argNum++] = totallen;
} }
} }
} }
@ -228,20 +284,15 @@ int ICACHE_FLASH_ATTR WEB_CgiJsonHook(HttpdConnData *connData)
break; break;
} }
os_printf("Web callback to MCU: %s\n", reasonBuf); if( WEB_addArg(&argBuffer, NULL, 0) )
{
cmdResponseStart(CMD_WEB_REQ_CB, (uint32_t)cb->callback, 4 + argNum); errorResponse(connData, 400, "Post too large!");
uint16_t r = (uint16_t)reason; return HTTPD_CGI_DONE;
cmdResponseBody(&r, sizeof(uint16_t)); }
cmdResponseBody(&connData->conn->proto.tcp->remote_ip, 4);
cmdResponseBody(&connData->conn->proto.tcp->remote_port, sizeof(uint16_t));
cmdResponseBody(connData->url, os_strlen(connData->url));
int j; os_printf("Web callback to MCU: %s\n", reasonBuf);
for( j=0; j < argNum; j++ )
cmdResponseBody(argPos[j], argLen[j]);
cmdResponseEnd(); WEB_sendArgBuffer(&argBuffer, connData, (uint32_t)cb->callback, reason );
if( reason == SUBMIT ) if( reason == SUBMIT )
{ {
@ -250,26 +301,26 @@ int ICACHE_FLASH_ATTR WEB_CgiJsonHook(HttpdConnData *connData)
return HTTPD_CGI_DONE; return HTTPD_CGI_DONE;
} }
connData->cgiData = (void *)1; return HTTPD_CGI_MORE;
} }
if( connData->cgiResponse != NULL ) // data from MCU // this method receives SLIP data from MCU sends JSON to the browser
{ static int ICACHE_FLASH_ATTR WEB_handleMCUResponse(HttpdConnData *connData, CmdRequest * response)
{
char jsonBuf[1500]; char jsonBuf[1500];
int jsonPtr = 0; int jsonPtr = 0;
jsonBuf[jsonPtr++] = '{'; jsonBuf[jsonPtr++] = '{';
CmdRequest * req = (CmdRequest *)(connData->cgiResponse);
int c = 2; int c = 2;
while( c++ < cmdGetArgc(req) ) while( c++ < cmdGetArgc(response) )
{ {
int len = cmdArgLen(req); int len = cmdArgLen(response);
char buf[len+1]; char buf[len+1];
buf[len] = 0; buf[len] = 0;
cmdPopArg(req, buf, len); cmdPopArg(response, buf, len);
if(len == 0) if(len == 0)
break; // last argument break; // last argument
@ -360,11 +411,28 @@ int ICACHE_FLASH_ATTR WEB_CgiJsonHook(HttpdConnData *connData)
httpdSend(connData, jsonBuf, jsonPtr); httpdSend(connData, jsonBuf, jsonPtr);
return HTTPD_CGI_DONE; return HTTPD_CGI_DONE;
}
// this method is responsible for the MCU <==JSON==> Browser communication
int ICACHE_FLASH_ATTR WEB_CgiJsonHook(HttpdConnData *connData)
{
if (connData->conn==NULL) return HTTPD_CGI_DONE; // Connection aborted. Clean up.
void * cgiData = connData->cgiData;
if( cgiData == NULL )
{
connData->cgiData = (void *)1; // indicate, that request was processed
return WEB_handleJSONRequest(connData);
} }
if( connData->cgiResponse != NULL ) // data from MCU
return WEB_handleMCUResponse(connData, (CmdRequest *)(connData->cgiResponse));
return HTTPD_CGI_MORE; return HTTPD_CGI_MORE;
} }
// this method is called when MCU transmits WEB_DATA command
void ICACHE_FLASH_ATTR WEB_Data(CmdPacket *cmd) void ICACHE_FLASH_ATTR WEB_Data(CmdPacket *cmd)
{ {
CmdRequest req; CmdRequest req;
@ -373,14 +441,14 @@ void ICACHE_FLASH_ATTR WEB_Data(CmdPacket *cmd)
if (cmdGetArgc(&req) < 2) return; if (cmdGetArgc(&req) < 2) return;
uint8_t ip[4]; uint8_t ip[4];
cmdPopArg(&req, ip, 4); cmdPopArg(&req, ip, 4); // pop the IP address
uint16_t port; uint16_t port;
cmdPopArg(&req, &port, 2); cmdPopArg(&req, &port, 2); // pop the HTTP port
HttpdConnData * conn = httpdLookUpConn(ip, port); HttpdConnData * conn = httpdLookUpConn(ip, port); // look up connection based on IP/port
if( conn != NULL && conn->cgi == WEB_CgiJsonHook ) // make sure that the right CGI handler will be called if( conn != NULL && conn->cgi == WEB_CgiJsonHook ) // make sure that the right CGI handler is configured
httpdSetCGIResponse( conn, &req ); httpdSetCGIResponse( conn, &req );
else else
os_printf("WEB response ignored as no valid http connection found for the request!\n"); os_printf("WEB_DATA ignored as no valid HTTP connection found!\n");
} }

20
web-server/web-server.h
Unescape View File

@ -8,22 +8,22 @@
typedef enum typedef enum
{ {
LOAD=0, LOAD=0, // loading web-page content at the first time
REFRESH, REFRESH, // loading web-page subsequently
BUTTON, BUTTON, // HTML button pressed
SUBMIT, SUBMIT, // HTML form is submitted
INVALID=-1, INVALID=-1,
} RequestReason; } RequestReason;
typedef enum typedef enum
{ {
WEB_STRING=0, WEB_STRING=0, // the value is string
WEB_NULL, WEB_NULL, // the value is NULL
WEB_INTEGER, WEB_INTEGER, // the value is integer
WEB_BOOLEAN, WEB_BOOLEAN, // the value is boolean
WEB_FLOAT, WEB_FLOAT, // the value is float
WEB_JSON WEB_JSON // the value is JSON data
} WebValueType; } WebValueType;
void WEB_Init(); void WEB_Init();

Write Preview
Loading…
Cancel
Save