X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/1869f416f3903a83fa2beed7a36deb2dc55c5d13..a4a13734bb167ab42f86da26c3aa1cb4da9954fd:/print-vrrp.c

diff --git a/print-vrrp.c b/print-vrrp.c
index 3c069614..8b733d22 100644
--- a/print-vrrp.c
+++ b/print-vrrp.c
@@ -24,19 +24,18 @@
  */
 
 #ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-vrrp.c,v 1.3 2000-10-10 05:05:08 guy Exp $";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-vrrp.c,v 1.10 2005-05-06 07:56:54 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"
@@ -64,40 +63,63 @@ static const char rcsid[] =
  *    |                     Authentication Data (2)                   |
  *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
  */
+
+/* Type */
+#define	VRRP_TYPE_ADVERTISEMENT	1
+
+static const struct tok type2str[] = {
+	{ VRRP_TYPE_ADVERTISEMENT,	"Advertisement"	},
+	{ 0,				NULL		}
+};
+
+/* Auth Type */
+#define	VRRP_AUTH_NONE		0
+#define	VRRP_AUTH_SIMPLE	1
+#define	VRRP_AUTH_AH		2
+
+static const struct tok auth2str[] = {
+	{ VRRP_AUTH_NONE,		"none"		},
+	{ VRRP_AUTH_SIMPLE,		"simple"	},
+	{ VRRP_AUTH_AH,			"ah"		},
+	{ 0,				NULL		}
+};
+
 void
 vrrp_print(register const u_char *bp, register u_int len, int ttl)
 {
 	int version, type, auth_type;
-	char *type_s;
+	const char *type_s;
 
 	TCHECK(bp[0]);
 	version = (bp[0] & 0xf0) >> 4;
 	type = bp[0] & 0x0f;
-	if (type == 1)
-		type_s = "advertise";
-	else
-		type_s = "unknown";
-	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);
-	if (version != 2 || type != 1)
+		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];
-	if (auth_type != 0)
-		printf(" authtype=%d", 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(":");
@@ -109,9 +131,14 @@ vrrp_print(register const u_char *bp, register u_int len, int ttl)
 			c = ',';
 			bp += 4;
 		}
-		if (auth_type == 1) { /* simple text password */
+		if (auth_type == VRRP_AUTH_SIMPLE) { /* simple text password */
 			TCHECK(bp[7]);
-			printf(" auth %.8s", bp);
+			printf(" auth \"");
+			if (fn_printn(bp, 8, snapend)) {
+				printf("\"");
+				goto trunc;
+			}
+			printf("\"");
 		}
 	}
 	return;