arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-27 21:16:50 +03:00
Code

IPv6: DHCP6 & NTP fix (lwIP fix from David J. Fiddes D.J@fiddes.net) (#5649)

Browse Source 
* +dhcp6_set_ntp_servers (lwIP patch from David J. Fiddes D.J@fiddes.net)
This commit is contained in:
david gauchard 2019-01-30 09:33:22 +01:00 committed by GitHub
parent 3f267bd238
commit 7d512c4c7c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
tools/sdk/lib/liblwip2-1460-feat.a
View File

Binary file not shown.

BIN
tools/sdk/lib/liblwip2-1460.a
View File

Binary file not shown.

BIN
tools/sdk/lib/liblwip2-536-feat.a
View File

Binary file not shown.

BIN
tools/sdk/lib/liblwip2-536.a
View File

Binary file not shown.

BIN
tools/sdk/lib/liblwip6-1460-feat.a
View File

Binary file not shown.

BIN
tools/sdk/lib/liblwip6-536-feat.a
View File

Binary file not shown.

2
tools/sdk/lwip2/builder

@ -1 +1 @@
Subproject commit 7206349a0acaa9e042fc56ab3726f3a0ea058416 Subproject commit d2f388bf070aab74cb4d81d52419a7dc2d36fb81

2
tools/sdk/lwip2/include/lwip-git-hash.h
View File

@ -1,5 +1,5 @@
// generated by makefiles/make-lwip2-hash // generated by makefiles/make-lwip2-hash
#ifndef LWIP_HASH_H #ifndef LWIP_HASH_H
#define LWIP_HASH_H #define LWIP_HASH_H
#define LWIP_HASH_STR "STABLE-2_1_2_RELEASE/glue:1.0-11-g87c709d" #define LWIP_HASH_STR "STABLE-2_1_2_RELEASE/glue:1.1"
#endif // LWIP_HASH_H #endif // LWIP_HASH_H

6
tools/sdk/lwip2/include/lwip/apps/sntp.h
View File

@ -67,11 +67,11 @@ void sntp_setservername(u8_t idx, const char *server);
const char *sntp_getservername(u8_t idx); const char *sntp_getservername(u8_t idx);
#endif /* SNTP_SERVER_DNS */ #endif /* SNTP_SERVER_DNS */
#if SNTP_GET_SERVERS_FROM_DHCP #if SNTP_GET_SERVERS_FROM_DHCP || SNTP_GET_SERVERS_FROM_DHCPV6
void sntp_servermode_dhcp(int set_servers_from_dhcp); void sntp_servermode_dhcp(int set_servers_from_dhcp);
#else /* SNTP_GET_SERVERS_FROM_DHCP */ #else /* SNTP_GET_SERVERS_FROM_DHCP || SNTP_GET_SERVERS_FROM_DHCPV6 */
#define sntp_servermode_dhcp(x) #define sntp_servermode_dhcp(x)
#endif /* SNTP_GET_SERVERS_FROM_DHCP */ #endif /* SNTP_GET_SERVERS_FROM_DHCP || SNTP_GET_SERVERS_FROM_DHCPV6 */
#ifdef __cplusplus #ifdef __cplusplus
} }

6
tools/sdk/lwip2/include/lwip/apps/sntp_opts.h
View File

@ -67,6 +67,12 @@
#define SNTP_GET_SERVERS_FROM_DHCP LWIP_DHCP_GET_NTP_SRV #define SNTP_GET_SERVERS_FROM_DHCP LWIP_DHCP_GET_NTP_SRV
#endif #endif
/** Set this to 1 to implement the callback function called by dhcpv6 when
* NTP servers are received. */
#if !defined SNTP_GET_SERVERS_FROM_DHCPV6 || defined __DOXYGEN__
#define SNTP_GET_SERVERS_FROM_DHCPV6 LWIP_DHCP6_GET_NTP_SRV
#endif
/** Set this to 1 to support DNS names (or IP address strings) to set sntp servers /** Set this to 1 to support DNS names (or IP address strings) to set sntp servers
* One server address/name can be defined as default if SNTP_SERVER_DNS == 1: * One server address/name can be defined as default if SNTP_SERVER_DNS == 1:
* \#define SNTP_SERVER_ADDRESS "pool.ntp.org" * \#define SNTP_SERVER_ADDRESS "pool.ntp.org"

2
tools/sdk/lwip2/include/lwipopts.h
View File

@ -2705,7 +2705,7 @@
* void dhcp6_set_ntp_servers(u8_t num_ntp_servers, ip_addr_t* ntp_server_addrs); * void dhcp6_set_ntp_servers(u8_t num_ntp_servers, ip_addr_t* ntp_server_addrs);
*/ */
#if !defined LWIP_DHCP6_GET_NTP_SRV || defined __DOXYGEN__ #if !defined LWIP_DHCP6_GET_NTP_SRV || defined __DOXYGEN__
#define LWIP_DHCP6_GET_NTP_SRV 0 // with 1: dhcp6_set_ntp_servers() must be implemented #define LWIP_DHCP6_GET_NTP_SRV 1 // with 1: dhcp6_set_ntp_servers() must be implemented
#endif #endif
/** /**