Date: Sat, 7 Jan 2017 00:17:01 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r311570 - head/contrib/tcpdump Message-ID: <201701070017.v070H1xQ067575@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701070017.v070H1xQ067575>