changes for server

Author: maidnl

libraries/WiFiS3/src/WiFiClient.cpp

@@ -1,14 +1,41 @@
 #include "WiFiClient.h"
 
 /* -------------------------------------------------------------------------- */
-WiFiClient::WiFiClient() : _sock(-1) { }
+WiFiClient::WiFiClient() : _sock(-1), destroy_at_distructor(true), rx_buffer(nullptr) { 
+   rx_buffer = 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>();
+}
 /* -------------------------------------------------------------------------- */
 
 /* -------------------------------------------------------------------------- */
-WiFiClient::WiFiClient(int s) : _sock(s) {
+WiFiClient::~WiFiClient() {
+   if(destroy_at_distructor) {
+      clear_buffer();
+   }
 }
 /* -------------------------------------------------------------------------- */
-   
+
+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() {
 /* -------------------------------------------------------------------------- */
@@ -77,9 +104,9 @@ size_t WiFiClient::write(const uint8_t *buf, size_t size){
 int WiFiClient::available(){
 /* -------------------------------------------------------------------------- */   
    int rv = 0;
-   if(_sock >= 0) {
-      if(rx_buffer.available() > 0) {
-         return rx_buffer.available();
+   if(_sock >= 0 && rx_buffer != nullptr) {
+      if(rx_buffer->available() > 0) {
+         return rx_buffer->available();
       }
       else {
          string res = "";
@@ -96,29 +123,33 @@ int WiFiClient::available(){
 int WiFiClient::_read() {
 /* -------------------------------------------------------------------------- */   
    int rv = -1;
-   if(_sock >= 0) {
+   if(_sock >= 0 && rx_buffer != nullptr) {
       string res = "";
-      uint32_t size = rx_buffer.freePositions() - 1;
+      uint32_t size = rx_buffer->freePositions() - 1;
       modem.begin();
 
       /* 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]);
+            rx_buffer->store((uint8_t)res[i]);
             rv++;
          }
       }
    }
+   
+   
    return rv;
 }  
 
 /* -------------------------------------------------------------------------- */
 bool WiFiClient::read_needed(size_t s) {
 /* -------------------------------------------------------------------------- */   
-   if((size_t)rx_buffer.available() < s) {
-      _read();
+   if(rx_buffer != nullptr) {
+      if((size_t)rx_buffer->available() < s) {
+         _read();
+      }
    }
 }
 
@@ -138,14 +169,16 @@ int WiFiClient::read(uint8_t *buf, size_t size) {
    read_needed(size);
    int rv = 0;
    bool go_on = true;
-   for(int i = 0; i < size && go_on; i++) {
-      bool is_read = false;
-      *(buf+i) = rx_buffer.read(&is_read);
-      if(is_read) {
-         rv++;
-      }
-      else {
-         go_on = false;
+   if(_sock >= 0 && rx_buffer != nullptr) {
+      for(int i = 0; i < size && go_on; i++) {
+         bool is_read = false;
+         *(buf+i) = rx_buffer->read(&is_read);
+         if(is_read) {
+            rv++;
+         }
+         else {
+            go_on = false;
+         }
       }
    }
    return rv; 

libraries/WiFiS3/src/WiFiClient.h

@@ -35,7 +35,10 @@ class WiFiClient : public Client {
 
 public:
   WiFiClient();
+  /* this constructor is not intended to be called outside of the Server class */
   WiFiClient(int s);
+  WiFiClient(const WiFiClient& c);
+  ~WiFiClient();
   virtual int connect(IPAddress ip, uint16_t port);
   virtual int connect(const char *host, uint16_t port);
   virtual size_t write(uint8_t);
@@ -61,9 +64,11 @@ class WiFiClient : public Client {
 protected:
   int _sock;
   void getSocket();
-  FifoBuffer<uint8_t,RX_BUFFER_DIM> rx_buffer;
+  FifoBuffer<uint8_t,RX_BUFFER_DIM> *rx_buffer;
   int _read();
   bool read_needed(size_t s);
+  void clear_buffer();
+  bool destroy_at_distructor;
 
 
 

libraries/WiFiS3/src/WiFiServer.cpp

@@ -11,13 +11,21 @@ WiFiServer::WiFiServer(int p) : _sock(-1), _port(p) {}
 
 /* -------------------------------------------------------------------------- */
 WiFiClient WiFiServer::available() {
-/* -------------------------------------------------------------------------- */   
+/* -------------------------------------------------------------------------- */
    if(_sock != -1) {
       string res = "";
       modem.begin();
       if(modem.write(string(PROMPT(_SERVERAVAILABLE)),res, "%s%d\r\n" , CMD_WRITE(_SERVERAVAILABLE), _sock)) {
          int client_sock = atoi(res.c_str());
-         return WiFiClient(client_sock);
+         
+         if(client._sock == client_sock) {
+            return client;
+         }
+         else {
+            client.clear_buffer();
+            client = WiFiClient(client_sock);
+            return client;
+         }
       }
    }
    return WiFiClient();
@@ -41,15 +49,26 @@ void WiFiServer::begin() {
    begin(_port);
 }
 
+
+
 /* -------------------------------------------------------------------------- */
-size_t WiFiServer::write(uint8_t){
+size_t WiFiServer::write(uint8_t b){
 /* -------------------------------------------------------------------------- */   
-   return 0;
+   return write(&b, 1);
 }
 
 /* -------------------------------------------------------------------------- */
 size_t WiFiServer::write(const uint8_t *buf, size_t size) {
 /* -------------------------------------------------------------------------- */   
+   if(_sock >= 0) {
+      string res = "";
+      modem.begin();
+      modem.write_nowait(string(PROMPT(_SERVERWRITE)),res, "%s%d,%d\r\n" , CMD_WRITE(_SERVERWRITE), _sock, size);
+      if(modem.passthrough(buf,size)) {
+         return size;
+      }
+      
+   }
    return 0;
 }
 

libraries/WiFiS3/src/WiFiServer.h

@@ -25,12 +25,13 @@
 #include "Modem.h"
 #include "WiFiClient.h"
 
-class WiFiClient;
+
 
 class WiFiServer : public Server {
 private:
   int _sock;
   int _port;
+  WiFiClient client;
 
 public:
   WiFiServer();
@@ -44,6 +45,8 @@ class WiFiServer : public Server {
 
 
   using Print::write;
+
+  friend class WiFiClient;
 };
 
 #endif