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.

Committer:
Bobty
Date:
Sun May 03 20:41:35 2015 +0000
Revision:
12:c14ffd4ec125
Parent:
11:cec51b430b20
Child:
13:4f9c09d3da13
Added debugging macros

Who changed what in which revision?

UserRevisionLine numberNew contents of line
Bobty 3:594136d34a32 1 /* RdWebServer.cpp
Bobty 3:594136d34a32 2 Rob Dobson 2013
Bobty 3:594136d34a32 3 Inspired by Jasper Schuurmans multi-threaded web server for Netduino http://www.schuurmans.cc/multi-threaded-web-server-for-netduino-plus
Bobty 3:594136d34a32 4 More details at http://robdobson.com/2013/10/moving-my-window-shades-control-to-mbed/
Bobty 3:594136d34a32 5 */
Bobty 3:594136d34a32 6
Bobty 12:c14ffd4ec125 7 #define RDWEB_DEBUG 5
Bobty 12:c14ffd4ec125 8
Bobty 0:b5b4d07f7827 9 #include "RdWebServer.h"
Bobty 0:b5b4d07f7827 10
Bobty 1:75bb184de749 11 #define MAX_CMDSTR_LEN 100
Bobty 1:75bb184de749 12 #define MAX_ARGSTR_LEN 100
Bobty 1:75bb184de749 13
Bobty 0:b5b4d07f7827 14 RdWebServer::RdWebServer()
Bobty 0:b5b4d07f7827 15 {
Bobty 0:b5b4d07f7827 16 _serverIsListening = false;
Bobty 0:b5b4d07f7827 17 _pStatusLed = NULL;
Bobty 0:b5b4d07f7827 18 }
Bobty 0:b5b4d07f7827 19
Bobty 0:b5b4d07f7827 20 RdWebServer::~RdWebServer()
Bobty 0:b5b4d07f7827 21 {
Bobty 2:9d8793c23b46 22 // Clean-up - probably never called as we're on a microcontroller!
Bobty 2:9d8793c23b46 23 for (std::vector<RdWebServerCmdDef*>::iterator it = _commands.begin() ; it != _commands.end(); ++it)
Bobty 2:9d8793c23b46 24 delete (*it);
Bobty 0:b5b4d07f7827 25 }
Bobty 0:b5b4d07f7827 26
Bobty 4:6afb3bbf20a4 27 bool RdWebServer::init(int port, DigitalOut* pStatusLed, char* pBaseWebFolder)
Bobty 0:b5b4d07f7827 28 {
Bobty 12:c14ffd4ec125 29 printf("Here\r\n");
Bobty 12:c14ffd4ec125 30 RD_INFO("Here\r\n");
Bobty 0:b5b4d07f7827 31 _port = port;
Bobty 0:b5b4d07f7827 32 _pStatusLed = pStatusLed;
Bobty 4:6afb3bbf20a4 33 _pBaseWebFolder = pBaseWebFolder;
Bobty 0:b5b4d07f7827 34
Bobty 6:46285c519af2 35 _socketSrv.set_blocking(true);
Bobty 0:b5b4d07f7827 36
Bobty 0:b5b4d07f7827 37 //setup tcp socket
Bobty 0:b5b4d07f7827 38 if(_socketSrv.bind(port)< 0)
Bobty 0:b5b4d07f7827 39 {
Bobty 11:cec51b430b20 40 RD_WARN("TCP server bind fail\n\r");
Bobty 0:b5b4d07f7827 41 return false;
Bobty 0:b5b4d07f7827 42 }
Bobty 0:b5b4d07f7827 43 else
Bobty 0:b5b4d07f7827 44 {
Bobty 11:cec51b430b20 45 RD_DBG("TCP server bind success\n\r");
Bobty 0:b5b4d07f7827 46 _serverIsListening = true;
Bobty 0:b5b4d07f7827 47 }
Bobty 0:b5b4d07f7827 48
Bobty 0:b5b4d07f7827 49 if(_socketSrv.listen(1) < 0)
Bobty 0:b5b4d07f7827 50 {
Bobty 11:cec51b430b20 51 RD_WARN("TCP server listen fail\n\r");
Bobty 0:b5b4d07f7827 52 return false;
Bobty 0:b5b4d07f7827 53 }
Bobty 0:b5b4d07f7827 54 else
Bobty 0:b5b4d07f7827 55 {
Bobty 11:cec51b430b20 56 RD_INFO("TCP server is listening...\r\n");
Bobty 6:46285c519af2 57 }
Bobty 6:46285c519af2 58
Bobty 6:46285c519af2 59 return true;
Bobty 6:46285c519af2 60 }
Bobty 6:46285c519af2 61
Bobty 6:46285c519af2 62 void RdWebServer::handleReceivedHttp(TCPSocketConnection &client)
Bobty 6:46285c519af2 63 {
Bobty 11:cec51b430b20 64 RD_DBG("Received Data: %d\n\r\n\r%.*s\n\r",strlen(_buffer),strlen(_buffer),_buffer);
Bobty 7:fe7c33f7fbb8 65 int method = METHOD_OTHER;
Bobty 6:46285c519af2 66 if (strncmp(_buffer, "GET ", 4) == 0)
Bobty 7:fe7c33f7fbb8 67 method = METHOD_GET;
Bobty 7:fe7c33f7fbb8 68 if (strncmp(_buffer, "POST", 4) == 0)
Bobty 7:fe7c33f7fbb8 69 method = METHOD_POST;
Bobty 7:fe7c33f7fbb8 70
Bobty 7:fe7c33f7fbb8 71 char cmdStr[MAX_CMDSTR_LEN];
Bobty 7:fe7c33f7fbb8 72 char argStr[MAX_ARGSTR_LEN];
Bobty 7:fe7c33f7fbb8 73 if (extractCmdArgs(_buffer+3, cmdStr, MAX_CMDSTR_LEN, argStr, MAX_ARGSTR_LEN))
Bobty 6:46285c519af2 74 {
Bobty 11:cec51b430b20 75 RD_DBG("CmdStr %s\n\r", cmdStr);
Bobty 11:cec51b430b20 76 RD_DBG("ArgStr %s\n\r", argStr);
Bobty 7:fe7c33f7fbb8 77 bool cmdFound = false;
Bobty 7:fe7c33f7fbb8 78 for (std::vector<RdWebServerCmdDef*>::iterator it = _commands.begin() ; it != _commands.end(); ++it)
Bobty 6:46285c519af2 79 {
Bobty 11:cec51b430b20 80 RD_DBG("Testing <<%s>> with <<%s>>\r\n", (*it)->_pCmdStr, cmdStr);
Bobty 7:fe7c33f7fbb8 81 if (strcasecmp((*it)->_pCmdStr, cmdStr) == 0)
Bobty 7:fe7c33f7fbb8 82 {
Bobty 11:cec51b430b20 83 RD_DBG("FoundCmd <%s> Type %d\n\r", cmdStr, (*it)->_cmdType);
Bobty 7:fe7c33f7fbb8 84 cmdFound = true;
Bobty 7:fe7c33f7fbb8 85 if ((*it)->_cmdType == RdWebServerCmdDef::CMD_CALLBACK)
Bobty 7:fe7c33f7fbb8 86 {
Bobty 7:fe7c33f7fbb8 87 char* respStr = ((*it)->_callback)(method, cmdStr, argStr);
Bobty 7:fe7c33f7fbb8 88 client.send(respStr, strlen(respStr));
Bobty 6:46285c519af2 89 }
Bobty 7:fe7c33f7fbb8 90 else if ((*it)->_cmdType == RdWebServerCmdDef::CMD_LOCALFILE)
Bobty 7:fe7c33f7fbb8 91 {
Bobty 7:fe7c33f7fbb8 92 if ((*it)->_substFileName[0] != '\0')
Bobty 7:fe7c33f7fbb8 93 handleLocalFileRequest((*it)->_substFileName, argStr, client, _httpHeader, (*it)->_bCacheIfPossible);
Bobty 7:fe7c33f7fbb8 94 else
Bobty 7:fe7c33f7fbb8 95 handleLocalFileRequest(cmdStr, argStr, client, _httpHeader, (*it)->_bCacheIfPossible);
Bobty 7:fe7c33f7fbb8 96 }
Bobty 7:fe7c33f7fbb8 97 else if ((*it)->_cmdType == RdWebServerCmdDef::CMD_SDORUSBFILE)
Bobty 7:fe7c33f7fbb8 98 {
Bobty 7:fe7c33f7fbb8 99 if ((*it)->_substFileName[0] != '\0')
Bobty 7:fe7c33f7fbb8 100 handleSDFileRequest((*it)->_substFileName, argStr, client, _httpHeader);
Bobty 7:fe7c33f7fbb8 101 else
Bobty 7:fe7c33f7fbb8 102 handleSDFileRequest(cmdStr, argStr, client, _httpHeader);
Bobty 7:fe7c33f7fbb8 103 }
Bobty 7:fe7c33f7fbb8 104 break;
Bobty 6:46285c519af2 105 }
Bobty 6:46285c519af2 106 }
Bobty 7:fe7c33f7fbb8 107 // If command not found see if it is a local file
Bobty 7:fe7c33f7fbb8 108 if (!cmdFound)
Bobty 7:fe7c33f7fbb8 109 handleSDFileRequest(cmdStr, argStr, client, _httpHeader);
Bobty 6:46285c519af2 110 }
Bobty 6:46285c519af2 111 }
Bobty 6:46285c519af2 112
Bobty 6:46285c519af2 113 void RdWebServer::run()
Bobty 6:46285c519af2 114 {
Bobty 8:de915bd70ec1 115 TCPSocketConnection client;
Bobty 8:de915bd70ec1 116 Timer connectLimitTimer;
Bobty 6:46285c519af2 117
Bobty 8:de915bd70ec1 118 while (isListening())
Bobty 6:46285c519af2 119 {
Bobty 11:cec51b430b20 120 RD_INFO("Waiting for TCP connection\r\n");
Bobty 6:46285c519af2 121 if(_socketSrv.accept(client)<0)
Bobty 6:46285c519af2 122 {
Bobty 11:cec51b430b20 123 RD_WARN("TCP Socket failed to accept connection\n\r");
Bobty 6:46285c519af2 124 }
Bobty 6:46285c519af2 125 else
Bobty 6:46285c519af2 126 {
Bobty 9:35668248199b 127 client.set_blocking(false, 2000);
Bobty 11:cec51b430b20 128 RD_INFO("Connection from IP: %s\n\r",client.get_address());
Bobty 6:46285c519af2 129 if (_pStatusLed != NULL)
Bobty 6:46285c519af2 130 *_pStatusLed = true;
Bobty 8:de915bd70ec1 131
Bobty 8:de915bd70ec1 132 connectLimitTimer.reset();
Bobty 8:de915bd70ec1 133 connectLimitTimer.start();
Bobty 8:de915bd70ec1 134 while(true)
Bobty 6:46285c519af2 135 {
Bobty 8:de915bd70ec1 136 // Check connection timer - 10 seconds timeout on HTTP operation
Bobty 8:de915bd70ec1 137 if (connectLimitTimer.read() >= 10)
Bobty 8:de915bd70ec1 138 {
Bobty 11:cec51b430b20 139 RD_WARN("Connection timed out\n\r");
Bobty 8:de915bd70ec1 140 break;
Bobty 8:de915bd70ec1 141 }
Bobty 8:de915bd70ec1 142 // Get received data
Bobty 8:de915bd70ec1 143 int rxLen = client.receive(_buffer, HTTPD_MAX_REQ_LENGTH);
Bobty 8:de915bd70ec1 144 if (rxLen == -1)
Bobty 8:de915bd70ec1 145 {
Bobty 8:de915bd70ec1 146 continue;
Bobty 8:de915bd70ec1 147 }
Bobty 8:de915bd70ec1 148 else if (rxLen == 0)
Bobty 8:de915bd70ec1 149 {
Bobty 11:cec51b430b20 150 RD_WARN("received buffer is empty.\n\r");
Bobty 8:de915bd70ec1 151 continue;
Bobty 8:de915bd70ec1 152 }
Bobty 8:de915bd70ec1 153 else if (rxLen > HTTPD_MAX_REQ_LENGTH)
Bobty 8:de915bd70ec1 154 {
Bobty 8:de915bd70ec1 155 sprintf(_httpHeader,"HTTP/1.1 413 Request Entity Too Large \r\nContent-Type: text\r\nConnection: Close\r\n\r\n");
Bobty 8:de915bd70ec1 156 client.send(_httpHeader,strlen(_httpHeader));
Bobty 8:de915bd70ec1 157 client.send(_buffer, rxLen);
Bobty 8:de915bd70ec1 158 continue;
Bobty 8:de915bd70ec1 159 }
Bobty 8:de915bd70ec1 160 _buffer[rxLen] = '\0';
Bobty 8:de915bd70ec1 161
Bobty 8:de915bd70ec1 162 // Handle buffer
Bobty 8:de915bd70ec1 163 handleReceivedHttp(client);
Bobty 8:de915bd70ec1 164
Bobty 8:de915bd70ec1 165 // Done
Bobty 8:de915bd70ec1 166 break;
Bobty 6:46285c519af2 167 }
Bobty 8:de915bd70ec1 168
Bobty 8:de915bd70ec1 169 // Connection now closed
Bobty 11:cec51b430b20 170 RD_INFO("Connection closed ...\r\n");
Bobty 8:de915bd70ec1 171 client.close();
Bobty 8:de915bd70ec1 172 if (_pStatusLed != NULL)
Bobty 8:de915bd70ec1 173 *_pStatusLed = false;
Bobty 6:46285c519af2 174 }
Bobty 8:de915bd70ec1 175
Bobty 0:b5b4d07f7827 176 }
Bobty 6:46285c519af2 177 }
Bobty 6:46285c519af2 178
Bobty 6:46285c519af2 179 void RdWebServer::addCommand(char* pCmdStr, int cmdType, CmdCallbackType callback, char* substFileName, bool cacheIfPossible)
Bobty 6:46285c519af2 180 {
Bobty 6:46285c519af2 181 _commands.push_back(new RdWebServerCmdDef(pCmdStr, cmdType, callback, substFileName, cacheIfPossible));
Bobty 6:46285c519af2 182 }
Bobty 6:46285c519af2 183
Bobty 6:46285c519af2 184 void RdWebServer::handleSDFileRequest(char* inFileName, char* argStr, TCPSocketConnection &client, char* httpHeader)
Bobty 6:46285c519af2 185 {
Bobty 6:46285c519af2 186 const int HTTPD_MAX_FNAME_LENGTH = 127;
Bobty 6:46285c519af2 187 char filename[HTTPD_MAX_FNAME_LENGTH+1];
Bobty 6:46285c519af2 188
Bobty 11:cec51b430b20 189 RD_INFO("Requesting file %s\n\r", inFileName);
Bobty 6:46285c519af2 190
Bobty 12:c14ffd4ec125 191 #ifdef SUPPORT_FOLDER_VIEW
Bobty 10:b4b9d4d5e5be 192 if ((strlen(inFileName) > 0) && (inFileName[strlen(inFileName)-1] == '/'))
Bobty 6:46285c519af2 193 {
Bobty 11:cec51b430b20 194 RD_INFO("Request directory %s%s\r\n", _pBaseWebFolder, inFileName);
Bobty 6:46285c519af2 195 sprintf(filename, "%s%s", _pBaseWebFolder, inFileName);
Bobty 6:46285c519af2 196 DIR *d = opendir(filename);
Bobty 11:cec51b430b20 197 if (d != NULL)
Bobty 11:cec51b430b20 198 {
Bobty 6:46285c519af2 199 sprintf(httpHeader,"HTTP/1.1 200 OK\r\nContent-Type: text/html\r\nConnection: Close\r\n\r\n");
Bobty 6:46285c519af2 200 client.send(httpHeader,strlen(httpHeader));
Bobty 6:46285c519af2 201 sprintf(httpHeader,"<html><head><title>Directory Listing</title></head><body><h1>%s</h1><ul>", inFileName);
Bobty 6:46285c519af2 202 client.send(httpHeader,strlen(httpHeader));
Bobty 6:46285c519af2 203 struct dirent *p;
Bobty 11:cec51b430b20 204 while((p = readdir(d)) != NULL)
Bobty 11:cec51b430b20 205 {
Bobty 11:cec51b430b20 206 RD_INFO("%s\r\n", p->d_name);
Bobty 6:46285c519af2 207 sprintf(httpHeader,"<li>%s</li>", p->d_name);
Bobty 6:46285c519af2 208 client.send(httpHeader,strlen(httpHeader));
Bobty 6:46285c519af2 209 }
Bobty 6:46285c519af2 210 }
Bobty 6:46285c519af2 211 closedir(d);
Bobty 11:cec51b430b20 212 RD_DBG("Directory closed\n");
Bobty 6:46285c519af2 213 sprintf(httpHeader,"</ul></body></html>");
Bobty 6:46285c519af2 214 client.send(httpHeader,strlen(httpHeader));
Bobty 6:46285c519af2 215 }
Bobty 6:46285c519af2 216 else
Bobty 12:c14ffd4ec125 217 #endif
Bobty 6:46285c519af2 218 {
Bobty 6:46285c519af2 219 sprintf(filename, "%s%s", _pBaseWebFolder, inFileName);
Bobty 11:cec51b430b20 220 RD_INFO("Filename %s\r\n", filename);
Bobty 6:46285c519af2 221
Bobty 6:46285c519af2 222 FILE* fp = fopen(filename, "r");
Bobty 6:46285c519af2 223 if (fp == NULL)
Bobty 6:46285c519af2 224 {
Bobty 11:cec51b430b20 225 RD_WARN("Filename %s not found\r\n", filename);
Bobty 6:46285c519af2 226 sprintf(httpHeader,"HTTP/1.1 404 Not Found \r\nContent-Type: text\r\nConnection: Close\r\n\r\n");
Bobty 6:46285c519af2 227 client.send(httpHeader,strlen(httpHeader));
Bobty 6:46285c519af2 228 client.send(inFileName,strlen(inFileName));
Bobty 6:46285c519af2 229 }
Bobty 6:46285c519af2 230 else
Bobty 6:46285c519af2 231 {
Bobty 11:cec51b430b20 232 RD_INFO("Sending file %s\r\n", filename);
Bobty 6:46285c519af2 233 sprintf(httpHeader,"HTTP/1.1 200 OK\r\nContent-Type: text/html\r\nConnection: Close\r\n\r\n");
Bobty 6:46285c519af2 234 client.send(httpHeader,strlen(httpHeader));
Bobty 6:46285c519af2 235 int rdCnt = 0;
Bobty 6:46285c519af2 236 char fileBuf[1024];
Bobty 6:46285c519af2 237 while ((rdCnt = fread(fileBuf, sizeof( char ), 1024, fp)) == 1024)
Bobty 6:46285c519af2 238 {
Bobty 9:35668248199b 239 client.send_all(fileBuf, rdCnt);
Bobty 6:46285c519af2 240 }
Bobty 6:46285c519af2 241 client.send(fileBuf, rdCnt);
Bobty 6:46285c519af2 242 fclose(fp);
Bobty 6:46285c519af2 243 }
Bobty 6:46285c519af2 244 }
Bobty 6:46285c519af2 245 }
Bobty 6:46285c519af2 246
Bobty 6:46285c519af2 247 void RdWebServer::sendFromCache(RdFileCacheEntry* pCacheEntry, TCPSocketConnection &client, char* httpHeader)
Bobty 6:46285c519af2 248 {
Bobty 11:cec51b430b20 249 RD_INFO("Sending file %s from cache %d bytes\r\n", pCacheEntry->_fileName, pCacheEntry->_nFileLen);
Bobty 6:46285c519af2 250 sprintf(httpHeader,"HTTP/1.1 200 OK\r\nContent-Type: text/html\r\nConnection: Close\r\n\r\n");
Bobty 6:46285c519af2 251 client.send(httpHeader,strlen(httpHeader));
Bobty 6:46285c519af2 252 char* pMem = pCacheEntry->_pFileContent;
Bobty 6:46285c519af2 253 int nLenLeft = pCacheEntry->_nFileLen;
Bobty 6:46285c519af2 254 int blkSize = 2048;
Bobty 6:46285c519af2 255 while(nLenLeft > 0)
Bobty 6:46285c519af2 256 {
Bobty 6:46285c519af2 257 if (blkSize > nLenLeft)
Bobty 6:46285c519af2 258 blkSize = nLenLeft;
Bobty 6:46285c519af2 259 client.send_all(pMem, blkSize);
Bobty 6:46285c519af2 260 pMem += blkSize;
Bobty 6:46285c519af2 261 nLenLeft -= blkSize;
Bobty 6:46285c519af2 262 }
Bobty 6:46285c519af2 263 }
Bobty 6:46285c519af2 264
Bobty 6:46285c519af2 265 void RdWebServer::handleLocalFileRequest(char* inFileName, char* argStr, TCPSocketConnection &client, char* httpHeader, bool bCacheIfPossible)
Bobty 6:46285c519af2 266 {
Bobty 12:c14ffd4ec125 267
Bobty 12:c14ffd4ec125 268 #ifdef SUPPORT_LOCAL_FILESYSTEM
Bobty 12:c14ffd4ec125 269
Bobty 6:46285c519af2 270 const int HTTPD_MAX_FNAME_LENGTH = 127;
Bobty 6:46285c519af2 271 char localFilename[HTTPD_MAX_FNAME_LENGTH+1];
Bobty 6:46285c519af2 272 char reqFileNameStr[HTTPD_MAX_FNAME_LENGTH+1];
Bobty 6:46285c519af2 273
Bobty 11:cec51b430b20 274 RD_INFO("Requesting local file %s\n\r", inFileName);
Bobty 6:46285c519af2 275 sprintf(reqFileNameStr, "/%s", inFileName);
Bobty 6:46285c519af2 276 sprintf(localFilename, "/local/%s", inFileName);
Bobty 6:46285c519af2 277
Bobty 6:46285c519af2 278 if (bCacheIfPossible)
Bobty 6:46285c519af2 279 {
Bobty 6:46285c519af2 280 // Check if file already cached
Bobty 6:46285c519af2 281 bool bTryToCache = true;
Bobty 6:46285c519af2 282 for (std::vector<RdFileCacheEntry*>::iterator it = _cachedFiles.begin() ; it != _cachedFiles.end(); ++it)
Bobty 6:46285c519af2 283 {
Bobty 6:46285c519af2 284 if (strcmp(inFileName, (*it)->_fileName) == 0)
Bobty 6:46285c519af2 285 {
Bobty 6:46285c519af2 286 if ((*it)->_bCacheValid)
Bobty 6:46285c519af2 287 {
Bobty 6:46285c519af2 288 sendFromCache(*it, client, httpHeader);
Bobty 6:46285c519af2 289 return;
Bobty 6:46285c519af2 290 }
Bobty 6:46285c519af2 291 bTryToCache = false; // don't try to cache as cacheing must have already failed
Bobty 6:46285c519af2 292 }
Bobty 6:46285c519af2 293 }
Bobty 6:46285c519af2 294
Bobty 6:46285c519af2 295 // See if we can cache the file
Bobty 6:46285c519af2 296 if (bTryToCache)
Bobty 6:46285c519af2 297 {
Bobty 6:46285c519af2 298 RdFileCacheEntry* pCacheEntry = new RdFileCacheEntry(inFileName);
Bobty 6:46285c519af2 299 if (pCacheEntry)
Bobty 6:46285c519af2 300 {
Bobty 6:46285c519af2 301 bool bCacheSuccess = pCacheEntry->readLocalFileIntoCache(localFilename);
Bobty 6:46285c519af2 302 // Store the cache entry even if reading failed (mem alloc or file not found, etc) so we don't try to cache again
Bobty 6:46285c519af2 303 _cachedFiles.push_back(pCacheEntry);
Bobty 6:46285c519af2 304 if (bCacheSuccess)
Bobty 6:46285c519af2 305 {
Bobty 6:46285c519af2 306 sendFromCache(pCacheEntry, client, httpHeader);
Bobty 6:46285c519af2 307 return;
Bobty 6:46285c519af2 308 }
Bobty 6:46285c519af2 309 }
Bobty 6:46285c519af2 310 }
Bobty 6:46285c519af2 311 }
Bobty 6:46285c519af2 312
Bobty 6:46285c519af2 313 LocalFileSystem local("local");
Bobty 6:46285c519af2 314
Bobty 6:46285c519af2 315 FILE* fp = fopen(localFilename, "r");
Bobty 6:46285c519af2 316 if (fp == NULL)
Bobty 6:46285c519af2 317 {
Bobty 11:cec51b430b20 318 RD_WARN("Local file %s not found\r\n", localFilename);
Bobty 6:46285c519af2 319 sprintf(httpHeader,"HTTP/1.1 404 Not Found \r\nContent-Type: text\r\nConnection: Close\r\n\r\n");
Bobty 6:46285c519af2 320 client.send(httpHeader,strlen(httpHeader));
Bobty 6:46285c519af2 321 client.send(reqFileNameStr,strlen(reqFileNameStr));
Bobty 6:46285c519af2 322 }
Bobty 6:46285c519af2 323 else
Bobty 6:46285c519af2 324 {
Bobty 11:cec51b430b20 325 RD_INFO("Sending file %s from disk\r\n", localFilename);
Bobty 6:46285c519af2 326 sprintf(httpHeader,"HTTP/1.1 200 OK\r\nContent-Type: text/html\r\nConnection: Close\r\n\r\n");
Bobty 6:46285c519af2 327 client.send(httpHeader,strlen(httpHeader));
Bobty 6:46285c519af2 328 int rdCnt = 0;
Bobty 6:46285c519af2 329 char fileBuf[2000];
Bobty 6:46285c519af2 330 while ((rdCnt = fread(fileBuf, sizeof( char ), 2000, fp)) == 2000)
Bobty 6:46285c519af2 331 {
Bobty 6:46285c519af2 332 client.send_all(fileBuf, rdCnt);
Bobty 6:46285c519af2 333 }
Bobty 6:46285c519af2 334 client.send_all(fileBuf, rdCnt);
Bobty 6:46285c519af2 335 fclose(fp);
Bobty 6:46285c519af2 336 }
Bobty 12:c14ffd4ec125 337
Bobty 12:c14ffd4ec125 338 #else
Bobty 12:c14ffd4ec125 339
Bobty 12:c14ffd4ec125 340 RD_WARN("Local file system not supported\r\n");
Bobty 12:c14ffd4ec125 341 sprintf(httpHeader,"HTTP/1.1 404 Not Found \r\nContent-Type: text\r\nConnection: Close\r\n\r\n");
Bobty 12:c14ffd4ec125 342 client.send(httpHeader,strlen(httpHeader));
Bobty 12:c14ffd4ec125 343 client.send_all(inFileName,strlen(inFileName));
Bobty 12:c14ffd4ec125 344
Bobty 12:c14ffd4ec125 345 #endif
Bobty 6:46285c519af2 346 }
Bobty 6:46285c519af2 347
Bobty 6:46285c519af2 348 bool RdFileCacheEntry::readLocalFileIntoCache(char* fileName)
Bobty 6:46285c519af2 349 {
Bobty 12:c14ffd4ec125 350 #ifdef SUPPORT_LOCAL_FILESYSTEM
Bobty 12:c14ffd4ec125 351
Bobty 11:cec51b430b20 352 RD_INFO("Reading into cache %s\n\r", fileName);
Bobty 6:46285c519af2 353 LocalFileSystem local("local");
Bobty 6:46285c519af2 354 FILE* fp = fopen(fileName, "r");
Bobty 6:46285c519af2 355 if (fp == NULL)
Bobty 6:46285c519af2 356 {
Bobty 11:cec51b430b20 357 RD_WARN("Failed to open file\n\r");
Bobty 6:46285c519af2 358 return false;
Bobty 6:46285c519af2 359 }
Bobty 11:cec51b430b20 360 RD_DBG("Seeking\n\r");
Bobty 6:46285c519af2 361 fseek(fp, 0, SEEK_END);
Bobty 6:46285c519af2 362 _nFileLen = (int)ftell(fp);
Bobty 6:46285c519af2 363 _pFileContent = new char[_nFileLen];
Bobty 11:cec51b430b20 364 RD_DBG("Len %d Buf %08x\n\r", _nFileLen, _pFileContent);
Bobty 6:46285c519af2 365 if (!_pFileContent)
Bobty 6:46285c519af2 366 {
Bobty 11:cec51b430b20 367 RD_WARN("Failed to allocate %lu\n\r", _nFileLen);
Bobty 6:46285c519af2 368 fclose(fp);
Bobty 6:46285c519af2 369 return false;
Bobty 6:46285c519af2 370 }
Bobty 11:cec51b430b20 371 RD_DBG("Allocated\n\r");
Bobty 6:46285c519af2 372 memset(_pFileContent, 0, _nFileLen);
Bobty 6:46285c519af2 373 fseek(fp, 0, SEEK_SET);
Bobty 6:46285c519af2 374 char* pMem = _pFileContent;
Bobty 6:46285c519af2 375 char fileBuf[100];
Bobty 6:46285c519af2 376 int totCnt = 0;
Bobty 6:46285c519af2 377 int rdCnt = 0;
Bobty 11:cec51b430b20 378 RD_DBG("Reading\n\r");
Bobty 6:46285c519af2 379 while (true)
Bobty 6:46285c519af2 380 {
Bobty 6:46285c519af2 381 int toRead = _nFileLen - totCnt;
Bobty 6:46285c519af2 382 if (toRead > sizeof(fileBuf))
Bobty 6:46285c519af2 383 toRead = sizeof(fileBuf);
Bobty 6:46285c519af2 384 if (toRead <= 0)
Bobty 6:46285c519af2 385 break;
Bobty 6:46285c519af2 386 rdCnt = fread(fileBuf, sizeof(char), toRead, fp);
Bobty 6:46285c519af2 387 if (rdCnt <= 0)
Bobty 6:46285c519af2 388 break;
Bobty 11:cec51b430b20 389 RD_DBG("Read %d tot %d of %d\n\r", rdCnt, totCnt, _nFileLen);
Bobty 6:46285c519af2 390 memcpy(pMem, fileBuf, rdCnt);
Bobty 6:46285c519af2 391 pMem += rdCnt;
Bobty 6:46285c519af2 392 totCnt += rdCnt;
Bobty 6:46285c519af2 393 }
Bobty 11:cec51b430b20 394 RD_DBG("Done read\n\r");
Bobty 6:46285c519af2 395 fclose(fp);
Bobty 11:cec51b430b20 396 RD_DBG("Success in caching %d bytes (read %d)\n\r", _nFileLen, totCnt);
Bobty 6:46285c519af2 397 _bCacheValid = true;
Bobty 0:b5b4d07f7827 398 return true;
Bobty 12:c14ffd4ec125 399 #else
Bobty 12:c14ffd4ec125 400 return false;
Bobty 12:c14ffd4ec125 401 #endif
Bobty 0:b5b4d07f7827 402 }
Bobty 0:b5b4d07f7827 403
Bobty 1:75bb184de749 404 bool RdWebServer::extractCmdArgs(char* buf, char* pCmdStr, int maxCmdStrLen, char* pArgStr, int maxArgStrLen)
Bobty 1:75bb184de749 405 {
Bobty 1:75bb184de749 406 *pCmdStr = '\0';
Bobty 1:75bb184de749 407 *pArgStr = '\0';
Bobty 1:75bb184de749 408 int cmdStrLen = 0;
Bobty 1:75bb184de749 409 int argStrLen = 0;
Bobty 1:75bb184de749 410 if (buf == NULL)
Bobty 1:75bb184de749 411 return false;
Bobty 7:fe7c33f7fbb8 412 // Check for first slash
Bobty 1:75bb184de749 413 char* pSlash1 = strchr(buf, '/');
Bobty 1:75bb184de749 414 if (pSlash1 == NULL)
Bobty 1:75bb184de749 415 return false;
Bobty 1:75bb184de749 416 pSlash1++;
Bobty 7:fe7c33f7fbb8 417 // Extract command
Bobty 1:75bb184de749 418 while(*pSlash1)
Bobty 1:75bb184de749 419 {
Bobty 1:75bb184de749 420 if (cmdStrLen >= maxCmdStrLen-1)
Bobty 1:75bb184de749 421 break;
Bobty 7:fe7c33f7fbb8 422 if ((*pSlash1 == '/') || (*pSlash1 == ' ') || (*pSlash1 == '\n') || (*pSlash1 == '?') || (*pSlash1 == '&'))
Bobty 1:75bb184de749 423 break;
Bobty 1:75bb184de749 424 *pCmdStr++ = *pSlash1++;
Bobty 1:75bb184de749 425 *pCmdStr = '\0';
Bobty 1:75bb184de749 426 cmdStrLen++;
Bobty 1:75bb184de749 427 }
Bobty 1:75bb184de749 428 if ((*pSlash1 == '\0') || (*pSlash1 == ' ') || (*pSlash1 == '\n'))
Bobty 1:75bb184de749 429 return true;
Bobty 7:fe7c33f7fbb8 430 // Now args
Bobty 1:75bb184de749 431 *pSlash1++;
Bobty 1:75bb184de749 432 while(*pSlash1)
Bobty 1:75bb184de749 433 {
Bobty 1:75bb184de749 434 if (argStrLen >= maxArgStrLen-1)
Bobty 1:75bb184de749 435 break;
Bobty 1:75bb184de749 436 if ((*pSlash1 == ' ') || (*pSlash1 == '\n'))
Bobty 1:75bb184de749 437 break;
Bobty 1:75bb184de749 438 *pArgStr++ = *pSlash1++;
Bobty 1:75bb184de749 439 *pArgStr = '\0';
Bobty 1:75bb184de749 440 argStrLen++;
Bobty 1:75bb184de749 441 }
Bobty 1:75bb184de749 442 return true;
Bobty 1:75bb184de749 443 }