X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/4dba2d1283529c066192e69a2c365b399745fb29..39d15607cad1b4b463794c1a67873f6182dc52f7:/print-vrrp.c

diff --git a/print-vrrp.c b/print-vrrp.c
index 2fd3fef5..f0414d9f 100644
--- a/print-vrrp.c
+++ b/print-vrrp.c
@@ -23,20 +23,14 @@
  * FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-vrrp.c,v 1.5 2001-07-23 22:27:30 fenner 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 +63,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 +88,33 @@ 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!)",
-				EXTRACT_16BITS(&bp[6]));
-		printf(" addrs");
+		if (TTEST2(bp[0], len)) {
+			struct cksum_vec vec[1];
+
+			vec[0].ptr = bp;
+			vec[0].len = len;
+			if (in_cksum(vec, 1))
+				printf(", (bad vrrp cksum %x)",
+					EXTRACT_16BITS(&bp[6]));
+		}
+		printf(", addrs");
 		if (naddrs > 1)
 			printf("(%d)", naddrs);
 		printf(":");
@@ -129,7 +129,10 @@ vrrp_print(register const u_char *bp, register u_int len, int ttl)
 		if (auth_type == VRRP_AUTH_SIMPLE) { /* simple text password */
 			TCHECK(bp[7]);
 			printf(" auth \"");
-			fn_printn(bp, 8, NULL);
+			if (fn_printn(bp, 8, snapend)) {
+				printf("\"");
+				goto trunc;
+			}
 			printf("\"");
 		}
 	}