Merge pull request #79 from JAndrassy/server_accept

support server.accept() for WiFiNINA library

Author: facchinm

arduino/libraries/WiFi/src/WiFiServer.cpp

@@ -72,7 +72,13 @@ uint8_t WiFiServer::begin(uint16_t port)
 
 WiFiClient WiFiServer::available(uint8_t* status)
 {
-  int result = lwip_accept(_socket, NULL, 0);
+  int result = -1;
+  if (_accepted_sock >= 0) {
+    result = _accepted_sock;
+    _accepted_sock = -1;
+  } else {
+    result = lwip_accept(_socket, NULL, 0);
+  }
 
   if (status) {
     *status = (result != -1);
@@ -109,6 +115,25 @@ WiFiClient WiFiServer::available(uint8_t* status)
   return WiFiClient(result);
 }
 
+WiFiClient WiFiServer::accept()
+{
+  int result = -1;
+  if (_accepted_sock >= 0) {
+    result = _accepted_sock;
+    _accepted_sock = -1;
+  } else {
+    result = lwip_accept(_socket, NULL, 0);
+  }
+  return WiFiClient(result);
+}
+
+bool WiFiServer::hasClient() {
+  if (_accepted_sock != -1) 
+    return true;
+  _accepted_sock = lwip_accept(_socket, NULL, 0);
+  return (_accepted_sock != -1);
+}
+
 uint8_t WiFiServer::status() {
   // Deprecated.
   return 0;

arduino/libraries/WiFi/src/WiFiServer.h

@@ -31,6 +31,8 @@ class WiFiServer /*: public Server*/ {
 public:
   WiFiServer();
   WiFiClient available(uint8_t* status = NULL);
+  WiFiClient accept();
+  bool hasClient();
   uint8_t begin(uint16_t port);
   virtual size_t write(uint8_t);
   virtual size_t write(const uint8_t *buf, size_t size);
@@ -44,6 +46,7 @@ class WiFiServer /*: public Server*/ {
   uint16_t _port;
   int _socket;
   int _spawnedSockets[CONFIG_LWIP_MAX_SOCKETS];
+  int _accepted_sock = -1;
 };
 
 #endif // WIFISERVER_H

main/CommandHandler.cpp

@@ -456,10 +456,24 @@ int availDataTcp(const uint8_t command[], uint8_t response[])
 
   if (socketTypes[socket] == 0x00) {
     if (tcpServers[socket]) {
-      WiFiClient client = tcpServers[socket].available();
 
+      uint8_t accept = command[6];
       available = 255;
 
+      if (accept) {
+        for (int i = 0; i < MAX_SOCKETS; i++) {
+          if (socketTypes[i] == 255) {
+            WiFiClient client = tcpServers[socket].accept();
+            if (client) {
+              socketTypes[i] = 0x00;
+              tcpClients[i] = client;
+              available = i;
+            }
+            break;
+          }
+        }
+     } else {
+      WiFiClient client = tcpServers[socket].available();
       if (client) {
         // try to find existing socket slot
         for (int i = 0; i < MAX_SOCKETS; i++) {
@@ -491,6 +505,7 @@ int availDataTcp(const uint8_t command[], uint8_t response[])
           }
         }
       }
+     }
     } else {
       available = tcpClients[socket].available();
     }
@@ -2153,7 +2168,7 @@ void CommandHandlerClass::updateGpio0Pin()
 
   for (int i = 0; i < MAX_SOCKETS; i++) {
     if (socketTypes[i] == 0x00) {
-      if (tcpServers[i] && tcpServers[i].available()) {
+      if (tcpServers[i] && (tcpServers[i].hasClient() || tcpServers[i].available())) {
         available = 1;
         break;
       } else if (tcpClients[i] && tcpClients[i].connected() && tcpClients[i].available()) {