From owner-svn-src-all@freebsd.org  Sat Jan  7 00:17:02 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id CC4BCCA3B90;
 Sat,  7 Jan 2017 00:17:02 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 9BDCD1748;
 Sat,  7 Jan 2017 00:17:02 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v070H1M5067576;
 Sat, 7 Jan 2017 00:17:01 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v070H1xQ067575;
 Sat, 7 Jan 2017 00:17:01 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201701070017.v070H1xQ067575@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org
 using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sat, 7 Jan 2017 00:17:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r311570 - head/contrib/tcpdump
X-SVN-Group: head
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.23
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: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 07 Jan 2017 00:17:02 -0000

Author: dim
Date: Sat Jan  7 00:17:01 2017
New Revision: 311570
URL: https://svnweb.freebsd.org/changeset/base/311570

Log:
  In tcpdump's print-tcp.c, avoid increasing alignment when taking the
  addresses of members of struct ip, which is packed.  Since the pointers
  are only used for memcmp'ing, they can be pointing to void instead.
  
  Note that upstream has removed the src and dst variables, in the mean
  time.
  
  MFC after:	3 days

Modified:
  head/contrib/tcpdump/print-tcp.c

Modified: head/contrib/tcpdump/print-tcp.c
==============================================================================
--- head/contrib/tcpdump/print-tcp.c	Sat Jan  7 00:08:55 2017	(r311569)
+++ head/contrib/tcpdump/print-tcp.c	Sat Jan  7 00:17:01 2017	(r311570)
@@ -253,7 +253,7 @@ tcp_print(netdissect_options *ndo,
                 if (ip6) {
                         register struct tcp_seq_hash6 *th;
                         struct tcp_seq_hash6 *tcp_seq_hash;
-                        const struct in6_addr *src, *dst;
+                        const void *src, *dst;
                         struct tha6 tha;
 
                         tcp_seq_hash = tcp_seq_hash6;
@@ -309,7 +309,7 @@ tcp_print(netdissect_options *ndo,
 #endif /*INET6*/
                         register struct tcp_seq_hash *th;
                         struct tcp_seq_hash *tcp_seq_hash;
-                        const struct in_addr *src, *dst;
+                        const void *src, *dst;
                         struct tha tha;
 
                         tcp_seq_hash = tcp_seq_hash4;