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

NTP client, more clean-up and minor enhancements

Browse Source
This commit is contained in:
Gregory Nutt 2014-04-11 09:02:50 -06:00
parent b2080e94f7
commit e72ec4ad00
1 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
netutils/ntpclient/ntpclient.c
View File

@ -339,11 +339,18 @@ static int ntpc_daemon(int argc, char **argv)
server.sin_addr.s_addr = htonl(CONFIG_NETUTILS_NTPCLIENT_SERVERIP); server.sin_addr.s_addr = htonl(CONFIG_NETUTILS_NTPCLIENT_SERVERIP);
/* 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
* The NTP packet received is decoded to the recv structure for easy * and used to set the current time.
* access. *
* NOTE that the scheduler is locked whenever this function runs. That
* assures both: (1) that there are no asynchronous stop requests and
* (2) that we are not suspended while in critical moments when we about
* to set the new time. This sounds harsh, but this function is suspended
* most of the time either: (1) send a datagram, (2) receiving a datagram,
* or (3) waiting for the next poll cycle.
*/ */
sched_lock();
while (g_ntpc_daemon.state == NTP_STOP_REQUESTED) while (g_ntpc_daemon.state == NTP_STOP_REQUESTED)
{ {
memset(&xmit, 0, sizeof(xmit)); memset(&xmit, 0, sizeof(xmit));
@ -354,14 +361,23 @@ static int ntpc_daemon(int argc, char **argv)
ret = sendto(sd, &xmit, sizeof(struct ntp_datagram_s), ret = sendto(sd, &xmit, sizeof(struct ntp_datagram_s),
0, (FAR struct sockaddr *)&server, 0, (FAR struct sockaddr *)&server,
sizeof(struct sockaddr_in)); sizeof(struct sockaddr_in));
if (ret < 0) if (ret < 0)
{ {
if (g_ntpc_daemon.state != NTP_STOP_REQUESTED) int errval = errno;
if (errval != EINTR)
{ {
ndbg("ERROR: sendto() failed: %d\n", errno); ndbg("ERROR: sendto() failed: %d\n", errval);
exitcode = EXIT_FAILURE; exitcode = EXIT_FAILURE;
break;
} }
break;
/* Go back to the top of the loop if we were interrupted
* by a signal. The signal might mean that we were
* requested to stop(?)
*/
continue;
} }
/* Attempt to receive a packet (with a timeout) */ /* Attempt to receive a packet (with a timeout) */
@ -369,6 +385,7 @@ static int ntpc_daemon(int argc, char **argv)
socklen = sizeof(struct sockaddr_in); socklen = sizeof(struct sockaddr_in);
nbytes = recvfrom(sd, (void *)&recv, sizeof(struct ntp_datagram_s), nbytes = recvfrom(sd, (void *)&recv, sizeof(struct ntp_datagram_s),
0, (FAR struct sockaddr *)&server, &socklen); 0, (FAR struct sockaddr *)&server, &socklen);
if (nbytes >= NTP_DATAGRAM_MINSIZE) if (nbytes >= NTP_DATAGRAM_MINSIZE)
{ {
svdbg("Setting time\n"); svdbg("Setting time\n");
@ -390,6 +407,8 @@ static int ntpc_daemon(int argc, char **argv)
/* The NTP client is terminating */ /* The NTP client is terminating */
sched_unlock();
g_ntpc_daemon.state = NTP_STOPPED; g_ntpc_daemon.state = NTP_STOPPED;
sem_post(&g_ntpc_daemon.interlock); sem_post(&g_ntpc_daemon.interlock);
return exitcode; return exitcode;