diff options
Diffstat (limited to 'contrib/tcpdump/print-vrrp.c')
-rw-r--r-- | contrib/tcpdump/print-vrrp.c | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/contrib/tcpdump/print-vrrp.c b/contrib/tcpdump/print-vrrp.c index 9bc29d1..f615dfd 100644 --- a/contrib/tcpdump/print-vrrp.c +++ b/contrib/tcpdump/print-vrrp.c @@ -24,19 +24,18 @@ */ #ifndef lint -static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-vrrp.c,v 1.5 2001/07/23 22:27:30 fenner Exp $"; +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-vrrp.c,v 1.7.2.2 2003/11/16 08:51:55 guy Exp $"; #endif #ifdef HAVE_CONFIG_H #include "config.h" #endif +#include <tcpdump-stdinc.h> + #include <stdio.h> #include <stdlib.h> -#include <unistd.h> - -#include <netinet/in.h> #include "interface.h" #include "extract.h" @@ -69,7 +68,7 @@ static const char rcsid[] = #define VRRP_TYPE_ADVERTISEMENT 1 static const struct tok type2str[] = { - { VRRP_TYPE_ADVERTISEMENT, "advertisement" }, + { VRRP_TYPE_ADVERTISEMENT, "Advertisement" }, { 0, NULL } }; @@ -94,27 +93,27 @@ vrrp_print(register const u_char *bp, register u_int len, int ttl) TCHECK(bp[0]); version = (bp[0] & 0xf0) >> 4; type = bp[0] & 0x0f; - type_s = tok2str(type2str, "type#%d", type); - printf("VRRPv%d-%s %d: ", version, type_s, len); + type_s = tok2str(type2str, "unknown type (%u)", type); + printf("VRRPv%u, %s", version, type_s); if (ttl != 255) - printf("[ttl=%d!] ", ttl); + printf(", (ttl %u)", ttl); if (version != 2 || type != VRRP_TYPE_ADVERTISEMENT) return; TCHECK(bp[2]); - printf("vrid=%d prio=%d", bp[1], bp[2]); + printf(", vrid %u, prio %u", bp[1], bp[2]); TCHECK(bp[5]); auth_type = bp[4]; - printf(" authtype=%s", tok2str(auth2str, NULL, auth_type)); - printf(" intvl=%d", bp[5]); + printf(", authtype %s", tok2str(auth2str, NULL, auth_type)); + printf(", intvl %us, length %u", bp[5],len); if (vflag) { int naddrs = bp[3]; int i; char c; if (TTEST2(bp[0], len) && in_cksum((const u_short*)bp, len, 0)) - printf(" (bad vrrp cksum %x!)", + printf(", (bad vrrp cksum %x)", EXTRACT_16BITS(&bp[6])); - printf(" addrs"); + printf(", addrs"); if (naddrs > 1) printf("(%d)", naddrs); printf(":"); |