Merge pull request #158 from mazgch/fixes_for_arduino_esp32_v3.0.0

Fixes for arduino esp32 v3.0.0
gilmaimon · Jun 3, 2024 · d89b200 · d89b200
2 parents 917809c + 662d6ab
commit d89b200
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/src/tiny_websockets/network/esp32/esp32_tcp.hpp b/src/tiny_websockets/network/esp32/esp32_tcp.hpp
@@ -8,6 +8,7 @@
 #include <tiny_websockets/network/generic_esp/generic_esp_clients.hpp>
 
 #include <WiFi.h>
+#include <WiFiClientSecure.h>
 #include <HTTPClient.h>
 
 namespace websockets { namespace network {

diff --git a/src/websockets_client.cpp b/src/websockets_client.cpp
@@ -134,7 +134,7 @@ namespace websockets {
 #ifndef _WS_CONFIG_SKIP_HANDSHAKE_ACCEPT_VALIDATION
         result.expectedAcceptKey = crypto::websocketsHandshakeEncodeKey(key);
 #endif
-        return std::move(result);
+        return result;
     }
 
     bool isWhitespace(char ch) {

diff --git a/src/websockets_endpoint.cpp b/src/websockets_endpoint.cpp
@@ -182,7 +182,7 @@ namespace internals {
 
             done_reading += numReceived;
         }
-        return std::move(data);
+        return data;
     }
 
     void remaskData(WSString& data, const uint8_t* const maskingKey, uint64_t payloadLength) {
@@ -233,14 +233,14 @@ namespace internals {
         frame.opcode = header.opcode;
         frame.payload_length = payloadLength;
 
-        return std::move(frame);
+        return frame;
     }
 
     WebsocketsMessage WebsocketsEndpoint::handleFrameInStreamingMode(WebsocketsFrame& frame) {
         if(frame.isControlFrame()) {
             auto msg = WebsocketsMessage::CreateFromFrame(std::move(frame));
             this->handleMessageInternally(msg);
-            return std::move(msg);
+            return msg;
         }
         else if(frame.isBeginningOfFragmentsStream()) {
             this->_recvMode = RecvMode_Streaming;
@@ -293,7 +293,7 @@ namespace internals {
         if(frame.isNormalUnfragmentedMessage() || frame.isControlFrame()) {
             auto msg = WebsocketsMessage::CreateFromFrame(std::move(frame));
             this->handleMessageInternally(msg);
-            return std::move(msg);
+            return msg;
         } 
         else if(frame.isBeginningOfFragmentsStream()) {
             return handleFrameInStreamingMode(frame);