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

Compare commits

base: Th3maz1ng:4635f4daaa2107329c2f22ea7587b5558cbe81ba
Branches Tags
Th3maz1ng:master
..
compare: Th3maz1ng:db1873b714b7cdb2d01ce145f2f7c0fa5795f8d4
Branches Tags
Th3maz1ng:master

No commits in common. "4635f4daaa2107329c2f22ea7587b5558cbe81ba" and "db1873b714b7cdb2d01ce145f2f7c0fa5795f8d4" have entirely different histories.
4635f4daaa ... db1873b714

7 changed files with 68 additions and 182 deletions
Show Stats Expand all files Collapse all files

4
src/app/FTPClient.h
View File

@ -29,8 +29,8 @@ class FTPClient : public TCPClient
char *_username = NULL; char *_username = NULL;
char *_currentDirectory = NULL; char *_currentDirectory = NULL;
char *_currentFile = NULL; char *_currentFile = NULL;
size_t _fileSentBytes = 0; uint64_t _fileSentBytes = 0;
size_t _fileRecvBytes = 0; uint64_t _fileRecvBytes = 0;
boolean _waitingForDataConnection = false; boolean _waitingForDataConnection = false;
boolean _fileIsBeeingReceived = false; boolean _fileIsBeeingReceived = false;
uint64_t _actionTimeout = 0; uint64_t _actionTimeout = 0;

89
src/app/FTPServer.h
View File

@ -6,7 +6,7 @@
#include "utilities.h" #include "utilities.h"
#include "Dictionary.h" #include "Dictionary.h"
//#define DEBUG_FTPS //#define DEBUG_FTPS
#define SEND_RECV_BUFFER_SIZE 5000 #define READ_BUFFER_SIZE 2048 //2048 is max to read sd card, more will crash
template <typename T> template <typename T>
class FTPServer : public TCPServer<T> class FTPServer : public TCPServer<T>
@ -14,9 +14,9 @@ class FTPServer : public TCPServer<T>
public: public:
enum FTPClientState {INIT, WAITING_FOR_COMMANDS}; enum FTPClientState {INIT, WAITING_FOR_COMMANDS};
enum FTPClientDataTransfer {NONE = 0, LIST_DF, NLST_DF, RETR_DF, STOR_DF, APPE_DF}; enum FTPClientDataTransfer {NONE = 0, LIST_DF, NLST_DF, RETR_DF, STOR_DF, APPE_DF};
enum FileTransferStatus {OK, NOT_FOUND, NO_FILE_NAME, MALLOC_ERROR}; enum FileTransferStatus {OK, NOT_FOUND, NO_FILE_NAME};
enum BinaryFlag {OFF = 0, ON}; enum BinaryFlag {OFF = 0, ON};
enum FTPMsgCode {_150, _200, _215, _220, _221, _230, _226, _227, _250, _257, _331, _350, _451, _5_502, _504, _530, _550 }; enum FtpMsgCode {_150, _200, _215, _220, _221, _230, _226, _227, _250, _257, _331, _350, _451, _5_502, _504, _530, _550 };
FTPServer(uint16_t port = 21, SDClass *sdClass = NULL, const char *login = NULL, const char *password = NULL, uint8_t maxClient = MAX_CLIENT, uint16_t clientCommandDataBufferSize = 255) : TCPServer<T>(port, maxClient, clientCommandDataBufferSize), FTPServer(uint16_t port = 21, SDClass *sdClass = NULL, const char *login = NULL, const char *password = NULL, uint8_t maxClient = MAX_CLIENT, uint16_t clientCommandDataBufferSize = 255) : TCPServer<T>(port, maxClient, clientCommandDataBufferSize),
_login(NULL), _login(NULL),
@ -140,7 +140,7 @@ class FTPServer : public TCPServer<T>
client->_client.println("150 File status okay."); client->_client.println("150 File status okay.");
FileTransferStatus fts; FileTransferStatus fts;
if(!sendFile(client,&fts))//Whole file was sent or error an occured if(!sendFile(client,&fts))//File was sent or error occured
{ {
//we check the return code //we check the return code
if(fts == OK) if(fts == OK)
@ -155,12 +155,6 @@ class FTPServer : public TCPServer<T>
client->closeDataConnection(); client->closeDataConnection();
client->_dataTransferPending = NONE; client->_dataTransferPending = NONE;
} }
else if(fts == MALLOC_ERROR)
{
client->_client.println("451 Insufficient RAM space.");
client->closeDataConnection();
client->_dataTransferPending = NONE;
}
} }
} }
else if(client->_fileSentBytes != 0) else if(client->_fileSentBytes != 0)
@ -187,14 +181,6 @@ class FTPServer : public TCPServer<T>
{ {
client->_client.println("501 No file name given."); client->_client.println("501 No file name given.");
} }
else if(fts == NOT_FOUND)
{
client->_client.println("451 File not found.");
}
else if(fts == MALLOC_ERROR)
{
client->_client.println("451 Insufficient RAM space.");
}
else else
{ {
client->_client.println("451 Requested action aborted: local error in processing."); client->_client.println("451 Requested action aborted: local error in processing.");
@ -252,14 +238,6 @@ class FTPServer : public TCPServer<T>
{ {
client->_client.println("501 No file name given."); client->_client.println("501 No file name given.");
} }
else if(fts == NOT_FOUND)
{
client->_client.println("451 File not found.");
}
else if(fts == MALLOC_ERROR)
{
client->_client.println("451 Insufficient RAM space.");
}
else else
{ {
client->_client.println("451 Requested action aborted: local error in processing."); client->_client.println("451 Requested action aborted: local error in processing.");
@ -419,7 +397,23 @@ class FTPServer : public TCPServer<T>
return; return;
} }
client->_client.printf("227 Entering Passive Mode (%u,%u,%u,%u,%d,%d).\r\n", client->_client.localIP()[0], client->_client.localIP()[1], client->_client.localIP()[2], client->_client.localIP()[3], _dataPort / 256, _dataPort % 256); //We need to test if we are in softAP or STA to chose the right IP
uint8_t addr[4] = {0};
if(WiFi.status() == WL_CONNECTED)
{
addr[0] = WiFi.localIP()[0];
addr[1] = WiFi.localIP()[1];
addr[2] = WiFi.localIP()[2];
addr[3] = WiFi.localIP()[3];
}else
{
addr[0] = WiFi.softAPIP()[0];
addr[1] = WiFi.softAPIP()[1];
addr[2] = WiFi.softAPIP()[2];
addr[3] = WiFi.softAPIP()[3];
}
client->_client.printf("227 Entering Passive Mode (%u,%u,%u,%u,%d,%d).\r\n", addr[0], addr[1], addr[2], addr[3], _dataPort / 256, _dataPort % 256);
#ifdef DEBUG_FTPS #ifdef DEBUG_FTPS
Serial.println("Opening data server for new data client"); Serial.println("Opening data server for new data client");
#endif #endif
@ -809,21 +803,12 @@ class FTPServer : public TCPServer<T>
if(fileBeeingReceived) if(fileBeeingReceived)
{ {
size_t mallocAcceptedSize(0); uint8_t recvBuffer[2048];
uint8_t *recvBuffer = (uint8_t*)mallocWithFallback(SEND_RECV_BUFFER_SIZE * sizeof(uint8_t), &mallocAcceptedSize);
if(!recvBuffer)
{
*fts = MALLOC_ERROR;
fileBeeingReceived.close();
return false;
}
/*fileBeeingReceived.seek(client->_fileRecvBytes);*/ /*fileBeeingReceived.seek(client->_fileRecvBytes);*/
size_t size = client->_dataClient.read(recvBuffer, mallocAcceptedSize); uint16_t size = client->_dataClient.read(recvBuffer, 2048);
fileBeeingReceived.write(recvBuffer, size);
free(recvBuffer); fileBeeingReceived.write(recvBuffer, size);
client->_fileRecvBytes += size; client->_fileRecvBytes += size;
fileBeeingReceived.close(); fileBeeingReceived.close();
@ -833,7 +818,6 @@ class FTPServer : public TCPServer<T>
} }
else else
{ {
*fts = NOT_FOUND;
return false; return false;
} }
} }
@ -856,7 +840,7 @@ class FTPServer : public TCPServer<T>
File currentDirectory = _sdClass->open(client->_currentDirectory); File currentDirectory = _sdClass->open(client->_currentDirectory);
if (currentDirectory) if (currentDirectory)
{ {
//currentDirectory.rewindDirectory(); currentDirectory.rewindDirectory();
while (true) //May be removed in the future to improve responsiveness while (true) //May be removed in the future to improve responsiveness
{ {
File fileOrDir = currentDirectory.openNextFile(); File fileOrDir = currentDirectory.openNextFile();
@ -906,37 +890,26 @@ class FTPServer : public TCPServer<T>
//The binary flag needs to be taken into consideration //The binary flag needs to be taken into consideration
IRAM_ATTR inline boolean sendFile(T *client, FileTransferStatus *fts) IRAM_ATTR inline boolean sendFile(T *client, FileTransferStatus *fts)
{ {
if (client->_currentFile != nullptr) if (client->_currentFile != NULL)
{ {
uint8_t sendBuffer[READ_BUFFER_SIZE];
File fileToSend = _sdClass->open(client->_currentFile); File fileToSend = _sdClass->open(client->_currentFile);
if (fileToSend) if (fileToSend)
{ {
*fts = OK; *fts = OK;
size_t readBytes(0); unsigned int readBytes(0);
fileToSend.seek(client->_fileSentBytes); fileToSend.seek(client->_fileSentBytes);
if(fileToSend.available()) if(fileToSend.available())
{ {
size_t mallocAcceptedSize(0); readBytes = fileToSend.read(sendBuffer, READ_BUFFER_SIZE);
uint8_t *sendBuffer = (uint8_t*)mallocWithFallback(SEND_RECV_BUFFER_SIZE * sizeof(uint8_t), &mallocAcceptedSize);
if(!sendBuffer)
{
*fts = MALLOC_ERROR;
fileToSend.close();
return false;
}
readBytes = fileToSend.read(sendBuffer, mallocAcceptedSize);
client->_dataClient.write(sendBuffer, readBytes); client->_dataClient.write(sendBuffer, readBytes);
free(sendBuffer);
client->_fileSentBytes += readBytes; client->_fileSentBytes += readBytes;
#ifdef DEBUG_FTPS #ifdef DEBUG_FTPS
Serial.printf("File : bytes sent : %u - free stack : %u\n", readBytes, ESP.getFreeContStack()); Serial.printf("File : bytes sent : %u\n",readBytes);
#endif #endif
} }
else //The whole file has been sent else //The whole file has been sent
@ -1005,7 +978,7 @@ class FTPServer : public TCPServer<T>
} }
//Error code functions //Error code functions
void sendInfoResponse(FTPMsgCode code, T *client, const char *msg = "") void sendInfoResponse(FtpMsgCode code, T *client, const char *msg = "")
{ {
switch(code) switch(code)
{ {

2
src/app/WEBClient.h
View File

@ -16,7 +16,7 @@ class WEBClient : public TCPClient
private: private:
WEBServer<WEBClient>::HttpRequestData _httpRequestData; WEBServer<WEBClient>::HttpRequestData _httpRequestData;
WEBServer<WEBClient>::HttpParserStatus _httpParserState = WEBServer<WEBClient>::HttpParserStatus::PARSE_HTTP_VERB; WEBServer<WEBClient>::HttpParserStatus _httpParserState = WEBServer<WEBClient>::HttpParserStatus::PARSE_HTTP_VERB;
size_t _fileSentBytes = 0; uint64_t _fileSentBytes = 0;
struct struct
{ {
bool _rangeRequest; bool _rangeRequest;

134
src/app/WEBServer.h
View File

@ -7,7 +7,7 @@
#include "HttpConstants.h" #include "HttpConstants.h"
#include "utilities.h" #include "utilities.h"
//#define DEBUG_WEBS //#define DEBUG_WEBS
#define READ_WRITE_BUFFER_SIZE 5000 #define READ_WRITE_BUFFER_SIZE 2000
template <typename T> template <typename T>
class WEBServer : public TCPServer<T>, public HttpConstants class WEBServer : public TCPServer<T>, public HttpConstants
@ -562,7 +562,8 @@ class WEBServer : public TCPServer<T>, public HttpConstants
{ {
File pageToSend; File pageToSend;
char *filePath(NULL), *header(NULL); char *filePath(NULL), *header(NULL);
size_t readBytes(0); uint8_t sendBuffer[READ_WRITE_BUFFER_SIZE];
int readBytes(0);
//We check what kind of http verb it is //We check what kind of http verb it is
switch(client->_httpRequestData.HRM) switch(client->_httpRequestData.HRM)
{ {
@ -575,7 +576,8 @@ class WEBServer : public TCPServer<T>, public HttpConstants
} }
#ifdef DEBUG_WEBS #ifdef DEBUG_WEBS
Serial.printf("File path : #%s#\n",filePath); Serial.print("FILE PATH : ");
Serial.println(filePath);
#endif #endif
pageToSend = _sdClass->open(filePath); pageToSend = _sdClass->open(filePath);
@ -586,7 +588,7 @@ class WEBServer : public TCPServer<T>, public HttpConstants
{ {
char *response(NULL); char *response(NULL);
response = (char *) malloc(sizeof(char) * (36 + strlen(client->_httpRequestData.httpResource) + 1)); response = (char *) malloc(sizeof(char) * (strlen_P((PGM_P)F("Resource : not found on this server")) + strlen(client->_httpRequestData.httpResource) + 1));
if(response == NULL) if(response == NULL)
{ {
sendInfoResponse(HTTP_CODE::HTTP_CODE_INTERNAL_SERVER_ERROR, client, "Failed to allocate memory for the response"); sendInfoResponse(HTTP_CODE::HTTP_CODE_INTERNAL_SERVER_ERROR, client, "Failed to allocate memory for the response");
@ -609,28 +611,10 @@ class WEBServer : public TCPServer<T>, public HttpConstants
if(pageToSend.isDirectory()) //TODO : List the files present in the directory if(pageToSend.isDirectory()) //TODO : List the files present in the directory
{ {
//If the ressource wasn't terminated by a '/' then we issue a 301 Moved Permanently, else all's good //sendDirectoryListing(client, pageToSend); //Sends the content of the directory like what apache does by default. CRASHING FOR NOW, needs to be checked further.
if(client->_httpRequestData.httpResource[strlen(client->_httpRequestData.httpResource)-1] != '/')
{
uint16_t locationLength(strlen(client->_httpRequestData.httpResource) + 7/*http://*/ + 16/*ip addr + :*/ + 5/*port*/ + 2);
char *location = (char *)malloc(locationLength * sizeof(char));
char *message = (char *)malloc((27 + locationLength + 1) * sizeof(char));
if(!location || !message)
{
sendInfoResponse(HTTP_CODE::HTTP_CODE_INTERNAL_SERVER_ERROR, client, "Failed to allocate memory for the location or message");
pageToSend.close();
return false;
}
sprintf(location, "http://%s:%u%s/",client->_client.localIP().toString().c_str(), TCPServer<T>::getPort(), client->_httpRequestData.httpResource);
sprintf(message, "The document has moved to %s.", location);
sendInfoResponse(HTTP_CODE::HTTP_CODE_MOVED_PERMANENTLY, client, message, location);
free(location);free(message);
}
else
sendDirectoryListing(client, pageToSend); //Sends the content of the directory like what apache does by default.
pageToSend.close(); pageToSend.close();
sendInfoResponse(HTTP_CODE::HTTP_CODE_FORBIDDEN, client, "The file you want to access is a folder");
return false; return false;
} }
@ -683,34 +667,14 @@ class WEBServer : public TCPServer<T>, public HttpConstants
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() && client->_fileSentBytes < client->_rangeData._rangeEnd + 1) // File is done sending once the whole file was sent or the partial part is done sending
{ {
size_t mallocAcceptedSize(0); readBytes = pageToSend.read(sendBuffer,READ_WRITE_BUFFER_SIZE);
/*
The original issue was that a buffer of 2048 bytes was allocated on the stack causing a hard to track down stack overflow.
Possible solutions I cam up with :
1) Create a statically allocated buffer which would live in the BSS (Block Started by a Symbol) RAM segment.
Advantage : buffer is allocated once and ready to be used immediately.
Drawback : takes space in RAM (lost space) even if the buffer isn't used.
2) Create a dynamically allocated buffer using malloc and friends which would live in the heap RAM segment - SOLUTION I IMPLEMENTED
Advantage : buffer is taking RAM only when needed and can be freed afterwards.
Drawback : Allocating and deallocating heap memory a lot is costly in MCU time, leads to RAM fragmentation and could potentially fail...
*/
uint8_t *sendBuffer = (uint8_t*)mallocWithFallback(READ_WRITE_BUFFER_SIZE * sizeof(uint8_t), &mallocAcceptedSize);
if(!sendBuffer)
{
pageToSend.close();
return false; //Not clean but what else can I do. Should never happen anyway.
}
readBytes = pageToSend.read(sendBuffer,mallocAcceptedSize);
client->_client.write(sendBuffer, readBytes); client->_client.write(sendBuffer, readBytes);
free(sendBuffer);
#ifdef DEBUG_WEBS #ifdef DEBUG_WEBS
Serial.printf("Bytes sent : %u, got allocated buffer size : %u - free stack : %u\n", readBytes, mallocAcceptedSize, ESP.getFreeContStack()); Serial.print("BYTES SENT : ");
Serial.println(readBytes);
#endif #endif
client->_fileSentBytes += readBytes; //We save the number of bytes sent so that we can reopen the file to this position later on. client->_fileSentBytes += readBytes; //We save the number of bytes sent so that we can reopen the file to this position later on.
} }
else else
@ -738,7 +702,7 @@ class WEBServer : public TCPServer<T>, public HttpConstants
void sendDirectoryListing(T *client, File& pageToSend) void sendDirectoryListing(T *client, File& pageToSend)
{ {
sendHTTPHeader(&client->_client, HttpConstants::httpMIMETypeToString(HttpConstants::TEXT_HTML)); /*sendHTTPHeader(&client->_client, HttpConstants::httpMIMETypeToString(HttpConstants::TEXT_HTML));
client->_client.printf_P(PSTR( "<!DOCTYPE HTML>\r\n\ client->_client.printf_P(PSTR( "<!DOCTYPE HTML>\r\n\
<html>\r\n\ <html>\r\n\
<head>\r\n\ <head>\r\n\
@ -747,66 +711,41 @@ class WEBServer : public TCPServer<T>, public HttpConstants
<body>\r\n\ <body>\r\n\
<h1>Index of %s</h1>\r\n\ <h1>Index of %s</h1>\r\n\
<table>\r\n\ <table>\r\n\
<tr><th>Type</th><th>Name</th><th>Created</th><th>Last modified</th><th>Size</th></tr>\r\n\ <tr><th>Name</th><th>Created</th><th>Last modified</th><th>Size</th></tr>\r\n\
<tr><th colspan=\"5\"><hr></th></tr>\r\n") <tr><th colspan=\"4\"><hr></th></tr>\r\n")
, client->_httpRequestData.httpResource, client->_httpRequestData.httpResource); , client->_httpRequestData.httpResource, client->_httpRequestData.httpResource);*/
//File nextFile;
if(strlen(client->_httpRequestData.httpResource) > 1) //Then we are not at the root of the WEBServer's directory. for (;;)
{
char *rsrcCopy = strdup(client->_httpRequestData.httpResource);
if(rsrcCopy)
{
char *lastSlash(strrchr(rsrcCopy, '/'));
if(lastSlash)*lastSlash = '\0';
lastSlash = strrchr(rsrcCopy, '/');
if(lastSlash)*lastSlash = '\0';
client->_client.printf_P(PSTR("<tr><td>[DIR]</td><td><a href=\"%s/\">Parent Directory</a></td><td> - </td><td align=\"right\"> - </td><td> </td></tr>\r\n"), rsrcCopy);
free(rsrcCopy);
}
}
File nextFile;
for(;;)
{ {
if(!(nextFile = pageToSend.openNextFile()))break; //if(!(nextFile = pageToSend.openNextFile()))break;
File nextFile = pageToSend.openNextFile();
char zero_prepended[4][3] = {"","","",""}; if (!nextFile) //No more files in the directory
time_t rawCreationTime(nextFile.getCreationTime()), rawLastModifiedTime(nextFile.getLastWrite()); break;
tm creationTime(*localtime(&rawCreationTime)), lastModifiedTime(*localtime(&rawLastModifiedTime)); //time_t creationTime = nextFile.getCreationTime(), lastModified = nextFile.getLastWrite();
client->_client.printf_P(PSTR("<tr><td>%s</td><td><a href=\"%s\">%s</a></td><td align=\"right\">%d-%d-%d %s:%s</td><td align=\"right\">%d-%d-%d %s:%s</td><td align=\"right\">%.1fK</td></tr>\r\n"), /*client->_client.printf_P(PSTR("<tr><td><a href=\"%s\">%s</a></td><td align=\"right\">2021-07-09 15:37 </td><td align=\"right\">2021-07-09 15:37 </td><td align=\"right\"> %u</td></tr>\r\n"),
nextFile.isDirectory() ? "[DIR]":"[FILE]",
nextFile.name(), nextFile.name(),
nextFile.name(), nextFile.name(),
creationTime.tm_year + 1900, creationTime.tm_mon + 1, creationTime.tm_mday, dateTimeFormater(zero_prepended[0], creationTime.tm_hour, '0'), dateTimeFormater(zero_prepended[1], creationTime.tm_min, '0'), nextFile.size()
lastModifiedTime.tm_year + 1900, lastModifiedTime.tm_mon + 1, lastModifiedTime.tm_mday, dateTimeFormater(zero_prepended[2], lastModifiedTime.tm_hour, '0'), dateTimeFormater(zero_prepended[3], lastModifiedTime.tm_min, '0'), );*/
nextFile.size() / 1024.0 Serial.printf("%s %u\r\n", nextFile.name(), nextFile.size());
);
#ifdef DEBUG_WEBS
Serial.printf("File name : %s\nFile size : %u\nFree stack : %u\n", nextFile.name(), nextFile.size(), ESP.getFreeContStack());
#endif
nextFile.close(); nextFile.close();
} }
client->_client.printf_P(PSTR( "<tr><th colspan=\"5\"><hr></th></tr>\r\n\ /*client->_client.printf_P(PSTR( "<tr><th colspan=\"4\"><hr></th></tr>\r\n\
</table>\r\n\ </table>\r\n\
<address>SAB WEBServer, Version %s at %s Port %u</address>\r\n\ <address>SAB WEBServer, Version %s at %s Port %u</address>\r\n\
</body>\r\n\ </body>\r\n\
</html>"), "1.0.0", client->_client.localIP().toString().c_str(), TCPServer<T>::getPort()); </html>"), "1.0.0", "", TCPServer<T>::getPort()); //TODO get IP*/
} }
/*Static helper methods*/ /*Static helper methods*/
static void sendInfoResponse(HTTP_CODE http_code, T *client, const char *message, const char *location = nullptr) static void sendInfoResponse(HTTP_CODE http_code, T *client, const char *message)
{ {
char codeLiteral[100]; char codeLiteral[100];
switch(http_code) switch(http_code)
{ {
case HTTP_CODE_MOVED_PERMANENTLY:
strcpy_P(codeLiteral,PSTR("Moved Permanently"));
break;
case HTTP_CODE_BAD_REQUEST: case HTTP_CODE_BAD_REQUEST:
strcpy_P(codeLiteral,PSTR("Bad Request")); strcpy_P(codeLiteral,PSTR("Bad Request"));
break; break;
@ -829,13 +768,7 @@ class WEBServer : public TCPServer<T>, public HttpConstants
strcpy_P(codeLiteral,PSTR("Error Not Defined")); strcpy_P(codeLiteral,PSTR("Error Not Defined"));
break; break;
} }
client->_client.printf_P(PSTR("HTTP/1.1 %d %s\r\n"), http_code, codeLiteral); client->_client.printf_P(PSTR("HTTP/1.1 %d %s\r\nContent-Type: text/html\r\nContent-Length: %d\r\n\r\n<!DOCTYPE HTML>\r\n<html>\r\n<h1>Error %d</h1><p>%s</p>\r\n</html>"), http_code, codeLiteral, strlen(message) + 56 + (http_code != 0 ? 3:1), http_code , message);
if(http_code == HTTP_CODE_MOVED_PERMANENTLY)
client->_client.printf_P(PSTR("Location: %s\r\n"), location);
client->_client.printf_P(PSTR("Content-Type: text/html\r\nContent-Length: %d\r\n\r\n<!DOCTYPE HTML>\r\n<html>\r\n<h1>Error %d</h1><p>%s</p>\r\n</html>"), strlen(message) + 56 + (http_code != 0 ? 3:1), http_code , message);
} }
static HttpRequestMethod getHttpVerbEnumValue(const char *parseBuffer) static HttpRequestMethod getHttpVerbEnumValue(const char *parseBuffer)
@ -869,7 +802,6 @@ class WEBServer : public TCPServer<T>, public HttpConstants
else if(strcmp(extension, "jpg") == 0) return IMAGE_JPEG; else if(strcmp(extension, "jpg") == 0) return IMAGE_JPEG;
else if(strcmp(extension, "ico") == 0) return IMAGE_X_ICO; else if(strcmp(extension, "ico") == 0) return IMAGE_X_ICO;
else if(strcmp(extension, "mp3") == 0) return AUDIO_MPEG; else if(strcmp(extension, "mp3") == 0) return AUDIO_MPEG;
else if(strcmp(extension, "txt") == 0) return TEXT_PLAIN;
else return UNKNOWN_MIME; else return UNKNOWN_MIME;
} }

3
src/app/tasks.cpp
View File

@ -17,12 +17,11 @@ boolean task_sys_info(void *pData)
uint8_t HEAPfrag; uint8_t HEAPfrag;
ESP.getHeapStats(&freeRAM, &biggestContigMemBlock, &HEAPfrag); ESP.getHeapStats(&freeRAM, &biggestContigMemBlock, &HEAPfrag);
Serial.printf_P(PSTR("BATT SENSING...\nRunning since : %d s\nSystem error : %u\nStation IP : %s, %d dBm\nAP IP : %s\nWEB Server clients : %u\nMemory info:\n\tFree RAM : %u\n\tHeap frag : %u\n\tMax block %u\n"), Serial.printf_P(PSTR("BATT SENSING...\nRunning since : %d s\nSystem error : %u\nIP : %s, %d dBm\nWEB Server clients : %u\nMemory info:\n\tFree RAM : %u\n\tHeap frag : %u\n\tMax block %u\n"),
millis()/1000, millis()/1000,
p->sab->getError(), p->sab->getError(),
p->sab->getConnectivityManager().localIP().toString().c_str(), p->sab->getConnectivityManager().localIP().toString().c_str(),
p->sab->getConnectivityManager().RSSI(), p->sab->getConnectivityManager().RSSI(),
p->sab->getConnectivityManager().softAPIP().toString().c_str(),
p->sab->getWebServer().getConnectedClientsCount(), p->sab->getWebServer().getConnectedClientsCount(),
freeRAM, freeRAM,
HEAPfrag, HEAPfrag,

17
src/app/utilities.cpp
View File

@ -68,20 +68,3 @@ uint32_t monthNumTo3LetterAbbreviation(const uint8_t monthNumber)
return toReturn; return toReturn;
} }
void *mallocWithFallback(size_t requestedSize, size_t *acceptedSize)
{
void *allocAddr(nullptr);
uint32_t divider(1);
do
{
requestedSize /= divider++;
allocAddr = malloc(requestedSize);
} while(!allocAddr && requestedSize >= 50); //If we can't even manage to malloc 50 bytes then we should give up and cry
if(acceptedSize && allocAddr)*acceptedSize = requestedSize;
else if(acceptedSize)*acceptedSize = 0;
return allocAddr;
}

1
src/app/utilities.h
View File

@ -5,5 +5,4 @@
char *addChar(char *pointer, const char character); char *addChar(char *pointer, const char character);
char *dateTimeFormater(char *pointer, const uint8_t value, const char character); char *dateTimeFormater(char *pointer, const uint8_t value, const char character);
uint32_t monthNumTo3LetterAbbreviation(const uint8_t monthNumber); uint32_t monthNumTo3LetterAbbreviation(const uint8_t monthNumber);
void *mallocWithFallback(size_t requestedSize, size_t *acceptedSize = nullptr);
#endif // UTILITIES_H #endif // UTILITIES_H