From 7c20d41d9dd088a12312d6855ed27f58bca14b80 Mon Sep 17 00:00:00 2001
From: guy <guy>
Date: Fri, 20 Jul 2001 03:16:22 +0000
Subject: [PATCH] Changes from Klaus Klein <kleink@reziprozitaet.de> to improve
 the output and to avoid control characters in the auth-simple output.

---
 CREDITS      |  1 +
 print-vrrp.c | 41 ++++++++++++++++++++++++++++++-----------
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/CREDITS b/CREDITS
index cdd30b8c..2a342210 100644
--- a/CREDITS
+++ b/CREDITS
@@ -37,6 +37,7 @@ Additional people who have contributed patches:
 	Kelly Carmichael		<kcarmich@ipapp.com>
 	Ken Hornstein			<kenh@cmf.nrl.navy.mil>
 	Kevin Steves			<stevesk@sweden.hp.com>
+	Klaus Klein			<kleink@reziprozitaet.de>
  	Kris Kennaway			<kris@freebsd.org>
 	Larry Lile			<lile@stdio.com>
 	Lennert Buytenhek 		<buytenh@gnu.org>
diff --git a/print-vrrp.c b/print-vrrp.c
index 3c069614..caef77e0 100644
--- a/print-vrrp.c
+++ b/print-vrrp.c
@@ -25,7 +25,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-vrrp.c,v 1.3 2000-10-10 05:05:08 guy Exp $";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-vrrp.c,v 1.4 2001-07-20 03:16:23 guy Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -64,30 +64,47 @@ 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";
+	type_s = tok2str(type2str, "type#%d", type);
 	printf("VRRPv%d-%s %d: ", version, type_s, len);
 	if (ttl != 255)
 		printf("[ttl=%d!] ", ttl);
-	if (version != 2 || type != 1)
+	if (version != 2 || type != VRRP_TYPE_ADVERTISEMENT)
 		return;
 	TCHECK(bp[2]);
 	printf("vrid=%d prio=%d", bp[1], bp[2]);
 	TCHECK(bp[5]);
 	auth_type = bp[4];
-	if (auth_type != 0)
-		printf(" authtype=%d", auth_type);
+	printf(" authtype=%s", tok2str(auth2str, NULL, auth_type));
 	printf(" intvl=%d", bp[5]);
 	if (vflag) {
 		int naddrs = bp[3];
@@ -109,9 +126,11 @@ 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 \"");
+			fn_printn(bp, bp[7] - bp[0] + 1, NULL);
+			printf("\"");
 		}
 	}
 	return;
-- 
2.39.5