apps/netutils/ntpclient/ntpclient.c: Merge local structure variables xmit and recv into pkt to save the stack.

This commit is contained in:
Xiang Xiao 2019-12-18 09:39:57 -06:00 committed by Gregory Nutt
parent e48a74f358
commit 3a2bd2c05f

View File

@ -305,8 +305,7 @@ static void ntpc_settime(FAR uint8_t *timestamp)
static int ntpc_daemon(int argc, char **argv) static int ntpc_daemon(int argc, char **argv)
{ {
struct sockaddr_in server; struct sockaddr_in server;
struct ntp_datagram_s xmit; struct ntp_datagram_s pkt;
struct ntp_datagram_s recv;
struct timeval tv; struct timeval tv;
#ifdef CONFIG_LIBC_NETDB #ifdef CONFIG_LIBC_NETDB
@ -409,12 +408,12 @@ static int ntpc_daemon(int argc, char **argv)
{ {
/* Format the transmit datagram */ /* Format the transmit datagram */
memset(&xmit, 0, sizeof(xmit)); memset(&pkt, 0, sizeof(pkt));
xmit.lvm = MKLVM(0, 3, NTP_VERSION); pkt.lvm = MKLVM(0, 3, NTP_VERSION);
sinfo("Sending a NTP packet\n"); sinfo("Sending a NTP packet\n");
ret = sendto(sd, &xmit, sizeof(struct ntp_datagram_s), ret = sendto(sd, &pkt, sizeof(struct ntp_datagram_s),
0, (FAR struct sockaddr *)&server, 0, (FAR struct sockaddr *)&server,
sizeof(struct sockaddr_in)); sizeof(struct sockaddr_in));
@ -445,7 +444,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 *)&pkt, sizeof(struct ntp_datagram_s),
0, (FAR struct sockaddr *)&server, &socklen); 0, (FAR struct sockaddr *)&server, &socklen);
/* Check if the received message was long enough to be a valid NTP /* Check if the received message was long enough to be a valid NTP
@ -455,7 +454,7 @@ static int ntpc_daemon(int argc, char **argv)
if (nbytes >= (ssize_t)NTP_DATAGRAM_MINSIZE) if (nbytes >= (ssize_t)NTP_DATAGRAM_MINSIZE)
{ {
sinfo("Setting time\n"); sinfo("Setting time\n");
ntpc_settime(recv.recvtimestamp); ntpc_settime(pkt.recvtimestamp);
retry = 0; retry = 0;
} }