Make it clearer that the hex or hex-and-ASCII dump for "-x", "-xx",

[tcpdump] / print-vrrp.c

diff --git a/print-vrrp.c b/print-vrrp.c
index fefb2d9afc8975f1276bcc90f430486ecacee6c4..12e47716e0c9ae4cdaab6cf6d5fd9a1438df7e1a 100644 (file)
--- a/print-vrrp.c
+++ b/print-vrrp.c
@@ -24,17 +24,18 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-vrrp.c,v 1.2 2000-07-29 06:22:17 assar Exp $";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-vrrp.c,v 1.9.2.1 2005-05-06 07:57:20 guy Exp $";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

+#include <tcpdump-stdinc.h>
+

 #include <stdio.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdlib.h>

-#include <unistd.h>

 
 #include "interface.h"
 #include "extract.h"
 
 #include "interface.h"
 #include "extract.h"


@@ -62,40 +63,57 @@ static const char rcsid[] =
  *    |                     Authentication Data (2)                   |
  *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
  */
  *    |                     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;
 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;
 
        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)
        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]);
                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];
        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))
        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]));
                                EXTRACT_16BITS(&bp[6]));

-               printf(" addrs");
+               printf(", addrs");

                if (naddrs > 1)
                        printf("(%d)", naddrs);
                printf(":");
                if (naddrs > 1)
                        printf("(%d)", naddrs);
                printf(":");


@@ -107,9 +125,14 @@ vrrp_print(register const u_char *bp, register u_int len, int ttl)
                        c = ',';
                        bp += 4;
                }
                        c = ',';
                        bp += 4;
                }

-               if (auth_type == 1) { /* simple text password */
+               if (auth_type == VRRP_AUTH_SIMPLE) { /* simple text password */

                        TCHECK(bp[7]);
                        TCHECK(bp[7]);

-                       printf(" auth %.8s", bp);
+                       printf(" auth \"");
+                       if (fn_printn(bp, 8, snapend)) {
+                               printf("\"");
+                               goto trunc;
+                       }
+                       printf("\"");

                }
        }
        return;
                }
        }
        return;