Merge branch 'master' of git+ssh://bpf.tcpdump.org/tcpdump/master/git/tcpdump

[tcpdump] / print-pim.c

diff --git a/print-pim.c b/print-pim.c
index 3cd681090d457f14871ff7fa12c7f574ca1ffdda..157df46f778191bf77444f862d7e2bfafd063f3d 100644 (file)
--- a/print-pim.c
+++ b/print-pim.c
@@ -95,7 +95,7 @@ static const struct tok pimv2_register_flag_values[] = {
     { PIMV2_REGISTER_FLAG_BORDER, "Border" },
     { PIMV2_REGISTER_FLAG_NULL, "Null" },
     { 0, NULL}
-};    
+};
 
 /*
  * XXX: We consider a case where IPv6 is not ready yet for portability,
@@ -121,7 +121,7 @@ static void pimv2_print(register const u_char *bp, register u_int len, u_int cks
 static void
 pimv1_join_prune_print(register const u_char *bp, register u_int len)
 {
-       int maddrlen, addrlen, ngroups, njoin, nprune;
+       int ngroups, njoin, nprune;
        int njp;
 
        /* If it's a single group and a single source, use 1-line output. */
@@ -162,8 +162,6 @@ pimv1_join_prune_print(register const u_char *bp, register u_int len)
        len -= 8;
 
        TCHECK2(bp[0], 4);
-       maddrlen = bp[1];
-       addrlen = bp[2];
        ngroups = bp[3];
        bp += 4;
        len -= 4;
@@ -732,12 +730,12 @@ pimv2_print(register const u_char *bp, register u_int len, u_int cksum)
                                break;
                        default:
                                 if (vflag <= 1)
-                                    print_unknown_data(bp,"\n\t    ",olen);
+                                    print_unknown_data(gndo,bp,"\n\t    ",olen);
                                 break;
                        }
                         /* do we want to see an additionally hexdump ? */
                         if (vflag> 1)
-                            print_unknown_data(bp,"\n\t    ",olen);
+                            print_unknown_data(gndo,bp,"\n\t    ",olen);
                        bp += olen;
                }
                break;