Handle very large -f files by rejecting them.

[tcpdump] / print-vrrp.c

diff --git a/print-vrrp.c b/print-vrrp.c
index fefb2d9afc8975f1276bcc90f430486ecacee6c4..a39766767e40d7a054cae8f3d2c96789172ed317 100644 (file)
--- a/print-vrrp.c
+++ b/print-vrrp.c
@@ -23,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.2 2000-07-29 06:22:17 assar Exp $";
-#endif
+/* \summary: Virtual Router Redundancy Protocol (VRRP) printer */

 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #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
  *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+


@@ -61,58 +59,129 @@ 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,
+           register const u_char *bp, register u_int len,
+           register const u_char *bp2, int ttl)

 {
 {

-       int version, type, auth_type;
-       char *type_s;
+       int version, type, auth_type = VRRP_AUTH_NONE; /* keep compiler happy */
+       const char *type_s;

 
 

-       TCHECK(bp[0]);
+       ND_TCHECK(bp[0]);

        version = (bp[0] & 0xf0) >> 4;
        type = bp[0] & 0x0f;
        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);
+       ND_PRINT((ndo, "VRRPv%u, %s", version, type_s));

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

-               printf("[ttl=%d!] ", ttl);
-       if (version != 2 || type != 1)
+               ND_PRINT((ndo, ", (ttl %u)", ttl));
+       if (version < 2 || version > 3 || type != VRRP_TYPE_ADVERTISEMENT)

                return;
                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(" intvl=%d", bp[5]);
-       if (vflag) {
+       ND_TCHECK(bp[2]);
+       ND_PRINT((ndo, ", vrid %u, prio %u", bp[1], bp[2]));
+       ND_TCHECK(bp[5]);
+
+       if (version == 2) {
+               auth_type = bp[4];
+               ND_PRINT((ndo, ", authtype %s", tok2str(auth2str, NULL, auth_type)));
+               ND_PRINT((ndo, ", intvl %us, length %u", bp[5], len));
+       } else { /* version == 3 */
+               uint16_t intvl = (bp[4] & 0x0f) << 8 | bp[5];
+               ND_PRINT((ndo, ", intvl %ucs, length %u", intvl, len));
+       }
+
+       if (ndo->ndo_vflag) {

                int naddrs = bp[3];
                int i;
                char c;
 
                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 (version == 2 && ND_TTEST2(bp[0], len)) {
+                       struct cksum_vec vec[1];
+
+                       vec[0].ptr = bp;
+                       vec[0].len = len;
+                       if (in_cksum(vec, 1)) {
+                               ND_TCHECK_16BITS(&bp[6]);
+                               ND_PRINT((ndo, ", (bad vrrp cksum %x)",
+                                       EXTRACT_16BITS(&bp[6])));
+                       }
+               }
+
+               if (version == 3 && ND_TTEST2(bp[0], len)) {
+                       uint16_t cksum = nextproto4_cksum(ndo, (const struct ip *)bp2, bp,
+                               len, len, IPPROTO_VRRP);
+                       if (cksum) {
+                               ND_TCHECK_16BITS(&bp[6]);
+                               ND_PRINT((ndo, ", (bad vrrp cksum %x)",
+                                       EXTRACT_16BITS(&bp[6])));
+                       }
+               }
+
+               ND_PRINT((ndo, ", addrs"));

                if (naddrs > 1)
                if (naddrs > 1)

-                       printf("(%d)", naddrs);
-               printf(":");
+                       ND_PRINT((ndo, "(%d)", naddrs));
+               ND_PRINT((ndo, ":"));

                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(bp[3]);
+                       ND_PRINT((ndo, "%c%s", c, ipaddr_string(ndo, bp)));

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

-               if (auth_type == 1) { /* simple text password */
-                       TCHECK(bp[7]);
-                       printf(" auth %.8s", bp);
+               if (version == 2 && auth_type == VRRP_AUTH_SIMPLE) { /* simple text password */
+                       ND_TCHECK(bp[7]);
+                       ND_PRINT((ndo, " auth \""));
+                       if (fn_printn(ndo, bp, 8, ndo->ndo_snapend)) {
+                               ND_PRINT((ndo, "\""));
+                               goto trunc;
+                       }
+                       ND_PRINT((ndo, "\""));

                }
        }
        return;
 trunc:
                }
        }
        return;
 trunc:

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

 }
 }