Merge branch 'master' into Arduino_1.5.5

ntruchsess · Mar 1, 2014 · 75f473a · 75f473a
2 parents 8e838ca + 5155710
commit 75f473a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/UIPEthernet/src/UIPClient.cpp b/UIPEthernet/src/UIPClient.cpp
@@ -55,6 +55,9 @@ UIPClient::connect(IPAddress ip, uint16_t port)
   struct uip_conn* conn = uip_connect(&ipaddr, htons(port));
   if (conn)
     {
+#if UIP_CONNECT_TIMEOUT > 0
+      int32_t timeout = millis() + 1000 * UIP_CONNECT_TIMEOUT;
+#endif
       while((conn->tcpstateflags & UIP_TS_MASK) != UIP_CLOSED)
         {
           UIPEthernetClass::tick();
@@ -69,6 +72,13 @@ UIPClient::connect(IPAddress ip, uint16_t port)
 #endif
               return 1;
             }
+#if UIP_CONNECT_TIMEOUT > 0
+          if (((int32_t)(millis() - timeout)) > 0)
+            {
+              conn->tcpstateflags = UIP_CLOSED;
+              break;
+            }
+#endif
         }
     }
   return 0;

diff --git a/UIPEthernet/src/utility/uipethernet-conf.h b/UIPEthernet/src/utility/uipethernet-conf.h
@@ -14,4 +14,8 @@
  * set to -1 to block until connection is closed by timeout */
 #define UIP_ATTEMPTS_ON_WRITE    -1
 
+/* timeout after which UIPClient::connect gives up. The timeout is specified in seconds.
+ * if set to a number <= 0 connect will timeout when uIP does (which might be longer than you expect...) */
+#define UIP_CONNECT_TIMEOUT      -1
+
 #endif