From owner-svn-src-all@FreeBSD.ORG Mon Dec 22 22:22:11 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E0B7AD66; Mon, 22 Dec 2014 22:22:11 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B304438A9; Mon, 22 Dec 2014 22:22:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBMMMBHx000268; Mon, 22 Dec 2014 22:22:11 GMT (envelope-from roberto@FreeBSD.org) Received: (from roberto@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBMMMBcu000266; Mon, 22 Dec 2014 22:22:11 GMT (envelope-from roberto@FreeBSD.org) Message-Id: <201412222222.sBMMMBcu000266@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: roberto set sender to roberto@FreeBSD.org using -f From: Ollivier Robert Date: Mon, 22 Dec 2014 22:22:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r276093 - vendor/ntp/dist/ntpd X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Dec 2014 22:22:12 -0000 Author: roberto Date: Mon Dec 22 22:22:10 2014 New Revision: 276093 URL: https://svnweb.freebsd.org/changeset/base/276093 Log: Add the two patches from the port in net/ntp/files to fix compilation issues with vendor code. r375210 & r375215. Modified: vendor/ntp/dist/ntpd/ntp_io.c vendor/ntp/dist/ntpd/refclock_mx4200.c Modified: vendor/ntp/dist/ntpd/ntp_io.c ============================================================================== --- vendor/ntp/dist/ntpd/ntp_io.c Mon Dec 22 22:15:31 2014 (r276092) +++ vendor/ntp/dist/ntpd/ntp_io.c Mon Dec 22 22:22:10 2014 (r276093) @@ -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")); Modified: vendor/ntp/dist/ntpd/refclock_mx4200.c ============================================================================== --- vendor/ntp/dist/ntpd/refclock_mx4200.c Mon Dec 22 22:15:31 2014 (r276092) +++ vendor/ntp/dist/ntpd/refclock_mx4200.c Mon Dec 22 22:22:10 2014 (r276093) @@ -1572,7 +1572,7 @@ mx4200_debug(struct peer *peer, char *fm * 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)