lwIP-v2: update & fix (see below)

d-a-v · d-a-v · commit cb2635225510 · 2018-05-17T14:12:19.000+02:00
* avoid crash when IP address is set to 0(any) by dhcp not getting its lease renewal in due time * automatically remove oldest PCBs in time-wait state, limit their number thanks to @me-no-dev 07f4d4c#diff-f8258e71e25fb9985ca3799e3d8b88ecR399 * add a macro HAS_PHY_CAPTURE=1 indicating capture facility is available
diff --git a/tools/sdk/lib/liblwip2.a b/tools/sdk/lib/liblwip2.a
diff --git a/tools/sdk/lib/liblwip2_1460.a b/tools/sdk/lib/liblwip2_1460.a
diff --git a/tools/sdk/lwip2/builder b/tools/sdk/lwip2/builder
@@ -1 +1 @@
-Subproject commit 2b827f842925b2daf12b67ab1ae498e58174124e
+Subproject commit 0c0d8c2fb90de1fc1a956c89984b74dcdd7bf8dc
diff --git a/tools/sdk/lwip2/include/gluedebug.h b/tools/sdk/lwip2/include/gluedebug.h
@@ -35,6 +35,7 @@
 #ifdef __cplusplus
 extern "C"
 #endif
+#define HAS_PHY_CAPTURE 1
 void (*phy_capture) (int netif_idx, const char* data, size_t len, int out, int success);
 
 /////////////////////////////////////////////////////////////////////////////
diff --git a/tools/sdk/lwip2/include/lwip-git-hash.h b/tools/sdk/lwip2/include/lwip-git-hash.h
@@ -1,5 +1,5 @@
 // generated by makefiles/make-lwip2-hash
 #ifndef LWIP_HASH_H
 #define LWIP_HASH_H
-#define LWIP_HASH_STR "STABLE-2_0_3_RELEASE/glue:arduino-2.4.1-7-g2b827f8"
+#define LWIP_HASH_STR "STABLE-2_0_3_RELEASE/glue:arduino-2.4.1-10-g0c0d8c2"
 #endif // LWIP_HASH_H
diff --git a/tools/sdk/lwip2/include/lwipopts.h b/tools/sdk/lwip2/include/lwipopts.h
@@ -2997,6 +2997,7 @@
 
 /*
    --------------------------------------------------
+   ------------- End of original lwipopts -----------
    --------------------------------------------------
 */
 
@@ -3013,4 +3014,34 @@ struct netif;
 #endif
 LWIP_ERR_T lwip_unhandled_packet (struct pbuf* pbuf, struct netif* netif) __attribute__((weak));
 
+/*
+   --------------------------------------------------
+   ----------------- TIME-WAIT tweak ----------------
+   --------------------------------------------------
+   port @me-no-dev time-wait tweak
+   https://github.com/esp8266/Arduino/commit/07f4d4c241df2c552899857f39a4295164f686f2#diff-f8258e71e25fb9985ca3799e3d8b88ecR399
+*/
+
+void tcp_kill_timewait (void);
+#define TCP_TW_LIMIT(l)                \
+  if (l) do {                          \
+    u32_t count_plus_1 = 1;            \
+    struct tcp_pcb* tmp = tcp_tw_pcbs; \
+    if (tmp)                           \
+      while ((tmp = tmp->next))        \
+        ++count_plus_1;                \
+    while (--count_plus_1 > (l))       \
+      /* kill the oldest */            \
+      /* pcb in TW state */            \
+      tcp_kill_timewait();             \
+  } while (0)
+
+/**
+ * MEMP_NUM_TCP_PCB_TIME_WAIT: the number of TCP pcbs in TIME_WAIT state.
+ * (requires the LWIP_TCP option, 0 = disabled)
+ */
+#ifndef MEMP_NUM_TCP_PCB_TIME_WAIT
+#define MEMP_NUM_TCP_PCB_TIME_WAIT       5
+#endif
+
 #endif // MYLWIPOPTS_H
