mirrors/tcpdump
0
0
Fork 0
mirror of https://github.com/the-tcpdump-group/tcpdump.git synced 2024-11-24 02:23:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Correctly check for various values of the ICMP type field.

Browse Source 
clang+llvm warnings pointed out some incorrect code - you can't, in C,
check for multiple values for a variable that way.
This commit is contained in:
Guy Harris 2010-08-19 19:23:08 -07:00
parent aad7d3d1b1
commit 020b16ec4f
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CREDITS
View File

@ -148,6 +148,7 @@ Additional people who have contributed patches:
Peter Jeremy <peter dot jeremy at alcatel dot com dot au>
<pfhunt at users dot sourceforge dot net>
Peter Volkov <pva at gentoo dot org>
<pwo at users dot sourceforge dot net>
Phil Wood <cpw at lanl dot gov>
Rafal Maszkowski <rzm at icm dot edu dot pl>
Randy Sofia <rsofia at users dot sourceforge dot net>

15
print-icmp6.c
View File

@ -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) {