Changes from Klaus Klein <[email protected]> to improve the output

and to avoid control characters in the auth-simple output.

diff --git a/CREDITS b/CREDITS
index cdd30b8cfc4d8d504c176f3f546a7a178a4aea4b..2a342210d10c6ea1270e96bbc57306c01e029e96 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -37,6 +37,7 @@ Additional people who have contributed patches:
        Kelly Carmichael                <[email protected]>
        Ken Hornstein                   <[email protected]>
        Kevin Steves                    <[email protected]>
+       Klaus Klein                     <[email protected]>
        Kris Kennaway                   <[email protected]>
        Larry Lile                      <[email protected]>
        Lennert Buytenhek               <[email protected]>

diff --git a/print-vrrp.c b/print-vrrp.c
index 3c0696140b36e7ba4f6df5bf8feb59e5f9c43e2f..caef77e08841c7ad9838fbaa2a5d774d5ee360f9 100644 (file)
--- 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;