diff options
| author | delphij <delphij@FreeBSD.org> | 2012-05-17 05:11:57 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2012-05-17 05:11:57 +0000 |
| commit | 661b9d94414ea6d11d5b7960aef1f172975ce52b (patch) | |
| tree | 1720d207a135a239a304163c4635810a1094209a /contrib/tcpdump/print-pim.c | |
| parent | 63ab347efe2621fc79f689a92c4bbda531593626 (diff) | |
| parent | d36dcecdb3228d24b199eb51cfd7ac666f5b8eb8 (diff) | |
| download | FreeBSD-src-661b9d94414ea6d11d5b7960aef1f172975ce52b.zip FreeBSD-src-661b9d94414ea6d11d5b7960aef1f172975ce52b.tar.gz | |
Merge tcpdump 4.2.1.
MFC after: 2 weeks
Diffstat (limited to 'contrib/tcpdump/print-pim.c')
| -rw-r--r-- | contrib/tcpdump/print-pim.c | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/contrib/tcpdump/print-pim.c b/contrib/tcpdump/print-pim.c index 96ba758..93ffb9a 100644 --- a/contrib/tcpdump/print-pim.c +++ b/contrib/tcpdump/print-pim.c @@ -31,7 +31,15 @@ static const char rcsid[] _U_ = #endif #include <tcpdump-stdinc.h> + +#include <stdio.h> +#include <stdlib.h> + #include "interface.h" +#include "addrtoname.h" +#include "extract.h" + +#include "ip.h" #define PIMV2_TYPE_HELLO 0 #define PIMV2_TYPE_REGISTER 1 @@ -110,16 +118,6 @@ struct pim { u_short pim_cksum; /* IP style check sum */ }; - -#include <stdio.h> -#include <stdlib.h> - -#include "interface.h" -#include "addrtoname.h" -#include "extract.h" - -#include "ip.h" - static void pimv2_print(register const u_char *bp, register u_int len, u_int cksum); static void @@ -401,8 +399,12 @@ cisco_autorp_print(register const u_char *bp, register u_int len) TCHECK2(bp[0], 6); (void)printf("%c%s%s/%d", s, bp[0] & 1 ? "!" : "", ipaddr_string(&bp[2]), bp[1]); - if (bp[0] & 0xfe) - (void)printf("[rsvd=0x%02x]", bp[0] & 0xfe); + if (bp[0] & 0x02) { + (void)printf(" bidir"); + } + if (bp[0] & 0xfc) { + (void)printf("[rsvd=0x%02x]", bp[0] & 0xfc); + } s = ','; bp += 6; len -= 6; } @@ -770,7 +772,7 @@ pimv2_print(register const u_char *bp, register u_int len, u_int cksum) break; #ifdef INET6 case 6: /* IPv6 */ - ip6_print(bp, len); + ip6_print(gndo, bp, len); break; #endif default: |
