github tag

EthernetInterface.cpp

@@ -213,22 +213,25 @@ void EthernetInterface::loop2() {
     if (client)
     {
         byte socket;
-        for (socket = 0; socket < MAX_SOCK_NUM; socket++)
-        {
-          if (clients[socket]) {
-            if (clients[socket] == client)
+	bool sockfound = false;
+        for (socket = 0; socket < MAX_SOCK_NUM; socket++) {
+          if (clients[socket] && (clients[socket] == client)) {
+	    sockfound = true;
+	    if (Diag::ETHERNET) DIAG(F("Ethernet: Old client socket %d"),socket);
 	    break;
           }
-          else //if (!clients[socket])
-            {
-                if (Diag::ETHERNET) DIAG(F("Ethernet: New client "));
+	}
+	if (!sockfound) { // new client
+	  for (socket = 0; socket < MAX_SOCK_NUM; socket++) {
+	    if (!clients[socket]) {
 	      // On accept() the EthernetServer doesn't track the client anymore
 	      // so we store it in our client array
-                if (Diag::ETHERNET) DIAG(F("Socket %d"),socket);
 	      clients[socket] = client;
+	      if (Diag::ETHERNET) DIAG(F("Ethernet: New client socket %d"),socket);
 	      break;
             }
 	  }
+        }
         if (socket==MAX_SOCK_NUM) DIAG(F("new Ethernet OVERFLOW")); 
     }
 
@@ -236,6 +239,14 @@ void EthernetInterface::loop2() {
     for (byte socket = 0; socket < MAX_SOCK_NUM; 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();
 	if (available > 0) {
@@ -251,15 +262,6 @@ void EthernetInterface::loop2() {
       }
     }
 
-    // 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);
     
     // handle at most 1 outbound transmission 

GITHUB_SHA.h

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