compatibility esp32 >=3.0.0

dvarrel · Jul 28, 2024 · 1b07095 · 0xCAFEDECAF · Oct 21, 2024 · 1b07095
1 parent bc8b756
commit 1b07095
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 3 deletions.
diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=ESPAsyncWebSrv
-version=1.2.7
+version=1.2.8
 author=dvarrel
 maintainer=dvarrel
 sentence=Asynchronous HTTP and WebSocket Server Library for ESP8266 and ESP32 . Forked from https://github.com/me-no-dev/ESPAsyncWebServer

diff --git a/src/AsyncEventSource.cpp b/src/AsyncEventSource.cpp
@@ -185,7 +185,7 @@ void AsyncEventSourceClient::_queueMessage(AsyncEventSourceMessage *dataMessage)
     return;
   }
   if(_messageQueue.length() >= SSE_MAX_QUEUED_MESSAGES){
-      ets_printf("ERROR: Too many messages queued\n");
+      //ets_printf("ERROR: Too many messages queued\n");
       delete dataMessage;
   } else {
       _messageQueue.add(dataMessage);

diff --git a/src/AsyncWebSocket.cpp b/src/AsyncWebSocket.cpp
@@ -548,7 +548,7 @@ void AsyncWebSocketClient::_queueMessage(AsyncWebSocketMessage *dataMessage){
     return;
   }
   if(_messageQueue.length() >= WS_MAX_QUEUED_MESSAGES){
-      ets_printf("ERROR: Too many messages queued\n");
+      //ets_printf("ERROR: Too many messages queued\n");
       delete dataMessage;
   } else {
       _messageQueue.add(dataMessage);

diff --git a/src/AsyncWebSocket.h b/src/AsyncWebSocket.h
@@ -24,6 +24,10 @@
 #include <Arduino.h>
 #ifdef ESP32
 #include <AsyncTCP.h>
+#if ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(3, 0, 0)
+// Code for version 3.x
+#include "mbedtls/compat-2.x.h"
+#endif
 #define WS_MAX_QUEUED_MESSAGES 32
 #else
 #include <ESPAsyncTCP.h>

diff --git a/src/WebAuthentication.h b/src/WebAuthentication.h
@@ -24,6 +24,13 @@
 
 #include "Arduino.h"
 
+#if ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(3, 0, 0)
+  // Code for version 3.x
+  #ifdef ESP32
+    #include "mbedtls/compat-2.x.h"
+  #endif
+#endif
+
 bool checkBasicAuthentication(const char * header, const char * username, const char * password);
 String requestDigestAuthentication(const char * realm);
 bool checkDigestAuthentication(const char * header, const char * method, const char * username, const char * password, const char * realm, bool passwordIsHash, const char * nonce, const char * opaque, const char * uri);