Rob Dobson / RdWebServer

A simple web server mainly based on ideas from Jasper Schuurmans Netduino web server

Dependents:   RdBlindsServer SpideyWallWeb RdGasUseMonitor

A fast and reliable web server for MBED! http://robdobson.com/2015/08/a-reliable-mbed-webserver/

It has a very neat way to implement REST commands and can serve files from local storage (on LPC1768 for instance) and from SD cards. It also has a caching facility which is particularly useful for serving files from local storage.

The server can be run in the main() thread (and has a sub-2ms response time if this is done) or in a mbed-rtos thread which increases the response time to (a still respectable) 30ms or so.

The latest project that uses this is here - https://developer.mbed.org/users/Bobty/code/SpideyWallWeb/

int main (void)
{
    // Ethernet interface
    EthernetInterface::init();

    // Connect ethernet
    EthernetInterface::connect();

    // Init the web server
    pc.printf("Starting web server\r\n");
    char* baseWebFolder = "/sd/";  // should be /sd/ for SDcard files - not used for local file system
    RdWebServer webServer;
    
    // Add commands to handle the home page and favicon
    webServer.addCommand("", RdWebServerCmdDef::CMD_LOCALFILE, NULL, "index.htm", true);
    webServer.addCommand("favicon.ico", RdWebServerCmdDef::CMD_LOCALFILE, NULL, NULL, true);
    
    // Add the lightwall control commands
    webServer.addCommand("name", RdWebServerCmdDef::CMD_CALLBACK, &lightwallGetSystemName);
    webServer.addCommand("clear", RdWebServerCmdDef::CMD_CALLBACK, &lightwallClear);
    webServer.addCommand("rawfill", RdWebServerCmdDef::CMD_CALLBACK, &lightwallRawFill);
    webServer.addCommand("fill", RdWebServerCmdDef::CMD_CALLBACK, &lightwallFill);
    webServer.addCommand("showleds", RdWebServerCmdDef::CMD_CALLBACK, &lightwallShowLeds);
    
    // Start the server
    webServer.init(WEBPORT, &led4, baseWebFolder);
    webServer.run();

}

// Get system name - No arguments required
char* lightwallGetSystemName(int method, char*cmdStr, char* argStr, char* msgBuffer, int msgLen, 
                int contentLen, unsigned char* pPayload, int payloadLen, int splitPayloadPos)
{
    // Perform any required actions here ....

    // ...

    // Return the system name
    return systemName;
}

This server was originally based on a Netduino web server from Jasper Schuurmans but has been optimised for speed.

Files at this revision

API Documentation at this revision

Revision 4:6afb3bbf20a4, committed 2015-02-02

Comitter:
Bobty
Date:
Mon Feb 02 16:36:14 2015 +0000
Parent:
3:594136d34a32
Child:
5:e6286b529d6b
Commit message:
Updated to use SD or USB

Changed in this revision

RdWebServer.cpp Show annotated file Show diff for this revision Revisions of this file
RdWebServer.h Show annotated file Show diff for this revision Revisions of this file 
--- a/RdWebServer.cpp	Fri Oct 04 10:36:57 2013 +0000
+++ b/RdWebServer.cpp	Mon Feb 02 16:36:14 2015 +0000
@@ -19,28 +19,41 @@
         printf("Failed to open file\n\r");
         return false;
     }
+    printf("Seeking\n\r");
     fseek(fp, 0, SEEK_END);
     _nFileLen = (int)ftell(fp);
     _pFileContent = new char[_nFileLen];
+    printf("Len %d Buf %08x\n\r", _nFileLen, _pFileContent);
     if (!_pFileContent)
     {
         printf("Failed to allocate %lu\n\r", _nFileLen);
         fclose(fp);
         return false;
     }
+    printf("Allocated\n\r");
+    memset(_pFileContent, 0, _nFileLen);
     fseek(fp, 0, SEEK_SET);
     char* pMem = _pFileContent;
-    char fileBuf[500];
+    char fileBuf[100];
     int totCnt = 0;
     int rdCnt;
-    while ((rdCnt = fread(fileBuf, sizeof( char ), 500, fp)) == 500) 
+    printf("Reading\n\r");
+    while (true)
     {
+        int toRead = _nFileLen - totCnt;
+        if (toRead > sizeof(fileBuf))
+            toRead = sizeof(fileBuf);
+        if (toRead <= 0)
+            break;
+        rdCnt = fread(fileBuf, sizeof(char), toRead, fp);
+        if (rdCnt <= 0)
+            break;
+        printf("Read %d tot %d of %d\n\r", rdCnt, totCnt, _nFileLen);
         memcpy(pMem, fileBuf, rdCnt);
         pMem += rdCnt;
         totCnt += rdCnt;
     }
-    memcpy(pMem, fileBuf, rdCnt);
-    totCnt += rdCnt;
+    printf("Done read\n\r");
     fclose(fp);
     printf("Success in caching %d bytes (read %d)\n\r", _nFileLen, totCnt);
     _bCacheValid = true;
@@ -60,10 +73,11 @@
         delete (*it);
 }
 
-bool RdWebServer::init(int port, DigitalOut* pStatusLed)
+bool RdWebServer::init(int port, DigitalOut* pStatusLed, char* pBaseWebFolder)
 {
     _port = port;
     _pStatusLed = pStatusLed;
+    _pBaseWebFolder = pBaseWebFolder;
         
 //    _socketSrv.set_blocking(true);
 
@@ -230,9 +244,9 @@
     char *lstchr = strrchr(inFileName, NULL) -1;
     if ('/' == *lstchr)
     {
-        // printf("Open directory /sd/%s\n", inFileName);
+        printf("Request file %s%s\n", _pBaseWebFolder, inFileName);
         *lstchr = 0;
-        sprintf(filename, "/sd/%s", inFileName);
+        sprintf(filename, "%s%s", _pBaseWebFolder, inFileName);
         DIR *d = opendir(filename);
         if (d != NULL) {
             sprintf(httpHeader,"HTTP/1.1 200 OK\r\nContent-Type: text/html\r\nConnection: Close\r\n\r\n");
@@ -241,7 +255,7 @@
             pClient->send(httpHeader,strlen(httpHeader));
             struct dirent *p;
             while((p = readdir(d)) != NULL) {
-                // printf("%s\n", p->d_name);
+                printf("%s\n", p->d_name);
                 sprintf(httpHeader,"<li>%s</li>", p->d_name);
                 pClient->send(httpHeader,strlen(httpHeader));
             }
@@ -253,8 +267,8 @@
     }
     else
     {
-        sprintf(filename, "/sd/%s", inFileName);
-        // printf ("Filename %s\r\n", filename);
+        sprintf(filename, "%s%s", _pBaseWebFolder, inFileName);
+        printf ("Filename %s\r\n", filename);
         FILE* fp = fopen(filename, "r");
         if (fp == NULL)
         {
@@ -354,7 +368,7 @@
                                     else
                                         handleLocalFileRequest(cmdStr, argStr, &client, httpHeader, (*it)->_bCacheIfPossible);
                                 }
-                                else if ((*it)->_cmdType == RdWebServerCmdDef::CMD_SDCARDFILE)
+                                else if ((*it)->_cmdType == RdWebServerCmdDef::CMD_SDORUSBFILE)
                                 {
                                     if ((*it)->_substFileName[0] != '\0')
                                         handleSDFileRequest((*it)->_substFileName, argStr, &client, httpHeader);

--- a/RdWebServer.h	Fri Oct 04 10:36:57 2013 +0000
+++ b/RdWebServer.h	Mon Feb 02 16:36:14 2015 +0000
@@ -40,7 +40,7 @@
     public:
         static const int CMD_LOCALFILE = 1;
         static const int CMD_CALLBACK = 2;
-        static const int CMD_SDCARDFILE = 3;
+        static const int CMD_SDORUSBFILE = 3;
         RdWebServerCmdDef(char* pStr, int cmdType, CmdCallbackType callback, char* substFileName, bool bCacheIfPossible)
         {
             _pCmdStr = pStr;
@@ -68,7 +68,7 @@
         RdWebServer();
         virtual ~RdWebServer();
         
-        bool init(int port, DigitalOut* pStatusLed);
+        bool init(int port, DigitalOut* pStatusLed, char* pBaseWebFolder);
         void run();
         bool isListening()
         {
@@ -85,6 +85,7 @@
         std::vector<RdWebServerCmdDef*> _commands;
         std::vector<RdFileCacheEntry*> _cachedFiles;
         bool extractCmdArgs(char* buf, char* pCmdStr, int maxCmdStrLen, char* pArgStr, int maxArgStrLen);
+        char* _pBaseWebFolder;
 
         void handleLocalFileRequest(char* cmdStr, char* argStr, TCPSocketConnection* pClient, char* httpHeader, bool bCacheIfPossible);
         void handleSDFileRequest(char* cmdStr, char* argStr, TCPSocketConnection* pClient, char* httpHeader);