electro
/
f105-motor-demo_esp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

improved template to support multipart substitution

Browse Source
master
Ondřej Hruška 9 years ago
parent ed17164e1c
commit b9885c8b1a
6 changed files with 242 additions and 66 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. 14
      html/multipart.tpl
  2. 12
      libesphttpd/core/httpd.c
  3. 185
      libesphttpd/core/httpdespfs.c
  4. 53
      user/cgi.c
  5. 2
      user/cgi.h
  6. 18
      user/user_main.c

14
html/multipart.tpl
Unescape View File

@ -0,0 +1,14 @@
<!DOCTYPE html>
<html>
<head><title>ESP8266 web server</title>
<link rel="stylesheet" type="text/css" href="style.css">
</head>
<body>
<div id="main">
<h1>Multipart</h1>
<nav>
<ul>
%numbers%
</ul>
</body></html>

12
libesphttpd/core/httpd.c
Unescape View File

@ -737,6 +737,18 @@ int ICACHE_FLASH_ATTR httpdConnectCb(ConnTypePtr conn, char *remIp, int remPort)
httpd_printf("Conn req from %d.%d.%d.%d:%d, using pool slot %d\n", remIp[0]&0xff, remIp[1]&0xff, remIp[2]&0xff, remIp[3]&0xff, remPort, i); httpd_printf("Conn req from %d.%d.%d.%d:%d, using pool slot %d\n", remIp[0]&0xff, remIp[1]&0xff, remIp[2]&0xff, remIp[3]&0xff, remPort, i);
if (i==HTTPD_MAX_CONNECTIONS) { if (i==HTTPD_MAX_CONNECTIONS) {
httpd_printf("Aiee, conn pool overflow!\n"); httpd_printf("Aiee, conn pool overflow!\n");
// added by mightypork
if (system_get_free_heap_size() < 29000) {
// this probably means we got flooded by someone spamming F5
// better restart
httpd_printf("\x1b[31;1mLow heap & con pool overflow, GOING FOR RESTART.\x1b[0m\n");
system_restart();
}
return 0; return 0;
} }
connData[i]=malloc(sizeof(HttpdConnData)); connData[i]=malloc(sizeof(HttpdConnData));

185
libesphttpd/core/httpdespfs.c
Unescape View File

@ -18,24 +18,32 @@ Connector to let httpd use the espfs filesystem to serve the files in it.
// The static files marked with FLAG_GZIP are compressed and will be served with GZIP compression. // The static files marked with FLAG_GZIP are compressed and will be served with GZIP compression.
// If the client does not advertise that he accepts GZIP send following warning message (telnet users for e.g.) // If the client does not advertise that he accepts GZIP send following warning message (telnet users for e.g.)
static const char *gzipNonSupportedMessage = "HTTP/1.0 501 Not implemented\r\nServer: esp8266-httpd/"HTTPDVER"\r\nConnection: close\r\nContent-Type: text/plain\r\nContent-Length: 52\r\n\r\nYour browser does not accept gzip-compressed data.\r\n"; static const char *gzipNonSupportedMessage = "HTTP/1.0 501 Not implemented\r\n"
"Server: esp8266-httpd/"HTTPDVER"\r\n"
"Connection: close\r\n"
"Content-Type: text/plain\r\n"
"Content-Length: 52\r\n"
"\r\n"
"Your browser does not accept gzip-compressed data.\r\n";
EspFsFile *tryOpenIndex(char *buff, const char *path) { EspFsFile *tryOpenIndex(const char *path)
{
// Try appending index.tpl // Try appending index.tpl
char fname[100];
size_t url_len = strlen(path); size_t url_len = strlen(path);
strcpy(buff, path); // add current path strcpy(fname, path); // add current path
// add slash if not already ending with slash // add slash if not already ending with slash
if (path[url_len-1] != '/') { if (path[url_len - 1] != '/') {
buff[url_len++] = '/'; fname[url_len++] = '/';
} }
// add index // add index
strcpy(buff + url_len, "index.tpl"); strcpy(fname + url_len, "index.tpl");
return espFsOpen(buff); return espFsOpen(fname);
} }
@ -43,28 +51,29 @@ EspFsFile *tryOpenIndex(char *buff, const char *path) {
//This is a catch-all cgi function. It takes the url passed to it, looks up the corresponding //This is a catch-all cgi function. It takes the url passed to it, looks up the corresponding
//path in the filesystem and if it exists, passes the file through. This simulates what a normal //path in the filesystem and if it exists, passes the file through. This simulates what a normal
//webserver would do with static files. //webserver would do with static files.
int ICACHE_FLASH_ATTR cgiEspFsHook(HttpdConnData *connData) { int ICACHE_FLASH_ATTR cgiEspFsHook(HttpdConnData *connData)
EspFsFile *file=connData->cgiData; {
EspFsFile *file = connData->cgiData;
int len; int len;
char buff[1024]; char buff[1024];
char acceptEncodingBuffer[64]; char acceptEncodingBuffer[64];
int isGzip; int isGzip;
if (connData->conn==NULL) { if (connData->conn == NULL) {
//Connection aborted. Clean up. //Connection aborted. Clean up.
espFsClose(file); espFsClose(file);
return HTTPD_CGI_DONE; return HTTPD_CGI_DONE;
} }
if (file==NULL) { if (file == NULL) {
//First call to this cgi. Open the file so we can read it. //First call to this cgi. Open the file so we can read it.
file=espFsOpen(connData->url); file = espFsOpen(connData->url);
if (file==NULL) { if (file == NULL) {
// file not found // file not found
file = tryOpenIndex(buff, connData->url); file = tryOpenIndex(connData->url);
if (file==NULL) { if (file == NULL) {
return HTTPD_CGI_NOTFOUND; return HTTPD_CGI_NOTFOUND;
} }
@ -89,7 +98,7 @@ int ICACHE_FLASH_ATTR cgiEspFsHook(HttpdConnData *connData) {
} }
} }
connData->cgiData=file; connData->cgiData = file;
httpdStartResponse(connData, 200); httpdStartResponse(connData, 200);
httpdHeader(connData, "Content-Type", httpdGetMimetype(connData->url)); httpdHeader(connData, "Content-Type", httpdGetMimetype(connData->url));
if (isGzip) { if (isGzip) {
@ -100,9 +109,9 @@ int ICACHE_FLASH_ATTR cgiEspFsHook(HttpdConnData *connData) {
return HTTPD_CGI_MORE; return HTTPD_CGI_MORE;
} }
len=espFsRead(file, buff, 1024); len = espFsRead(file, buff, 1024);
if (len>0) httpdSend(connData, buff, len); if (len > 0) httpdSend(connData, buff, len);
if (len!=1024) { if (len != 1024) {
//We're done. //We're done.
espFsClose(file); espFsClose(file);
return HTTPD_CGI_DONE; return HTTPD_CGI_DONE;
@ -115,23 +124,33 @@ int ICACHE_FLASH_ATTR cgiEspFsHook(HttpdConnData *connData) {
//cgiEspFsTemplate can be used as a template. //cgiEspFsTemplate can be used as a template.
#define TEMPLATE_CHUNK 1024
typedef struct { typedef struct {
EspFsFile *file; EspFsFile *file;
void *tplArg; void *tplArg;
char token[64]; char token[64];
int tokenPos; int tokenPos;
char buff[TEMPLATE_CHUNK + 1];
bool chunk_resume;
int buff_len;
int buff_x;
int buff_sp;
char *buff_e;
} TplData; } TplData;
typedef void (* TplCallback)(HttpdConnData *connData, char *token, void **arg); typedef int (* TplCallback)(HttpdConnData *connData, char *token, void **arg);
int ICACHE_FLASH_ATTR cgiEspFsTemplate(HttpdConnData *connData) { int ICACHE_FLASH_ATTR cgiEspFsTemplate(HttpdConnData *connData)
TplData *tpd=connData->cgiData; {
TplData *tpd = connData->cgiData;
int len; int len;
int x, sp=0; int x, sp = 0;
char *e=NULL; char *e = NULL;
char buff[1025];
if (connData->conn==NULL) { if (connData->conn == NULL) {
//Connection aborted. Clean up. //Connection aborted. Clean up.
((TplCallback)(connData->cgiArg))(connData, NULL, &tpd->tplArg); ((TplCallback)(connData->cgiArg))(connData, NULL, &tpd->tplArg);
espFsClose(tpd->file); espFsClose(tpd->file);
@ -139,77 +158,135 @@ int ICACHE_FLASH_ATTR cgiEspFsTemplate(HttpdConnData *connData) {
return HTTPD_CGI_DONE; return HTTPD_CGI_DONE;
} }
if (tpd==NULL) { if (tpd == NULL) {
//First call to this cgi. Open the file so we can read it. //First call to this cgi. Open the file so we can read it.
tpd=(TplData *)malloc(sizeof(TplData)); tpd = (TplData *)malloc(sizeof(TplData));
tpd->file=espFsOpen(connData->url);
if (tpd->file==NULL) { tpd->chunk_resume = false;
tpd->file = espFsOpen(connData->url);
if (tpd->file == NULL) {
// file not found // file not found
tpd->file = tryOpenIndex(buff, connData->url); tpd->file = tryOpenIndex(connData->url);
if (tpd->file==NULL) { if (tpd->file == NULL) {
espFsClose(tpd->file); espFsClose(tpd->file);
free(tpd); free(tpd);
return HTTPD_CGI_NOTFOUND; return HTTPD_CGI_NOTFOUND;
} }
} }
tpd->tplArg=NULL; tpd->tplArg = NULL;
tpd->tokenPos=-1; tpd->tokenPos = -1;
if (espFsFlags(tpd->file) & FLAG_GZIP) { if (espFsFlags(tpd->file) & FLAG_GZIP) {
httpd_printf("cgiEspFsTemplate: Trying to use gzip-compressed file %s as template!\n", connData->url); httpd_printf("cgiEspFsTemplate: Trying to use gzip-compressed file %s as template!\n", connData->url);
espFsClose(tpd->file); espFsClose(tpd->file);
free(tpd); free(tpd);
return HTTPD_CGI_NOTFOUND; return HTTPD_CGI_NOTFOUND;
} }
connData->cgiData=tpd; connData->cgiData = tpd;
httpdStartResponse(connData, 200); httpdStartResponse(connData, 200);
httpdHeader(connData, "Content-Type", httpdGetMimetype(connData->url)); httpdHeader(connData, "Content-Type", httpdGetMimetype(connData->url));
httpdEndHeaders(connData); httpdEndHeaders(connData);
return HTTPD_CGI_MORE; return HTTPD_CGI_MORE;
} }
len=espFsRead(tpd->file, buff, 1024); char *buff = tpd->buff;
if (len>0) {
sp=0;
e=buff; // resume the parser state from the last token,
for (x=0; x<len; x++) { // if subst. func wants more data to be sent.
if (tpd->tokenPos==-1) { if (tpd->chunk_resume) {
printf("\nResuming chunk...\n");
len = tpd->buff_len;
e = tpd->buff_e;
sp = tpd->buff_sp;
x = tpd->buff_x;
} else {
len = espFsRead(tpd->file, buff, TEMPLATE_CHUNK);
tpd->buff_len = len;
e = buff;
sp = 0;
x = 0;
}
if (len > 0) {
printf("*a");
for (; x < len; x++) {
printf("*b");
if (tpd->tokenPos == -1) {
//Inside ordinary text. //Inside ordinary text.
if (buff[x]=='%') { if (buff[x] == '%') {
//Send raw data up to now //Send raw data up to now
if (sp!=0) httpdSend(connData, e, sp); if (sp != 0) httpdSend(connData, e, sp);
sp=0; sp = 0;
//Go collect token chars. //Go collect token chars.
tpd->tokenPos=0; tpd->tokenPos = 0;
} else { } else {
sp++; sp++;
} }
} else { } else {
if (buff[x]=='%') { printf("*c");
if (tpd->tokenPos==0) { if (buff[x] == '%') {
printf("*d");
if (tpd->tokenPos == 0) {
//This is the second % of a %% escape string. //This is the second % of a %% escape string.
//Send a single % and resume with the normal program flow. //Send a single % and resume with the normal program flow.
httpdSend(connData, "%", 1); httpdSend(connData, "%", 1);
} else { } else {
printf("*e");
if (!tpd->chunk_resume) {
//This is an actual token. //This is an actual token.
tpd->token[tpd->tokenPos++]=0; //zero-terminate token tpd->token[tpd->tokenPos++] = 0; //zero-terminate token
((TplCallback)(connData->cgiArg))(connData, tpd->token, &tpd->tplArg); } else {
printf("*f");
}
tpd->chunk_resume = false;
int status = ((TplCallback)(connData->cgiArg))(connData, tpd->token, &tpd->tplArg);
if (status == HTTPD_CGI_MORE) {
printf("\nSaving template pos & continuing in next run..\n");
// wants to send more in this token's place.....
tpd->chunk_resume = true;
tpd->buff_len = len;
tpd->buff_e = e;
tpd->buff_sp = sp;
tpd->buff_x = x;
break;
}
} }
//Go collect normal chars again. //Go collect normal chars again.
e=&buff[x+1]; e = &buff[x + 1];
tpd->tokenPos=-1; tpd->tokenPos = -1;
} else { } else {
if (tpd->tokenPos<(sizeof(tpd->token)-1)) tpd->token[tpd->tokenPos++]=buff[x]; if (tpd->tokenPos < (sizeof(tpd->token) - 1)) tpd->token[tpd->tokenPos++] = buff[x];
} }
} }
} }
} }
if (tpd->chunk_resume) {
return HTTPD_CGI_MORE;
}
//Send remaining bit. //Send remaining bit.
if (sp!=0) httpdSend(connData, e, sp); if (sp != 0) httpdSend(connData, e, sp);
if (len!=1024) { if (len != TEMPLATE_CHUNK) {
//We're done. //We're done.
// let the cgi func clean it's stuff
((TplCallback)(connData->cgiArg))(connData, NULL, &tpd->tplArg); ((TplCallback)(connData->cgiArg))(connData, NULL, &tpd->tplArg);
espFsClose(tpd->file); espFsClose(tpd->file);
free(tpd); free(tpd);
return HTTPD_CGI_DONE; return HTTPD_CGI_DONE;

53
user/cgi.c
Unescape View File

@ -29,15 +29,68 @@ int ICACHE_FLASH_ATTR tplCounter(HttpdConnData *connData, char *token, void **ar
os_sprintf(buff, "%ld", hitCounter); os_sprintf(buff, "%ld", hitCounter);
} }
httpdSend(connData, buff, -1); httpdSend(connData, buff, -1);
return HTTPD_CGI_DONE; return HTTPD_CGI_DONE;
} }
typedef struct { typedef struct {
uint32_t count_remain; uint32_t count_remain;
} RandomNumberState; } RandomNumberState;
//Template code for the counter on the index page.
int ICACHE_FLASH_ATTR tplMultipart(HttpdConnData *connData, char *token, void **arg)
{
if (token == NULL) {
if (*arg != NULL) free(*arg);
return HTTPD_CGI_DONE; // cleanup
}
if (os_strcmp(token, "numbers") == 0) {
RandomNumberState *rns = *arg;
char buff[20];
if (rns == NULL) {
//First call to this cgi. Open the file so we can read it.
rns=(RandomNumberState *)malloc(sizeof(RandomNumberState));
*arg=rns;
// parse count
uint32_t count = 1;
int len = httpdFindArg(connData->getArgs, "count", buff, sizeof(buff));
if (len==-1) {
// no such get arg
} else {
count = (uint32_t)atoi(buff);
}
rns->count_remain = count;
printf("User wants %d numbers.", count);
}
for (int i = 0; i < 100; i++) {
os_sprintf(buff, "<li>%lu\n", os_random());
httpdSend(connData, buff, -1);
if (--rns->count_remain == 0) {
break;
}
}
if (rns->count_remain == 0) {
free(rns);
return HTTPD_CGI_DONE;
}
return HTTPD_CGI_MORE;
}
return HTTPD_CGI_DONE;
}
// better to put it in the fs... // better to put it in the fs...
int FLASH_FN cgiRandomNumbers(HttpdConnData *connData) { int FLASH_FN cgiRandomNumbers(HttpdConnData *connData) {

2
user/cgi.h
Unescape View File

@ -8,4 +8,6 @@ int tplCounter(HttpdConnData *connData, char *token, void **arg);
int cgiRandomNumbers(HttpdConnData *connData); int cgiRandomNumbers(HttpdConnData *connData);
int tplMultipart(HttpdConnData *connData, char *token, void **arg);
#endif #endif

18
user/user_main.c
Unescape View File

@ -28,6 +28,16 @@
#include "sbmp.h" #include "sbmp.h"
#define SHOW_HEAP_USE
#ifdef SHOW_HEAP_USE
static ETSTimer prHeapTimer;
static void ICACHE_FLASH_ATTR prHeapTimerCb(void *arg) {
os_printf("Heap: %ld\n", (unsigned long)system_get_free_heap_size());
}
#endif
/** /**
* @brief BasicAuth name/password checking function. * @brief BasicAuth name/password checking function.
@ -101,6 +111,8 @@ static HttpdBuiltInUrl builtInUrls[] = {
{"*", cgiRedirectApClientToHostname, "esp8266.nonet"}, // redirect func for the captive portal {"*", cgiRedirectApClientToHostname, "esp8266.nonet"}, // redirect func for the captive portal
{"/", cgiEspFsTemplate, (void *)tplCounter}, {"/", cgiEspFsTemplate, (void *)tplCounter},
{"/multipart.tpl", cgiEspFsTemplate, (void *)tplMultipart},
{"/random.tpl", cgiRandomNumbers, NULL}, {"/random.tpl", cgiRandomNumbers, NULL},
//Enable the line below to protect the WiFi configuration with an username/password combo. //Enable the line below to protect the WiFi configuration with an username/password combo.
@ -166,6 +178,12 @@ void user_init(void)
os_printf("\nReady\n"); os_printf("\nReady\n");
#ifdef SHOW_HEAP_USE
os_timer_disarm(&prHeapTimer);
os_timer_setfn(&prHeapTimer, prHeapTimerCb, NULL);
os_timer_arm(&prHeapTimer, 3000, 1);
#endif
// // print TEST on the command interface every 500 ms // // print TEST on the command interface every 500 ms
// os_timer_disarm(&prTestTimer); // os_timer_disarm(&prTestTimer);
// os_timer_setfn(&prTestTimer, test_timer_task, NULL); // os_timer_setfn(&prTestTimer, test_timer_task, NULL);

Write Preview
Loading…
Cancel
Save