reimplementing Server class with ethernet and wifi subclasses

Author: andreagilardoni

libraries/Ethernet/src/EthernetClient.h

@@ -1,17 +1,23 @@
-#ifndef ARDUINO_LWIP_ETHERNET_CLIENT_H
-#define ARDUINO_LWIP_ETHERNET_CLIENT_H
-
+#pragma once
 
 #include "lwipClient.h"
 
 class EthernetClient : public lwipClient {
 public:
-   EthernetClient() {
-      this->bindCNetIf(Ethernet);
-   }
-   EthernetClient(struct tcp_pcb *pcb) : lwipClient(pcb) {
-      this->bindCNetIf(Ethernet);
-   }
-};
+    EthernetClient() {
+    }
+    EthernetClient(struct tcp_pcb *pcb, lwipServer *server)
+    : lwipClient(pcb, server) {
+    }
+    EthernetClient(lwipClient c)
+    : lwipClient(c) {
+    }
+
+    int connect(IPAddress ip, uint16_t port) {
+        auto res = lwipClient::connect(ip, port);
 
-#endif
+        this->bindCNetIf(Ethernet);
+
+        return res;
+    }
+};

libraries/Ethernet/src/EthernetServer.h

@@ -1,36 +1,16 @@
-#ifndef ARDUINO_LWIP_ETHERNET_SERVER_H
-#define ARDUINO_LWIP_ETHERNET_SERVER_H
-
-
+#pragma once
 
 #include "lwipServer.h"
 #include "EthernetClient.h"
 
-class EthernetServer : public lwipServer {
-   public:
-   EthernetServer() {}
-   EthernetServer(uint16_t port) : lwipServer(port) {}
-
-   EthernetClient available() {
-      accept();
+class EthernetServer: public lwipServer {
+public:
+    void begin() {
+        lwipServer::begin();
+        this->bindCNetIf(WiFi);
+    }
 
-      for (int n = 0; n < MAX_CLIENT; n++) {
-         if (_tcp_client[n] != NULL) {
-            if (_tcp_client[n]->pcb != NULL) {
-               EthernetClient client(_tcp_client[n]);
-               uint8_t s = client.status();
-               if (s == TCP_ACCEPTED) {
-                  if (client.available()) {
-                     return client;
-                  }
-               }
-            }
-         }
-     }
-
-     struct tcp_struct *default_client = NULL;
-     return EthernetClient(default_client);
-   }
+    EthernetClient available() {
+        return EthernetClient(lwipServer::available());
+    }
 };
-
-#endif

libraries/WiFi/src/WiFiClient.h

@@ -1,18 +1,23 @@
-#ifndef ARDUINO_LWIP_WIFI_CLIENT_H
-#define ARDUINO_LWIP_WIFI_CLIENT_H
-
+#pragma once
 
 #include "lwipClient.h"
 
-class WiFiClient : public lwipClient {
-   public:
-   WiFiClient() {
-      this->bindCNetIf(WiFi);
-   }
-   WiFiClient(struct tcp_pcb *pcb) : lwipClient(pcb) {
-      this->bindCNetIf(WiFi);
-   }
-};
+class WiFiClient: public lwipClient {
+public:
+    WiFiClient() {
+    }
+    WiFiClient(struct tcp_pcb *pcb, lwipServer *server)
+    : lwipClient(pcb, server) {
+    }
+    WiFiClient(lwipClient c)
+    : lwipClient(c) {
+    }
 
-#endif
+    int connect(IPAddress ip, uint16_t port) {
+        auto res = lwipClient::connect(ip, port);
 
+        this->bindCNetIf(WiFi);
+
+        return res;
+    }
+};

libraries/WiFi/src/WiFiServer.h

@@ -1,35 +1,16 @@
-#ifndef ARDUINO_LWIP_WIFI_SERVER_H
-#define ARDUINO_LWIP_WIFI_SERVER_H
-
+#pragma once
 
 #include "lwipServer.h"
-#include "WiFiClient.h"
-
-class WiFiServer : public lwipServer {
-   public:
-   WiFiServer() {}
-   WiFiServer(uint16_t port) : lwipServer(port) {}
+#include "lwipClient.h"
 
-   WiFiClient available() {
-      accept();
+class WiFiServer: public lwipServer {
+public:
+    void begin() {
+        lwipServer::begin();
+        this->bindCNetIf(WiFi);
+    }
 
-      for (int n = 0; n < MAX_CLIENT; n++) {
-         if (_tcp_client[n] != NULL) {
-            if (_tcp_client[n]->pcb != NULL) {
-               WiFiClient client(_tcp_client[n]);
-               uint8_t s = client.status();
-               if (s == TCP_ACCEPTED) {
-                  if (client.available()) {
-                     return client;
-                  }
-               }
-            }
-         }
-     }
-
-     struct tcp_struct *default_client = NULL;
-     return WiFiClient(default_client);
-   }
+    WiFiClient available() {
+        return WiFiClient(lwipServer::available());
+    }
 };
-
-#endif