diff options
| author | dim <dim@FreeBSD.org> | 2017-01-11 20:55:01 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2017-01-11 20:55:01 +0000 |
| commit | f91ff953ed87a3c6ad83c744db610b8dde2d8dc1 (patch) | |
| tree | 2548162bf4ff71e449bf30ec489bfd8b76d38867 | |
| parent | 2c09b49edf496d9ea1face9a6af2a0dcccfd55ad (diff) | |
| download | FreeBSD-src-f91ff953ed87a3c6ad83c744db610b8dde2d8dc1.zip FreeBSD-src-f91ff953ed87a3c6ad83c744db610b8dde2d8dc1.tar.gz | |
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.
| -rw-r--r-- | contrib/tcpdump/print-tcp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/tcpdump/print-tcp.c b/contrib/tcpdump/print-tcp.c index bc200e2..a5c7047 100644 --- a/contrib/tcpdump/print-tcp.c +++ b/contrib/tcpdump/print-tcp.c @@ -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; |
