diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2017-01-07 00:17:01 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2017-01-07 00:17:01 +0000 |
| commit | 05ea86b0c0acef00e6ff4f42470b9fe7a1e865e4 (patch) | |
| tree | d54bc534257d495a2857737d561abd9166238de2 /contrib | |
| parent | e4612db2cdad3284aef5ff79805c21d25a7eeedf (diff) | |
| download | src-05ea86b0c0acef00e6ff4f42470b9fe7a1e865e4.tar.gz src-05ea86b0c0acef00e6ff4f42470b9fe7a1e865e4.zip | |
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
Notes
Notes:
svn path=/head/; revision=311570
Diffstat (limited to 'contrib')
| -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 bc200e2f8e21..a5c70477a8fb 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; |