using shared ptr to solve server / client problem

Author: maidnl

libraries/WiFiS3/src/WiFiClient.cpp

@@ -2,40 +2,27 @@
 
 /* -------------------------------------------------------------------------- */
 WiFiClient::WiFiClient() : _sock(-1), destroy_at_distructor(true), rx_buffer(nullptr) { 
-   rx_buffer = new FifoBuffer<uint8_t,RX_BUFFER_DIM>();
+   rx_buffer = shared_ptr<FifoBuffer<uint8_t,RX_BUFFER_DIM>>(new FifoBuffer<uint8_t,RX_BUFFER_DIM>());
 }
 /* -------------------------------------------------------------------------- */
 
 /* -------------------------------------------------------------------------- */
 WiFiClient::WiFiClient(int s) : _sock(s), destroy_at_distructor(false), rx_buffer(nullptr) {
-   rx_buffer = new FifoBuffer<uint8_t,RX_BUFFER_DIM>();
+   rx_buffer = shared_ptr<FifoBuffer<uint8_t,RX_BUFFER_DIM>>(new FifoBuffer<uint8_t,RX_BUFFER_DIM>());
 }
 /* -------------------------------------------------------------------------- */
 
 /* -------------------------------------------------------------------------- */
-WiFiClient::~WiFiClient() {
-   if(destroy_at_distructor) {
-      clear_buffer();
-   }
-}
+WiFiClient::~WiFiClient() { }
 /* -------------------------------------------------------------------------- */
 
-void WiFiClient::clear_buffer() {
-   if(rx_buffer != nullptr) {
-      delete rx_buffer;
-      rx_buffer = nullptr;
-   }
-}
-
-
 /* -------------------------------------------------------------------------- */   
 WiFiClient::WiFiClient(const WiFiClient& c) {
 /* -------------------------------------------------------------------------- */   
    _sock = c._sock;
    rx_buffer = c.rx_buffer;
 }
 
-
 /* -------------------------------------------------------------------------- */
 void WiFiClient::getSocket() {
 /* -------------------------------------------------------------------------- */
@@ -48,8 +35,6 @@ void WiFiClient::getSocket() {
    }   
 }
 
-
-
 /* -------------------------------------------------------------------------- */
 int WiFiClient::connect(IPAddress ip, uint16_t port){
 /* -------------------------------------------------------------------------- */   
@@ -113,6 +98,7 @@ int WiFiClient::available(){
          modem.begin();
          if(modem.write(string(PROMPT(_AVAILABLE)),res, "%s%d\r\n" , CMD_WRITE(_AVAILABLE), _sock)) {
             rv = atoi(res.c_str());
+            
          }  
       }
    }
@@ -131,15 +117,14 @@ int WiFiClient::_read() {
       /* important - it works one shot */
       modem.avoid_trim_results();
       modem.read_using_size();
+      
       if(modem.write(string(PROMPT(_CLIENTRECEIVE)),res, "%s%d,%d\r\n" , CMD_WRITE(_CLIENTRECEIVE), _sock, size)) {
          for(int i = 0, rv = 0; i < size && i < res.size(); i++) {
             rx_buffer->store((uint8_t)res[i]);
             rv++;
          }
       }
    }
-   
-   
    return rv;
 }  
 

libraries/WiFiS3/src/WiFiClient.h

@@ -28,6 +28,7 @@
 #include "WiFiTypes.h"
 #include "Modem.h"
 #include "FifoBuffer.h"
+#include <memory>
 
 #define RX_BUFFER_DIM 1024
 
@@ -64,7 +65,7 @@ class WiFiClient : public Client {
 protected:
   int _sock;
   void getSocket();
-  FifoBuffer<uint8_t,RX_BUFFER_DIM> *rx_buffer;
+  shared_ptr<FifoBuffer<uint8_t,RX_BUFFER_DIM>> rx_buffer;
   int _read();
   bool read_needed(size_t s);
   void clear_buffer();

libraries/WiFiS3/src/WiFiServer.cpp

@@ -15,14 +15,13 @@ WiFiClient WiFiServer::available() {
    if(_sock != -1) {
       string res = "";
       modem.begin();
+      /* call the server available on esp so that the accept is performed */
       if(modem.write(string(PROMPT(_SERVERAVAILABLE)),res, "%s%d\r\n" , CMD_WRITE(_SERVERAVAILABLE), _sock)) {
          int client_sock = atoi(res.c_str());
-         
          if(client._sock == client_sock) {
             return client;
          }
          else {
-            client.clear_buffer();
             client = WiFiClient(client_sock);
             return client;
          }