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

ntp: don't set address for sendmsg() with connected sockets

Browse source
This commit is contained in:
Miroslav Lichvar 2014-06-25 15:36:14 +02:00
parent a5c865937f
commit 9c6d1c214f
1 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
ntp_io.c
View file

@ -583,12 +583,21 @@ send_packet(void *packet, int packetlen, NTP_Remote_Address *remote_addr, NTP_Lo
struct iovec iov; struct iovec iov;
char cmsgbuf[256]; char cmsgbuf[256];
int cmsglen; int cmsglen;
socklen_t addrlen; socklen_t addrlen = 0;
assert(initialised); assert(initialised);
if (local_addr->sock_fd == INVALID_SOCK_FD) {
DEBUG_LOG(LOGF_NtpIO, "No socket to send to %s:%d",
UTI_IPToString(&remote_addr->ip_addr), remote_addr->port);
return;
}
switch (remote_addr->ip_addr.family) { switch (remote_addr->ip_addr.family) {
case IPADDR_INET4: case IPADDR_INET4:
/* Don't set address with connected socket */
if (local_addr->sock_fd != server_sock_fd4 && separate_client_sockets)
break;
memset(&remote.in4, 0, sizeof (remote.in4)); memset(&remote.in4, 0, sizeof (remote.in4));
addrlen = sizeof (remote.in4); addrlen = sizeof (remote.in4);
remote.in4.sin_family = AF_INET; remote.in4.sin_family = AF_INET;
@ -597,6 +606,9 @@ send_packet(void *packet, int packetlen, NTP_Remote_Address *remote_addr, NTP_Lo
break; break;
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
case IPADDR_INET6: case IPADDR_INET6:
/* Don't set address with connected socket */
if (local_addr->sock_fd != server_sock_fd6 && separate_client_sockets)
break;
memset(&remote.in6, 0, sizeof (remote.in6)); memset(&remote.in6, 0, sizeof (remote.in6));
addrlen = sizeof (remote.in6); addrlen = sizeof (remote.in6);
remote.in6.sin6_family = AF_INET6; remote.in6.sin6_family = AF_INET6;
@ -609,16 +621,16 @@ send_packet(void *packet, int packetlen, NTP_Remote_Address *remote_addr, NTP_Lo
return; return;
} }
if (local_addr->sock_fd == INVALID_SOCK_FD) { if (addrlen) {
DEBUG_LOG(LOGF_NtpIO, "No socket to send to %s:%d", msg.msg_name = &remote.u;
UTI_IPToString(&remote_addr->ip_addr), remote_addr->port); msg.msg_namelen = addrlen;
return; } else {
msg.msg_name = NULL;
msg.msg_namelen = 0;
} }
iov.iov_base = packet; iov.iov_base = packet;
iov.iov_len = packetlen; iov.iov_len = packetlen;
msg.msg_name = &remote.u;
msg.msg_namelen = addrlen;
msg.msg_iov = &iov; msg.msg_iov = &iov;
msg.msg_iovlen = 1; msg.msg_iovlen = 1;
msg.msg_control = cmsgbuf; msg.msg_control = cmsgbuf;