d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ntpd tries to bind to IPv6 interfaces in 'tentative' state and fails as IPv6 is

Browse Source 
actually disabled. Fix it by making ntpd ignore such interfaces.

Submitted by:	ume
Reviewed by:	bz, gnn
MFC after:	1 week
Differential Revision:	https://reviews.freebsd.org/D1527
This commit is contained in:
Hiren Panchasara 2015-01-14 23:34:00 +00:00
parent 3a5ae4edcf
commit a2b8f1cbb7
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
contrib/ntp/ntpd/ntp_io.c
View File

@ -1176,12 +1176,13 @@ set_wildcard_reuse(int family, int on)
#ifdef INCLUDE_IPV6_SUPPORT
static isc_boolean_t
is_anycast(struct sockaddr *sa, char *name)
is_not_bindable(struct sockaddr *sa, char *name)
{
#if defined(SIOCGIFAFLAG_IN6) && defined(IN6_IFF_ANYCAST)
#if defined(SIOCGIFAFLAG_IN6) && \
(defined(IN6_IFF_ANYCAST) || defined(IN6_IFF_NOTREADY))
struct in6_ifreq ifr6;
int fd;
u_int32_t flags6;
u_int32_t flags6, exclude = 0;
if (sa->sa_family != AF_INET6)
return ISC_FALSE;
@ -1197,9 +1198,15 @@ is_anycast(struct sockaddr *sa, char *name)
}
close(fd);
flags6 = ifr6.ifr_ifru.ifru_flags6;
if ((flags6 & IN6_IFF_ANYCAST) != 0)
#if defined(IN6_IFF_ANYCAST)
exclude |= IN6_IFF_ANYCAST;
#endif /* !IN6_IFF_ANYCAST */
#if defined(IN6_IFF_NOTREADY)
exclude |= IN6_IFF_NOTREADY;
#endif /* !IN6_IFF_NOTREADY */
if ((flags6 & exclude) != 0)
return ISC_TRUE;
#endif /* !SIOCGIFAFLAG_IN6 || !IN6_IFF_ANYCAST */
#endif /* !SIOCGIFAFLAG_IN6 || !(IN6_IFF_ANYCAST && IN6_IFF_NOTREADY) */
return ISC_FALSE;
}
#endif /* !INCLUDE_IPV6_SUPPORT */
@ -1344,7 +1351,7 @@ update_interfaces(
continue;
#ifdef INCLUDE_IPV6_SUPPORT
if (is_anycast((struct sockaddr *)&interface.sin, isc_if.name))
if (is_not_bindable((struct sockaddr *)&interface.sin, isc_if.name))
continue;
#endif /* !INCLUDE_IPV6_SUPPORT */