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

Add the two patches from the port in net/ntp/files to fix compilation

Browse Source 
issues with vendor code. r375210 & r375215.
This commit is contained in:
Ollivier Robert 2014-12-22 22:22:10 +00:00
parent c59fb7145e
commit 44a728f815
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ntpd/ntp_io.c
View File

@ -3454,15 +3454,15 @@ read_network_packet(
if (AF_INET6 == itf->family) {
DPRINTF(1, ("Got an IPv6 packet, from <%s> (%d) to <%s> (%d)\n",
stoa(&rb->recv_srcadr),
IN6_IS_ADDR_LOOPBACK(&rb->recv_srcadr),
IN6_IS_ADDR_LOOPBACK(&rb->recv_srcadr.sa6.sin6_addr),
stoa(&itf->sin),
!IN6_IS_ADDR_LOOPBACK(&itf->sin)
!IN6_IS_ADDR_LOOPBACK(&itf->sin.sa6.sin6_addr)
));
}
if ( AF_INET6 == itf->family
&& IN6_IS_ADDR_LOOPBACK(&rb->recv_srcadr)
&& !IN6_IS_ADDR_LOOPBACK(&itf->sin)
&& IN6_IS_ADDR_LOOPBACK(&rb->recv_srcadr.sa6.sin6_addr)
&& !IN6_IS_ADDR_LOOPBACK(&itf->sin.sa6.sin6_addr)
) {
packets_dropped++;
DPRINTF(1, ("DROPPING that packet\n"));

6
ntpd/refclock_mx4200.c
View File

@ -1572,7 +1572,7 @@ mx4200_debug(struct peer *peer, char *fmt, ...)
* Print debug message to stdout
* In the future, we may want to get get more creative...
*/
mvprintf(fmt, ap);
vprintf(fmt, ap);
va_end(ap);
}
@ -1613,11 +1613,11 @@ mx4200_send(peer, fmt, va_alist)
cp = buf;
*cp++ = '$';
n = VSNPRINTF((cp, sizeof(buf) - 1, fmt, ap));
n = vsnprintf(cp, sizeof(buf) - 1, fmt, ap);
ck = mx4200_cksum(cp, n);
cp += n;
++n;
n += SNPRINTF((cp, sizeof(buf) - n - 5, "*%02X\r\n", ck));
n += snprintf(cp, sizeof(buf) - n - 5, "*%02X\r\n", ck);
m = write(pp->io.fd, buf, (unsigned)n);
if (m < 0)