David Smart / SW_HTTPServer

A simple web server that can be bound to either the EthernetInterface or the WiflyInterface.

Dependents:   Smart-WiFly-WebServer WattEye X10Svr SSDP_Server

SW_HTTPServer.cpp@8:262583f054f6, 2013-07-01 (annotated)

Committer:
WiredHome
Date:
Mon Jul 01 04:36:54 2013 +0000
Revision:
8:262583f054f6
Parent:
7:99ad7a67f05e
Child:
9:2ea342765c9d
Some refactoring while working issues with the wifly interface.

Who changed what in which revision?

UserRevisionLine numberNew contents of line
WiredHome 0:729320f63c5c 1 //
WiredHome 2:a29c32190037 2 // @note Copyright © 2013 by Smartware Computing, all rights reserved.
WiredHome 0:729320f63c5c 3 // Individuals may use this application for evaluation or non-commercial
WiredHome 0:729320f63c5c 4 // purposes. Within this restriction, changes may be made to this application
WiredHome 0:729320f63c5c 5 // as long as this copyright notice is retained. The user shall make
WiredHome 0:729320f63c5c 6 // clear that their work is a derived work, and not the original.
WiredHome 0:729320f63c5c 7 // Users of this application and sources accept this application "as is" and
WiredHome 0:729320f63c5c 8 // shall hold harmless Smartware Computing, for any undesired results while
WiredHome 0:729320f63c5c 9 // using this application - whether real or imagined.
WiredHome 0:729320f63c5c 10 //
WiredHome 0:729320f63c5c 11 // author David Smart, Smartware Computing
WiredHome 0:729320f63c5c 12 //
WiredHome 0:729320f63c5c 13 #include "mbed.h"
WiredHome 0:729320f63c5c 14 #include "SW_HTTPServer.h"
WiredHome 0:729320f63c5c 15 #include "Utility.h"
WiredHome 0:729320f63c5c 16
WiredHome 8:262583f054f6 17 //#define DEBUG
WiredHome 0:729320f63c5c 18
WiredHome 0:729320f63c5c 19 const char * DEFAULT_FILENAME = "index.htm";
WiredHome 0:729320f63c5c 20
WiredHome 8:262583f054f6 21 // Header information to always send (must be \r\n terminated)
WiredHome 8:262583f054f6 22 const char hdr_httpver[] = "HTTP/1.0"; // typically HTTP/1.0 or HTTP/1.1
WiredHome 8:262583f054f6 23 const char hdr_age[] = "Max-age: 0\r\n"; // expires right away
WiredHome 8:262583f054f6 24 const char hdr_server[] = "Server: Smart_Server v0.1\r\n"; // Server
WiredHome 8:262583f054f6 25 const char hdr_dnt[] = "DNT: 1\r\n"; // Do Not Track
WiredHome 8:262583f054f6 26 const char hdr_close[] = "Connection: close\r\n"; // tell the client to close the connection
WiredHome 8:262583f054f6 27 const char nl[] = "\r\n"; // final \r\n for the termination of the header
WiredHome 0:729320f63c5c 28
WiredHome 0:729320f63c5c 29 static const struct {
WiredHome 0:729320f63c5c 30 char *ext;
WiredHome 0:729320f63c5c 31 char *filetype;
WiredHome 0:729320f63c5c 32 } extensions [] = {
WiredHome 3:17928786bdb5 33 {".gif", "Content-Type: image/gif\r\n" },
WiredHome 3:17928786bdb5 34 {".jpg", "Content-Type: image/jpeg\r\n" },
WiredHome 3:17928786bdb5 35 {".jpeg","Content-Type: image/jpeg\r\n" },
WiredHome 3:17928786bdb5 36 {".ico", "Content-Type: image/x-icon\r\n" },
WiredHome 3:17928786bdb5 37 {".png", "Content-Type: image/png\r\n" },
WiredHome 3:17928786bdb5 38 {".zip", "Content-Type: image/zip\r\n" },
WiredHome 3:17928786bdb5 39 {".gz", "Content-Type: image/gz\r\n" },
WiredHome 3:17928786bdb5 40 {".tar", "Content-Type: image/tar\r\n" },
WiredHome 3:17928786bdb5 41 {".txt", "Content-Type: plain/text\r\n" },
WiredHome 3:17928786bdb5 42 {".pdf", "Content-Type: application/pdf\r\n" },
WiredHome 3:17928786bdb5 43 {".htm", "Content-Type: text/html\r\n" },
WiredHome 3:17928786bdb5 44 {".html","Content-Type: text/html\r\n" },
WiredHome 0:729320f63c5c 45 {0,0}
WiredHome 0:729320f63c5c 46 };
WiredHome 0:729320f63c5c 47
WiredHome 8:262583f054f6 48 #ifdef DEBUG
WiredHome 8:262583f054f6 49 static void * MyMalloc(int x, int y)
WiredHome 8:262583f054f6 50 {
WiredHome 8:262583f054f6 51 std::printf("[%04d] malloc(%d)\r\n", y, x);
WiredHome 8:262583f054f6 52 return malloc(x);
WiredHome 8:262583f054f6 53 }
WiredHome 8:262583f054f6 54 #define mymalloc(x) MyMalloc(x, __LINE__)
WiredHome 8:262583f054f6 55 #define myfree(x) \
WiredHome 8:262583f054f6 56 pc->printf("[%04d] free(%02x %02x %02x %02x ...\r\n", __LINE__, *x, *(x+1), *(x+2), *(x+3)); \
WiredHome 8:262583f054f6 57 free(x);
WiredHome 8:262583f054f6 58 #else
WiredHome 8:262583f054f6 59 #define mymalloc(x) malloc(x)
WiredHome 8:262583f054f6 60 #define myfree(x) free(x)
WiredHome 8:262583f054f6 61 #endif
WiredHome 8:262583f054f6 62
WiredHome 3:17928786bdb5 63 HTTPServer::HTTPServer(
WiredHome 7:99ad7a67f05e 64 Wifly * _wf,
WiredHome 7:99ad7a67f05e 65 int port,
WiredHome 7:99ad7a67f05e 66 const char * _webroot,
WiredHome 7:99ad7a67f05e 67 int _maxparams,
WiredHome 7:99ad7a67f05e 68 int _maxdynamicpages,
WiredHome 7:99ad7a67f05e 69 PC * _pc,
WiredHome 7:99ad7a67f05e 70 int _allocforheader,
WiredHome 3:17928786bdb5 71 int _allocforfile)
WiredHome 0:729320f63c5c 72 {
WiredHome 0:729320f63c5c 73 wifly = _wf;
WiredHome 0:729320f63c5c 74 webroot = (char *)malloc(strlen(_webroot)+1);
WiredHome 0:729320f63c5c 75 strcpy(webroot, _webroot);
WiredHome 0:729320f63c5c 76 maxparams = _maxparams;
WiredHome 0:729320f63c5c 77 maxdynamicpages = _maxdynamicpages;
WiredHome 0:729320f63c5c 78 params = (namevalue *)malloc(maxparams * sizeof(namevalue));
WiredHome 0:729320f63c5c 79 handlers = (handler *)malloc(maxdynamicpages * sizeof(handler));
WiredHome 3:17928786bdb5 80 headerbuffersize = _allocforheader;
WiredHome 3:17928786bdb5 81 headerbuffer = (char *)malloc(headerbuffersize);
WiredHome 0:729320f63c5c 82 pc = _pc;
WiredHome 3:17928786bdb5 83 queryType = NULL;
WiredHome 3:17928786bdb5 84 queryString = NULL;
WiredHome 3:17928786bdb5 85 hostString = NULL;
WiredHome 3:17928786bdb5 86 contentLength = NULL;
WiredHome 3:17928786bdb5 87 contentType = NULL;
WiredHome 3:17928786bdb5 88 postQueryString = NULL;
WiredHome 0:729320f63c5c 89 paramcount = 0;
WiredHome 0:729320f63c5c 90 handlercount = 0;
WiredHome 3:17928786bdb5 91 maxheaderbytes = 0;
WiredHome 0:729320f63c5c 92 server = new TCPSocketServer();
WiredHome 0:729320f63c5c 93 server->bind(port);
WiredHome 0:729320f63c5c 94 server->listen();
WiredHome 8:262583f054f6 95 // server->set_blocking(false, 0);
WiredHome 8:262583f054f6 96 // client.set_blocking(false, 0);
WiredHome 8:262583f054f6 97 // server->accept(client);
WiredHome 3:17928786bdb5 98 ResetPerformanceData();
WiredHome 3:17928786bdb5 99 timer.start();
WiredHome 0:729320f63c5c 100 }
WiredHome 0:729320f63c5c 101
WiredHome 0:729320f63c5c 102 HTTPServer::~HTTPServer()
WiredHome 0:729320f63c5c 103 {
WiredHome 8:262583f054f6 104 int i;
WiredHome 8:262583f054f6 105
WiredHome 8:262583f054f6 106 for (i=0; i<handlercount; i++)
WiredHome 8:262583f054f6 107 myfree(handlers[i].path);
WiredHome 8:262583f054f6 108 myfree(headerbuffer);
WiredHome 8:262583f054f6 109 myfree(handlers);
WiredHome 8:262583f054f6 110 myfree(params);
WiredHome 8:262583f054f6 111 myfree(webroot);
WiredHome 0:729320f63c5c 112 webroot = NULL;
WiredHome 0:729320f63c5c 113 }
WiredHome 0:729320f63c5c 114
WiredHome 3:17928786bdb5 115 int HTTPServer::GetMaxHeaderSize()
WiredHome 3:17928786bdb5 116 {
WiredHome 3:17928786bdb5 117 return maxheaderbytes;
WiredHome 3:17928786bdb5 118 }
WiredHome 3:17928786bdb5 119
WiredHome 0:729320f63c5c 120 bool HTTPServer::RegisterHandler(const char * path, Handler callback)
WiredHome 0:729320f63c5c 121 {
WiredHome 0:729320f63c5c 122 if (handlercount < maxdynamicpages && path && callback) {
WiredHome 8:262583f054f6 123 handlers[handlercount].path = (char *)mymalloc(strlen(path)+1);
WiredHome 0:729320f63c5c 124 memcpy(handlers[handlercount].path, path, strlen(path)+1);
WiredHome 0:729320f63c5c 125 handlers[handlercount].callback = callback;
WiredHome 0:729320f63c5c 126 handlercount++;
WiredHome 0:729320f63c5c 127 return true;
WiredHome 0:729320f63c5c 128 } else {
WiredHome 0:729320f63c5c 129 return false;
WiredHome 0:729320f63c5c 130 }
WiredHome 0:729320f63c5c 131 }
WiredHome 0:729320f63c5c 132
WiredHome 2:a29c32190037 133 // Poll()
WiredHome 0:729320f63c5c 134 //
WiredHome 0:729320f63c5c 135 // *OPEN*GET /x=1 HTTP/1.1
WiredHome 0:729320f63c5c 136 // Host: 192.168.1.140
WiredHome 0:729320f63c5c 137 // Connection: keep-alive
WiredHome 0:729320f63c5c 138 // Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
WiredHome 0:729320f63c5c 139 // User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.94 Safari/537.36
WiredHome 0:729320f63c5c 140 // Accept-Encoding: gzip,deflate,sdch
WiredHome 0:729320f63c5c 141 // Accept-Language: en-US,en;q=0.8
WiredHome 0:729320f63c5c 142 //
WiredHome 2:a29c32190037 143 void HTTPServer::Poll()
WiredHome 0:729320f63c5c 144 {
WiredHome 3:17928786bdb5 145 typedef enum {
WiredHome 3:17928786bdb5 146 Idle, // waiting for a connection
WiredHome 3:17928786bdb5 147 Receiving, // receiving data
WiredHome 3:17928786bdb5 148 Sending, // send the response
WiredHome 7:99ad7a67f05e 149 WaitingToClose, // small timeout to close
WiredHome 7:99ad7a67f05e 150 Reset
WiredHome 3:17928786bdb5 151 } state;
WiredHome 0:729320f63c5c 152 static state op = Idle;
WiredHome 3:17928786bdb5 153 static char * bPtr = headerbuffer;
WiredHome 0:729320f63c5c 154 int n;
WiredHome 3:17928786bdb5 155 static int t_ref; // reference point for the timer
WiredHome 0:729320f63c5c 156
WiredHome 8:262583f054f6 157 #ifdef DEBUG
WiredHome 8:262583f054f6 158 static state lastOp = Reset;
WiredHome 7:99ad7a67f05e 159 if (lastOp != op) {
WiredHome 8:262583f054f6 160 char *states[] = {"Idle", "Receiving", "Sending", "WaitingToClose", "Reset"};
WiredHome 8:262583f054f6 161 pc->printf("Poll: %s\r\n", states[op]);
WiredHome 7:99ad7a67f05e 162 lastOp = op;
WiredHome 7:99ad7a67f05e 163 }
WiredHome 8:262583f054f6 164 #endif
WiredHome 0:729320f63c5c 165 switch(op) {
WiredHome 3:17928786bdb5 166 default: // not expected to arrive here
WiredHome 3:17928786bdb5 167 op = Idle;
WiredHome 3:17928786bdb5 168 break;
WiredHome 8:262583f054f6 169
WiredHome 3:17928786bdb5 170 case Idle:
WiredHome 3:17928786bdb5 171 timer.reset();
WiredHome 3:17928786bdb5 172 bPtr = headerbuffer;
WiredHome 8:262583f054f6 173 if (0 == server->accept(client)) { // client.receive(bPtr, 0)) { // server->accept(client) == 0) {
WiredHome 3:17928786bdb5 174 op = Receiving;
WiredHome 3:17928786bdb5 175 t_ref = timer.read_us();
WiredHome 8:262583f054f6 176 #ifdef DEBUG
WiredHome 8:262583f054f6 177 pc->printf("Accept at %d\r\n", t_ref);
WiredHome 8:262583f054f6 178 #endif
WiredHome 3:17928786bdb5 179 }
WiredHome 0:729320f63c5c 180 break;
WiredHome 8:262583f054f6 181
WiredHome 3:17928786bdb5 182 case Receiving:
WiredHome 3:17928786bdb5 183 n = client.receive(bPtr, headerbuffersize - (bPtr - headerbuffer));
WiredHome 3:17928786bdb5 184 if (n < 0) {
WiredHome 8:262583f054f6 185 pc->printf("*** client.receive() => %d\r\n", n);
WiredHome 3:17928786bdb5 186 } else if (n) {
WiredHome 3:17928786bdb5 187 bPtr[n] = '\0';
WiredHome 3:17928786bdb5 188 if (ParseHeader(headerbuffer)) {
WiredHome 3:17928786bdb5 189 op = Sending;
WiredHome 3:17928786bdb5 190 t_ref = RecordPerformanceData(&perfData.Header, t_ref);
WiredHome 3:17928786bdb5 191 }
WiredHome 3:17928786bdb5 192 bPtr += n;
WiredHome 0:729320f63c5c 193 }
WiredHome 0:729320f63c5c 194 break;
WiredHome 8:262583f054f6 195
WiredHome 0:729320f63c5c 196 case Sending:
WiredHome 3:17928786bdb5 197 SendResponse();
WiredHome 0:729320f63c5c 198 op = WaitingToClose;
WiredHome 3:17928786bdb5 199 RecordPerformanceData(&perfData.SendData, t_ref);
WiredHome 0:729320f63c5c 200 break;
WiredHome 0:729320f63c5c 201 case WaitingToClose:
WiredHome 3:17928786bdb5 202 close_connection();
WiredHome 0:729320f63c5c 203 op = Idle;
WiredHome 0:729320f63c5c 204 break;
WiredHome 0:729320f63c5c 205 }
WiredHome 0:729320f63c5c 206 }
WiredHome 0:729320f63c5c 207
WiredHome 0:729320f63c5c 208
WiredHome 0:729320f63c5c 209 const char * HTTPServer::GetSupportedType(const char * filename)
WiredHome 0:729320f63c5c 210 {
WiredHome 0:729320f63c5c 211 int i;
WiredHome 0:729320f63c5c 212 int buflen = strlen(filename);
WiredHome 0:729320f63c5c 213 int extlen;
WiredHome 0:729320f63c5c 214
WiredHome 0:729320f63c5c 215 for (i=0; extensions[i].ext != 0; i++) {
WiredHome 0:729320f63c5c 216 extlen = strlen(extensions[i].ext);
WiredHome 0:729320f63c5c 217 if ( !strncmp(&filename[buflen-extlen], extensions[i].ext, extlen)) {
WiredHome 0:729320f63c5c 218 return extensions[i].filetype;
WiredHome 0:729320f63c5c 219 }
WiredHome 0:729320f63c5c 220 }
WiredHome 0:729320f63c5c 221 return NULL;
WiredHome 0:729320f63c5c 222 }
WiredHome 0:729320f63c5c 223
WiredHome 3:17928786bdb5 224
WiredHome 0:729320f63c5c 225 void HTTPServer::send(const char * msg, int bytes)
WiredHome 0:729320f63c5c 226 {
WiredHome 0:729320f63c5c 227 if (bytes == -1)
WiredHome 0:729320f63c5c 228 bytes = strlen(msg);
WiredHome 0:729320f63c5c 229 wifly->send(msg, bytes);
WiredHome 0:729320f63c5c 230 }
WiredHome 0:729320f63c5c 231
WiredHome 3:17928786bdb5 232
WiredHome 0:729320f63c5c 233 bool HTTPServer::SendFile(const char * filename, const char * filetype)
WiredHome 0:729320f63c5c 234 {
WiredHome 0:729320f63c5c 235 FILE * fp;
WiredHome 3:17928786bdb5 236
WiredHome 0:729320f63c5c 237 fp = fopen(filename,"rb");
WiredHome 0:729320f63c5c 238 if (fp) { // can open it
WiredHome 8:262583f054f6 239 char *fbuffer = (char *)mymalloc(FILESEND_BUF_SIZE);
WiredHome 0:729320f63c5c 240 int bytes;
WiredHome 0:729320f63c5c 241
WiredHome 3:17928786bdb5 242 if (fbuffer) {
WiredHome 3:17928786bdb5 243 header(200, "OK", filetype);
WiredHome 0:729320f63c5c 244 bytes = fread(fbuffer,sizeof(char),FILESEND_BUF_SIZE,fp);
WiredHome 3:17928786bdb5 245 while (bytes > 0) {
WiredHome 3:17928786bdb5 246 send(fbuffer, bytes);
WiredHome 3:17928786bdb5 247 bytes = fread(fbuffer,sizeof(char),FILESEND_BUF_SIZE,fp);
WiredHome 3:17928786bdb5 248 }
WiredHome 8:262583f054f6 249 myfree(fbuffer);
WiredHome 3:17928786bdb5 250 } else {
WiredHome 3:17928786bdb5 251 header(500, "Server Error", "Pragma: err - insufficient memory\r\n");
WiredHome 0:729320f63c5c 252 }
WiredHome 0:729320f63c5c 253 fclose(fp);
WiredHome 0:729320f63c5c 254 return true;
WiredHome 0:729320f63c5c 255 } else {
WiredHome 3:17928786bdb5 256 header(404, "Not Found", "Pragma: err - Can't open file\r\n");
WiredHome 0:729320f63c5c 257 return false;
WiredHome 0:729320f63c5c 258 }
WiredHome 0:729320f63c5c 259 }
WiredHome 0:729320f63c5c 260
WiredHome 0:729320f63c5c 261 int HTTPServer::HexCharToInt(char c)
WiredHome 0:729320f63c5c 262 {
WiredHome 0:729320f63c5c 263 if (c >= 'a' && c <= 'f')
WiredHome 0:729320f63c5c 264 return (c - 'a' + 10);
WiredHome 0:729320f63c5c 265 else if (c >= 'A' && c <= 'F')
WiredHome 0:729320f63c5c 266 return (c - 'A' + 10);
WiredHome 0:729320f63c5c 267 else if (c >= '0' && c <= '9')
WiredHome 0:729320f63c5c 268 return c - '0';
WiredHome 0:729320f63c5c 269 else
WiredHome 0:729320f63c5c 270 return 0;
WiredHome 0:729320f63c5c 271 }
WiredHome 0:729320f63c5c 272
WiredHome 0:729320f63c5c 273 char HTTPServer::HexPairToChar(char * p)
WiredHome 0:729320f63c5c 274 {
WiredHome 0:729320f63c5c 275 return 16 * HexCharToInt(*p) + HexCharToInt(*(p+1));
WiredHome 0:729320f63c5c 276 }
WiredHome 0:729320f63c5c 277
WiredHome 0:729320f63c5c 278 void HTTPServer::UnescapeString(char * encoded)
WiredHome 0:729320f63c5c 279 {
WiredHome 0:729320f63c5c 280 char *p;
WiredHome 0:729320f63c5c 281
WiredHome 0:729320f63c5c 282 // first convert '+' to ' '
WiredHome 0:729320f63c5c 283 p = strchr(encoded, '+');
WiredHome 0:729320f63c5c 284 while (p) {
WiredHome 0:729320f63c5c 285 *p = ' ';
WiredHome 0:729320f63c5c 286 p = strchr(encoded, '+');
WiredHome 0:729320f63c5c 287 }
WiredHome 0:729320f63c5c 288 // then convert hex '%xx' to char 'x'
WiredHome 0:729320f63c5c 289 p = strchr(encoded, '%');
WiredHome 0:729320f63c5c 290 while (p) {
WiredHome 0:729320f63c5c 291 if (strchr("0123456789ABCDEFabcdef", *(p+1))
WiredHome 0:729320f63c5c 292 && strchr("0123456789ABCDEFabcdef", *(p+2)) ) {
WiredHome 0:729320f63c5c 293 *p = HexPairToChar(p+1);
WiredHome 0:729320f63c5c 294 p++; // advance past the %
WiredHome 0:729320f63c5c 295 char * a = p;
WiredHome 0:729320f63c5c 296 char * b = p + 2;
WiredHome 0:729320f63c5c 297 do {
WiredHome 0:729320f63c5c 298 *a++ = *b++;
WiredHome 0:729320f63c5c 299 } while (*b);
WiredHome 0:729320f63c5c 300 *a = '\0';
WiredHome 0:729320f63c5c 301 }
WiredHome 0:729320f63c5c 302 p = strchr(p, '%');
WiredHome 0:729320f63c5c 303 }
WiredHome 0:729320f63c5c 304 }
WiredHome 0:729320f63c5c 305
WiredHome 0:729320f63c5c 306 const char * HTTPServer::GetParameter(const char * name)
WiredHome 0:729320f63c5c 307 {
WiredHome 0:729320f63c5c 308 for (int i=0; i<paramcount; i++) {
WiredHome 0:729320f63c5c 309 if (strcmp(params[i].name, name) == 0) {
WiredHome 0:729320f63c5c 310 return params[i].value;
WiredHome 0:729320f63c5c 311 }
WiredHome 0:729320f63c5c 312 }
WiredHome 0:729320f63c5c 313 return NULL;
WiredHome 0:729320f63c5c 314 }
WiredHome 0:729320f63c5c 315
WiredHome 0:729320f63c5c 316 // this=that&who=what&more=stuff...
WiredHome 0:729320f63c5c 317 // ^ ^ ^
WiredHome 3:17928786bdb5 318 void HTTPServer::ParseParameters(char * pName)
WiredHome 0:729320f63c5c 319 {
WiredHome 0:729320f63c5c 320 char * pVal;
WiredHome 0:729320f63c5c 321 char * pNextName;
WiredHome 0:729320f63c5c 322
WiredHome 0:729320f63c5c 323 // Parse params
WiredHome 0:729320f63c5c 324 pVal = strchr(pName, '#'); // If there is a '#fragment_id', we can ignore it
WiredHome 0:729320f63c5c 325 if (pVal)
WiredHome 3:17928786bdb5 326 *pVal = '\0';
WiredHome 0:729320f63c5c 327 do {
WiredHome 0:729320f63c5c 328 //pc->printf("Parse(%s)\r\n", pName);
WiredHome 0:729320f63c5c 329 //*pName++ = '\0'; // already '\0' on the first entry
WiredHome 0:729320f63c5c 330 params[paramcount].name = pName;
WiredHome 0:729320f63c5c 331 pVal = strchr(pName, '=');
WiredHome 0:729320f63c5c 332 pNextName = strchr(pName,'&');
WiredHome 0:729320f63c5c 333 if (pVal) {
WiredHome 0:729320f63c5c 334 if (pNextName == NULL || (pNextName && pNextName > pVal)) {
WiredHome 0:729320f63c5c 335 *pVal++ = '\0';
WiredHome 0:729320f63c5c 336 params[paramcount].value = pVal;
WiredHome 0:729320f63c5c 337 pName = pVal;
WiredHome 0:729320f63c5c 338 }
WiredHome 0:729320f63c5c 339 }
WiredHome 0:729320f63c5c 340 //pc->printf(" [%s]=[%s]\r\n", params[paramcount].name, params[paramcount].value);
WiredHome 0:729320f63c5c 341 paramcount++;
WiredHome 0:729320f63c5c 342 if (pNextName) {
WiredHome 0:729320f63c5c 343 pName = pNextName;
WiredHome 0:729320f63c5c 344 *pName++ = '\0';
WiredHome 0:729320f63c5c 345 } else {
WiredHome 0:729320f63c5c 346 pName = NULL;
WiredHome 0:729320f63c5c 347 }
WiredHome 0:729320f63c5c 348 } while (pName && paramcount < maxparams);
WiredHome 0:729320f63c5c 349 }
WiredHome 0:729320f63c5c 350
WiredHome 0:729320f63c5c 351
WiredHome 5:c9b27e718054 352 bool HTTPServer::GetRemoteAddr(char * str, int strSize)
WiredHome 0:729320f63c5c 353 {
WiredHome 0:729320f63c5c 354 bool res = false;
WiredHome 0:729320f63c5c 355 char *p;
WiredHome 0:729320f63c5c 356
WiredHome 4:f34642902056 357 if (strSize < 16) { // Can only guard it here w/o modifying Wifly class
WiredHome 3:17928786bdb5 358 *str = '\0';
WiredHome 5:c9b27e718054 359 return res;
WiredHome 3:17928786bdb5 360 }
WiredHome 5:c9b27e718054 361 res = wifly->sendCommand("show z\r", NULL, str, strSize);
WiredHome 0:729320f63c5c 362 if (res) {
WiredHome 0:729320f63c5c 363 p = strchr(str, '\n'); // truncate after the octets.
WiredHome 0:729320f63c5c 364 if (p) *p = '\0';
WiredHome 0:729320f63c5c 365 p = strchr(str, ' '); // or a space
WiredHome 0:729320f63c5c 366 if (p) *p = '\0';
WiredHome 0:729320f63c5c 367 p = strchr(str, '<'); // or a <
WiredHome 0:729320f63c5c 368 if (p) *p = '\0';
WiredHome 5:c9b27e718054 369 res = true;
WiredHome 0:729320f63c5c 370 }
WiredHome 0:729320f63c5c 371 wifly->exit();
WiredHome 5:c9b27e718054 372 return res;
WiredHome 0:729320f63c5c 373 }
WiredHome 0:729320f63c5c 374
WiredHome 0:729320f63c5c 375
WiredHome 0:729320f63c5c 376 void HTTPServer::header(int code, const char * code_text, const char * content_type, const char * optional_text)
WiredHome 0:729320f63c5c 377 {
WiredHome 0:729320f63c5c 378 char http[100];
WiredHome 0:729320f63c5c 379
WiredHome 0:729320f63c5c 380 sprintf(http, "%s %i %s\r\n", hdr_httpver, code, code_text);
WiredHome 0:729320f63c5c 381 send(http);
WiredHome 0:729320f63c5c 382 send(hdr_age);
WiredHome 0:729320f63c5c 383 send(hdr_server);
WiredHome 0:729320f63c5c 384 if (content_type) {
WiredHome 0:729320f63c5c 385 send(content_type);
WiredHome 0:729320f63c5c 386 }
WiredHome 0:729320f63c5c 387 if (optional_text) {
WiredHome 0:729320f63c5c 388 send(optional_text);
WiredHome 0:729320f63c5c 389 }
WiredHome 2:a29c32190037 390 send(hdr_dnt);
WiredHome 0:729320f63c5c 391 send(hdr_close);
WiredHome 0:729320f63c5c 392 send(nl);
WiredHome 0:729320f63c5c 393 }
WiredHome 0:729320f63c5c 394
WiredHome 7:99ad7a67f05e 395 bool HTTPServer::close_connection()
WiredHome 0:729320f63c5c 396 {
WiredHome 7:99ad7a67f05e 397 bool res;
WiredHome 7:99ad7a67f05e 398
WiredHome 7:99ad7a67f05e 399 res = wifly->close();
WiredHome 7:99ad7a67f05e 400 #ifdef DEBUG
WiredHome 7:99ad7a67f05e 401 pc->printf("close connection returned %d\r\n", res);
WiredHome 0:729320f63c5c 402 #endif
WiredHome 7:99ad7a67f05e 403 return res;
WiredHome 0:729320f63c5c 404 }
WiredHome 0:729320f63c5c 405
WiredHome 0:729320f63c5c 406 bool HTTPServer::Extract(char * haystack, char * needle, char ** string)
WiredHome 0:729320f63c5c 407 {
WiredHome 0:729320f63c5c 408 bool ret = false; // assume failure until proven otherwise
WiredHome 0:729320f63c5c 409 char * qs = NULL;
WiredHome 0:729320f63c5c 410 char * eqs = NULL;
WiredHome 0:729320f63c5c 411 char * container = NULL;
WiredHome 0:729320f63c5c 412 char * get = strstr(haystack, needle); // what if not at the front?
WiredHome 0:729320f63c5c 413 if (get) {
WiredHome 0:729320f63c5c 414 // Seems to be a valid "...GET /QueryString HTTP/1.1"
WiredHome 8:262583f054f6 415 // or "...<needle>param..."
WiredHome 0:729320f63c5c 416 qs = get + strlen(needle); // in case the needle didn't have space delimiters
WiredHome 0:729320f63c5c 417 while (*qs == ' ')
WiredHome 0:729320f63c5c 418 qs++;
WiredHome 0:729320f63c5c 419 // /QueryString\0HTTP/1.1\0\0
WiredHome 0:729320f63c5c 420 if (*string) // recycle old string when working a new one
WiredHome 8:262583f054f6 421 myfree(*string);
WiredHome 8:262583f054f6 422 container = (char *)mymalloc(strlen(qs));
WiredHome 0:729320f63c5c 423 if (container) {
WiredHome 0:729320f63c5c 424 strcpy(container, qs);
WiredHome 0:729320f63c5c 425 eqs = strchr(container, ' ');
WiredHome 0:729320f63c5c 426 if (eqs)
WiredHome 0:729320f63c5c 427 *eqs = '\0';
WiredHome 0:729320f63c5c 428 *string = container;
WiredHome 8:262583f054f6 429 #ifdef DEBUG
WiredHome 8:262583f054f6 430 pc->printf("Extract(%s) = %s\r\n", needle, container);
WiredHome 8:262583f054f6 431 #endif
WiredHome 0:729320f63c5c 432 ret = true;
WiredHome 0:729320f63c5c 433 } else {
WiredHome 0:729320f63c5c 434 *string = NULL; // something bad happened... no memory
WiredHome 0:729320f63c5c 435 }
WiredHome 0:729320f63c5c 436 }
WiredHome 0:729320f63c5c 437 return ret;
WiredHome 0:729320f63c5c 438 }
WiredHome 0:729320f63c5c 439
WiredHome 0:729320f63c5c 440 char * HTTPServer::rewriteWithDefaultFile(char * queryString)
WiredHome 0:729320f63c5c 441 {
WiredHome 8:262583f054f6 442 char * temp = (char *)mymalloc(strlen(queryString) + strlen(DEFAULT_FILENAME) + 1);
WiredHome 0:729320f63c5c 443
WiredHome 0:729320f63c5c 444 if (temp) {
WiredHome 0:729320f63c5c 445 *temp = '\0';
WiredHome 0:729320f63c5c 446 strcpy(temp, queryString);
WiredHome 0:729320f63c5c 447 strcat(temp, DEFAULT_FILENAME);
WiredHome 8:262583f054f6 448 myfree(queryString);
WiredHome 0:729320f63c5c 449 return temp;
WiredHome 0:729320f63c5c 450 } else {
WiredHome 0:729320f63c5c 451 return queryString;
WiredHome 0:729320f63c5c 452 }
WiredHome 0:729320f63c5c 453 }
WiredHome 0:729320f63c5c 454
WiredHome 0:729320f63c5c 455 char * HTTPServer::rewritePrependWebroot(char * queryString)
WiredHome 0:729320f63c5c 456 {
WiredHome 8:262583f054f6 457 char * temp = (char *)mymalloc(strlen(webroot) + strlen(queryString) + 1);
WiredHome 0:729320f63c5c 458
WiredHome 0:729320f63c5c 459 if (temp) {
WiredHome 0:729320f63c5c 460 *temp = '\0';
WiredHome 0:729320f63c5c 461 strcpy(temp, webroot);
WiredHome 0:729320f63c5c 462 if (temp[strlen(temp)-1] == '/' && *queryString == '/')
WiredHome 0:729320f63c5c 463 temp[strlen(temp)-1] = '\0';
WiredHome 0:729320f63c5c 464 strcat(temp, queryString);
WiredHome 8:262583f054f6 465 myfree(queryString);
WiredHome 0:729320f63c5c 466 return temp;
WiredHome 0:729320f63c5c 467 } else {
WiredHome 0:729320f63c5c 468 return queryString;
WiredHome 0:729320f63c5c 469 }
WiredHome 0:729320f63c5c 470 }
WiredHome 0:729320f63c5c 471
WiredHome 3:17928786bdb5 472 bool HTTPServer::CheckDynamicHandlers()
WiredHome 3:17928786bdb5 473 {
WiredHome 3:17928786bdb5 474 bool regHandled = false;
WiredHome 0:729320f63c5c 475
WiredHome 3:17928786bdb5 476 // If this queryString is in the list of registered handlers, call that
WiredHome 3:17928786bdb5 477 for (int i=0; i<handlercount; i++) {
WiredHome 3:17928786bdb5 478 if (strcmp(handlers[i].path, queryString) == 0) {
WiredHome 3:17928786bdb5 479 (*handlers[i].callback)(this, SEND_PAGE, queryString, params, paramcount);
WiredHome 3:17928786bdb5 480 regHandled = true;
WiredHome 3:17928786bdb5 481 break; // we only execute the first one
WiredHome 3:17928786bdb5 482 }
WiredHome 3:17928786bdb5 483 }
WiredHome 3:17928786bdb5 484 return regHandled;
WiredHome 3:17928786bdb5 485 }
WiredHome 3:17928786bdb5 486
WiredHome 3:17928786bdb5 487 void HTTPServer::SendResponse()
WiredHome 3:17928786bdb5 488 {
WiredHome 8:262583f054f6 489 #ifdef DEBUG
WiredHome 8:262583f054f6 490 pc->printf("SendResponse(%s) [%d]\r\n", queryType, __LINE__);
WiredHome 8:262583f054f6 491 #endif
WiredHome 3:17928786bdb5 492 if (strcmp(queryType, "GET") == 0 || strcmp(queryType, "POST") == 0) {
WiredHome 3:17928786bdb5 493 if (!(queryString[0] == '.' && queryString[1] == '.')) {
WiredHome 3:17928786bdb5 494 const char * fType;
WiredHome 3:17928786bdb5 495
WiredHome 8:262583f054f6 496 #ifdef DEBUG
WiredHome 8:262583f054f6 497 pc->printf(" SendResponse() [%d]\r\n", __LINE__);
WiredHome 8:262583f054f6 498 #endif
WiredHome 3:17928786bdb5 499 if (!CheckDynamicHandlers()) {
WiredHome 3:17928786bdb5 500 // Otherwise, this queryString must be trying to reference a static file
WiredHome 3:17928786bdb5 501 if (queryString[strlen(queryString)-1] == '/') {
WiredHome 3:17928786bdb5 502 queryString = rewriteWithDefaultFile(queryString);
WiredHome 3:17928786bdb5 503 }
WiredHome 3:17928786bdb5 504 // see if we support this file type
WiredHome 3:17928786bdb5 505 fType = GetSupportedType(queryString);
WiredHome 3:17928786bdb5 506 if (fType) {
WiredHome 3:17928786bdb5 507 queryString = rewritePrependWebroot(queryString);
WiredHome 3:17928786bdb5 508 SendFile(queryString, fType);
WiredHome 3:17928786bdb5 509 } else {
WiredHome 3:17928786bdb5 510 //pc->printf("Unsupported file type %s\r\n", queryString);
WiredHome 3:17928786bdb5 511 header(404, "Not Found", "Pragma: err - Unsupported type\r\n");
WiredHome 3:17928786bdb5 512 }
WiredHome 3:17928786bdb5 513 }
WiredHome 3:17928786bdb5 514 } else {
WiredHome 3:17928786bdb5 515 //pc->printf("Unsupported path %s\r\n", queryString);
WiredHome 3:17928786bdb5 516 header(400, "Bad Request", "Pragma: err - Unsupported path\r\n");
WiredHome 3:17928786bdb5 517 }
WiredHome 3:17928786bdb5 518 } else {
WiredHome 3:17928786bdb5 519 //pc->printf("Unsupported query type %s\r\n", queryType);
WiredHome 3:17928786bdb5 520 header(400, "Bad Request", "Pragma: err - Unsupported query type\r\n");
WiredHome 3:17928786bdb5 521 }
WiredHome 3:17928786bdb5 522 if (queryType) {
WiredHome 8:262583f054f6 523 myfree(queryType);
WiredHome 3:17928786bdb5 524 queryType = NULL;
WiredHome 3:17928786bdb5 525 }
WiredHome 3:17928786bdb5 526 if (queryString) {
WiredHome 8:262583f054f6 527 myfree(queryString);
WiredHome 3:17928786bdb5 528 queryString = NULL;
WiredHome 3:17928786bdb5 529 }
WiredHome 3:17928786bdb5 530 if (hostString) {
WiredHome 8:262583f054f6 531 myfree(hostString);
WiredHome 3:17928786bdb5 532 hostString = NULL;
WiredHome 3:17928786bdb5 533 }
WiredHome 3:17928786bdb5 534 if (contentLength) {
WiredHome 8:262583f054f6 535 myfree(contentLength);
WiredHome 3:17928786bdb5 536 contentLength = NULL;
WiredHome 3:17928786bdb5 537 }
WiredHome 3:17928786bdb5 538 if (contentType) {
WiredHome 8:262583f054f6 539 myfree(contentType);
WiredHome 3:17928786bdb5 540 contentType = NULL;
WiredHome 3:17928786bdb5 541 }
WiredHome 3:17928786bdb5 542 if (postQueryString) {
WiredHome 8:262583f054f6 543 myfree(postQueryString);
WiredHome 3:17928786bdb5 544 postQueryString = NULL;
WiredHome 3:17928786bdb5 545 }
WiredHome 3:17928786bdb5 546 }
WiredHome 3:17928786bdb5 547
WiredHome 3:17928786bdb5 548 bool HTTPServer::ParseHeader(char * buffer)
WiredHome 3:17928786bdb5 549 {
WiredHome 3:17928786bdb5 550 char * dblCR;
WiredHome 3:17928786bdb5 551 bool advanceState = false;
WiredHome 3:17928786bdb5 552 int bytecount;
WiredHome 7:99ad7a67f05e 553
WiredHome 3:17928786bdb5 554 // Bad hack to have to do this here, but it isn't being set in the
WiredHome 3:17928786bdb5 555 // underlying layer, and this is what allows it to properly "close"
WiredHome 3:17928786bdb5 556 // when it is done.
WiredHome 3:17928786bdb5 557 wifly->setConnectionState(true);
WiredHome 3:17928786bdb5 558 // Buffer could have partial, but the double \r\n is the key
WiredHome 8:262583f054f6 559 // GET /QueryString HTTP/1.1\r\n
WiredHome 8:262583f054f6 560 // GET /QueryString HTTP/1.1\r\nHost: 192.168.1.140\r\nCache-Con
WiredHome 8:262583f054f6 561 // GET /QueryString HTTP/1.1\r\nHost: 192.168.1.140\r\nCache-Control: max-age=0\r\n\r\n
WiredHome 3:17928786bdb5 562 dblCR = strstr(buffer,"\r\n\r\n");
WiredHome 3:17928786bdb5 563 if (dblCR) { // Have to scan from the beginning in case split on \r
WiredHome 8:262583f054f6 564 #ifdef DEBUG
WiredHome 8:262583f054f6 565 pc->printf("==\r\n%s==\r\n", buffer);
WiredHome 3:17928786bdb5 566 #endif
WiredHome 3:17928786bdb5 567 char * soRec = buffer; // start of the next record of text
WiredHome 3:17928786bdb5 568 char * eoRec = strchr(soRec, '\n'); // search for end of a record
WiredHome 7:99ad7a67f05e 569
WiredHome 3:17928786bdb5 570 bytecount = strlen(buffer);
WiredHome 3:17928786bdb5 571 if (bytecount > maxheaderbytes)
WiredHome 3:17928786bdb5 572 maxheaderbytes = bytecount;
WiredHome 3:17928786bdb5 573 while (eoRec) {
WiredHome 3:17928786bdb5 574 *eoRec = '\0';
WiredHome 3:17928786bdb5 575 if (*(eoRec-1) == '\r')
WiredHome 3:17928786bdb5 576 *(eoRec-1) = '\0';
WiredHome 8:262583f054f6 577 #ifdef DEBUG
WiredHome 8:262583f054f6 578 pc->printf("rec {%s}\r\n", soRec);
WiredHome 8:262583f054f6 579 #endif
WiredHome 8:262583f054f6 580 // Inspect the supported query types (GET, POST) and ignore (HEAD, PUT, OPTION, DELETE, TRACE, CONNECT]
WiredHome 8:262583f054f6 581 // This is very clumsy
WiredHome 8:262583f054f6 582 if (strstr(soRec, "GET ") == soRec) {
WiredHome 8:262583f054f6 583 Extract(soRec, "GET", &queryString);
WiredHome 8:262583f054f6 584 if (queryString) {
WiredHome 8:262583f054f6 585 queryType = (char *)mymalloc(strlen("GET")+1);
WiredHome 8:262583f054f6 586 strcpy(queryType, "GET");
WiredHome 8:262583f054f6 587 }
WiredHome 8:262583f054f6 588 } else if (strstr(soRec, "POST ") == soRec) {
WiredHome 8:262583f054f6 589 Extract(soRec, "POST", &queryString);
WiredHome 8:262583f054f6 590 if (queryString) {
WiredHome 8:262583f054f6 591 queryType = (char *)mymalloc(strlen("POST")+1);
WiredHome 8:262583f054f6 592 strcpy(queryType, "POST");
WiredHome 8:262583f054f6 593 }
WiredHome 8:262583f054f6 594 }
WiredHome 3:17928786bdb5 595 Extract(soRec, "Host: ", &hostString);
WiredHome 3:17928786bdb5 596 Extract(soRec, "Content-Length: ", &contentLength);
WiredHome 3:17928786bdb5 597 Extract(soRec, "Content-Type: ", &contentType);
WiredHome 3:17928786bdb5 598 soRec = eoRec + 1;
WiredHome 3:17928786bdb5 599 eoRec = strchr(soRec, '\n');
WiredHome 3:17928786bdb5 600 }
WiredHome 3:17928786bdb5 601 if (queryString) {
WiredHome 3:17928786bdb5 602 // We have enough to try to reply
WiredHome 8:262583f054f6 603 #ifdef DEBUG
WiredHome 8:262583f054f6 604 pc->printf("create reply queryType{%s}, queryString{%s}\r\n", "GET", queryString);
WiredHome 8:262583f054f6 605 #endif
WiredHome 3:17928786bdb5 606 // parse params - if any
WiredHome 3:17928786bdb5 607 // /file.htm?name1=value1&name2=value2...
WiredHome 3:17928786bdb5 608 // /file.htm?name1&name2=value2...
WiredHome 3:17928786bdb5 609 paramcount = 0;
WiredHome 3:17928786bdb5 610 char * paramDelim = strchr(queryString, '?');
WiredHome 3:17928786bdb5 611 if (paramDelim) {
WiredHome 3:17928786bdb5 612 *paramDelim++ = '\0';
WiredHome 3:17928786bdb5 613 UnescapeString(paramDelim); // everything after the '?'
WiredHome 3:17928786bdb5 614 ParseParameters(paramDelim); // pointing at the NULL, but there are params beyond
WiredHome 3:17928786bdb5 615 }
WiredHome 3:17928786bdb5 616 //for (int i=0; i<paramcount; i++)
WiredHome 3:17928786bdb5 617 // pc->printf("param %d '%s'='%s'\r\n", i, params[i].name, params[i].value);
WiredHome 3:17928786bdb5 618 } else {
WiredHome 8:262583f054f6 619 pc->printf("ERROR: queryString not found\r\n");
WiredHome 3:17928786bdb5 620 }
WiredHome 3:17928786bdb5 621 advanceState = true;
WiredHome 3:17928786bdb5 622 buffer[0] = 0;
WiredHome 3:17928786bdb5 623
WiredHome 3:17928786bdb5 624 // This part parses the extra data on a POST method.
WiredHome 3:17928786bdb5 625 // Since there has to be a dynamic handler registered for this
WiredHome 3:17928786bdb5 626 // it would make sense to move some of this responsibility to
WiredHome 3:17928786bdb5 627 // that handler. It could then choose if it wanted to allocate
WiredHome 3:17928786bdb5 628 // the requested 'Content-Length' amount of memory.
WiredHome 3:17928786bdb5 629 // Should we check the 'Content-Type' to see if it is
WiredHome 3:17928786bdb5 630 // 'application/x-www-form-urlencoded'?
WiredHome 3:17928786bdb5 631 int postBytes = atoi(contentLength);
WiredHome 3:17928786bdb5 632 bool acceptIt = false;
WiredHome 3:17928786bdb5 633 //pc->printf("Content-Length = %d\r\n", postBytes);
WiredHome 3:17928786bdb5 634 if (strcmp(queryType, "POST") == 0 && postBytes > 0 ) {
WiredHome 3:17928786bdb5 635 if (postBytes) {
WiredHome 3:17928786bdb5 636 bool regHandled = false;
WiredHome 3:17928786bdb5 637 // Registered Dynamic Handler
WiredHome 3:17928786bdb5 638 // Callback and ask if they want to accept this data
WiredHome 3:17928786bdb5 639 for (int i=0; i<handlercount; i++) {
WiredHome 3:17928786bdb5 640 if (strcmp(handlers[i].path, queryString) == 0) {
WiredHome 3:17928786bdb5 641 acceptIt = (*handlers[i].callback)(this, CONTENT_LENGTH_REQUEST, queryString, params, paramcount);
WiredHome 3:17928786bdb5 642 regHandled = true;
WiredHome 3:17928786bdb5 643 break; // we only execute the first one
WiredHome 3:17928786bdb5 644 }
WiredHome 3:17928786bdb5 645 }
WiredHome 3:17928786bdb5 646
WiredHome 3:17928786bdb5 647 if (regHandled && acceptIt) {
WiredHome 3:17928786bdb5 648 // If so, we'll make space for it
WiredHome 8:262583f054f6 649 postQueryString = (char *)mymalloc(postBytes + 1);
WiredHome 3:17928786bdb5 650 if (postQueryString) {
WiredHome 3:17928786bdb5 651 char * offset;
WiredHome 3:17928786bdb5 652 int len;
WiredHome 3:17928786bdb5 653
WiredHome 3:17928786bdb5 654 dblCR += 4; // If we slurped up any of the POST,
WiredHome 3:17928786bdb5 655 while (*dblCR && *dblCR <= ' ')
WiredHome 3:17928786bdb5 656 dblCR++;
WiredHome 3:17928786bdb5 657 strcpy(postQueryString, dblCR); // copy that in and then get the rest
WiredHome 3:17928786bdb5 658 while ((len = strlen(postQueryString)) < postBytes) {
WiredHome 3:17928786bdb5 659 int n;
WiredHome 3:17928786bdb5 660 offset = postQueryString + len;
WiredHome 3:17928786bdb5 661 n = client.receive(offset, postBytes - len);
WiredHome 3:17928786bdb5 662 if (n >=0) {
WiredHome 3:17928786bdb5 663 offset[n] = '\0';
WiredHome 3:17928786bdb5 664 }
WiredHome 3:17928786bdb5 665 }
WiredHome 3:17928786bdb5 666 if (len >= 0) {
WiredHome 3:17928786bdb5 667 UnescapeString(postQueryString);
WiredHome 3:17928786bdb5 668 ParseParameters(postQueryString);
WiredHome 3:17928786bdb5 669 }
WiredHome 3:17928786bdb5 670 }
WiredHome 3:17928786bdb5 671 } else {
WiredHome 3:17928786bdb5 672 // Simply copy it to the bitbucket
WiredHome 3:17928786bdb5 673 int bytesToDump = postBytes;
WiredHome 8:262583f054f6 674 char * bitbucket = (char *)mymalloc(201);
WiredHome 3:17928786bdb5 675 dblCR += 4;
WiredHome 3:17928786bdb5 676 while (*dblCR && *dblCR <= ' ')
WiredHome 3:17928786bdb5 677 dblCR++;
WiredHome 3:17928786bdb5 678 bytesToDump -= strlen(dblCR);
WiredHome 3:17928786bdb5 679 while (bytesToDump > 0) {
WiredHome 3:17928786bdb5 680 int n = (bytesToDump > 200) ? 200 : bytesToDump;
WiredHome 3:17928786bdb5 681 n = client.receive(bitbucket, n);
WiredHome 3:17928786bdb5 682 bytesToDump -= n;
WiredHome 3:17928786bdb5 683 }
WiredHome 8:262583f054f6 684 myfree(bitbucket);
WiredHome 3:17928786bdb5 685 }
WiredHome 3:17928786bdb5 686 }
WiredHome 3:17928786bdb5 687 }
WiredHome 3:17928786bdb5 688 }
WiredHome 3:17928786bdb5 689 return advanceState;
WiredHome 3:17928786bdb5 690 }
WiredHome 3:17928786bdb5 691
WiredHome 7:99ad7a67f05e 692 void HTTPServer::GetPerformanceData(SW_PerformanceData * p)
WiredHome 7:99ad7a67f05e 693 {
WiredHome 3:17928786bdb5 694 memcpy(p, &perfData, sizeof(perfData));
WiredHome 3:17928786bdb5 695 }
WiredHome 3:17928786bdb5 696
WiredHome 7:99ad7a67f05e 697 int HTTPServer::RecordPerformanceData(SW_PerformanceParam * param, int refTime)
WiredHome 7:99ad7a67f05e 698 {
WiredHome 3:17928786bdb5 699 int t_now = timer.read_us();
WiredHome 3:17928786bdb5 700 param->TotalTime_us += (t_now - refTime);
WiredHome 3:17928786bdb5 701 param->Samples++;
WiredHome 3:17928786bdb5 702 if ((t_now - refTime) > param->MaxTime_us)
WiredHome 3:17928786bdb5 703 param->MaxTime_us = (t_now - refTime);
WiredHome 3:17928786bdb5 704 return t_now;
WiredHome 3:17928786bdb5 705 }
WiredHome 3:17928786bdb5 706
WiredHome 7:99ad7a67f05e 707 void HTTPServer::ResetPerformanceData()
WiredHome 7:99ad7a67f05e 708 {
WiredHome 3:17928786bdb5 709 memset(&perfData, 0, sizeof(perfData));
WiredHome 3:17928786bdb5 710 }
WiredHome 3:17928786bdb5 711
WiredHome 4:f34642902056 712