Merge branch 'master' into Arduino_1.5.5

Author: ntruchsess

UIPEthernet/src/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;
@@ -448,24 +448,24 @@ uipclient_appcall(void)
       if (u->state & UIP_CLIENT_CLOSE)
         {
 #ifdef UIPETHERNET_DEBUG_CLIENT
-              Serial.print(F("UIPClient state UIP_CLIENT_CLOSE"));
-              _dumpAllData();
+          Serial.println(F("UIPClient state UIP_CLIENT_CLOSE"));
+          UIPClient::_dumpAllData();
 #endif
           if (u->packets_out[0] == NOBLOCK)
             {
               u->state = 0;
               uip_conn->appstate = NULL;
               uip_close();
 #ifdef UIPETHERNET_DEBUG_CLIENT
-              Serial.print(F("no blocks out -> free userdata"));
-              _dumpAllData();
+              Serial.println(F("no blocks out -> free userdata"));
+              UIPClient::_dumpAllData();
 #endif
             }
           else
             {
               uip_stop();
 #ifdef UIPETHERNET_DEBUG_CLIENT
-              Serial.print(F("blocks outstanding transfer -> uip_stop()"));
+              Serial.println(F("blocks outstanding transfer -> uip_stop()"));
 #endif
             }
         }
@@ -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;
     }
 }