diff --git a/README.md b/README.md index 0eb482b..119ff6e 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,10 @@ # ESPAsyncWebServer + +[![Join the chat at https://gitter.im/me-no-dev/ESPAsyncWebServer](https://badges.gitter.im/me-no-dev/ESPAsyncWebServer.svg)](https://gitter.im/me-no-dev/ESPAsyncWebServer?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) Async Web Server for ESP8266 Arduino +Requires [ESPAsyncTCP](https://github.com/me-no-dev/ESPAsyncTCP) to work + +This library should be considered experimental +Examples, description and all will be provided really soon :) + +To use this library you need to have the git versions of either ESP8266 or ESP31B Arduino Core diff --git a/examples/ESP32_AsyncFSBrowser/ESP32_AsyncFSBrowser.ino b/examples/ESP32_AsyncFSBrowser/ESP32_AsyncFSBrowser.ino new file mode 100644 index 0000000..faf0b7e --- /dev/null +++ b/examples/ESP32_AsyncFSBrowser/ESP32_AsyncFSBrowser.ino @@ -0,0 +1,199 @@ +#include +#include +#include +#include + +// WEB HANDLER IMPLEMENTATION +class SPIFFSEditor: public AsyncWebHandler { + private: + String _username; + String _password; + bool _uploadAuthenticated; + public: + SPIFFSEditor(String username=String(), String password=String()):_username(username),_password(password),_uploadAuthenticated(false){} + bool canHandle(AsyncWebServerRequest *request){ + if(request->method() == HTTP_GET && request->url() == "/edit" && (SPIFFS.exists("/edit.htm") || SPIFFS.exists("/edit.htm.gz"))) + return true; + else if(request->method() == HTTP_GET && request->url() == "/list") + return true; + else if(request->method() == HTTP_GET && (request->url().endsWith("/") || SPIFFS.exists(request->url()) || (!request->hasParam("download") && SPIFFS.exists(request->url()+".gz")))) + return true; + else if(request->method() == HTTP_POST && request->url() == "/edit") + return true; + else if(request->method() == HTTP_DELETE && request->url() == "/edit") + return true; + else if(request->method() == HTTP_PUT && request->url() == "/edit") + return true; + return false; + } + + void handleRequest(AsyncWebServerRequest *request){ + if(_username.length() && (request->method() != HTTP_GET || request->url() == "/edit" || request->url() == "/list") && !request->authenticate(_username.c_str(),_password.c_str())) + return request->requestAuthentication(); + + if(request->method() == HTTP_GET && request->url() == "/edit"){ + request->send(SPIFFS, "/edit.htm"); + } else if(request->method() == HTTP_GET && request->url() == "/list"){ + if(request->hasParam("dir")){ + String path = request->getParam("dir")->value(); + Dir dir = SPIFFS.openDir(path); + path = String(); + String output = "["; + while(dir.next()){ + File entry = dir.openFile("r"); + if (output != "[") output += ','; + bool isDir = false; + output += "{\"type\":\""; + output += (isDir)?"dir":"file"; + output += "\",\"name\":\""; + output += String(entry.name()).substring(1); + output += "\"}"; + entry.close(); + } + output += "]"; + request->send(200, "text/json", output); + output = String(); + } + else + request->send(400); + } else if(request->method() == HTTP_GET){ + String path = request->url(); + if(path.endsWith("/")) + path += "index.htm"; + request->send(SPIFFS, path, String(), request->hasParam("download")); + } else if(request->method() == HTTP_DELETE){ + if(request->hasParam("path", true)){ + SPIFFS.remove(request->getParam("path", true)->value()); + request->send(200, "", "DELETE: "+request->getParam("path", true)->value()); + } else + request->send(404); + } else if(request->method() == HTTP_POST){ + if(request->hasParam("data", true, true) && SPIFFS.exists(request->getParam("data", true, true)->value())) + request->send(200, "", "UPLOADED: "+request->getParam("data", true, true)->value()); + else + request->send(500); + } else if(request->method() == HTTP_PUT){ + if(request->hasParam("path", true)){ + String filename = request->getParam("path", true)->value(); + if(SPIFFS.exists(filename)){ + request->send(200); + } else { + File f = SPIFFS.open(filename, "w"); + if(f){ + f.write(0x00); + f.close(); + request->send(200, "", "CREATE: "+filename); + } else { + request->send(500); + } + } + } else + request->send(400); + } + } + + void handleUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final){ + if(!index){ + if(!_username.length() || request->authenticate(_username.c_str(),_password.c_str())) + _uploadAuthenticated = true; + request->_tempFile = SPIFFS.open(filename, "w"); + } + if(_uploadAuthenticated && request->_tempFile && len){ + request->_tempFile.write(data,len); + } + if(_uploadAuthenticated && final) + if(request->_tempFile) request->_tempFile.close(); + } +}; + + +// SKETCH BEGIN +AsyncWebServer server(80); + +const char* ssid = "**********"; +const char* password = "************"; +const char* http_username = "admin"; +const char* http_password = "admin"; + +void setup(){ + Serial.begin(115200); + Serial.setDebugOutput(true); + SPIFFS.begin(); + WiFi.mode(WIFI_STA); + WiFi.begin(ssid, password); + if(WiFi.waitForConnectResult() != WL_CONNECTED){ + Serial.printf("WiFi Failed!\n"); + } + + server.serveStatic("/fs", SPIFFS, "/"); + + server.on("/heap", HTTP_GET, [](AsyncWebServerRequest *request){ + request->send(200, "text/plain", String(ESP.getFreeHeap())); + }); + server.addHandler(new SPIFFSEditor(http_username,http_password)); + + server.onNotFound([](AsyncWebServerRequest *request){ + os_printf("NOT_FOUND: "); + if(request->method() == HTTP_GET) + os_printf("GET"); + else if(request->method() == HTTP_POST) + os_printf("POST"); + else if(request->method() == HTTP_DELETE) + os_printf("DELETE"); + else if(request->method() == HTTP_PUT) + os_printf("PUT"); + else if(request->method() == HTTP_PATCH) + os_printf("PATCH"); + else if(request->method() == HTTP_HEAD) + os_printf("HEAD"); + else if(request->method() == HTTP_OPTIONS) + os_printf("OPTIONS"); + else + os_printf("UNKNOWN"); + os_printf(" http://%s%s\n", request->host().c_str(), request->url().c_str()); + + if(request->contentLength()){ + os_printf("_CONTENT_TYPE: %s\n", request->contentType().c_str()); + os_printf("_CONTENT_LENGTH: %u\n", request->contentLength()); + } + + int headers = request->headers(); + int i; + for(i=0;igetHeader(i); + os_printf("_HEADER[%s]: %s\n", h->name().c_str(), h->value().c_str()); + } + + int params = request->params(); + for(i=0;igetParam(i); + if(p->isFile()){ + os_printf("_FILE[%s]: %s, size: %u\n", p->name().c_str(), p->value().c_str(), p->size()); + } else if(p->isPost()){ + os_printf("_POST[%s]: %s\n", p->name().c_str(), p->value().c_str()); + } else { + os_printf("_GET[%s]: %s\n", p->name().c_str(), p->value().c_str()); + } + } + + request->send(404); + }); + server.onFileUpload([](AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final){ + if(!index) + os_printf("UploadStart: %s\n", filename.c_str()); + os_printf("%s", (const char*)data); + if(final) + os_printf("UploadEnd: %s (%u)\n", filename.c_str(), index+len); + }); + server.onRequestBody([](AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total){ + if(!index) + os_printf("BodyStart: %u\n", total); + os_printf("%s", (const char*)data); + if(index + len == total) + os_printf("BodyEnd: %u\n", total); + }); + server.begin(); +} + +void loop(){} + diff --git a/examples/ESP32_AsyncFSBrowser/data/edit.htm.gz b/examples/ESP32_AsyncFSBrowser/data/edit.htm.gz new file mode 100644 index 0000000..9ee1b81 Binary files /dev/null and b/examples/ESP32_AsyncFSBrowser/data/edit.htm.gz differ diff --git a/examples/ESP32_AsyncFSBrowser/data/favicon.ico b/examples/ESP32_AsyncFSBrowser/data/favicon.ico new file mode 100644 index 0000000..71b25fe Binary files /dev/null and b/examples/ESP32_AsyncFSBrowser/data/favicon.ico differ diff --git a/examples/ESP32_AsyncFSBrowser/data/graphs.js.gz b/examples/ESP32_AsyncFSBrowser/data/graphs.js.gz new file mode 100644 index 0000000..e0e13f6 Binary files /dev/null and b/examples/ESP32_AsyncFSBrowser/data/graphs.js.gz differ diff --git a/examples/ESP32_AsyncFSBrowser/data/index.htm b/examples/ESP32_AsyncFSBrowser/data/index.htm new file mode 100644 index 0000000..7523b22 --- /dev/null +++ b/examples/ESP32_AsyncFSBrowser/data/index.htm @@ -0,0 +1,366 @@ + + + + + + ESP Monitor + + + + + + +
+
+
+ + + + +
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+ + + + + + + + + + + + + +
   SSIDBSSIDChannelSecureHiddenRSSI
+
+ + + + diff --git a/library.properties b/library.properties index b2354cf..18bbbbd 100644 --- a/library.properties +++ b/library.properties @@ -1,9 +1,9 @@ -name=ESP8266 Async Web Server +name=ESP Async WebServer version=1.0.0 -author=ESP8266 +author=Me-No-Dev maintainer=Me-No-Dev -sentence=Async Web Server for ESP8266 -paragraph=Async Web Server for ESP8266 +sentence=Async Web Server for ESP8266 and ESP31B +paragraph=Async Web Server for ESP8266 and ESP31B category=Other url=https://github.com/me-no-dev/ESPAsyncWebServer architectures=* diff --git a/src/AsyncWebServerHandlerImpl.h b/src/AsyncWebServerHandlerImpl.h index 0cb2f4b..8f4794f 100644 --- a/src/AsyncWebServerHandlerImpl.h +++ b/src/AsyncWebServerHandlerImpl.h @@ -21,7 +21,8 @@ class AsyncStaticWebHandler: public AsyncWebHandler { public: AsyncStaticWebHandler(FS& fs, const char* path, const char* uri, const char* cache_header) : _fs(fs), _uri(uri), _path(path), _cache_header(cache_header){ - _isFile = _fs.exists(path); + + _isFile = _fs.exists(path) || _fs.exists((String(path)+".gz").c_str()); if (_uri != "/" && _uri.endsWith("/")) { _uri = _uri.substring(0, _uri.length() - 1); //os_printf("[AsyncStaticWebHandler] _uri / removed"); diff --git a/src/AsyncWebServerResponseImpl.h b/src/AsyncWebServerResponseImpl.h index 145243b..b894440 100644 --- a/src/AsyncWebServerResponseImpl.h +++ b/src/AsyncWebServerResponseImpl.h @@ -57,6 +57,17 @@ class AsyncCallbackResponse: public AsyncAbstractResponse { size_t _fillBuffer(uint8_t *buf, size_t maxLen); }; +class AsyncChunkedResponse: public AsyncAbstractResponse { + private: + AwsResponseFiller _content; + public: + AsyncChunkedResponse(String contentType, AwsResponseFiller callback); + bool _sourceValid(){ return !!(_content); } + size_t _fillBuffer(uint8_t *buf, size_t maxLen); +}; + +class cbuf; + class AsyncResponseStream: public AsyncAbstractResponse, public Print { private: cbuf *_content; diff --git a/src/ESPAsyncWebServer.h b/src/ESPAsyncWebServer.h index a8be5a8..eb28239 100644 --- a/src/ESPAsyncWebServer.h +++ b/src/ESPAsyncWebServer.h @@ -86,6 +86,7 @@ class AsyncWebServerRequest { String _temp; uint8_t _parseState; + uint8_t _version; WebRequestMethod _method; String _url; String _host; @@ -142,6 +143,7 @@ class AsyncWebServerRequest { ~AsyncWebServerRequest(); AsyncClient* client(){ return _client; } + uint8_t version(){ return _version; } WebRequestMethod method(){ return _method; } String url(){ return _url; } String host(){ return _host; } @@ -161,11 +163,13 @@ class AsyncWebServerRequest { void send(FS &fs, String path, String contentType=String(), bool download=false); void send(Stream &stream, String contentType, size_t len); void send(String contentType, size_t len, AwsResponseFiller callback); + void sendChunked(String contentType, AwsResponseFiller callback); AsyncWebServerResponse *beginResponse(int code, String contentType=String(), String content=String()); AsyncWebServerResponse *beginResponse(FS &fs, String path, String contentType=String(), bool download=false); AsyncWebServerResponse *beginResponse(Stream &stream, String contentType, size_t len); AsyncWebServerResponse *beginResponse(String contentType, size_t len, AwsResponseFiller callback); + AsyncWebServerResponse *beginChunkedResponse(String contentType, AwsResponseFiller callback); AsyncResponseStream *beginResponseStream(String contentType, size_t len, size_t bufferSize=1460); int headers(); // get header count @@ -221,6 +225,8 @@ class AsyncWebServerResponse { AsyncWebHeader *_headers; String _contentType; size_t _contentLength; + bool _sendContentLength; + bool _chunked; size_t _headLength; size_t _sentLength; size_t _ackedLength; @@ -230,8 +236,10 @@ class AsyncWebServerResponse { public: AsyncWebServerResponse(); virtual ~AsyncWebServerResponse(); + virtual void setContentLength(size_t len); + virtual void setContentType(String type); virtual void addHeader(String name, String value); - virtual String _assembleHead(); + virtual String _assembleHead(uint8_t version); virtual bool _finished(); virtual bool _failed(); virtual void _respond(AsyncWebServerRequest *request); diff --git a/src/StringArray.h b/src/StringArray.h index 1d89bbb..bce1067 100644 --- a/src/StringArray.h +++ b/src/StringArray.h @@ -9,7 +9,7 @@ #define STRINGARRAY_H_ #include "stddef.h" -#include "String.h" +#include "WString.h" class StringArrayItem; class StringArrayItem { diff --git a/src/WebResponses.cpp b/src/WebResponses.cpp index 0717787..c94e5b9 100644 --- a/src/WebResponses.cpp +++ b/src/WebResponses.cpp @@ -2,7 +2,6 @@ #include "AsyncWebServerResponseImpl.h" #include "cbuf.h" - /* * Abstract Response * */ @@ -53,14 +52,16 @@ const char* AsyncWebServerResponse::_responseCodeToString(int code) { } AsyncWebServerResponse::AsyncWebServerResponse() -:_code(0) -,_headers(NULL) -,_contentType() -,_contentLength(0) -,_headLength(0) -,_sentLength(0) -,_ackedLength(0) -,_state(RESPONSE_SETUP) + : _code(0) + , _headers(NULL) + , _contentType() + , _contentLength(0) + , _sendContentLength(true) + , _chunked(false) + , _headLength(0) + , _sentLength(0) + , _ackedLength(0) + , _state(RESPONSE_SETUP) { addHeader("Connection","close"); addHeader("Access-Control-Allow-Origin","*"); @@ -74,6 +75,16 @@ AsyncWebServerResponse::~AsyncWebServerResponse(){ } } +void AsyncWebServerResponse::setContentLength(size_t len){ + if(_state == RESPONSE_SETUP) + _contentLength = len; +} + +void AsyncWebServerResponse::setContentType(String type){ + if(_state == RESPONSE_SETUP) + _contentType = type; +} + void AsyncWebServerResponse::addHeader(String name, String value){ AsyncWebHeader *header = new AsyncWebHeader(name, value); if(_headers == NULL){ @@ -85,12 +96,19 @@ void AsyncWebServerResponse::addHeader(String name, String value){ } } -String AsyncWebServerResponse::_assembleHead(){ - String out = "HTTP/1.1 " + String(_code) + " " + _responseCodeToString(_code) + "\r\n"; - out += "Content-Length: " + String(_contentLength) + "\r\n"; - if(_contentType.length()){ - out += "Content-Type: " + _contentType + "\r\n"; +String AsyncWebServerResponse::_assembleHead(uint8_t version){ + if(version){ + addHeader("Accept-Ranges","none"); + if(_chunked) + addHeader("Transfer-Encoding","chunked"); } + String out = "HTTP/1." + String(version) + " " + String(_code) + " " + _responseCodeToString(_code) + "\r\n"; + if(_sendContentLength) + out += "Content-Length: " + String(_contentLength) + "\r\n"; + + if(_contentType.length()) + out += "Content-Type: " + _contentType + "\r\n"; + AsyncWebHeader *h; while(_headers != NULL){ h = _headers; @@ -124,7 +142,7 @@ AsyncBasicResponse::AsyncBasicResponse(int code, String contentType, String cont void AsyncBasicResponse::_respond(AsyncWebServerRequest *request){ _state = RESPONSE_HEADERS; - String out = _assembleHead(); + String out = _assembleHead(request->version()); size_t outLen = out.length(); size_t space = request->client()->space(); if(!_contentLength && space >= outLen){ @@ -193,7 +211,7 @@ void AsyncAbstractResponse::_respond(AsyncWebServerRequest *request){ request->send(500); return; } - _head = _assembleHead(); + _head = _assembleHead(request->version()); _state = RESPONSE_HEADERS; size_t outLen = _head.length(); size_t space = request->client()->space(); @@ -218,18 +236,42 @@ size_t AsyncAbstractResponse::_ack(AsyncWebServerRequest *request, size_t len, u _ackedLength += len; size_t space = request->client()->space(); if(_state == RESPONSE_CONTENT){ - size_t remaining = _contentLength - _sentLength; - size_t outLen = (remaining > space)?space:remaining; + size_t outLen; + size_t readLen = 0; + + if(_chunked || !_sendContentLength){ + outLen = space; + } else { + size_t remaining = _contentLength - _sentLength; + outLen = (remaining > space)?space:remaining; + } uint8_t *buf = (uint8_t *)malloc(outLen); - outLen = _fillBuffer(buf, outLen); + + if(_chunked){ + readLen = _fillBuffer(buf, outLen - 8); + char pre[6]; + sprintf(pre, "%x\r\n", readLen); + size_t preLen = strlen(pre); + memmove(buf+preLen, buf, preLen); + for(size_t i=0; iclient()->write((const char*)buf, outLen); + outLen = request->client()->write((const char*)buf, outLen); _sentLength += outLen; free(buf); - if(_sentLength == _contentLength){ + + if((_chunked && readLen == 0) || (!_sendContentLength && outLen == 0) || _sentLength == _contentLength){ _state = RESPONSE_WAIT_ACK; } return outLen; + } else if(_state == RESPONSE_HEADERS){ size_t outLen = _head.length(); if(space >= outLen){ @@ -244,8 +286,10 @@ size_t AsyncAbstractResponse::_ack(AsyncWebServerRequest *request, size_t len, u return out.length(); } } else if(_state == RESPONSE_WAIT_ACK){ - if(_ackedLength >= (_headLength+_contentLength)){ + if(!_sendContentLength || _ackedLength >= (_headLength+_contentLength)){ _state = RESPONSE_END; + if(!_chunked && !_sendContentLength) + request->client()->close(); } } return 0; @@ -330,6 +374,8 @@ AsyncCallbackResponse::AsyncCallbackResponse(String contentType, size_t len, Aws _code = 200; _content = callback; _contentLength = len; + if(!len) + _sendContentLength = false; _contentType = contentType; } @@ -337,6 +383,23 @@ size_t AsyncCallbackResponse::_fillBuffer(uint8_t *data, size_t len){ return _content(data, len); } +/* + * Chunked Response + * */ + +AsyncChunkedResponse::AsyncChunkedResponse(String contentType, AwsResponseFiller callback){ + _code = 200; + _content = callback; + _contentLength = 0; + _contentType = contentType; + _sendContentLength = false; + _chunked = true; +} + +size_t AsyncChunkedResponse::_fillBuffer(uint8_t *data, size_t len){ + return _content(data, len); +} + /* * Response Stream (You can print/write/printf to it, up to the contentLen bytes) @@ -345,6 +408,8 @@ size_t AsyncCallbackResponse::_fillBuffer(uint8_t *data, size_t len){ AsyncResponseStream::AsyncResponseStream(String contentType, size_t len, size_t bufferSize){ _code = 200; _contentLength = len; + if(!len) + _sendContentLength = false; _contentType = contentType; _content = new cbuf(bufferSize); } @@ -358,16 +423,15 @@ size_t AsyncResponseStream::_fillBuffer(uint8_t *buf, size_t maxLen){ } size_t AsyncResponseStream::write(const uint8_t *data, size_t len){ - if(_finished()) + if(_finished() || (_content->room() == 0 && ETS_INTR_WITHINISR())) return 0; - //while(_content->room() < len) delay(1); + if(len > _content->available()) + len = _content->available(); + while(_content->room() < len) delay(0); return _content->write((const char*)data, len); } size_t AsyncResponseStream::write(uint8_t data){ - if(_finished()) - return 0; - //while(_content->room() == 0) delay(1); return write(&data, 1); } diff --git a/src/WebServerClient.cpp b/src/WebServerClient.cpp index 5f6a419..f6e66a5 100644 --- a/src/WebServerClient.cpp +++ b/src/WebServerClient.cpp @@ -9,6 +9,10 @@ #include "AsyncWebServerResponseImpl.h" #include +#ifndef ESP8266 +#define os_strlen strlen +#endif + #define __is_param_char(c) ((c) && ((c) != '{') && ((c) != '[') && ((c) != '&') && ((c) != '=')) enum { PARSE_REQ_START, PARSE_REQ_HEADERS, PARSE_REQ_BODY, PARSE_REQ_END, PARSE_REQ_FAIL }; @@ -21,6 +25,7 @@ AsyncWebServerRequest::AsyncWebServerRequest(AsyncWebServer* s, AsyncClient* c) , _interestingHeaders(new StringArray()) , _temp() , _parseState(0) + , _version(0) , _method(HTTP_ANY) , _url() , _host() @@ -147,11 +152,12 @@ void AsyncWebServerRequest::_onAck(size_t len, uint32_t time){ } void AsyncWebServerRequest::_onError(int8_t error){ - //os_printf("e:%d:%u\n", error, _client->state()); + if(error != -11) + os_printf("ERROR[%d] %s, state: %s\n", error, _client->errorToString(error), _client->stateToString()); } void AsyncWebServerRequest::_onTimeout(uint32_t time){ - //os_printf("t:%u\n", time); + os_printf("TIMEOUT: %u, state: %s\n", time, _client->stateToString()); _client->close(); } @@ -224,6 +230,9 @@ bool AsyncWebServerRequest::_parseReqHead(){ } } + _temp = _temp.substring(_temp.indexOf(' ')+1); + if(_temp.startsWith("HTTP/1.1")) + _version = 1; _temp = String(); return true; } @@ -615,32 +624,42 @@ AsyncWebServerResponse * AsyncWebServerRequest::beginResponse(String contentType return new AsyncCallbackResponse(contentType, len, callback); } +AsyncWebServerResponse * AsyncWebServerRequest::beginChunkedResponse(String contentType, AwsResponseFiller callback){ + if(_version) + return new AsyncChunkedResponse(contentType, callback); + return new AsyncCallbackResponse(contentType, 0, callback); +} + AsyncResponseStream * AsyncWebServerRequest::beginResponseStream(String contentType, size_t len, size_t bufferSize){ return new AsyncResponseStream(contentType, len, bufferSize); } void AsyncWebServerRequest::send(int code, String contentType, String content){ - send(new AsyncBasicResponse(code, contentType, content)); + send(beginResponse(code, contentType, content)); } void AsyncWebServerRequest::send(FS &fs, String path, String contentType, bool download){ if(fs.exists(path) || (!download && fs.exists(path+".gz"))){ - send(new AsyncFileResponse(fs, path, contentType, download)); + send(beginResponse(fs, path, contentType, download)); } else send(404); } void AsyncWebServerRequest::send(Stream &stream, String contentType, size_t len){ - send(new AsyncStreamResponse(stream, contentType, len)); + send(beginResponse(stream, contentType, len)); } void AsyncWebServerRequest::send(String contentType, size_t len, AwsResponseFiller callback){ - send(new AsyncCallbackResponse(contentType, len, callback)); + send(beginResponse(contentType, len, callback)); +} + +void AsyncWebServerRequest::sendChunked(String contentType, AwsResponseFiller callback){ + send(beginChunkedResponse(contentType, callback)); } bool AsyncWebServerRequest::authenticate(const char * username, const char * password){ if(_authorization.length()){ - char toencodeLen = strlen(username)+strlen(password)+1; + char toencodeLen = os_strlen(username)+os_strlen(password)+1; char *toencode = new char[toencodeLen]; if(toencode == NULL){ return false;