Rewrite AdvancedChatServer to use EthernetServer accept()

Author: PaulStoffregen

examples/AdvancedChatServer/AdvancedChatServer.ino

@@ -28,7 +28,7 @@
 byte mac[] = {
   0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED
 };
-IPAddress ip(192, 168, 1, 177);
+IPAddress ip(192, 168, 194, 177);
 IPAddress myDns(192, 168, 1, 1);
 IPAddress gateway(192, 168, 1, 1);
 IPAddress subnet(255, 255, 0, 0);
@@ -76,53 +76,43 @@ void setup() {
 }
 
 void loop() {
-  // wait for a new client:
-  EthernetClient client = server.available();
-
-  // when the client sends the first byte, say hello:
-  if (client) {
-
-    boolean newClient = true;
+  // check for any new client connecting, and say hello (before any incoming data)
+  EthernetClient newClient = server.accept();
+  if (newClient) {
     for (byte i=0; i < 8; i++) {
-      //check whether this client refers to the same socket as one of the existing instances:
-      if (clients[i] == client) {
-        newClient = false;
+      if (!clients[i]) {
+        Serial.print("We have a new client #");
+        Serial.println(i);
+        newClient.print("Hello, client number: ");
+        newClient.println(i);
+        // Once we "accept", the client is no longer tracked by EthernetServer
+        // so we must store it into our list of clients
+        clients[i] = newClient;
         break;
       }
     }
+  }
 
-    if (newClient) {
-      //check which of the existing clients can be overridden:
-      for (byte i=0; i < 8; i++) {
-        if (!clients[i] && clients[i] != client) {
-          clients[i] = client;
-          // clear out the input buffer:
-          client.flush();
-          Serial.println("We have a new client");
-          client.print("Hello, client number: ");
-          client.print(i);
-          client.println();
-          break;
-        }
-      }
-    }
-
-    if (client.available() > 0) {
-      // read the bytes incoming from the client:
-      char thisChar = client.read();
-      // echo the bytes back to all other connected clients:
-      for (byte i=0; i < 8; i++) {
-        if (clients[i] && (clients[i] != client)) {
-          clients[i].write(thisChar);
+  // check for incoming data from all clients
+  for (byte i=0; i < 8; i++) {
+    if (clients[i] && clients[i].available() > 0) {
+      // read bytes from a client
+      byte buffer[80];
+      int count = clients[i].read(buffer, 80);
+      // write the bytes to all other connected clients
+      for (byte j=0; j < 8; j++) {
+        if (j != i && clients[j]) {
+          clients[j].write(buffer, count);
         }
       }
-      // echo the bytes to the server as well:
-      Serial.write(thisChar);
     }
   }
-  for (byte i=0; i < 8 ; i++) {
-    if (!(clients[i].connected())) {
-      // client.stop() invalidates the internal socket-descriptor, so next use of == will allways return false;
+
+  // stop any clients which disconnect
+  for (byte i=0; i < 8; i++) {
+    if (clients[i] && !clients[i].connected()) {
+      Serial.print("disconnect client #");
+      Serial.println(i);
       clients[i].stop();
     }
   }