travis: try removing the matrix: clause and putting back the Coverity stuff.

[tcpdump] / print-vrrp.c

diff --git a/print-vrrp.c b/print-vrrp.c
index 442823f3a009b2e68dca7f6cb3fb0472e3bbd979..2739e37c6294222a3a453723981e136a9dd44329 100644 (file)
--- a/print-vrrp.c
+++ b/print-vrrp.c
@@ -2,6 +2,13 @@
  * Copyright (c) 2000 William C. Fenner.
  *                All rights reserved.
  *
  * Copyright (c) 2000 William C. Fenner.
  *                All rights reserved.
  *

+ * Kevin Steves <[email protected]> July 2000
+ * Modified to:
+ * - print version, type string and packet length
+ * - print IP address count if > 1 (-v)
+ * - verify checksum (-v)
+ * - print authentication string (-v)
+ *

  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that: (1) source code
  * distributions retain the above copyright notice and this paragraph
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that: (1) source code
  * distributions retain the above copyright notice and this paragraph


@@ -16,25 +23,23 @@
  * FOR A PARTICULAR PURPOSE.
  */
 
  * FOR A PARTICULAR PURPOSE.
  */
 

-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-vrrp.c,v 1.1 2000-05-01 17:35:44 fenner Exp $";
-#endif
+/* \summary: Virtual Router Redundancy Protocol (VRRP) printer */

 
 #ifdef HAVE_CONFIG_H
 
 #ifdef HAVE_CONFIG_H

-#include "config.h"
+#include <config.h>

 #endif
 
 #endif
 

-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
+#include "netdissect-stdinc.h"

 
 

-#include "interface.h"
+#include "netdissect.h"

 #include "extract.h"
 #include "addrtoname.h"
 
 #include "extract.h"
 #include "addrtoname.h"
 

+#include "ip.h"
+#include "ipproto.h"

 /*
 /*

- * RFC 2338:
+ * RFC 2338 (VRRP v2):
+ *

  *     0                   1                   2                   3
  *     0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
  *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
  *     0                   1                   2                   3
  *     0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
  *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+


@@ -54,46 +59,126 @@ static const char rcsid[] =
  *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
  *    |                     Authentication Data (2)                   |
  *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
  *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
  *    |                     Authentication Data (2)                   |
  *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

+ *
+ *
+ * RFC 5798 (VRRP v3):
+ *
+ *    0                   1                   2                   3
+ *    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+ *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *    |                    IPv4 Fields or IPv6 Fields                 |
+ *   ...                                                             ...
+ *    |                                                               |
+ *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *    |Version| Type  | Virtual Rtr ID|   Priority    |Count IPvX Addr|
+ *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *    |(rsvd) |     Max Adver Int     |          Checksum             |
+ *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *    |                                                               |
+ *    +                                                               +
+ *    |                       IPvX Address(es)                        |
+ *    +                                                               +
+ *    |                                                               |
+ *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

  */
  */

+
+/* 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
 void

-vrrp_print(register const u_char *bp, register u_int len, int ttl)
+vrrp_print(netdissect_options *ndo,
+           const u_char *bp, u_int len,
+           const u_char *bp2, int ttl)

 {
 {

-       printf("vrrp ");
+       int version, type, auth_type = VRRP_AUTH_NONE; /* keep compiler happy */
+       const char *type_s;
+
+       ndo->ndo_protocol = "vrrp";
+       ND_TCHECK_1(bp);
+       version = (GET_U_1(bp) & 0xf0) >> 4;
+       type = GET_U_1(bp) & 0x0f;
+       type_s = tok2str(type2str, "unknown type (%u)", type);
+       ND_PRINT("VRRPv%u, %s", version, type_s);

        if (ttl != 255)
        if (ttl != 255)

-               printf("[ttl=%d!] ", ttl);
-       TCHECK(bp[3]);
-       if ((bp[0] & 0xf0) != 0x20) {
-               printf("[v=%d]", bp[0] >> 4);
+               ND_PRINT(", (ttl %u)", ttl);
+       if (version < 2 || version > 3 || type != VRRP_TYPE_ADVERTISEMENT)

                return;
                return;

+       ND_TCHECK_1(bp + 2);
+       ND_PRINT(", vrid %u, prio %u", GET_U_1(bp + 1), GET_U_1(bp + 2));
+       ND_TCHECK_1(bp + 5);
+
+       if (version == 2) {
+               auth_type = GET_U_1(bp + 4);
+               ND_PRINT(", authtype %s", tok2str(auth2str, NULL, auth_type));
+               ND_PRINT(", intvl %us, length %u", GET_U_1(bp + 5), len);
+       } else { /* version == 3 */
+               uint16_t intvl = (GET_U_1(bp + 4) & 0x0f) << 8 | GET_U_1(bp + 5);
+               ND_PRINT(", intvl %ucs, length %u", intvl, len);

        }
        }

-       if ((bp[0] & 0x0f) != 1) {
-               printf("[t=%d]", bp[0] & 0x0f);
-               return;
-       }
-       printf("vrid=%d prio=%d", bp[1], bp[2]);
-       TCHECK(bp[5]);
-       if (bp[4] != 0) {
-               printf(" [authtype %d]", bp[4]);
-       }
-       printf(" intvl=%d", bp[5]);
-       if (vflag) {
-               int naddrs = bp[3];
-               int i;
+
+       if (ndo->ndo_vflag) {
+               u_int naddrs = GET_U_1(bp + 3);
+               u_int i;

                char c;
 
                char c;
 

-               /* check checksum? */
-               printf(" addrs:");
+               if (version == 2 && ND_TTEST_LEN(bp, len)) {
+                       struct cksum_vec vec[1];
+
+                       vec[0].ptr = bp;
+                       vec[0].len = len;
+                       if (in_cksum(vec, 1))
+                               ND_PRINT(", (bad vrrp cksum %x)",
+                                       GET_BE_U_2(bp + 6));
+               }
+
+               if (version == 3 && ND_TTEST_LEN(bp, len)) {
+                       uint16_t cksum = nextproto4_cksum(ndo, (const struct ip *)bp2, bp,
+                               len, len, IPPROTO_VRRP);
+                       if (cksum)
+                               ND_PRINT(", (bad vrrp cksum %x)",
+                                       GET_BE_U_2(bp + 6));
+               }
+
+               ND_PRINT(", addrs");
+               if (naddrs > 1)
+                       ND_PRINT("(%u)", naddrs);
+               ND_PRINT(":");

                c = ' ';
                bp += 8;
                for (i = 0; i < naddrs; i++) {
                c = ' ';
                bp += 8;
                for (i = 0; i < naddrs; i++) {

-                       TCHECK(bp[3]);
-                       printf("%c%s", c, ipaddr_string(bp));
+                       ND_TCHECK_1(bp + 3);
+                       ND_PRINT("%c%s", c, GET_IPADDR_STRING(bp));

                        c = ',';
                        bp += 4;
                }
                        c = ',';
                        bp += 4;
                }

-               /* auth data? */
+               if (version == 2 && auth_type == VRRP_AUTH_SIMPLE) { /* simple text password */
+                       ND_TCHECK_1(bp + 7);
+                       ND_PRINT(" auth \"");
+                       if (nd_printn(ndo, bp, 8, ndo->ndo_snapend)) {
+                               ND_PRINT("\"");
+                               goto trunc;
+                       }
+                       ND_PRINT("\"");
+               }

        }
        return;
 trunc:
        }
        return;
 trunc:

-       printf("[|vrrp]");
+       nd_print_trunc(ndo);

 }
 }