Skip to content

Commit ed9e8ce

Browse files
authored
Sync with esp82xx-nonos-linklayer (#9078)
* Update lwip2 builder * Rebuild lwip2 libs
1 parent d7d50ff commit ed9e8ce

9 files changed

+18
-14
lines changed

tools/sdk/lib/liblwip2-1460-feat.a

-128 Bytes
Binary file not shown.

tools/sdk/lib/liblwip2-1460.a

-308 Bytes
Binary file not shown.

tools/sdk/lib/liblwip2-536-feat.a

-128 Bytes
Binary file not shown.

tools/sdk/lib/liblwip2-536.a

-308 Bytes
Binary file not shown.

tools/sdk/lib/liblwip6-1460-feat.a

-320 Bytes
Binary file not shown.

tools/sdk/lib/liblwip6-536-feat.a

-320 Bytes
Binary file not shown.
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// generated by makefiles/make-lwip2-hash
22
#ifndef LWIP_HASH_H
33
#define LWIP_HASH_H
4-
#define LWIP_HASH_STR "STABLE-2_1_3_RELEASE/glue:1.2-67-g8e3c4ee"
4+
#define LWIP_HASH_STR "STABLE-2_1_3_RELEASE/glue:1.2-70-g4087efd"
55
#endif // LWIP_HASH_H

tools/sdk/lwip2/include/lwipopts.h

+16-12
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@
33
#define __CUSTOM_EXTRA_DEFINES__
44

55
#endif
6-
76
#ifndef MYLWIPOPTS_H
87
#define MYLWIPOPTS_H
98

10-
// opt.h version lwip-2.1.0rc1 for esp8266
9+
/* opt.h version lwip-2.1.3 for esp8266 */
1110

1211
/**
1312
* @file
@@ -996,7 +995,7 @@
996995
#if !LWIP_IPV4
997996
/* disable AUTOIP when IPv4 is disabled */
998997
#undef LWIP_AUTOIP
999-
#define LWIP_AUTOIP 0
998+
#define LWIP_AUTOIP 0
1000999
#endif /* !LWIP_IPV4 */
10011000

10021001
/**
@@ -1564,7 +1563,7 @@
15641563
* LWIP_PBUF_REF_T: Refcount type in pbuf.
15651564
* Default width of u8_t can be increased if 255 refs are not enough for you.
15661565
*/
1567-
#ifndef LWIP_PBUF_REF_T
1566+
#if !defined LWIP_PBUF_REF_T || defined __DOXYGEN__
15681567
#define LWIP_PBUF_REF_T u8_t
15691568
#endif
15701569

@@ -2447,7 +2446,7 @@
24472446
* LWIP_IPV6_FORWARD==1: Forward IPv6 packets across netifs
24482447
*/
24492448
#if !defined LWIP_IPV6_FORWARD || defined __DOXYGEN__
2450-
#define LWIP_IPV6_FORWARD 0 // 0
2449+
#define LWIP_IPV6_FORWARD 0
24512450
#endif
24522451

24532452
/**
@@ -2683,7 +2682,7 @@
26832682
* servers to the DNS module.
26842683
*/
26852684
#if !defined LWIP_ND6_RDNSS_MAX_DNS_SERVERS || defined __DOXYGEN__
2686-
#define LWIP_ND6_RDNSS_MAX_DNS_SERVERS 0 // 0
2685+
#define LWIP_ND6_RDNSS_MAX_DNS_SERVERS 0
26872686
#endif
26882687
/**
26892688
* @}
@@ -2722,7 +2721,7 @@
27222721
* void dhcp6_set_ntp_servers(u8_t num_ntp_servers, ip_addr_t* ntp_server_addrs);
27232722
*/
27242723
#if !defined LWIP_DHCP6_GET_NTP_SRV || defined __DOXYGEN__
2725-
#define LWIP_DHCP6_GET_NTP_SRV 1 // with 1: dhcp6_set_ntp_servers() must be implemented
2724+
#define LWIP_DHCP6_GET_NTP_SRV 1
27262725
#endif
27272726

27282727
/**
@@ -3509,9 +3508,6 @@
35093508
#if !defined DHCP6_DEBUG || defined __DOXYGEN__
35103509
#define DHCP6_DEBUG LWIP_DBG_OFF
35113510
#endif
3512-
/**
3513-
* @}
3514-
*/
35153511

35163512
/**
35173513
* NAPT_DEBUG: Enable debugging for NAPT.
@@ -3520,6 +3516,10 @@
35203516
#define NAPT_DEBUG LWIP_DBG_OFF
35213517
#endif
35223518

3519+
/**
3520+
* @}
3521+
*/
3522+
35233523
/**
35243524
* LWIP_TESTMODE: Changes to make unit test possible
35253525
*/
@@ -3566,9 +3566,13 @@
35663566
#define PPPOS_SUPPORT IP_NAPT // because we don't have proxyarp yet
35673567
#define PPP_SUPPORT PPPOS_SUPPORT
35683568
#define PPP_SERVER 1
3569-
#define PPP_DEBUG ULWIPDEBUG
35703569
#define PRINTPKT_SUPPORT ULWIPDEBUG
35713570

3571+
#if ULWIPDEBUG
3572+
#define PPP_DEBUG LWIP_DBG_ON
3573+
#define PING_DEBUG LWIP_DBG_ON
3574+
#endif
3575+
35723576
#ifdef __cplusplus
35733577
extern "C" {
35743578
#endif
@@ -3710,4 +3714,4 @@ void tcp_kill_timewait (void);
37103714
} // extern "C"
37113715
#endif
37123716

3713-
#endif // MYLWIPOPTS_H
3717+
#endif /* MYLWIPOPTS_H */

0 commit comments

Comments
 (0)