diff options
| author | Xin LI <delphij@FreeBSD.org> | 2012-05-14 08:01:48 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2012-05-14 08:01:48 +0000 |
| commit | 60894fde29002aac35c5aff244b0f45c4d590413 (patch) | |
| tree | 2d0f73c65ae258539a2146cd435727a18ae62097 /print-pim.c | |
| parent | 6d59e2f382406def185ce5261b8723a174cd28a3 (diff) | |
Diffstat (limited to 'print-pim.c')
| -rw-r--r-- | print-pim.c | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/print-pim.c b/print-pim.c index f9fd0c69f553..0f558af13573 100644 --- a/print-pim.c +++ b/print-pim.c @@ -29,7 +29,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 @@ -108,16 +116,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 @@ -399,8 +397,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; } @@ -768,7 +770,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: |