diff options
| author | sam <sam@FreeBSD.org> | 2005-07-11 04:14:02 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2005-07-11 04:14:02 +0000 |
| commit | 5d66575dd923625f5f8a569b19801db44c111619 (patch) | |
| tree | 14f508983141729f86ce893b1f31e0d11cf1b4db /contrib/tcpdump/print-pim.c | |
| parent | fb0e3fc91b71a7c77c12753c471331fc4757d33c (diff) | |
| download | FreeBSD-src-5d66575dd923625f5f8a569b19801db44c111619.zip FreeBSD-src-5d66575dd923625f5f8a569b19801db44c111619.tar.gz | |
resolve merge conflicts
Approved by: re (scottl)
Diffstat (limited to 'contrib/tcpdump/print-pim.c')
| -rw-r--r-- | contrib/tcpdump/print-pim.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/contrib/tcpdump/print-pim.c b/contrib/tcpdump/print-pim.c index c5d8d8b..d4bafe4 100644 --- a/contrib/tcpdump/print-pim.c +++ b/contrib/tcpdump/print-pim.c @@ -23,7 +23,7 @@ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-pim.c,v 1.45 2005/04/06 21:32:42 mcr Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-pim.c,v 1.45.2.2 2005/04/20 22:08:44 guy Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -163,6 +163,10 @@ pimv1_join_prune_print(register const u_char *bp, register u_int len) bp += 4; len -= 4; while (ngroups--) { + /* + * XXX - does the address have length "addrlen" and the + * mask length "maddrlen"? + */ TCHECK2(bp[0], 4); (void)printf("\n\tGroup: %s", ipaddr_string(bp)); TCHECK2(bp[4], 4); @@ -509,7 +513,6 @@ static int pimv2_addr_print(const u_char *bp, enum pimv2_addrtype at, int silent) { int af; - const char *afstr; int len, hdrlen; TCHECK(bp[0]); @@ -519,13 +522,11 @@ pimv2_addr_print(const u_char *bp, enum pimv2_addrtype at, int silent) switch (bp[0]) { case 1: af = AF_INET; - afstr = "IPv4"; len = 4; break; #ifdef INET6 case 2: af = AF_INET6; - afstr = "IPv6"; len = 16; break; #endif @@ -539,12 +540,10 @@ pimv2_addr_print(const u_char *bp, enum pimv2_addrtype at, int silent) switch (pimv2_addr_len) { case 4: af = AF_INET; - afstr = "IPv4"; break; #ifdef INET6 case 16: af = AF_INET6; - afstr = "IPv6"; break; #endif default: |
