Date: Mon, 19 Dec 2011 17:32:55 +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: r228713 - head/contrib/tcpdump Message-ID: <201112191732.pBJHWta3067918@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Mon Dec 19 17:32:54 2011 New Revision: 228713 URL: http://svn.freebsd.org/changeset/base/228713 Log: 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 Modified: head/contrib/tcpdump/print-icmp6.c Modified: head/contrib/tcpdump/print-icmp6.c ============================================================================== --- head/contrib/tcpdump/print-icmp6.c Mon Dec 19 15:46:15 2011 (r228712) +++ head/contrib/tcpdump/print-icmp6.c Mon Dec 19 17:32:54 2011 (r228713) @@ -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) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201112191732.pBJHWta3067918>