Skip to content

IPv6: DHCP6 & NTP fix (lwIP fix from David J. Fiddes [email protected]) #5649

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 30, 2019
Merged

IPv6: DHCP6 & NTP fix (lwIP fix from David J. Fiddes [email protected]) #5649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
24fb417
+dhcp6_set_ntp_servers (lwIP patch from David J. Fiddes [email protected])
d-a-v Jan 22, 2019
28063de
fix and version bump
d-a-v Jan 28, 2019
3295c1a
Merge branch 'master' into dhcp6sntp
d-a-v Jan 29, 2019
9d283eb
Merge branch 'master' into dhcp6sntp
d-a-v Jan 29, 2019
2e67936
Merge branch 'master' into dhcp6sntp
devyte Jan 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified tools/sdk/lib/liblwip2-1460-feat.a
View file
Open in desktop
Binary file not shown.
Binary file modified tools/sdk/lib/liblwip2-1460.a
View file
Open in desktop
Binary file not shown.
Binary file modified tools/sdk/lib/liblwip2-536-feat.a
View file
Open in desktop
Binary file not shown.
Binary file modified tools/sdk/lib/liblwip2-536.a
View file
Open in desktop
Binary file not shown.
Binary file modified tools/sdk/lib/liblwip6-1460-feat.a
View file
Open in desktop
Binary file not shown.
Binary file modified tools/sdk/lib/liblwip6-536-feat.a
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion tools/sdk/lwip2/builder
Open in desktop
Submodule builder updated 4 files
+8 −26 README.md
+1 −1 glue-lwip/arduino/lwipopts.h
+10 −2 glue-lwip/lwip-git.c
+168 −0 patches/0001-Implement-RFC4075-Receive-SNTP-servers-via-DHCPv6.patch
2 changes: 1 addition & 1 deletion tools/sdk/lwip2/include/lwip-git-hash.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// generated by makefiles/make-lwip2-hash
#ifndef 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
6 changes: 3 additions & 3 deletions tools/sdk/lwip2/include/lwip/apps/sntp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,11 @@ void sntp_setservername(u8_t idx, const char *server);
const char *sntp_getservername(u8_t idx);
#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);
#else /* SNTP_GET_SERVERS_FROM_DHCP */
#else /* SNTP_GET_SERVERS_FROM_DHCP || SNTP_GET_SERVERS_FROM_DHCPV6 */
#define sntp_servermode_dhcp(x)
#endif /* SNTP_GET_SERVERS_FROM_DHCP */
#endif /* SNTP_GET_SERVERS_FROM_DHCP || SNTP_GET_SERVERS_FROM_DHCPV6 */

#ifdef __cplusplus
}
Expand Down
6 changes: 6 additions & 0 deletions tools/sdk/lwip2/include/lwip/apps/sntp_opts.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,12 @@
#define SNTP_GET_SERVERS_FROM_DHCP LWIP_DHCP_GET_NTP_SRV
#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
* One server address/name can be defined as default if SNTP_SERVER_DNS == 1:
* \#define SNTP_SERVER_ADDRESS "pool.ntp.org"
Expand Down
2 changes: 1 addition & 1 deletion tools/sdk/lwip2/include/lwipopts.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2705,7 +2705,7 @@
* 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__
#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

/**
Expand Down