svn commit: r311938 - stable/11/contrib/tcpdump

[Dimitry Andric]

Author: dim
Date: Wed Jan 11 20:55:01 2017
New Revision: 311938
URL: https://svnweb.freebsd.org/changeset/base/311938

Log:
  MFC r311570:
  
  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.

Modified:
  stable/11/contrib/tcpdump/print-tcp.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/contrib/tcpdump/print-tcp.c
==============================================================================
--- stable/11/contrib/tcpdump/print-tcp.c	Wed Jan 11 20:45:27 2017	(r311937)
+++ stable/11/contrib/tcpdump/print-tcp.c	Wed Jan 11 20:55:01 2017	(r311938)
@@ -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;