bin/45747: Comparsion with icmp6_type -

[henning.petersen%t-online.de@localhost]

>Number:         45747
>Category:       bin
>Synopsis:       Comparsion with icmp6_type -
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    bin-bug-people
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Tue Dec 27 12:10:00 +0000 2011
>Originator:     Henning Petersen
>Release:        NetBSD-current
>Organization:
>Environment:
>Description:
Fix comparsion with icmp6_type in print-icmp6.c .
Fixed in tcpdump release 4.2.0 .
>How-To-Repeat:

>Fix:
diff -u -p -r1.2 print-icmp6.c
--- external/bsd/tcpdump/dist/print-icmp6.c     5 Dec 2010 05:11:30 -0000       
1.2
+++ external/bsd/tcpdump/dist/print-icmp6.c     20 Dec 2011 07:00:18 -0000
@@ -355,14 +355,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) {