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.
RdWebServer.cpp@17:080f2bed8b36, 2015-05-11 (annotated)
- Committer:
- Bobty
- Date:
- Mon May 11 11:17:15 2015 +0000
- Revision:
- 17:080f2bed8b36
- Parent:
- 16:0248bbfdb6c1
- Child:
- 18:5de680c4cfcb
Improved settings
Who changed what in which revision?
User | Revision | Line number | New contents of line |
---|---|---|---|
Bobty | 3:594136d34a32 | 1 | /* RdWebServer.cpp |
Bobty | 15:0865fa4b046a | 2 | Rob Dobson 2013-2015 |
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 | 17:080f2bed8b36 | 7 | //#define RDWEB_DEBUG 5 |
Bobty | 12:c14ffd4ec125 | 8 | |
Bobty | 0:b5b4d07f7827 | 9 | #include "RdWebServer.h" |
Bobty | 0:b5b4d07f7827 | 10 | |
Bobty | 15:0865fa4b046a | 11 | const int MAX_CMDSTR_LEN = 100; |
Bobty | 15:0865fa4b046a | 12 | const int MAX_ARGSTR_LEN = 100; |
Bobty | 15:0865fa4b046a | 13 | const int MAX_FILENAME_LEN = (MAX_ARGSTR_LEN + 20); |
Bobty | 1:75bb184de749 | 14 | |
Bobty | 0:b5b4d07f7827 | 15 | RdWebServer::RdWebServer() |
Bobty | 0:b5b4d07f7827 | 16 | { |
Bobty | 15:0865fa4b046a | 17 | _initOk = false; |
Bobty | 0:b5b4d07f7827 | 18 | _pStatusLed = NULL; |
Bobty | 0:b5b4d07f7827 | 19 | } |
Bobty | 0:b5b4d07f7827 | 20 | |
Bobty | 0:b5b4d07f7827 | 21 | RdWebServer::~RdWebServer() |
Bobty | 0:b5b4d07f7827 | 22 | { |
Bobty | 2:9d8793c23b46 | 23 | // Clean-up - probably never called as we're on a microcontroller! |
Bobty | 2:9d8793c23b46 | 24 | for (std::vector<RdWebServerCmdDef*>::iterator it = _commands.begin() ; it != _commands.end(); ++it) |
Bobty | 2:9d8793c23b46 | 25 | delete (*it); |
Bobty | 0:b5b4d07f7827 | 26 | } |
Bobty | 0:b5b4d07f7827 | 27 | |
Bobty | 4:6afb3bbf20a4 | 28 | bool RdWebServer::init(int port, DigitalOut* pStatusLed, char* pBaseWebFolder) |
Bobty | 0:b5b4d07f7827 | 29 | { |
Bobty | 15:0865fa4b046a | 30 | // Settings |
Bobty | 0:b5b4d07f7827 | 31 | _port = port; |
Bobty | 0:b5b4d07f7827 | 32 | _pStatusLed = pStatusLed; |
Bobty | 4:6afb3bbf20a4 | 33 | _pBaseWebFolder = pBaseWebFolder; |
Bobty | 0:b5b4d07f7827 | 34 | |
Bobty | 17:080f2bed8b36 | 35 | // The sample web server on MBED site turns off blocking after the accept has happened |
Bobty | 17:080f2bed8b36 | 36 | // I've tried this but it doesn't seem to yield a reliable server |
Bobty | 17:080f2bed8b36 | 37 | _blockingOnAccept = true; |
Bobty | 17:080f2bed8b36 | 38 | _blockingOnReceive = true; |
Bobty | 17:080f2bed8b36 | 39 | |
Bobty | 17:080f2bed8b36 | 40 | // This is the same as the default in the socket.cpp file |
Bobty | 17:080f2bed8b36 | 41 | _timeoutOnBlocking = 1500; |
Bobty | 17:080f2bed8b36 | 42 | |
Bobty | 17:080f2bed8b36 | 43 | // Currently tested using close connection after send with a single file which works fine |
Bobty | 17:080f2bed8b36 | 44 | // If closeConnAfterSend is set false then the socket connection remains open and only |
Bobty | 17:080f2bed8b36 | 45 | // one client can access the server at a time |
Bobty | 17:080f2bed8b36 | 46 | // Need to test with the closeConnAfterSend seetting true when trying to download multiple files |
Bobty | 17:080f2bed8b36 | 47 | // for a website as previous experience would indicate that requests might be missed in this scenario |
Bobty | 17:080f2bed8b36 | 48 | // although all other settings may not have been the same |
Bobty | 17:080f2bed8b36 | 49 | _closeConnAfterSend = true; |
Bobty | 17:080f2bed8b36 | 50 | _closeConnOnReceiveFail = true; |
Bobty | 17:080f2bed8b36 | 51 | |
Bobty | 15:0865fa4b046a | 52 | // Setup tcp socket |
Bobty | 15:0865fa4b046a | 53 | _serverSocket.set_blocking(true); |
Bobty | 15:0865fa4b046a | 54 | if(_serverSocket.bind(port)< 0) |
Bobty | 0:b5b4d07f7827 | 55 | { |
Bobty | 11:cec51b430b20 | 56 | RD_WARN("TCP server bind fail\n\r"); |
Bobty | 0:b5b4d07f7827 | 57 | return false; |
Bobty | 0:b5b4d07f7827 | 58 | } |
Bobty | 15:0865fa4b046a | 59 | if(_serverSocket.listen(1) < 0) |
Bobty | 0:b5b4d07f7827 | 60 | { |
Bobty | 11:cec51b430b20 | 61 | RD_WARN("TCP server listen fail\n\r"); |
Bobty | 0:b5b4d07f7827 | 62 | return false; |
Bobty | 0:b5b4d07f7827 | 63 | } |
Bobty | 15:0865fa4b046a | 64 | RD_INFO("TCP server is listening...\r\n"); |
Bobty | 15:0865fa4b046a | 65 | _initOk = true; |
Bobty | 6:46285c519af2 | 66 | return true; |
Bobty | 6:46285c519af2 | 67 | } |
Bobty | 6:46285c519af2 | 68 | |
Bobty | 15:0865fa4b046a | 69 | void RdWebServer::run() |
Bobty | 15:0865fa4b046a | 70 | { |
Bobty | 15:0865fa4b046a | 71 | // Check initialised ok |
Bobty | 15:0865fa4b046a | 72 | if (!_initOk) |
Bobty | 15:0865fa4b046a | 73 | return; |
Bobty | 15:0865fa4b046a | 74 | |
Bobty | 15:0865fa4b046a | 75 | // Start accepting connections |
Bobty | 15:0865fa4b046a | 76 | while (true) |
Bobty | 15:0865fa4b046a | 77 | { |
Bobty | 15:0865fa4b046a | 78 | TCPSocketConnection clientSocketConn; |
Bobty | 15:0865fa4b046a | 79 | // Accept connection if available |
Bobty | 15:0865fa4b046a | 80 | RD_INFO("Waiting for TCP connection\r\n"); |
Bobty | 17:080f2bed8b36 | 81 | clientSocketConn.set_blocking(_blockingOnAccept, _timeoutOnBlocking); |
Bobty | 15:0865fa4b046a | 82 | if(_serverSocket.accept(clientSocketConn)<0) |
Bobty | 15:0865fa4b046a | 83 | { |
Bobty | 15:0865fa4b046a | 84 | RD_WARN("TCP Socket failed to accept connection\n\r"); |
Bobty | 15:0865fa4b046a | 85 | continue; |
Bobty | 15:0865fa4b046a | 86 | } |
Bobty | 15:0865fa4b046a | 87 | |
Bobty | 15:0865fa4b046a | 88 | // Connection |
Bobty | 15:0865fa4b046a | 89 | RD_INFO("Connection from IP: %s\n\r", clientSocketConn.get_address()); |
Bobty | 15:0865fa4b046a | 90 | if (_pStatusLed != NULL) |
Bobty | 15:0865fa4b046a | 91 | *_pStatusLed = true; |
Bobty | 15:0865fa4b046a | 92 | |
Bobty | 15:0865fa4b046a | 93 | // While connected |
Bobty | 15:0865fa4b046a | 94 | bool forcedClosed = false; |
Bobty | 15:0865fa4b046a | 95 | while(clientSocketConn.is_connected() && !forcedClosed) |
Bobty | 15:0865fa4b046a | 96 | { |
Bobty | 15:0865fa4b046a | 97 | // Receive data |
Bobty | 17:080f2bed8b36 | 98 | clientSocketConn.set_blocking(_blockingOnReceive, _timeoutOnBlocking); |
Bobty | 15:0865fa4b046a | 99 | int rxLen = clientSocketConn.receive(_buffer, HTTPD_MAX_REQ_LENGTH); |
Bobty | 15:0865fa4b046a | 100 | if (rxLen == -1) |
Bobty | 15:0865fa4b046a | 101 | { |
Bobty | 15:0865fa4b046a | 102 | RD_DBG("clientSocketConn.receive() returned %d\r\n", rxLen); |
Bobty | 17:080f2bed8b36 | 103 | if (_closeConnOnReceiveFail) |
Bobty | 15:0865fa4b046a | 104 | { |
Bobty | 15:0865fa4b046a | 105 | int closeRet = clientSocketConn.close(); |
Bobty | 15:0865fa4b046a | 106 | RD_DBG("Failed receive connection close() ret %d is connected %d\r\n", closeRet, clientSocketConn.is_connected()); |
Bobty | 15:0865fa4b046a | 107 | forcedClosed = true; |
Bobty | 15:0865fa4b046a | 108 | } |
Bobty | 15:0865fa4b046a | 109 | continue; |
Bobty | 15:0865fa4b046a | 110 | } |
Bobty | 15:0865fa4b046a | 111 | if (rxLen == 0) |
Bobty | 15:0865fa4b046a | 112 | { |
Bobty | 16:0248bbfdb6c1 | 113 | RD_DBG("clientSocketConn.receive() returned %d - ignoring - is connected %d\r\n", rxLen, clientSocketConn.is_connected()); |
Bobty | 15:0865fa4b046a | 114 | continue; |
Bobty | 15:0865fa4b046a | 115 | } |
Bobty | 15:0865fa4b046a | 116 | if (rxLen > HTTPD_MAX_REQ_LENGTH) |
Bobty | 15:0865fa4b046a | 117 | { |
Bobty | 15:0865fa4b046a | 118 | RD_DBG("clientSocketConn.receive() returned %d - too long\r\n", rxLen); |
Bobty | 17:080f2bed8b36 | 119 | formHTTPHeader("413 Request Entity Too Large", "text/plain", 0); |
Bobty | 17:080f2bed8b36 | 120 | // sprintf(_httpHeader,"HTTP/1.1 413 Request Entity Too Large \r\nContent-Type: text\r\nContent-Length: 0\r\n%s\r\n", closeConnAfterSend ? closeConnStr : ""); |
Bobty | 17:080f2bed8b36 | 121 | int sentRet = clientSocketConn.send(_httpHeader,strlen(_httpHeader)); |
Bobty | 15:0865fa4b046a | 122 | continue; |
Bobty | 15:0865fa4b046a | 123 | } |
Bobty | 15:0865fa4b046a | 124 | |
Bobty | 15:0865fa4b046a | 125 | RD_DBG("Received len %d\r\n", rxLen); |
Bobty | 15:0865fa4b046a | 126 | _buffer[rxLen] = '\0'; |
Bobty | 15:0865fa4b046a | 127 | RD_DBG("%s\r\n", _buffer); |
Bobty | 15:0865fa4b046a | 128 | |
Bobty | 15:0865fa4b046a | 129 | // Send a response |
Bobty | 17:080f2bed8b36 | 130 | // char* content = "HELLO\r\n"; |
Bobty | 17:080f2bed8b36 | 131 | // int sz = strlen(content); |
Bobty | 17:080f2bed8b36 | 132 | // sprintf(_httpHeader,"HTTP/1.1 200 OK\r\nContent-Type: text/html\r\nContent-Length: %d\r\n%s\r\n", sz, closeConnAfterSend ? closeConnStr : ""); |
Bobty | 17:080f2bed8b36 | 133 | // int sentRet = clientSocketConn.send(_httpHeader,strlen(_httpHeader)); |
Bobty | 17:080f2bed8b36 | 134 | // int sentRet2 = clientSocketConn.send(content, strlen(content)); |
Bobty | 17:080f2bed8b36 | 135 | // RD_DBG("Sent %s header ret %d content ret %d now connected %d\r\n", content, sentRet, sentRet2, clientSocketConn.is_connected()); |
Bobty | 17:080f2bed8b36 | 136 | |
Bobty | 17:080f2bed8b36 | 137 | // Handle received message |
Bobty | 17:080f2bed8b36 | 138 | if (handleReceivedHttp(clientSocketConn)) |
Bobty | 17:080f2bed8b36 | 139 | { |
Bobty | 17:080f2bed8b36 | 140 | // OK |
Bobty | 17:080f2bed8b36 | 141 | } |
Bobty | 17:080f2bed8b36 | 142 | else |
Bobty | 17:080f2bed8b36 | 143 | { |
Bobty | 17:080f2bed8b36 | 144 | // FAIL |
Bobty | 17:080f2bed8b36 | 145 | } |
Bobty | 15:0865fa4b046a | 146 | |
Bobty | 17:080f2bed8b36 | 147 | // Close connection if required |
Bobty | 17:080f2bed8b36 | 148 | if (_closeConnAfterSend) |
Bobty | 15:0865fa4b046a | 149 | { |
Bobty | 15:0865fa4b046a | 150 | int closeRet = clientSocketConn.close(); |
Bobty | 16:0248bbfdb6c1 | 151 | RD_DBG("After send connection close() ret %d is connected %d\r\n", closeRet, clientSocketConn.is_connected()); |
Bobty | 16:0248bbfdb6c1 | 152 | forcedClosed = true; |
Bobty | 15:0865fa4b046a | 153 | } |
Bobty | 15:0865fa4b046a | 154 | } |
Bobty | 15:0865fa4b046a | 155 | } |
Bobty | 15:0865fa4b046a | 156 | } |
Bobty | 15:0865fa4b046a | 157 | |
Bobty | 15:0865fa4b046a | 158 | // connectLimitTimer.reset(); |
Bobty | 15:0865fa4b046a | 159 | // connectLimitTimer.start(); |
Bobty | 15:0865fa4b046a | 160 | // while(true) |
Bobty | 15:0865fa4b046a | 161 | // { |
Bobty | 15:0865fa4b046a | 162 | // // Check connection timer - 10 seconds timeout on HTTP operation |
Bobty | 15:0865fa4b046a | 163 | // if (connectLimitTimer.read() >= 10) |
Bobty | 15:0865fa4b046a | 164 | // { |
Bobty | 15:0865fa4b046a | 165 | // RD_WARN("Connection timed out\n\r"); |
Bobty | 15:0865fa4b046a | 166 | // break; |
Bobty | 15:0865fa4b046a | 167 | // } |
Bobty | 15:0865fa4b046a | 168 | // // Get received data |
Bobty | 15:0865fa4b046a | 169 | // int rxLen = clientSocketConn.receive(_buffer, HTTPD_MAX_REQ_LENGTH); |
Bobty | 15:0865fa4b046a | 170 | // if (rxLen == -1) |
Bobty | 15:0865fa4b046a | 171 | // { |
Bobty | 15:0865fa4b046a | 172 | // RD_WARN("Nothing received\n\r"); |
Bobty | 15:0865fa4b046a | 173 | // continue; |
Bobty | 15:0865fa4b046a | 174 | // } |
Bobty | 15:0865fa4b046a | 175 | // else if (rxLen == 0) |
Bobty | 15:0865fa4b046a | 176 | // { |
Bobty | 15:0865fa4b046a | 177 | // RD_WARN("received buffer is empty.\n\r"); |
Bobty | 15:0865fa4b046a | 178 | // break; |
Bobty | 15:0865fa4b046a | 179 | // } |
Bobty | 15:0865fa4b046a | 180 | // else if (rxLen > HTTPD_MAX_REQ_LENGTH) |
Bobty | 15:0865fa4b046a | 181 | // { |
Bobty | 15:0865fa4b046a | 182 | // sprintf(_httpHeader,"HTTP/1.1 413 Request Entity Too Large \r\nContent-Type: text\r\nConnection: Close\r\n\r\n"); |
Bobty | 17:080f2bed8b36 | 183 | // clientSocketConn.send(_httpHeader,strlen(_httpHeader)); |
Bobty | 17:080f2bed8b36 | 184 | // clientSocketConn.send(_buffer, rxLen); |
Bobty | 15:0865fa4b046a | 185 | // break; |
Bobty | 15:0865fa4b046a | 186 | // } |
Bobty | 15:0865fa4b046a | 187 | // _buffer[rxLen] = '\0'; |
Bobty | 15:0865fa4b046a | 188 | // |
Bobty | 15:0865fa4b046a | 189 | // // Handle buffer |
Bobty | 15:0865fa4b046a | 190 | // if (handleReceivedHttp(clientSocketConn)) |
Bobty | 15:0865fa4b046a | 191 | // { |
Bobty | 15:0865fa4b046a | 192 | // break; |
Bobty | 15:0865fa4b046a | 193 | // } |
Bobty | 15:0865fa4b046a | 194 | // else |
Bobty | 15:0865fa4b046a | 195 | // { |
Bobty | 15:0865fa4b046a | 196 | // connectLimitTimer.reset(); |
Bobty | 15:0865fa4b046a | 197 | // connectLimitTimer.start(); |
Bobty | 15:0865fa4b046a | 198 | // } |
Bobty | 15:0865fa4b046a | 199 | // } |
Bobty | 15:0865fa4b046a | 200 | // |
Bobty | 15:0865fa4b046a | 201 | // // Connection now closed |
Bobty | 15:0865fa4b046a | 202 | // RD_INFO("Connection closed ...\r\n"); |
Bobty | 15:0865fa4b046a | 203 | // clientSocketConn.close(); |
Bobty | 15:0865fa4b046a | 204 | // if (_pStatusLed != NULL) |
Bobty | 15:0865fa4b046a | 205 | // *_pStatusLed = false; |
Bobty | 15:0865fa4b046a | 206 | // } |
Bobty | 15:0865fa4b046a | 207 | // |
Bobty | 15:0865fa4b046a | 208 | // } |
Bobty | 15:0865fa4b046a | 209 | //} |
Bobty | 15:0865fa4b046a | 210 | // |
Bobty | 15:0865fa4b046a | 211 | bool RdWebServer::handleReceivedHttp(TCPSocketConnection &clientSocketConn) |
Bobty | 6:46285c519af2 | 212 | { |
Bobty | 17:080f2bed8b36 | 213 | bool handledOk = false; |
Bobty | 11:cec51b430b20 | 214 | RD_DBG("Received Data: %d\n\r\n\r%.*s\n\r",strlen(_buffer),strlen(_buffer),_buffer); |
Bobty | 7:fe7c33f7fbb8 | 215 | int method = METHOD_OTHER; |
Bobty | 6:46285c519af2 | 216 | if (strncmp(_buffer, "GET ", 4) == 0) |
Bobty | 7:fe7c33f7fbb8 | 217 | method = METHOD_GET; |
Bobty | 7:fe7c33f7fbb8 | 218 | if (strncmp(_buffer, "POST", 4) == 0) |
Bobty | 7:fe7c33f7fbb8 | 219 | method = METHOD_POST; |
Bobty | 7:fe7c33f7fbb8 | 220 | |
Bobty | 7:fe7c33f7fbb8 | 221 | char cmdStr[MAX_CMDSTR_LEN]; |
Bobty | 7:fe7c33f7fbb8 | 222 | char argStr[MAX_ARGSTR_LEN]; |
Bobty | 7:fe7c33f7fbb8 | 223 | if (extractCmdArgs(_buffer+3, cmdStr, MAX_CMDSTR_LEN, argStr, MAX_ARGSTR_LEN)) |
Bobty | 6:46285c519af2 | 224 | { |
Bobty | 11:cec51b430b20 | 225 | RD_DBG("CmdStr %s\n\r", cmdStr); |
Bobty | 11:cec51b430b20 | 226 | RD_DBG("ArgStr %s\n\r", argStr); |
Bobty | 7:fe7c33f7fbb8 | 227 | bool cmdFound = false; |
Bobty | 7:fe7c33f7fbb8 | 228 | for (std::vector<RdWebServerCmdDef*>::iterator it = _commands.begin() ; it != _commands.end(); ++it) |
Bobty | 6:46285c519af2 | 229 | { |
Bobty | 11:cec51b430b20 | 230 | RD_DBG("Testing <<%s>> with <<%s>>\r\n", (*it)->_pCmdStr, cmdStr); |
Bobty | 7:fe7c33f7fbb8 | 231 | if (strcasecmp((*it)->_pCmdStr, cmdStr) == 0) |
Bobty | 7:fe7c33f7fbb8 | 232 | { |
Bobty | 11:cec51b430b20 | 233 | RD_DBG("FoundCmd <%s> Type %d\n\r", cmdStr, (*it)->_cmdType); |
Bobty | 7:fe7c33f7fbb8 | 234 | cmdFound = true; |
Bobty | 7:fe7c33f7fbb8 | 235 | if ((*it)->_cmdType == RdWebServerCmdDef::CMD_CALLBACK) |
Bobty | 7:fe7c33f7fbb8 | 236 | { |
Bobty | 7:fe7c33f7fbb8 | 237 | char* respStr = ((*it)->_callback)(method, cmdStr, argStr); |
Bobty | 17:080f2bed8b36 | 238 | clientSocketConn.send(respStr, strlen(respStr)); |
Bobty | 6:46285c519af2 | 239 | } |
Bobty | 17:080f2bed8b36 | 240 | else if ( ((*it)->_cmdType == RdWebServerCmdDef::CMD_LOCALFILE) || |
Bobty | 17:080f2bed8b36 | 241 | ((*it)->_cmdType == RdWebServerCmdDef::CMD_SDORUSBFILE) ) |
Bobty | 7:fe7c33f7fbb8 | 242 | { |
Bobty | 17:080f2bed8b36 | 243 | char combinedFileName[MAX_FILENAME_LEN]; |
Bobty | 17:080f2bed8b36 | 244 | strcpy(combinedFileName, (*it)->_substFileName); |
Bobty | 17:080f2bed8b36 | 245 | if (strlen(combinedFileName) == 0) |
Bobty | 17:080f2bed8b36 | 246 | strcpy(combinedFileName, cmdStr); |
Bobty | 17:080f2bed8b36 | 247 | else if (combinedFileName[strlen(combinedFileName)-1] == '*') |
Bobty | 17:080f2bed8b36 | 248 | strcpy(combinedFileName+strlen(combinedFileName)-1, argStr); |
Bobty | 17:080f2bed8b36 | 249 | if ((*it)->_cmdType == RdWebServerCmdDef::CMD_LOCALFILE) |
Bobty | 17:080f2bed8b36 | 250 | handledOk = handleLocalFileRequest(combinedFileName, argStr, clientSocketConn, (*it)->_bCacheIfPossible); |
Bobty | 7:fe7c33f7fbb8 | 251 | else |
Bobty | 17:080f2bed8b36 | 252 | handledOk = handleSDFileRequest(combinedFileName, argStr, clientSocketConn); |
Bobty | 17:080f2bed8b36 | 253 | |
Bobty | 7:fe7c33f7fbb8 | 254 | } |
Bobty | 7:fe7c33f7fbb8 | 255 | break; |
Bobty | 6:46285c519af2 | 256 | } |
Bobty | 6:46285c519af2 | 257 | } |
Bobty | 7:fe7c33f7fbb8 | 258 | // If command not found see if it is a local file |
Bobty | 7:fe7c33f7fbb8 | 259 | if (!cmdFound) |
Bobty | 17:080f2bed8b36 | 260 | { |
Bobty | 17:080f2bed8b36 | 261 | char combinedFileName[MAX_FILENAME_LEN]; |
Bobty | 17:080f2bed8b36 | 262 | strcpy(combinedFileName, cmdStr); |
Bobty | 17:080f2bed8b36 | 263 | strcat(combinedFileName, "/"); |
Bobty | 17:080f2bed8b36 | 264 | strcat(combinedFileName, argStr); |
Bobty | 17:080f2bed8b36 | 265 | handledOk = handleSDFileRequest(cmdStr, argStr, clientSocketConn); |
Bobty | 17:080f2bed8b36 | 266 | } |
Bobty | 6:46285c519af2 | 267 | } |
Bobty | 17:080f2bed8b36 | 268 | return handledOk; |
Bobty | 6:46285c519af2 | 269 | } |
Bobty | 6:46285c519af2 | 270 | |
Bobty | 6:46285c519af2 | 271 | void RdWebServer::addCommand(char* pCmdStr, int cmdType, CmdCallbackType callback, char* substFileName, bool cacheIfPossible) |
Bobty | 6:46285c519af2 | 272 | { |
Bobty | 6:46285c519af2 | 273 | _commands.push_back(new RdWebServerCmdDef(pCmdStr, cmdType, callback, substFileName, cacheIfPossible)); |
Bobty | 6:46285c519af2 | 274 | } |
Bobty | 6:46285c519af2 | 275 | |
Bobty | 17:080f2bed8b36 | 276 | void RdWebServer::formHTTPHeader(const char* rsltCode, const char* contentType, int contentLen) |
Bobty | 17:080f2bed8b36 | 277 | { |
Bobty | 17:080f2bed8b36 | 278 | const char* closeConnStr = "\r\nConnection: Close"; |
Bobty | 17:080f2bed8b36 | 279 | if(contentLen != -1) |
Bobty | 17:080f2bed8b36 | 280 | sprintf(_httpHeader, "HTTP/1.1 %s\r\nContent-Type: %s\r\nContent-Length: %d%s\r\n\r\n", rsltCode, contentType, contentLen, _closeConnAfterSend ? closeConnStr : ""); |
Bobty | 17:080f2bed8b36 | 281 | else |
Bobty | 17:080f2bed8b36 | 282 | sprintf(_httpHeader, "HTTP/1.1 %s\r\nContent-Type: %s%s\r\n\r\n", rsltCode, contentType, _closeConnAfterSend ? closeConnStr : ""); |
Bobty | 17:080f2bed8b36 | 283 | } |
Bobty | 17:080f2bed8b36 | 284 | |
Bobty | 17:080f2bed8b36 | 285 | char* getMimeTypeStr(char* filename) |
Bobty | 6:46285c519af2 | 286 | { |
Bobty | 17:080f2bed8b36 | 287 | char* mimeType = "text/plain"; |
Bobty | 17:080f2bed8b36 | 288 | char *pDot = strrchr(filename, '.'); |
Bobty | 17:080f2bed8b36 | 289 | if (pDot && (!strcmp(pDot, ".html") || !strcmp(pDot, ".htm"))) |
Bobty | 17:080f2bed8b36 | 290 | mimeType = "text/html"; |
Bobty | 17:080f2bed8b36 | 291 | else if (pDot && !strcmp(pDot, ".css")) |
Bobty | 17:080f2bed8b36 | 292 | mimeType = "text/css"; |
Bobty | 17:080f2bed8b36 | 293 | else if (pDot && !strcmp(pDot, ".js")) |
Bobty | 17:080f2bed8b36 | 294 | mimeType = "application/javascript"; |
Bobty | 17:080f2bed8b36 | 295 | else if (pDot && !strcmp(pDot, ".png")) |
Bobty | 17:080f2bed8b36 | 296 | mimeType = "image/png"; |
Bobty | 17:080f2bed8b36 | 297 | else if (pDot && (!strcmp(pDot, ".jpeg") || !strcmp(pDot, ".jpeg"))) |
Bobty | 17:080f2bed8b36 | 298 | mimeType = "image/jpeg"; |
Bobty | 17:080f2bed8b36 | 299 | return mimeType; |
Bobty | 17:080f2bed8b36 | 300 | } |
Bobty | 17:080f2bed8b36 | 301 | |
Bobty | 17:080f2bed8b36 | 302 | bool RdWebServer::handleSDFileRequest(char* inFileName, char* argStr, TCPSocketConnection &clientSocketConn) |
Bobty | 17:080f2bed8b36 | 303 | { |
Bobty | 17:080f2bed8b36 | 304 | bool handledOk = false; |
Bobty | 6:46285c519af2 | 305 | const int HTTPD_MAX_FNAME_LENGTH = 127; |
Bobty | 6:46285c519af2 | 306 | char filename[HTTPD_MAX_FNAME_LENGTH+1]; |
Bobty | 6:46285c519af2 | 307 | |
Bobty | 11:cec51b430b20 | 308 | RD_INFO("Requesting file %s\n\r", inFileName); |
Bobty | 6:46285c519af2 | 309 | |
Bobty | 12:c14ffd4ec125 | 310 | #ifdef SUPPORT_FOLDER_VIEW |
Bobty | 10:b4b9d4d5e5be | 311 | if ((strlen(inFileName) > 0) && (inFileName[strlen(inFileName)-1] == '/')) |
Bobty | 6:46285c519af2 | 312 | { |
Bobty | 11:cec51b430b20 | 313 | RD_INFO("Request directory %s%s\r\n", _pBaseWebFolder, inFileName); |
Bobty | 6:46285c519af2 | 314 | sprintf(filename, "%s%s", _pBaseWebFolder, inFileName); |
Bobty | 6:46285c519af2 | 315 | DIR *d = opendir(filename); |
Bobty | 11:cec51b430b20 | 316 | if (d != NULL) |
Bobty | 11:cec51b430b20 | 317 | { |
Bobty | 17:080f2bed8b36 | 318 | formHTTPHeader("200 OK", "text/html", -1); |
Bobty | 17:080f2bed8b36 | 319 | clientSocketConn.send(_httpHeader,strlen(_httpHeader)); |
Bobty | 17:080f2bed8b36 | 320 | sprintf(_httpHeader,"<html><head><title>Directory Listing</title></head><body><h1>%s</h1><ul>", inFileName); |
Bobty | 17:080f2bed8b36 | 321 | clientSocketConn.send(_httpHeader,strlen(_httpHeader)); |
Bobty | 6:46285c519af2 | 322 | struct dirent *p; |
Bobty | 11:cec51b430b20 | 323 | while((p = readdir(d)) != NULL) |
Bobty | 11:cec51b430b20 | 324 | { |
Bobty | 11:cec51b430b20 | 325 | RD_INFO("%s\r\n", p->d_name); |
Bobty | 17:080f2bed8b36 | 326 | sprintf(_httpHeader,"<li>%s</li>", p->d_name); |
Bobty | 17:080f2bed8b36 | 327 | clientSocketConn.send(_httpHeader,strlen(_httpHeader)); |
Bobty | 6:46285c519af2 | 328 | } |
Bobty | 6:46285c519af2 | 329 | } |
Bobty | 6:46285c519af2 | 330 | closedir(d); |
Bobty | 11:cec51b430b20 | 331 | RD_DBG("Directory closed\n"); |
Bobty | 17:080f2bed8b36 | 332 | sprintf(_httpHeader,"</ul></body></html>"); |
Bobty | 17:080f2bed8b36 | 333 | clientSocketConn.send(_httpHeader,strlen(_httpHeader)); |
Bobty | 17:080f2bed8b36 | 334 | handledOk = true; |
Bobty | 6:46285c519af2 | 335 | } |
Bobty | 6:46285c519af2 | 336 | else |
Bobty | 12:c14ffd4ec125 | 337 | #endif |
Bobty | 6:46285c519af2 | 338 | { |
Bobty | 6:46285c519af2 | 339 | sprintf(filename, "%s%s", _pBaseWebFolder, inFileName); |
Bobty | 11:cec51b430b20 | 340 | RD_INFO("Filename %s\r\n", filename); |
Bobty | 6:46285c519af2 | 341 | |
Bobty | 6:46285c519af2 | 342 | FILE* fp = fopen(filename, "r"); |
Bobty | 6:46285c519af2 | 343 | if (fp == NULL) |
Bobty | 6:46285c519af2 | 344 | { |
Bobty | 11:cec51b430b20 | 345 | RD_WARN("Filename %s not found\r\n", filename); |
Bobty | 17:080f2bed8b36 | 346 | formHTTPHeader("404 Not Found", "text/plain", 0); |
Bobty | 17:080f2bed8b36 | 347 | clientSocketConn.send(_httpHeader,strlen(_httpHeader)); |
Bobty | 17:080f2bed8b36 | 348 | handledOk = true; |
Bobty | 6:46285c519af2 | 349 | } |
Bobty | 6:46285c519af2 | 350 | else |
Bobty | 6:46285c519af2 | 351 | { |
Bobty | 11:cec51b430b20 | 352 | RD_INFO("Sending file %s\r\n", filename); |
Bobty | 17:080f2bed8b36 | 353 | // Find file length |
Bobty | 14:4b83670854f0 | 354 | fseek(fp, 0L, SEEK_END); |
Bobty | 14:4b83670854f0 | 355 | int sz = ftell(fp); |
Bobty | 14:4b83670854f0 | 356 | fseek(fp, 0L, SEEK_SET); |
Bobty | 17:080f2bed8b36 | 357 | // Get mime type |
Bobty | 17:080f2bed8b36 | 358 | char* mimeType = getMimeTypeStr(filename); |
Bobty | 14:4b83670854f0 | 359 | RD_INFO("MIME TYPE %s", mimeType); |
Bobty | 17:080f2bed8b36 | 360 | // Form header |
Bobty | 17:080f2bed8b36 | 361 | formHTTPHeader("200 OK", mimeType, sz); |
Bobty | 17:080f2bed8b36 | 362 | clientSocketConn.send(_httpHeader,strlen(_httpHeader)); |
Bobty | 14:4b83670854f0 | 363 | // Read file in blocks and send |
Bobty | 6:46285c519af2 | 364 | int rdCnt = 0; |
Bobty | 6:46285c519af2 | 365 | char fileBuf[1024]; |
Bobty | 6:46285c519af2 | 366 | while ((rdCnt = fread(fileBuf, sizeof( char ), 1024, fp)) == 1024) |
Bobty | 6:46285c519af2 | 367 | { |
Bobty | 17:080f2bed8b36 | 368 | clientSocketConn.send(fileBuf, rdCnt); |
Bobty | 6:46285c519af2 | 369 | } |
Bobty | 17:080f2bed8b36 | 370 | clientSocketConn.send(fileBuf, rdCnt); |
Bobty | 6:46285c519af2 | 371 | fclose(fp); |
Bobty | 17:080f2bed8b36 | 372 | handledOk = true; |
Bobty | 6:46285c519af2 | 373 | } |
Bobty | 6:46285c519af2 | 374 | } |
Bobty | 17:080f2bed8b36 | 375 | return handledOk; |
Bobty | 6:46285c519af2 | 376 | } |
Bobty | 6:46285c519af2 | 377 | |
Bobty | 15:0865fa4b046a | 378 | #ifdef SUPPORT_LOCAL_FILE_CACHE |
Bobty | 15:0865fa4b046a | 379 | |
Bobty | 17:080f2bed8b36 | 380 | void RdWebServer::sendFromCache(RdFileCacheEntry* pCacheEntry, TCPSocketConnection &clientSocketConn) |
Bobty | 6:46285c519af2 | 381 | { |
Bobty | 11:cec51b430b20 | 382 | RD_INFO("Sending file %s from cache %d bytes\r\n", pCacheEntry->_fileName, pCacheEntry->_nFileLen); |
Bobty | 17:080f2bed8b36 | 383 | // Get mime type |
Bobty | 17:080f2bed8b36 | 384 | char* mimeType = getMimeTypeStr(pCacheEntry->_fileName); |
Bobty | 17:080f2bed8b36 | 385 | RD_INFO("MIME TYPE %s", mimeType); |
Bobty | 17:080f2bed8b36 | 386 | // Form header |
Bobty | 17:080f2bed8b36 | 387 | formHTTPHeader("200 OK", mimeType, pCacheEntry->_nFileLen); |
Bobty | 17:080f2bed8b36 | 388 | clientSocketConn.send(_httpHeader,strlen(_httpHeader)); |
Bobty | 6:46285c519af2 | 389 | char* pMem = pCacheEntry->_pFileContent; |
Bobty | 6:46285c519af2 | 390 | int nLenLeft = pCacheEntry->_nFileLen; |
Bobty | 6:46285c519af2 | 391 | int blkSize = 2048; |
Bobty | 6:46285c519af2 | 392 | while(nLenLeft > 0) |
Bobty | 6:46285c519af2 | 393 | { |
Bobty | 6:46285c519af2 | 394 | if (blkSize > nLenLeft) |
Bobty | 6:46285c519af2 | 395 | blkSize = nLenLeft; |
Bobty | 17:080f2bed8b36 | 396 | clientSocketConn.send(pMem, blkSize); |
Bobty | 6:46285c519af2 | 397 | pMem += blkSize; |
Bobty | 6:46285c519af2 | 398 | nLenLeft -= blkSize; |
Bobty | 6:46285c519af2 | 399 | } |
Bobty | 6:46285c519af2 | 400 | } |
Bobty | 15:0865fa4b046a | 401 | #endif |
Bobty | 6:46285c519af2 | 402 | |
Bobty | 17:080f2bed8b36 | 403 | bool RdWebServer::handleLocalFileRequest(char* inFileName, char* argStr, TCPSocketConnection &clientSocketConn, bool bCacheIfPossible) |
Bobty | 6:46285c519af2 | 404 | { |
Bobty | 12:c14ffd4ec125 | 405 | |
Bobty | 12:c14ffd4ec125 | 406 | #ifdef SUPPORT_LOCAL_FILESYSTEM |
Bobty | 12:c14ffd4ec125 | 407 | |
Bobty | 6:46285c519af2 | 408 | const int HTTPD_MAX_FNAME_LENGTH = 127; |
Bobty | 6:46285c519af2 | 409 | char localFilename[HTTPD_MAX_FNAME_LENGTH+1]; |
Bobty | 6:46285c519af2 | 410 | char reqFileNameStr[HTTPD_MAX_FNAME_LENGTH+1]; |
Bobty | 6:46285c519af2 | 411 | |
Bobty | 11:cec51b430b20 | 412 | RD_INFO("Requesting local file %s\n\r", inFileName); |
Bobty | 6:46285c519af2 | 413 | sprintf(reqFileNameStr, "/%s", inFileName); |
Bobty | 6:46285c519af2 | 414 | sprintf(localFilename, "/local/%s", inFileName); |
Bobty | 6:46285c519af2 | 415 | |
Bobty | 6:46285c519af2 | 416 | if (bCacheIfPossible) |
Bobty | 6:46285c519af2 | 417 | { |
Bobty | 6:46285c519af2 | 418 | // Check if file already cached |
Bobty | 6:46285c519af2 | 419 | bool bTryToCache = true; |
Bobty | 6:46285c519af2 | 420 | for (std::vector<RdFileCacheEntry*>::iterator it = _cachedFiles.begin() ; it != _cachedFiles.end(); ++it) |
Bobty | 6:46285c519af2 | 421 | { |
Bobty | 6:46285c519af2 | 422 | if (strcmp(inFileName, (*it)->_fileName) == 0) |
Bobty | 6:46285c519af2 | 423 | { |
Bobty | 6:46285c519af2 | 424 | if ((*it)->_bCacheValid) |
Bobty | 6:46285c519af2 | 425 | { |
Bobty | 15:0865fa4b046a | 426 | sendFromCache(*it, clientSocketConn, httpHeader); |
Bobty | 17:080f2bed8b36 | 427 | return true; |
Bobty | 6:46285c519af2 | 428 | } |
Bobty | 6:46285c519af2 | 429 | bTryToCache = false; // don't try to cache as cacheing must have already failed |
Bobty | 6:46285c519af2 | 430 | } |
Bobty | 6:46285c519af2 | 431 | } |
Bobty | 6:46285c519af2 | 432 | |
Bobty | 6:46285c519af2 | 433 | // See if we can cache the file |
Bobty | 6:46285c519af2 | 434 | if (bTryToCache) |
Bobty | 6:46285c519af2 | 435 | { |
Bobty | 6:46285c519af2 | 436 | RdFileCacheEntry* pCacheEntry = new RdFileCacheEntry(inFileName); |
Bobty | 6:46285c519af2 | 437 | if (pCacheEntry) |
Bobty | 6:46285c519af2 | 438 | { |
Bobty | 6:46285c519af2 | 439 | bool bCacheSuccess = pCacheEntry->readLocalFileIntoCache(localFilename); |
Bobty | 6:46285c519af2 | 440 | // 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 | 441 | _cachedFiles.push_back(pCacheEntry); |
Bobty | 6:46285c519af2 | 442 | if (bCacheSuccess) |
Bobty | 6:46285c519af2 | 443 | { |
Bobty | 15:0865fa4b046a | 444 | sendFromCache(pCacheEntry, clientSocketConn, httpHeader); |
Bobty | 17:080f2bed8b36 | 445 | return true; |
Bobty | 6:46285c519af2 | 446 | } |
Bobty | 6:46285c519af2 | 447 | } |
Bobty | 6:46285c519af2 | 448 | } |
Bobty | 6:46285c519af2 | 449 | } |
Bobty | 6:46285c519af2 | 450 | |
Bobty | 6:46285c519af2 | 451 | LocalFileSystem local("local"); |
Bobty | 6:46285c519af2 | 452 | |
Bobty | 6:46285c519af2 | 453 | FILE* fp = fopen(localFilename, "r"); |
Bobty | 6:46285c519af2 | 454 | if (fp == NULL) |
Bobty | 6:46285c519af2 | 455 | { |
Bobty | 11:cec51b430b20 | 456 | RD_WARN("Local file %s not found\r\n", localFilename); |
Bobty | 17:080f2bed8b36 | 457 | formHTTPHeader("404 Not Found", "text/plain", 0); |
Bobty | 17:080f2bed8b36 | 458 | clientSocketConn.send(_httpHeader,strlen(_httpHeader)); |
Bobty | 17:080f2bed8b36 | 459 | return true; |
Bobty | 6:46285c519af2 | 460 | } |
Bobty | 6:46285c519af2 | 461 | else |
Bobty | 6:46285c519af2 | 462 | { |
Bobty | 11:cec51b430b20 | 463 | RD_INFO("Sending file %s from disk\r\n", localFilename); |
Bobty | 17:080f2bed8b36 | 464 | // Find file length |
Bobty | 17:080f2bed8b36 | 465 | fseek(fp, 0L, SEEK_END); |
Bobty | 17:080f2bed8b36 | 466 | int sz = ftell(fp); |
Bobty | 17:080f2bed8b36 | 467 | fseek(fp, 0L, SEEK_SET); |
Bobty | 17:080f2bed8b36 | 468 | // Get mime type |
Bobty | 17:080f2bed8b36 | 469 | char* mimeType = getMimeTypeStr(localFilename); |
Bobty | 17:080f2bed8b36 | 470 | RD_INFO("MIME TYPE %s", mimeType); |
Bobty | 17:080f2bed8b36 | 471 | // Form header |
Bobty | 17:080f2bed8b36 | 472 | formHTTPHeader("200 OK", mimeType, sz); |
Bobty | 17:080f2bed8b36 | 473 | clientSocketConn.send(_httpHeader,strlen(_httpHeader)); |
Bobty | 6:46285c519af2 | 474 | int rdCnt = 0; |
Bobty | 17:080f2bed8b36 | 475 | while ((rdCnt = fread(_httpHeader, sizeof( char ), sizeof(_httpHeader), fp)) == sizeof(_httpHeader)) |
Bobty | 6:46285c519af2 | 476 | { |
Bobty | 17:080f2bed8b36 | 477 | clientSocketConn.send(_httpHeader, rdCnt); |
Bobty | 6:46285c519af2 | 478 | } |
Bobty | 17:080f2bed8b36 | 479 | if (rdCnt != 0) |
Bobty | 17:080f2bed8b36 | 480 | clientSocketConn.send(_httpHeader, rdCnt); |
Bobty | 6:46285c519af2 | 481 | fclose(fp); |
Bobty | 17:080f2bed8b36 | 482 | return true; |
Bobty | 6:46285c519af2 | 483 | } |
Bobty | 12:c14ffd4ec125 | 484 | |
Bobty | 12:c14ffd4ec125 | 485 | #else |
Bobty | 12:c14ffd4ec125 | 486 | |
Bobty | 12:c14ffd4ec125 | 487 | RD_WARN("Local file system not supported\r\n"); |
Bobty | 17:080f2bed8b36 | 488 | formHTTPHeader("404 Not Found", "text/plain", 0); |
Bobty | 17:080f2bed8b36 | 489 | clientSocketConn.send(_httpHeader,strlen(_httpHeader)); |
Bobty | 17:080f2bed8b36 | 490 | return true; |
Bobty | 12:c14ffd4ec125 | 491 | |
Bobty | 12:c14ffd4ec125 | 492 | #endif |
Bobty | 6:46285c519af2 | 493 | } |
Bobty | 6:46285c519af2 | 494 | |
Bobty | 15:0865fa4b046a | 495 | #ifdef SUPPORT_LOCAL_FILE_CACHE |
Bobty | 15:0865fa4b046a | 496 | |
Bobty | 6:46285c519af2 | 497 | bool RdFileCacheEntry::readLocalFileIntoCache(char* fileName) |
Bobty | 6:46285c519af2 | 498 | { |
Bobty | 12:c14ffd4ec125 | 499 | #ifdef SUPPORT_LOCAL_FILESYSTEM |
Bobty | 12:c14ffd4ec125 | 500 | |
Bobty | 11:cec51b430b20 | 501 | RD_INFO("Reading into cache %s\n\r", fileName); |
Bobty | 6:46285c519af2 | 502 | LocalFileSystem local("local"); |
Bobty | 6:46285c519af2 | 503 | FILE* fp = fopen(fileName, "r"); |
Bobty | 6:46285c519af2 | 504 | if (fp == NULL) |
Bobty | 6:46285c519af2 | 505 | { |
Bobty | 11:cec51b430b20 | 506 | RD_WARN("Failed to open file\n\r"); |
Bobty | 6:46285c519af2 | 507 | return false; |
Bobty | 6:46285c519af2 | 508 | } |
Bobty | 11:cec51b430b20 | 509 | RD_DBG("Seeking\n\r"); |
Bobty | 6:46285c519af2 | 510 | fseek(fp, 0, SEEK_END); |
Bobty | 6:46285c519af2 | 511 | _nFileLen = (int)ftell(fp); |
Bobty | 6:46285c519af2 | 512 | _pFileContent = new char[_nFileLen]; |
Bobty | 11:cec51b430b20 | 513 | RD_DBG("Len %d Buf %08x\n\r", _nFileLen, _pFileContent); |
Bobty | 6:46285c519af2 | 514 | if (!_pFileContent) |
Bobty | 6:46285c519af2 | 515 | { |
Bobty | 11:cec51b430b20 | 516 | RD_WARN("Failed to allocate %lu\n\r", _nFileLen); |
Bobty | 6:46285c519af2 | 517 | fclose(fp); |
Bobty | 6:46285c519af2 | 518 | return false; |
Bobty | 6:46285c519af2 | 519 | } |
Bobty | 11:cec51b430b20 | 520 | RD_DBG("Allocated\n\r"); |
Bobty | 6:46285c519af2 | 521 | memset(_pFileContent, 0, _nFileLen); |
Bobty | 6:46285c519af2 | 522 | fseek(fp, 0, SEEK_SET); |
Bobty | 6:46285c519af2 | 523 | char* pMem = _pFileContent; |
Bobty | 6:46285c519af2 | 524 | char fileBuf[100]; |
Bobty | 6:46285c519af2 | 525 | int totCnt = 0; |
Bobty | 6:46285c519af2 | 526 | int rdCnt = 0; |
Bobty | 11:cec51b430b20 | 527 | RD_DBG("Reading\n\r"); |
Bobty | 6:46285c519af2 | 528 | while (true) |
Bobty | 6:46285c519af2 | 529 | { |
Bobty | 6:46285c519af2 | 530 | int toRead = _nFileLen - totCnt; |
Bobty | 6:46285c519af2 | 531 | if (toRead > sizeof(fileBuf)) |
Bobty | 6:46285c519af2 | 532 | toRead = sizeof(fileBuf); |
Bobty | 6:46285c519af2 | 533 | if (toRead <= 0) |
Bobty | 6:46285c519af2 | 534 | break; |
Bobty | 6:46285c519af2 | 535 | rdCnt = fread(fileBuf, sizeof(char), toRead, fp); |
Bobty | 6:46285c519af2 | 536 | if (rdCnt <= 0) |
Bobty | 6:46285c519af2 | 537 | break; |
Bobty | 11:cec51b430b20 | 538 | RD_DBG("Read %d tot %d of %d\n\r", rdCnt, totCnt, _nFileLen); |
Bobty | 6:46285c519af2 | 539 | memcpy(pMem, fileBuf, rdCnt); |
Bobty | 6:46285c519af2 | 540 | pMem += rdCnt; |
Bobty | 6:46285c519af2 | 541 | totCnt += rdCnt; |
Bobty | 6:46285c519af2 | 542 | } |
Bobty | 11:cec51b430b20 | 543 | RD_DBG("Done read\n\r"); |
Bobty | 6:46285c519af2 | 544 | fclose(fp); |
Bobty | 11:cec51b430b20 | 545 | RD_DBG("Success in caching %d bytes (read %d)\n\r", _nFileLen, totCnt); |
Bobty | 6:46285c519af2 | 546 | _bCacheValid = true; |
Bobty | 0:b5b4d07f7827 | 547 | return true; |
Bobty | 12:c14ffd4ec125 | 548 | #else |
Bobty | 12:c14ffd4ec125 | 549 | return false; |
Bobty | 12:c14ffd4ec125 | 550 | #endif |
Bobty | 0:b5b4d07f7827 | 551 | } |
Bobty | 0:b5b4d07f7827 | 552 | |
Bobty | 15:0865fa4b046a | 553 | #endif |
Bobty | 15:0865fa4b046a | 554 | |
Bobty | 1:75bb184de749 | 555 | bool RdWebServer::extractCmdArgs(char* buf, char* pCmdStr, int maxCmdStrLen, char* pArgStr, int maxArgStrLen) |
Bobty | 1:75bb184de749 | 556 | { |
Bobty | 1:75bb184de749 | 557 | *pCmdStr = '\0'; |
Bobty | 1:75bb184de749 | 558 | *pArgStr = '\0'; |
Bobty | 1:75bb184de749 | 559 | int cmdStrLen = 0; |
Bobty | 1:75bb184de749 | 560 | int argStrLen = 0; |
Bobty | 1:75bb184de749 | 561 | if (buf == NULL) |
Bobty | 1:75bb184de749 | 562 | return false; |
Bobty | 7:fe7c33f7fbb8 | 563 | // Check for first slash |
Bobty | 1:75bb184de749 | 564 | char* pSlash1 = strchr(buf, '/'); |
Bobty | 1:75bb184de749 | 565 | if (pSlash1 == NULL) |
Bobty | 1:75bb184de749 | 566 | return false; |
Bobty | 1:75bb184de749 | 567 | pSlash1++; |
Bobty | 7:fe7c33f7fbb8 | 568 | // Extract command |
Bobty | 1:75bb184de749 | 569 | while(*pSlash1) |
Bobty | 1:75bb184de749 | 570 | { |
Bobty | 1:75bb184de749 | 571 | if (cmdStrLen >= maxCmdStrLen-1) |
Bobty | 1:75bb184de749 | 572 | break; |
Bobty | 7:fe7c33f7fbb8 | 573 | if ((*pSlash1 == '/') || (*pSlash1 == ' ') || (*pSlash1 == '\n') || (*pSlash1 == '?') || (*pSlash1 == '&')) |
Bobty | 1:75bb184de749 | 574 | break; |
Bobty | 1:75bb184de749 | 575 | *pCmdStr++ = *pSlash1++; |
Bobty | 1:75bb184de749 | 576 | *pCmdStr = '\0'; |
Bobty | 1:75bb184de749 | 577 | cmdStrLen++; |
Bobty | 1:75bb184de749 | 578 | } |
Bobty | 1:75bb184de749 | 579 | if ((*pSlash1 == '\0') || (*pSlash1 == ' ') || (*pSlash1 == '\n')) |
Bobty | 1:75bb184de749 | 580 | return true; |
Bobty | 7:fe7c33f7fbb8 | 581 | // Now args |
Bobty | 1:75bb184de749 | 582 | *pSlash1++; |
Bobty | 1:75bb184de749 | 583 | while(*pSlash1) |
Bobty | 1:75bb184de749 | 584 | { |
Bobty | 1:75bb184de749 | 585 | if (argStrLen >= maxArgStrLen-1) |
Bobty | 1:75bb184de749 | 586 | break; |
Bobty | 1:75bb184de749 | 587 | if ((*pSlash1 == ' ') || (*pSlash1 == '\n')) |
Bobty | 1:75bb184de749 | 588 | break; |
Bobty | 1:75bb184de749 | 589 | *pArgStr++ = *pSlash1++; |
Bobty | 1:75bb184de749 | 590 | *pArgStr = '\0'; |
Bobty | 1:75bb184de749 | 591 | argStrLen++; |
Bobty | 1:75bb184de749 | 592 | } |
Bobty | 1:75bb184de749 | 593 | return true; |
Bobty | 1:75bb184de749 | 594 | } |