EthernetClient - efficient transmitting without UIP_CLIENT_TIMER

simply send waiting packet right after ACK for the previous

Author: JAndrassy

src/Ethernet.cpp

@@ -237,37 +237,14 @@ UIPEthernetClass::tick()
 
   unsigned long now = millis();
 
-#if UIP_CLIENT_TIMER >= 0
-  boolean periodic = (long)( now - periodic_timer ) >= 0;
-  for (int i = 0; i < UIP_CONNS; i++)
-    {
-#else
   if ((long)( now - periodic_timer ) >= 0)
     {
       periodic_timer = now + UIP_PERIODIC_TIMER;
 
       for (int i = 0; i < UIP_CONNS; i++)
         {
-#endif
       uip_conn = &uip_conns[i];
-#if UIP_CLIENT_TIMER >= 0
-      if (periodic)
-        {
-#endif
           uip_process(UIP_TIMER);
-#if UIP_CLIENT_TIMER >= 0
-        }
-      else
-        {
-          if (uip_conn->appstate != NULL && (long)( now - ((uip_userdata_t*)uip_conn->appstate)->timer) >= 0)
-            {
-            uip_process(UIP_POLL_REQUEST);
-            ((uip_userdata_t*)uip_conn->appstate)->timer = millis() + UIP_CLIENT_TIMER;
-            }
-          else
-            continue;
-        }
-#endif
         // If the above function invocation resulted in data that
         // should be sent out on the Enc28J60Network, the global variable
         // uip_len is set to a value > 0.
@@ -277,11 +254,6 @@ UIPEthernetClass::tick()
           network_send();
         }
     }
-#if UIP_CLIENT_TIMER >= 0
-  if (periodic)
-    {
-      periodic_timer = now + UIP_PERIODIC_TIMER;
-#endif
 #if UIP_UDP
       for (int i = 0; i < UIP_UDP_CONNS; i++)
         {

src/EthernetClient.cpp

@@ -223,9 +223,6 @@ UIPClient::_write(uip_userdata_t* u, const uint8_t *buf, size_t size)
           goto newpacket;
         }
 ready:
-#if UIP_CLIENT_TIMER >= 0
-      u->timer = millis()+UIP_CLIENT_TIMER;
-#endif
       return size-remain;
     }
   return 0;
@@ -442,12 +439,14 @@ uipclient_appcall(void)
           UIPClient::_eatBlock(u->packets_out);
           if (u->packets_out[0] == NOBLOCK)
             u->state &= ~UIP_CLIENT_FLUSH;
+          goto send;
         }
       if (uip_poll() || uip_rexmit())
         {
 #ifdef UIPETHERNET_DEBUG_CLIENT
           //Serial.println(F("UIPClient uip_poll"));
 #endif
+send:
           if (u->packets_out[0] != NOBLOCK)
             {
               if (u->packets_out[1] == NOBLOCK)

src/EthernetClient.h

@@ -49,9 +49,6 @@ typedef struct {
   memhandle packets_in[UIP_SOCKET_NUMPACKETS] = {NOBLOCK};
   memhandle packets_out[UIP_SOCKET_NUMPACKETS] = {NOBLOCK};
   memaddress out_pos;
-#if UIP_CLIENT_TIMER >= 0
-  unsigned long timer;
-#endif
 } uip_userdata_t;
 
 class EthernetClient : public Client {

src/utility/uipethernet-conf.h

@@ -35,10 +35,4 @@
 #define UIP_PERIODIC_TIMER       100
 #endif
 
-/* timer to poll client for data after last write (in ms)
- * set to -1 to disable fast polling and rely on periodic only (saves 100 bytes flash) */
-#ifndef UIP_CLIENT_TIMER
-#define UIP_CLIENT_TIMER         10
-#endif
-
 #endif