From 670785ed8650e513033c74b2c88d8b949cbf93ab Mon Sep 17 00:00:00 2001
From: ntruchsess <norbert.truchsess@t-online.de>
Date: Sun, 2 Mar 2014 22:16:18 +0100
Subject: [PATCH 1/2] fix regression introduced in
 4cf19395480a877df6f96b4ff1d0b17e47594c2d

---
 UIPClient.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/UIPClient.cpp b/UIPClient.cpp
index 0fe180a..687a9c0 100644
--- a/UIPClient.cpp
+++ b/UIPClient.cpp
@@ -331,7 +331,7 @@ uipclient_appcall(void)
     {
 #ifdef UIPETHERNET_DEBUG_CLIENT
       Serial.println(F("UIPClient uip_connected"));
-      _dumpAllData();
+      UIPClient::_dumpAllData();
 #endif
       u = (uip_userdata_t*) UIPClient::_allocateData();
       if (u)
@@ -387,7 +387,7 @@ uipclient_appcall(void)
         {
 #ifdef UIPETHERNET_DEBUG_CLIENT
           Serial.println(F("UIPClient uip_closed"));
-          _dumpAllData();
+          UIPClient::_dumpAllData();
 #endif
           // drop outgoing packets not sent yet:
           UIPClient::_flushBlocks(&u->packets_out[0]);
@@ -401,7 +401,7 @@ uipclient_appcall(void)
           // disassociate appdata.
 #ifdef UIPETHERNET_DEBUG_CLIENT
           Serial.println(F("after UIPClient uip_closed"));
-          _dumpAllData();
+          UIPClient::_dumpAllData();
 #endif
           uip_conn->appstate = NULL;
           goto nodata;
@@ -449,7 +449,7 @@ uipclient_appcall(void)
         {
 #ifdef UIPETHERNET_DEBUG_CLIENT
               Serial.print(F("UIPClient state UIP_CLIENT_CLOSE"));
-              _dumpAllData();
+              UIPClient::_dumpAllData();
 #endif
           if (u->packets_out[0] == NOBLOCK)
             {
@@ -458,7 +458,7 @@ uipclient_appcall(void)
               uip_close();
 #ifdef UIPETHERNET_DEBUG_CLIENT
               Serial.print(F("no blocks out -> free userdata"));
-              _dumpAllData();
+              UIPClient::_dumpAllData();
 #endif
             }
           else
@@ -539,6 +539,7 @@ UIPClient::_flushBlocks(memhandle* block)
   for (uint8_t i = 0; i < UIP_SOCKET_NUMPACKETS; i++)
     {
       Enc28J60Network::freeBlock(block[i]);
+      block[i] = NOBLOCK;
     }
 }
 

From 7c0f6ca8a771d58fe5cf60393e752cc14896307e Mon Sep 17 00:00:00 2001
From: ntruchsess <norbert.truchsess@t-online.de>
Date: Mon, 3 Mar 2014 06:32:32 +0100
Subject: [PATCH 2/2] cosmetics (debug output)

---
 UIPClient.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/UIPClient.cpp b/UIPClient.cpp
index 687a9c0..ffbb3e1 100644
--- a/UIPClient.cpp
+++ b/UIPClient.cpp
@@ -448,8 +448,8 @@ uipclient_appcall(void)
       if (u->state & UIP_CLIENT_CLOSE)
         {
 #ifdef UIPETHERNET_DEBUG_CLIENT
-              Serial.print(F("UIPClient state UIP_CLIENT_CLOSE"));
-              UIPClient::_dumpAllData();
+          Serial.println(F("UIPClient state UIP_CLIENT_CLOSE"));
+          UIPClient::_dumpAllData();
 #endif
           if (u->packets_out[0] == NOBLOCK)
             {
@@ -457,7 +457,7 @@ uipclient_appcall(void)
               uip_conn->appstate = NULL;
               uip_close();
 #ifdef UIPETHERNET_DEBUG_CLIENT
-              Serial.print(F("no blocks out -> free userdata"));
+              Serial.println(F("no blocks out -> free userdata"));
               UIPClient::_dumpAllData();
 #endif
             }
@@ -465,7 +465,7 @@ uipclient_appcall(void)
             {
               uip_stop();
 #ifdef UIPETHERNET_DEBUG_CLIENT
-              Serial.print(F("blocks outstanding transfer -> uip_stop()"));
+              Serial.println(F("blocks outstanding transfer -> uip_stop()"));
 #endif
             }
         }