faraphel/chrony
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ntp: move debug message after sendmsg()

Browse source 
This should reduce the delay before sending the packet when debugging is
enabled.
This commit is contained in:
Miroslav Lichvar 2014-08-04 16:37:00 +02:00
parent 43cca04c33
commit 20cc1f6550
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
ntp_io.c
View file

@ -707,18 +707,14 @@ send_packet(void *packet, int packetlen, NTP_Remote_Address *remote_addr, NTP_Lo
} }
#endif #endif
reconnect = 0;
try_again:
DEBUG_LOG(LOGF_NtpIO, "Sending to %s:%d from %s fd %d",
UTI_IPToString(&remote_addr->ip_addr), remote_addr->port,
UTI_IPToString(&local_addr->ip_addr), local_addr->sock_fd);
msg.msg_controllen = cmsglen; msg.msg_controllen = cmsglen;
/* This is apparently required on some systems */ /* This is apparently required on some systems */
if (!cmsglen) if (!cmsglen)
msg.msg_control = NULL; msg.msg_control = NULL;
reconnect = 0;
try_again:
if (sendmsg(local_addr->sock_fd, &msg, 0) < 0) { if (sendmsg(local_addr->sock_fd, &msg, 0) < 0) {
/* If this is a separate client socket, try to reconnect it (but no more /* If this is a separate client socket, try to reconnect it (but no more
than once) if not connected yet or if it may be bound to an address that than once) if not connected yet or if it may be bound to an address that
@ -726,12 +722,18 @@ try_again:
reconnect = !reconnect && separate_client_sockets && !addrlen && reconnect = !reconnect && separate_client_sockets && !addrlen &&
(errno == ENOTCONN || errno == EDESTADDRREQ || errno == EINVAL); (errno == ENOTCONN || errno == EDESTADDRREQ || errno == EINVAL);
DEBUG_LOG(LOGF_NtpIO, "Could not send to %s:%d : %s", DEBUG_LOG(LOGF_NtpIO, "Could not send to %s:%d from %s fd %d : %s",
UTI_IPToString(&remote_addr->ip_addr), remote_addr->port, strerror(errno)); UTI_IPToString(&remote_addr->ip_addr), remote_addr->port,
UTI_IPToString(&local_addr->ip_addr), local_addr->sock_fd,
strerror(errno));
/* Try sending the packet again if reconnect succeeds */ /* Try sending the packet again if reconnect succeeds */
if (reconnect && reconnect_socket(local_addr->sock_fd, remote_addr)) if (reconnect && reconnect_socket(local_addr->sock_fd, remote_addr))
goto try_again; goto try_again;
} else {
DEBUG_LOG(LOGF_NtpIO, "Sent to %s:%d from %s fd %d",
UTI_IPToString(&remote_addr->ip_addr), remote_addr->port,
UTI_IPToString(&local_addr->ip_addr), local_addr->sock_fd);
} }
} }