EthernetInterface.cpp

@@ -213,24 +213,21 @@ void EthernetInterface::loop2() {
     if (client)
     {
         byte socket;
-	bool sockfound = false;
+        for (socket = 0; socket < MAX_SOCK_NUM; socket++)
-        for (socket = 0; socket < MAX_SOCK_NUM; socket++) {
+        {
-          if (clients[socket] && (clients[socket] == client)) {
+          if (clients[socket]) {
-	    sockfound = true;
+            if (clients[socket] == client)
-	    if (Diag::ETHERNET) DIAG(F("Ethernet: Old client socket %d"),socket);
+              break;
-	    break;
           }
-	}
+          else //if (!clients[socket])
-	if (!sockfound) { // new client
+            {
-	  for (socket = 0; socket < MAX_SOCK_NUM; socket++) {
+                if (Diag::ETHERNET) DIAG(F("Ethernet: New client "));
-	    if (!clients[socket]) {
+                // On accept() the EthernetServer doesn't track the client anymore
-	      // On accept() the EthernetServer doesn't track the client anymore
+                // so we store it in our client array
-	      // so we store it in our client array
+                if (Diag::ETHERNET) DIAG(F("Socket %d"),socket);
-	      clients[socket] = client;
+                clients[socket] = client;
-	      if (Diag::ETHERNET) DIAG(F("Ethernet: New client socket %d"),socket);
+                break;
-	      break;
             }
-	  }
         }
         if (socket==MAX_SOCK_NUM) DIAG(F("new Ethernet OVERFLOW")); 
     }
@@ -238,28 +235,29 @@ void EthernetInterface::loop2() {
     // check for incoming data from all possible clients
     for (byte socket = 0; socket < MAX_SOCK_NUM; socket++)
     {
-      if (clients[socket]) {
+        if (clients[socket]) {
-	if (!clients[socket].connected()) { // stop any clients which disconnect
-	  CommandDistributor::forget(socket);
-	  clients[socket].stop();
-	  clients[socket]=NULL;
-	  //if (Diag::ETHERNET)
-	  DIAG(F("Ethernet: disconnect %d "), socket);
-	  return; // Trick: So that we do not continue in this loop with client that is NULL
-	}
         
-	int available=clients[socket].available();
+        int available=clients[socket].available();
-	if (available > 0) {
+        if (available > 0) {
-	  if (Diag::ETHERNET)  DIAG(F("Ethernet: available socket=%d,avail=%d"), socket, available);
+            if (Diag::ETHERNET)  DIAG(F("Ethernet: available socket=%d,avail=%d"), socket, available);
-	  // read bytes from a client
+            // read bytes from a client
-	  int count = clients[socket].read(buffer, MAX_ETH_BUFFER);
+            int count = clients[socket].read(buffer, MAX_ETH_BUFFER);
-	  buffer[count] = '\0'; // terminate the string properly
+            buffer[count] = '\0'; // terminate the string properly
-	  if (Diag::ETHERNET) DIAG(F(",count=%d:%e"), socket,buffer);
+            if (Diag::ETHERNET) DIAG(F(",count=%d:%e"), socket,buffer);
-	  // execute with data going directly back
+            // execute with data going directly back
-	  CommandDistributor::parse(socket,buffer,outboundRing);
+            CommandDistributor::parse(socket,buffer,outboundRing);
-	  return; // limit the amount of processing that takes place within 1 loop() cycle.
+            return; // limit the amount of processing that takes place within 1 loop() cycle. 
-	}
+          }
-      }
+        }
+    }
+
+    // stop any clients which disconnect
+   for (int socket = 0; socket<MAX_SOCK_NUM; socket++) {
+     if (clients[socket] && !clients[socket].connected()) {
+      clients[socket].stop();
+      CommandDistributor::forget(socket);          
+      if (Diag::ETHERNET)  DIAG(F("Ethernet: disconnect %d "), socket);             
+     }
     }
 
     WiThrottle::loop(outboundRing);

GITHUB_SHA.h

@@ -1 +1 @@
-#define GITHUB_SHA "devel-stm32EC 202401280047Z"
+#define GITHUB_SHA "devel-202401202116Z"