EthernetClient - UIP_WRITE_TIMEOUT instead of UIP_ATTEMPTS_ON_WRITE

and static _write merged to not static version to use setWriteError() on
timeout

Author: JAndrassy

src/EthernetClient.cpp

@@ -153,22 +153,17 @@ UIPClient::operator bool()
 size_t
 UIPClient::write(uint8_t c)
 {
-  return _write(data, &c, 1);
+  return write(&c, 1);
 }
 
 size_t
 UIPClient::write(const uint8_t *buf, size_t size)
 {
-  return _write(data, buf, size);
-}
-
-size_t
-UIPClient::_write(uip_userdata_t* u, const uint8_t *buf, size_t size)
-{
+  uip_userdata_t* u = data;
   int remain = size;
   uint16_t written;
-#if UIP_ATTEMPTS_ON_WRITE > 0
-  uint16_t attempts = UIP_ATTEMPTS_ON_WRITE;
+#if UIP_WRITE_TIMEOUT > 0
+  uint32_t timeout_start = millis();
 #endif
   repeat:
   UIPEthernetClass::tick();
@@ -181,13 +176,14 @@ UIPClient::_write(uip_userdata_t* u, const uint8_t *buf, size_t size)
           u->packets_out[p] = Enc28J60Network::allocBlock(UIP_SOCKET_DATALEN);
           if (u->packets_out[p] == NOBLOCK)
             {
-#if UIP_ATTEMPTS_ON_WRITE > 0
-              if ((--attempts)>0)
-#endif
-#if UIP_ATTEMPTS_ON_WRITE != 0
-                goto repeat;
+#if UIP_WRITE_TIMEOUT > 0
+              if (millis() - timeout_start > UIP_WRITE_TIMEOUT)
+                {
+                  setWriteError();
+                  goto ready;
+                }
 #endif
-              goto ready;
+              goto repeat;
             }
           u->out_pos = 0;
         }
@@ -211,13 +207,14 @@ UIPClient::_write(uip_userdata_t* u, const uint8_t *buf, size_t size)
         {
           if (p == UIP_SOCKET_NUMPACKETS-1)
             {
-#if UIP_ATTEMPTS_ON_WRITE > 0
-              if ((--attempts)>0)
-#endif
-#if UIP_ATTEMPTS_ON_WRITE != 0
-                goto repeat;
+#if UIP_WRITE_TIMEOUT > 0
+              if (millis() - timeout_start > UIP_WRITE_TIMEOUT)
+                {
+                  setWriteError();
+                  goto ready;
+                }
 #endif
-              goto ready;
+              goto repeat;
             }
           p++;
           goto newpacket;
@@ -253,22 +250,15 @@ UIPClient::available()
   if (!(*this))
     return 0;
 
-  int len = _available(data);
-
-  // if sketch checks for incoming data and there are unsent data, flush the transmit buffer
-  if (!len)
-    flush();
-  return len;
-}
-
-int
-UIPClient::_available(uip_userdata_t *u)
-{
   int len = 0;
   for (uint8_t i = 0; i < UIP_SOCKET_NUMPACKETS; i++)
     {
-      len += Enc28J60Network::blockSize(u->packets_in[i]);
+      len += Enc28J60Network::blockSize(data->packets_in[i]);
     }
+
+  // if sketch checks for incoming data and there are unsent data, flush the transmit buffer
+  if (!len)
+    flush();
   return len;
 }
 

src/EthernetClient.h

@@ -88,9 +88,6 @@ class EthernetClient : public Client {
   static uip_userdata_t all_data[UIP_CONNS];
   static uip_userdata_t* _allocateData();
 
-  static size_t _write(uip_userdata_t *,const uint8_t *buf, size_t size);
-  static int _available(uip_userdata_t *);
-
   static uint8_t _currentBlock(memhandle* blocks);
   static void _eatBlock(memhandle* blocks);
   static void _flushBlocks(memhandle* blocks);

src/utility/uipethernet-conf.h

@@ -18,10 +18,11 @@
 #define UIP_CONF_UDP_CONNS       4
 #endif
 
-/* number of attempts on write before returning number of bytes sent so far
- * set to -1 to block until connection is closed by timeout */
-#ifndef UIP_ATTEMPTS_ON_WRITE
-#define UIP_ATTEMPTS_ON_WRITE    -1
+/* timeout in ms for attempts to get a free memory block to write
+ * before returning number of bytes sent so far
+ * set to 0 to block until connection is closed by timeout */
+#ifndef UIP_WRITE_TIMEOUT
+#define UIP_WRITE_TIMEOUT    2000
 #endif
 
 /* timeout after which UIPClient::connect gives up. The timeout is specified in seconds.