From owner-svn-src-all@FreeBSD.ORG  Thu Feb  9 07:28:18 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 023FD10657C0;
	Thu,  9 Feb 2012 07:28:18 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E06B38FC15;
	Thu,  9 Feb 2012 07:28:17 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q197SHqL087333;
	Thu, 9 Feb 2012 07:28:17 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q197SH1A087331;
	Thu, 9 Feb 2012 07:28:17 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <201202090728.q197SH1A087331@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Thu, 9 Feb 2012 07:28:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r231250 - stable/7/contrib/ntp/ntpd
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Feb 2012 07:28:18 -0000

Author: bz
Date: Thu Feb  9 07:28:17 2012
New Revision: 231250
URL: http://svn.freebsd.org/changeset/base/231250

Log:
  MFC r223626:
  
   Compare port numbers correctly.  They are stored by SRCPORT()
   in host byte order, so we need to compare them as such.
   Properly compare IPv6 addresses as well.
  
   This allows the, by default, 8 badaddrs slots per address
   family to work correctly and only print sendto() errors once.
  
   The change is no longer applicable to any latest upstream versions.
  
   Approved by:   roberto
   Sponsored by:  Sandvine Incorporated

Modified:
  stable/7/contrib/ntp/ntpd/ntp_io.c
Directory Properties:
  stable/7/contrib/ntp/   (props changed)

Modified: stable/7/contrib/ntp/ntpd/ntp_io.c
==============================================================================
--- stable/7/contrib/ntp/ntpd/ntp_io.c	Thu Feb  9 07:27:59 2012	(r231249)
+++ stable/7/contrib/ntp/ntpd/ntp_io.c	Thu Feb  9 07:28:17 2012	(r231250)
@@ -2646,14 +2646,14 @@ sendpkt(
 
 	for (slot = ERRORCACHESIZE; --slot >= 0; )
 		if(dest->ss_family == AF_INET) {
-			if (badaddrs[slot].port == ((struct sockaddr_in*)dest)->sin_port &&
+			if (badaddrs[slot].port == SRCPORT(dest) &&
 				badaddrs[slot].addr.s_addr == ((struct sockaddr_in*)dest)->sin_addr.s_addr)
 			break;
 		}
 #ifdef INCLUDE_IPV6_SUPPORT
 		else if (dest->ss_family == AF_INET6) {
-			if (badaddrs6[slot].port == ((struct sockaddr_in6*)dest)->sin6_port &&
-				badaddrs6[slot].addr.s6_addr == ((struct sockaddr_in6*)dest)->sin6_addr.s6_addr)
+			if (badaddrs6[slot].port == SRCPORT(dest) &&
+				!memcmp(&badaddrs6[slot].addr, &((struct sockaddr_in6*)dest)->sin6_addr, sizeof(struct in6_addr)))
 			break;
 		}
 #endif /* INCLUDE_IPV6_SUPPORT */