Th3maz1ng/ESP8266_swiss_army_board
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: Th3maz1ng:32e32e46d240b9303e624242d172c871dfefe4d8
Branches Tags
Th3maz1ng:master
..
compare: Th3maz1ng:5fb02304be3ecdff63699d3f84659f5d9877d473
Branches Tags
Th3maz1ng:master

No commits in common. "32e32e46d240b9303e624242d172c871dfefe4d8" and "5fb02304be3ecdff63699d3f84659f5d9877d473" have entirely different histories.
32e32e46d2 ... 5fb02304be

4 changed files with 43 additions and 126 deletions
Show Stats Expand all files Collapse all files

11
src/app/HttpConstants.h
View File

@ -137,17 +137,6 @@ class HttpConstants
}
}
static const char *httpStatusToString(HTTP_CODE c)
{
switch(c)
{
case HTTP_CODE_PARTIAL_CONTENT:
return HTTPCONSTANTS_STRING("206 Partial Content");
break;
default:
return HTTPCONSTANTS_STRING("200 OK");
}
}
protected:
private:
};

2
src/app/WEBClient.cpp
View File

@ -2,7 +2,7 @@
//#define DEBUG_WEBCL
WEBClient::WEBClient(WiFiClient client, uint8_t id, uint16_t maxResourceBuffer, uint16_t maxBodyBuffer, uint16_t dataBufferSize) : TCPClient(client, id, dataBufferSize)
WEBClient::WEBClient(WiFiClient client, uint8_t id, uint16_t maxResourceBuffer, uint16_t maxBodyBuffer, uint16_t dataBufferSize) : TCPClient(client, id, dataBufferSize), _WEBClientState(WEBServer<WEBClient>::WEBClientState::ACCEPTED), _httpParserState(WEBServer<WEBClient>::HttpParserStatus::HTTP_VERB), _fileSentBytes(0), _range(0)
{
#ifdef DEBUG_WEBCL
Serial.println("WEBClient : Standard constructor called");

14
src/app/WEBClient.h
View File

@ -12,18 +12,12 @@ class WEBClient : public TCPClient
WEBClient(WiFiClient client, uint8_t id, uint16_t maxResourceBuffer = 255, uint16_t maxBodyBuffer = 255, uint16_t dataBufferSize = 511);
virtual ~WEBClient();
protected:
WEBServer<WEBClient>::WEBClientState _WEBClientState = WEBServer<WEBClient>::WEBClientState::ACCEPTED;
WEBServer<WEBClient>::WEBClientState _WEBClientState;
private:
WEBServer<WEBClient>::HttpRequestData _httpRequestData;
WEBServer<WEBClient>::HttpParserStatus _httpParserState = WEBServer<WEBClient>::HttpParserStatus::HTTP_VERB;
uint64_t _fileSentBytes = 0;
struct
{
bool _rangeRequest;
size_t _rangeStart;
size_t _rangeEnd;
} _rangeData = {false, 0, 0}; //Used to store the values of the range param for file downloads and media playback
bool _keepAlive = false;
WEBServer<WEBClient>::HttpParserStatus _httpParserState;
uint64_t _fileSentBytes;
uint64_t _range; //Used to store the value of the range param for file downloading
void clearHttpRequestData();
};

126
src/app/WEBServer.h
View File

@ -259,7 +259,7 @@ class WEBServer : public TCPServer<T>, public HttpConstants
break;
}
//Before in the buffer : key1: value1\r\nkey2: value2
//Before in the buffer : key1: value1\0\nkey2: value2
//After in the buffer : key2: value2\r\n
client->freeDataBuffer((pEndLine - (char *)client->_data) + 2);
}
@ -317,77 +317,27 @@ class WEBServer : public TCPServer<T>, public HttpConstants
#endif
//Here we check if we have interesting params
char *search = strstr((char *)client->_data, "t-Type: application/x-www-form-urlen");
if(search != NULL)
char *contentTypeP = strstr((char *)client->_data, "t-Type: application/x-www-form-urlen");
if(contentTypeP != NULL)
{
#ifdef DEBUG_WEBS
Serial.printf("Content-Type : APPLICATION_X_WWW_FORM_URLENCODED\n");
Serial.printf("Data is of type : APPLICATION_X_WWW_FORM_URLENCODED\n");
#endif
client->_httpRequestData.HMT = APPLICATION_X_WWW_FORM_URLENCODED;
}
search = strstr((char *)client->_data, "ion: keep-al");
if(search != NULL)
//Range part for file downloads
/*char *startingP = strstr((char *)client->_data, "nge: bytes="), *endP = strchr((char *)client->_data, '-');
if(startingP != NULL && endP != NULL)
{
endP = '\0';
client->_range = strtoul(startingP + 11,NULL, 10);
#ifdef DEBUG_WEBS
Serial.printf("Connection : keep-alive\n");
Serial.printf("Range : %d\n", client->_range);
#endif
client->_keepAlive = true;
}
//Range part for file downloads and media playback
search = strstr((char *)client->_data, "nge: bytes=");
if(search != NULL)
{
//We parse the range byte data
if(fillRangeByteStruct(client))
{
#ifdef DEBUG_WEBS
Serial.printf("Range (bytes) data : start -> %u ; end -> %u\n", client->_rangeData._rangeStart, client->_rangeData._rangeEnd);
#endif
client->_rangeData._rangeRequest = true;
}
else
{
#ifdef DEBUG_WEBS
Serial.printf("Range (bytes) data parse error : start -> %u ; end -> %u\n", client->_rangeData._rangeStart, client->_rangeData._rangeEnd);
#endif
}
}
}
/*
* This function fills the client's _rangeData struct with proper values
*/
bool fillRangeByteStruct(T *client)
{
char *rangeStart = strchr((char *)client->_data, '='), *delimiter = strchr((char *)client->_data, '-'), *check(nullptr);
if(!rangeStart)return false;
rangeStart++; //We move one char forward
//We parse the 1st part of the range byte
if(!delimiter) // If only one part (ill-formed)
{
client->_rangeData._rangeStart = strtoull(rangeStart, &check, 10);
if(*check != '\0')return false;
return true;
}
else
{
*delimiter = '\0';
client->_rangeData._rangeStart = strtoull(rangeStart, &check, 10);
if(*check != '\0')return false;
}
rangeStart = delimiter+1;
//We parse the 2nd part of the range byte
client->_rangeData._rangeEnd = strtoull(rangeStart, &check, 10);
if(*check != '\0')return false;
return true;
}*/
}
/*
@ -581,29 +531,12 @@ class WEBServer : public TCPServer<T>, public HttpConstants
return false;
}
if(client->_fileSentBytes == 0)
if(client->_fileSentBytes == 0 /*&& client->_range == 0*/)
{
size_t pageToSendSize(pageToSend.size());
char *fileName = (char *) malloc(sizeof(char) * strlen(pageToSend.name()) + 1);
if(fileName == NULL)
{
sendInfoResponse(HTTP_CODE::HTTP_CODE_INTERNAL_SERVER_ERROR, client, "Failed to allocate memory for the response");
pageToSend.close();
return false;
}
strcpy(fileName, pageToSend.name());
if(client->_rangeData._rangeRequest)
{
client->_fileSentBytes = client->_rangeData._rangeStart;
client->_rangeData._rangeEnd = !client->_rangeData._rangeEnd ? pageToSendSize - 1 : client->_rangeData._rangeEnd;
pageToSend.seek(client->_fileSentBytes);
}
else
client->_rangeData._rangeEnd = pageToSendSize - 1; //Needed to carry on sending when not a partial file
header = getHTTPHeader(getMIMETypeByExtension(strlwr(getFileExtension(fileName))), pageToSendSize, client->_rangeData._rangeRequest, client->_rangeData._rangeStart, client->_rangeData._rangeEnd);
if(fileName != NULL)strcpy(fileName, pageToSend.name());
header = getHTTPHeader(getMIMETypeByExtension(strlwr(getFileExtension(fileName))), pageToSend.size());
#ifdef DEBUG_WEBS
Serial.print("FILE EXTENSION : ");
@ -620,15 +553,19 @@ class WEBServer : public TCPServer<T>, public HttpConstants
}
client->_client.print(header);
free(header);header = NULL;
}
/*else if(client->_fileSentBytes == 0 && (!client->_range == 0))
{
client->_fileSentBytes = client->_range-500;
Serial.println("RANGE SET");
}*/
else
{
pageToSend.seek(client->_fileSentBytes);
}
if(pageToSend.available() && client->_fileSentBytes < client->_rangeData._rangeEnd + 1) // File is done sending once the whole file was sent or the partial part is done sending
if(pageToSend.available())
{
readBytes = pageToSend.read(sendBuffer,READ_WRITE_BUFFER_SIZE);
client->_client.write(sendBuffer, readBytes);
@ -725,23 +662,20 @@ class WEBServer : public TCPServer<T>, public HttpConstants
else return UNKNOWN_MIME;
}
static char *getHTTPHeader(HttpMIMEType httpMIMEType, const size_t contentLength, bool acceptRanges = false, size_t rangeStart = 0, size_t rangeEnd = 0)
static char *getHTTPHeader(HttpMIMEType httpMIMEType, const size_t size)
{
size_t headerToAllocSize(/*strlen("HTTP/1.1 200 OK\r\nContent-Type: \r\nContent-Length: \r\nCache-Control: max-age=31536000\r\n\r\n")*/86 + 255/*Longest MIME-TYPE that RFC allows*/ + 10 /*Max unsigned long footprint*/ + 1 /*\0 character*/);
if(acceptRanges)headerToAllocSize += (22 + 25 + 10*3 + 13); //"Accept-Ranges: bytes\r\n" is 22 characters + "Content-Range: bytes %u-%u/%u\r\n" + 3*Max unsigned long footprint + space for 206 Partial Content
char *header = (char *) malloc(sizeof(char) /*strlen("HTTP/1.1 200 OK\r\nContent-Type: \r\nContent-Length: \r\nCache-Control: max-age=31536000\r\n\r\n")*/* (86 + 255/*Longest MIME-TYPE that RFC allows*/ + 10 /*Max unsigned long footprint*/ + 1));
char *header = (char *) malloc(sizeof(char) * headerToAllocSize);
if(!header)return NULL;
if(!acceptRanges)
sprintf(header,"HTTP/1.1 200 OK\r\nContent-Type: %s\r\nContent-Length: %u\r\nCache-Control: max-age=31536000\r\n\r\n", httpMIMETypeToString(httpMIMEType), contentLength);
else
sprintf(header,"HTTP/1.1 206 Partial Content\r\nContent-Type: %s\r\nAccept-Ranges: bytes\r\nContent-Length: %u\r\nContent-Range: bytes %u-%u/%u\r\nCache-Control: max-age=31536000\r\n\r\n", httpMIMETypeToString(httpMIMEType), rangeEnd-rangeStart+1,rangeStart ,rangeEnd, contentLength);
injectHeaderLayout(header, httpMIMETypeToString(httpMIMEType), size);
return header;
}
static void injectHeaderLayout(char *header, const char *contentType, const size_t size)
{
sprintf(header,"HTTP/1.1 200 OK\r\nContent-Type: %s\r\nContent-Length: %u\r\nCache-Control: max-age=31536000\r\n\r\n", contentType, size);
}
static char *getFileExtension(char *name)
{
char *p(lastIndexOf(name, '.'));