Address Michael's comments.

[tcpdump] / print-vrrp.c

diff --git a/print-vrrp.c b/print-vrrp.c
index caef77e08841c7ad9838fbaa2a5d774d5ee360f9..8b733d228c3c293dea78abcc57619171aa11be90 100644 (file)
--- a/print-vrrp.c
+++ b/print-vrrp.c
@@ -24,19 +24,18 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-vrrp.c,v 1.4 2001-07-20 03:16:23 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
 
 #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 <netinet/in.h>

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


@@ -69,7 +68,7 @@ static const char rcsid[] =
 #define        VRRP_TYPE_ADVERTISEMENT 1
 
 static const struct tok type2str[] = {
 #define        VRRP_TYPE_ADVERTISEMENT 1
 
 static const struct tok type2str[] = {

-       { VRRP_TYPE_ADVERTISEMENT,      "advertisement" },
+       { VRRP_TYPE_ADVERTISEMENT,      "Advertisement" },

        { 0,                            NULL            }
 };
 
        { 0,                            NULL            }
 };
 


@@ -94,27 +93,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;
        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)
        if (ttl != 255)

-               printf("[ttl=%d!] ", ttl);
+               printf(", (ttl %u)", ttl);

        if (version != 2 || type != VRRP_TYPE_ADVERTISEMENT)
                return;
        TCHECK(bp[2]);
        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];
        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 (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(":");
                if (naddrs > 1)
                        printf("(%d)", naddrs);
                printf(":");


@@ -129,7 +134,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 \"");
                if (auth_type == VRRP_AUTH_SIMPLE) { /* simple text password */
                        TCHECK(bp[7]);
                        printf(" auth \"");

-                       fn_printn(bp, bp[7] - bp[0] + 1, NULL);
+                       if (fn_printn(bp, 8, snapend)) {
+                               printf("\"");
+                               goto trunc;
+                       }

                        printf("\"");
                }
        }
                        printf("\"");
                }
        }