Date: Sun, 1 Jan 2012 23:45:21 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r229244 - stable/9/contrib/tcpdump Message-ID: <201201012345.q01NjLP0037737@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Sun Jan 1 23:45:21 2012 New Revision: 229244 URL: http://svn.freebsd.org/changeset/base/229244 Log: MFC r228713: 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.) Modified: stable/9/contrib/tcpdump/print-icmp6.c Directory Properties: stable/9/contrib/tcpdump/ (props changed) Modified: stable/9/contrib/tcpdump/print-icmp6.c ============================================================================== --- stable/9/contrib/tcpdump/print-icmp6.c Sun Jan 1 23:43:45 2012 (r229243) +++ stable/9/contrib/tcpdump/print-icmp6.c Sun Jan 1 23:45:21 2012 (r229244) @@ -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?201201012345.q01NjLP0037737>