sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

The NTP client will now optionally use pool.ntp.org as the NTP server; and reset the retry count upon success -- more robust.

Browse Source
This commit is contained in:
David Alessio 2016-07-10 17:47:07 -06:00 committed by Gregory Nutt
parent c64e61df3e
commit 8997e5849d
2 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
netutils/ntpclient/Kconfig
View File

@ -12,9 +12,15 @@ config NETUTILS_NTPCLIENT
if NETUTILS_NTPCLIENT if NETUTILS_NTPCLIENT
config NETUTILS_NTPCLIENT_SERVER
string "NTP server URL (or IP address)"
default "pool.ntp.org"
depends on LIBC_NETDB
config NETUTILS_NTPCLIENT_SERVERIP config NETUTILS_NTPCLIENT_SERVERIP
hex "NTP server IP address" hex "NTP server IP address"
default 0x0a000001 default 0x0a000001
depends on !LIBC_NETDB
config NETUTILS_NTPCLIENT_PORTNO config NETUTILS_NTPCLIENT_PORTNO
int "NTP server port number" int "NTP server port number"

40
netutils/ntpclient/ntpclient.c
View File

@ -52,6 +52,11 @@
#include <netinet/in.h> #include <netinet/in.h>
#ifdef CONFIG_LIBC_NETDB
# include <netdb.h>
# include <arpa/inet.h>
#endif
#include <apps/netutils/ntpclient.h> #include <apps/netutils/ntpclient.h>
#include "ntpv3.h" #include "ntpv3.h"
@ -60,6 +65,16 @@
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
/* Configuration ************************************************************/
#if defined(CONFIG_LIBC_NETDB) && !defined(CONFIG_NETUTILS_NTPCLIENT_SERVER)
# error CONFIG_NETUTILS_NTPCLIENT_SERVER my be provided
#endif
#if !defined(CONFIG_LIBC_NETDB) && !defined(CONFIG_NETUTILS_NTPCLIENT_SERVERIP)
# error CONFIG_NETUTILS_NTPCLIENT_SERVERIP my be provided
#endif
/* NTP Time is seconds since 1900. Convert to Unix time which is seconds /* NTP Time is seconds since 1900. Convert to Unix time which is seconds
* since 1970 * since 1970
*/ */
@ -293,6 +308,12 @@ static int ntpc_daemon(int argc, char **argv)
struct ntp_datagram_s xmit; struct ntp_datagram_s xmit;
struct ntp_datagram_s recv; struct ntp_datagram_s recv;
struct timeval tv; struct timeval tv;
#ifdef CONFIG_LIBC_NETDB
struct hostent *he;
struct in_addr **addr_list;
#endif
socklen_t socklen; socklen_t socklen;
ssize_t nbytes; ssize_t nbytes;
int exitcode = EXIT_SUCCESS; int exitcode = EXIT_SUCCESS;
@ -339,7 +360,25 @@ static int ntpc_daemon(int argc, char **argv)
memset(&server, 0, sizeof(struct sockaddr_in)); memset(&server, 0, sizeof(struct sockaddr_in));
server.sin_family = AF_INET; server.sin_family = AF_INET;
server.sin_port = htons(CONFIG_NETUTILS_NTPCLIENT_PORTNO); server.sin_port = htons(CONFIG_NETUTILS_NTPCLIENT_PORTNO);
#ifndef CONFIG_LIBC_NETDB
server.sin_addr.s_addr = htonl(CONFIG_NETUTILS_NTPCLIENT_SERVERIP); server.sin_addr.s_addr = htonl(CONFIG_NETUTILS_NTPCLIENT_SERVERIP);
#else
he = gethostbyname(CONFIG_NETUTILS_NTPCLIENT_SERVER);
if (he != NULL && he->h_addrtype == AF_INET)
{
addr_list = (struct in_addr **)he->h_addr_list;
server.sin_addr.s_addr = addr_list[0]->s_addr;
ninfo("INFO: '%s' resolved to: %s\n",
CONFIG_NETUTILS_NTPCLIENT_SERVER,
inet_ntoa(server.sin_addr));
}
else
{
nerr("ERROR: Failed to resolve '%s'\n", CONFIG_NETUTILS_NTPCLIENT_SERVER);
return EXIT_FAILURE;
}
#endif
/* Here we do the communication with the NTP server. This is a very simple /* Here we do the communication with the NTP server. This is a very simple
* client architecture. A request is sent and then a NTP packet is received * client architecture. A request is sent and then a NTP packet is received
@ -417,6 +456,7 @@ static int ntpc_daemon(int argc, char **argv)
{ {
sinfo("Setting time\n"); sinfo("Setting time\n");
ntpc_settime(recv.recvtimestamp); ntpc_settime(recv.recvtimestamp);
retry = 0;
} }
/* Check for errors. Note that properly received, short datagrams /* Check for errors. Note that properly received, short datagrams