diff options
| author | dim <dim@FreeBSD.org> | 2011-12-19 17:32:54 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2011-12-19 17:32:54 +0000 |
| commit | 83a41e00af84b93176757e8e08899036e937ccc3 (patch) | |
| tree | d85eee71126f1211523f1a8191f3497371a43573 | |
| parent | 9d3568341135ec9ae6015b817b71b7c887ae098f (diff) | |
| download | FreeBSD-src-83a41e00af84b93176757e8e08899036e937ccc3.zip FreeBSD-src-83a41e00af84b93176757e8e08899036e937ccc3.tar.gz | |
In contrib/tcpdump/print-icmp6.c, fix a problem where the comparison
against icmp6_hdr::icmp6_type is done incorrectly. (This fix has
already been applied upstream, but we do not have the latest version of
tcpdump.)
MFC after: 1 week
| -rw-r--r-- | contrib/tcpdump/print-icmp6.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/contrib/tcpdump/print-icmp6.c b/contrib/tcpdump/print-icmp6.c index cc48615..2476538 100644 --- a/contrib/tcpdump/print-icmp6.c +++ b/contrib/tcpdump/print-icmp6.c @@ -350,14 +350,13 @@ icmp6_print(netdissect_options *ndo, printf("ICMP6, %s", tok2str(icmp6_type_values,"unknown icmp6 type (%u)",dp->icmp6_type)); /* display cosmetics: print the packet length for printer that use the vflag now */ - if (vflag && (dp->icmp6_type == - ND_ROUTER_SOLICIT || - ND_ROUTER_ADVERT || - ND_NEIGHBOR_ADVERT || - ND_NEIGHBOR_SOLICIT || - ND_REDIRECT || - ICMP6_HADISCOV_REPLY || - ICMP6_MOBILEPREFIX_ADVERT )) + if (vflag && (dp->icmp6_type == ND_ROUTER_SOLICIT || + dp->icmp6_type == ND_ROUTER_ADVERT || + dp->icmp6_type == ND_NEIGHBOR_ADVERT || + dp->icmp6_type == ND_NEIGHBOR_SOLICIT || + dp->icmp6_type == ND_REDIRECT || + dp->icmp6_type == ICMP6_HADISCOV_REPLY || + dp->icmp6_type == ICMP6_MOBILEPREFIX_ADVERT )) printf(", length %u", length); switch (dp->icmp6_type) { |
