Fixed crash inside ChatServer & DhcpChatServer examples

Signed-off-by: fpr <[email protected]>

Author: fpr

libraries/NativeEthernet/examples/ChatServer/ChatServer.ino

@@ -12,24 +12,6 @@
  by David A. Mellis
  modified 9 Apr 2012
  by Tom Igoe
-
- Workaround:
- * If you can't send a message after the server has accepted the connection,
- reject the 26 first bytes.
-
- if (client.available() > 0) {
-   // read the bytes incoming from the client:
-   char thisChar = client.read();
-   if(n++ > 26) {
-     // echo the bytes back to the client:
-     server.write(thisChar);
-     // echo the bytes to the server as well:
-     Serial.write(thisChar);
-   }
- }
-
-
-
  */
 
 #include <NativeEthernet.h>

libraries/NativeEthernet/examples/DhcpAddressPrinter/DhcpAddressPrinter.ino

@@ -12,22 +12,6 @@
   by Tom Igoe
   modified 02 Sept 2015
   by Arturo Guadalupi
-
-  Workaround:
-  * If you can't send a message after the server has accepted the connection,
-  reject the 26 first bytes.
-
-  if (client.available() > 0) {
-    // read the bytes incoming from the client:
-    char thisChar = client.read();
-    if(n++ > 26) {
-      // echo the bytes back to the client:
-      server.write(thisChar);
-      // echo the bytes to the server as well:
-      Serial.write(thisChar);
-    }
-  }
-
 */
 
 #include <NativeEthernet.h>

libraries/NativeEthernet/src/EthernetClient.cpp

@@ -88,6 +88,13 @@ size_t EthernetClient::write(const uint8_t *buf, size_t size) {
     return 0;
   }
 
+  /* If client not connected or accepted, it can't write because connection is
+  not ready */
+  if((_tcp_client->state != TCP_ACCEPTED) &&
+    (_tcp_client->state != TCP_CONNECTED)) {
+    return 0;
+  }
+
   if(ERR_OK != tcp_write(_tcp_client->pcb, buf, size, TCP_WRITE_FLAG_COPY)) {
     return 0;
   }
@@ -97,16 +104,7 @@ size_t EthernetClient::write(const uint8_t *buf, size_t size) {
     return 0;
   }
 
-  tcp_client_states tmp = _tcp_client->state;
-  while(_tcp_client->state != TCP_SENT) {
-    stm32_eth_scheduler();
-    if(_tcp_client->state == TCP_CLOSING) {
-      stop();
-      return 0;
-    }
-  }
-
-  _tcp_client->state = tmp;
+  stm32_eth_scheduler();
 
   return size;
 }

libraries/NativeEthernet/src/utility/stm32_eth.c

@@ -916,8 +916,6 @@ static err_t tcp_sent_callback(void *arg, struct tcp_pcb *tpcb, u16_t len)
 
   if((tcp_arg != NULL) && (tcp_arg->pcb == tpcb))
   {
-    /* still got pbufs to send */
-    tcp_arg->state = TCP_SENT;
     return ERR_OK;
   }