]> The Tcpdump Group git mirrors - tcpdump/blobdiff - print-rip.c
projects / tcpdump / blobdiff
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
CI: Add warning exemptions for Sun C (suncc-5.14) on Solaris 10
[tcpdump] / print-rip.c
diff --git a/print-rip.c b/print-rip.c
index bd17d5f106517f379501f8beb149003c7ddba669..a399c610f546b52b2803eacbc114bc880a7e6a49 100644 (file)
--- a/print-rip.c
+++ b/print-rip.c
@@ -19,48 +19,60 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-rip.c,v 1.59 2006-03-23 14:58:44 hannes Exp $ (LBL)";
-#endif
+/* \summary: Routing Information Protocol (RIP) printer */
 
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+/* specification: RFC 1058, RFC 2453, RFC 4822 */
 
 
-#include <tcpdump-stdinc.h>
+#include <config.h>
 
 
-#include <stdio.h>
-#include <string.h>
+#include "netdissect-stdinc.h"
 
 
-#include "interface.h"
+#define ND_LONGJMP_FROM_TCHECK
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "addrtoname.h"
-#include "extract.h"                   /* must come after interface.h */
+#include "extract.h"
 
 #include "af.h"
 
 
 #include "af.h"
 
-static const char tstr[] = "[|rip]";
 
 
+/*
+ * RFC 1058 and RFC 2453 header of packet.
+ *
+ *  0                   1                   2                   3 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
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | Command (1)   | Version (1)   |           unused              |
+ * +---------------+---------------+-------------------------------+
+ */
 struct rip {
 struct rip {
-       u_int8_t rip_cmd;               /* request/response */
-       u_int8_t rip_vers;              /* protocol version # */
-       u_int8_t unused[2];             /* unused */
+       nd_uint8_t rip_cmd;             /* request/response */
+       nd_uint8_t rip_vers;            /* protocol version # */
+       nd_byte    unused[2];           /* unused */
 };
 
 #define        RIPCMD_REQUEST          1       /* want info */
 #define        RIPCMD_RESPONSE         2       /* responding to request */
 #define        RIPCMD_TRACEON          3       /* turn tracing on */
 #define        RIPCMD_TRACEOFF         4       /* turn it off */
 };
 
 #define        RIPCMD_REQUEST          1       /* want info */
 #define        RIPCMD_RESPONSE         2       /* responding to request */
 #define        RIPCMD_TRACEON          3       /* turn tracing on */
 #define        RIPCMD_TRACEOFF         4       /* turn it off */
-#define        RIPCMD_POLL             5       /* want info from everybody */
-#define        RIPCMD_POLLENTRY        6       /* poll for entry */
+/* 5 is reserved */
+#define RIPCMD_TRIGREQ         6
+#define RIPCMD_TRIGRESP                7
+#define RIPCMD_TRIGACK         8
+#define RIPCMD_UPDREQ          9
+#define RIPCMD_UPDRESP         10
+#define RIPCMD_UPDACK          11
 
 static const struct tok rip_cmd_values[] = {
     { RIPCMD_REQUEST,          "Request" },
     { RIPCMD_RESPONSE,         "Response" },
     { RIPCMD_TRACEON,          "Trace on" },
     { RIPCMD_TRACEOFF,         "Trace off" },
 
 static const struct tok rip_cmd_values[] = {
     { RIPCMD_REQUEST,          "Request" },
     { RIPCMD_RESPONSE,         "Response" },
     { RIPCMD_TRACEON,          "Trace on" },
     { RIPCMD_TRACEOFF,         "Trace off" },
-    { RIPCMD_POLL,             "Poll" },
-    { RIPCMD_POLLENTRY,                "Poll Entry" },
+    { RIPCMD_TRIGREQ,          "Triggered Request" },
+    { RIPCMD_TRIGRESP,         "Triggered Response" },
+    { RIPCMD_TRIGACK,          "Triggered Acknowledgement" },
+    { RIPCMD_UPDREQ,           "Update Request" },
+    { RIPCMD_UPDRESP,          "Update Response" },
+    { RIPCMD_UPDACK,           "Update Acknowledge" },
     { 0, NULL}
 };
 
     { 0, NULL}
 };
 
@@ -68,13 +80,46 @@ static const struct tok rip_cmd_values[] = {
 #define RIP_ROUTELEN 20
 
 /*
 #define RIP_ROUTELEN 20
 
 /*
- * rfc 1723
- * 
+ * First 4 bytes of all RIPv1/RIPv2 entries.
+ */
+struct rip_entry_header {
+       nd_uint16_t rip_family;
+       nd_uint16_t rip_tag;
+};
+
+/*
+ * RFC 1058 entry.
+ *
+ *  0                   1                   2                   3 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
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | Address Family Identifier (2) |       must be zero (2)        |
+ * +-------------------------------+-------------------------------+
+ * |                         IP Address (4)                        |
+ * +---------------------------------------------------------------+
+ * |                        must be zero (4)                       |
+ * +---------------------------------------------------------------+
+ * |                        must be zero (4)                       |
+ * +---------------------------------------------------------------+
+ * |                         Metric (4)                            |
+ * +---------------------------------------------------------------+
+ */
+struct rip_netinfo_v1 {
+       nd_uint16_t rip_family;
+       nd_byte     rip_mbz1[2];
+       nd_ipv4     rip_dest;
+       nd_byte     rip_mbz2[4];
+       nd_byte     rip_mbz3[4];
+       nd_uint32_t rip_metric;         /* cost of route */
+};
+
+
+/*
+ * RFC 2453 route entry
+ *
  *  0                   1                   2                   3 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 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
  * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * | Command (1)   | Version (1)   |           unused              |
- * +---------------+---------------+-------------------------------+
  * | Address Family Identifier (2) |        Route Tag (2)          |
  * +-------------------------------+-------------------------------+
  * |                         IP Address (4)                        |
  * | Address Family Identifier (2) |        Route Tag (2)          |
  * +-------------------------------+-------------------------------+
  * |                         IP Address (4)                        |
@@ -88,187 +133,262 @@ static const struct tok rip_cmd_values[] = {
  *
  */
 
  *
  */
 
-struct rip_netinfo {
-       u_int16_t rip_family;
-       u_int16_t rip_tag;
-       u_int32_t rip_dest;
-       u_int32_t rip_dest_mask;
-       u_int32_t rip_router;
-       u_int32_t rip_metric;           /* cost of route */
+struct rip_netinfo_v2 {
+       nd_uint16_t rip_family;
+       nd_uint16_t rip_tag;
+       nd_ipv4     rip_dest;
+       nd_uint32_t rip_dest_mask;
+       nd_ipv4     rip_router;
+       nd_uint32_t rip_metric;         /* cost of route */
+};
+
+/*
+ * RFC 2453 authentication entry
+ *
+ *  0                   1                   2                   3 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
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * |            0xFFFF             |    Authentication Type (2)    |
+ * +-------------------------------+-------------------------------+
+ * -                      Authentication (16)                      -
+ * +---------------------------------------------------------------+
+ */
+
+struct rip_auth_v2 {
+       nd_uint16_t rip_family;
+       nd_uint16_t rip_tag;
+       nd_byte     rip_auth[16];
+};
+
+/*
+ * RFC 4822 Cryptographic Authentication entry.
+ *
+ *  0                   1                   2                   3 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
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * |     RIPv2 Packet Length       |   Key ID      | Auth Data Len |
+ * +---------------+---------------+---------------+---------------+
+ * |               Sequence Number (non-decreasing)                |
+ * +---------------+---------------+---------------+---------------+
+ * |                      reserved must be zero                    |
+ * +---------------+---------------+---------------+---------------+
+ * |                      reserved must be zero                    |
+ * +---------------+---------------+---------------+---------------+
+ */
+struct rip_auth_crypto_v2 {
+       nd_uint16_t rip_packet_len;
+       nd_uint8_t  rip_key_id;
+       nd_uint8_t  rip_auth_data_len;
+       nd_uint32_t rip_seq_num;
+       nd_byte     rip_mbz1[4];
+       nd_byte     rip_mbz2[4];
 };
 
 };
 
-static void
-rip_entry_print_v1(register const struct rip_netinfo *ni)
+static unsigned
+rip_entry_print_v1(netdissect_options *ndo, const u_char *p,
+                  unsigned remaining)
 {
 {
-       register u_short family;
+       const struct rip_entry_header *eh = (const struct rip_entry_header *)p;
+       u_short family;
+       const struct rip_netinfo_v1 *ni = (const struct rip_netinfo_v1 *)p;
 
        /* RFC 1058 */
 
        /* RFC 1058 */
-       family = EXTRACT_16BITS(&ni->rip_family);
-       if (family != BSD_AFNUM_INET && family != 0) {
-               printf("\n\t AFI %s, ", tok2str(bsd_af_values, "Unknown (%u)", family));
-                print_unknown_data((u_int8_t *)&ni->rip_family,"\n\t  ",RIP_ROUTELEN);
-               return;
+       ND_ICHECKMSG_U("remaining data length", remaining, <, RIP_ROUTELEN);
+       ND_TCHECK_SIZE(ni);
+       family = GET_BE_U_2(ni->rip_family);
+       if (family != BSD_AF_INET && family != 0) {
+               ND_PRINT("\n\t AFI %s, ", tok2str(bsd_af_values, "Unknown (%u)", family));
+               print_unknown_data(ndo, p + sizeof(*eh), "\n\t  ", RIP_ROUTELEN - sizeof(*eh));
+               return (RIP_ROUTELEN);
        }
        }
-       if (EXTRACT_16BITS(&ni->rip_tag) ||
-           EXTRACT_32BITS(&ni->rip_dest_mask) ||
-           EXTRACT_32BITS(&ni->rip_router)) {
+       if (GET_BE_U_2(ni->rip_mbz1) ||
+           GET_BE_U_4(ni->rip_mbz2) ||
+           GET_BE_U_4(ni->rip_mbz3)) {
                /* MBZ fields not zero */
                /* MBZ fields not zero */
-                print_unknown_data((u_int8_t *)&ni->rip_family,"\n\t  ",RIP_ROUTELEN);
-               return;
+               print_unknown_data(ndo, p, "\n\t  ", RIP_ROUTELEN);
+               return (RIP_ROUTELEN);
        }
        if (family == 0) {
        }
        if (family == 0) {
-               printf("\n\t  AFI 0, %s, metric: %u",
-                       ipaddr_string(&ni->rip_dest),
-                       EXTRACT_32BITS(&ni->rip_metric));
-               return;
-       } /* BSD_AFNUM_INET */
-       printf("\n\t  %s, metric: %u",
-               ipaddr_string(&ni->rip_dest),
-              EXTRACT_32BITS(&ni->rip_metric));
+               ND_PRINT("\n\t  AFI 0, %s, metric: %u",
+                        GET_IPADDR_STRING(ni->rip_dest),
+                        GET_BE_U_4(ni->rip_metric));
+               return (RIP_ROUTELEN);
+       } /* BSD_AF_INET */
+       ND_PRINT("\n\t  %s, metric: %u",
+                GET_IPADDR_STRING(ni->rip_dest),
+                GET_BE_U_4(ni->rip_metric));
+       return (RIP_ROUTELEN);
+invalid:
+       return 0;
 }
 
 static unsigned
 }
 
 static unsigned
-rip_entry_print_v2(register const struct rip_netinfo *ni, const unsigned remaining)
+rip_entry_print_v2(netdissect_options *ndo, const u_char *p,
+                  unsigned remaining)
 {
 {
-       register u_short family;
+       const struct rip_entry_header *eh = (const struct rip_entry_header *)p;
+       u_short family;
+       const struct rip_netinfo_v2 *ni;
 
 
-       family = EXTRACT_16BITS(&ni->rip_family);
+       ND_ICHECKMSG_ZU("remaining data length", remaining, <, sizeof(*eh));
+       ND_TCHECK_SIZE(eh);
+       family = GET_BE_U_2(eh->rip_family);
        if (family == 0xFFFF) { /* variable-sized authentication structures */
        if (family == 0xFFFF) { /* variable-sized authentication structures */
-               u_int16_t auth_type = EXTRACT_16BITS(&ni->rip_tag);
+               uint16_t auth_type = GET_BE_U_2(eh->rip_tag);
+
+               p += sizeof(*eh);
+               remaining -= sizeof(*eh);
                if (auth_type == 2) {
                if (auth_type == 2) {
-                       register u_char *p = (u_char *)&ni->rip_dest;
-                       u_int i = 0;
-                       printf("\n\t  Simple Text Authentication data: ");
-                       for (; i < RIP_AUTHLEN; p++, i++)
-                               putchar (isprint(*p) ? *p : '.');
+                       ND_PRINT("\n\t  Simple Text Authentication data: ");
+                       nd_printjnp(ndo, p, RIP_AUTHLEN);
                } else if (auth_type == 3) {
                } else if (auth_type == 3) {
-                       printf("\n\t  Auth header:");
-                       printf(" Packet Len %u,", EXTRACT_16BITS((u_int8_t *)ni + 4));
-                       printf(" Key-ID %u,", *((u_int8_t *)ni + 6));
-                       printf(" Auth Data Len %u,", *((u_int8_t *)ni + 7));
-                       printf(" SeqNo %u,", EXTRACT_32BITS(&ni->rip_dest_mask));
-                       printf(" MBZ %u,", EXTRACT_32BITS(&ni->rip_router));
-                       printf(" MBZ %u", EXTRACT_32BITS(&ni->rip_metric));
+                       const struct rip_auth_crypto_v2 *ch;
+
+                       ch = (const struct rip_auth_crypto_v2 *)p;
+                       ND_ICHECKMSG_ZU("remaining data length", remaining,
+                                       <, sizeof(*ch));
+                       ND_PRINT("\n\t  Auth header:");
+                       ND_PRINT(" Packet Len %u,",
+                                GET_BE_U_2(ch->rip_packet_len));
+                       ND_PRINT(" Key-ID %u,", GET_U_1(ch->rip_key_id));
+                       ND_PRINT(" Auth Data Len %u,",
+                                GET_U_1(ch->rip_auth_data_len));
+                       ND_PRINT(" SeqNo %u,", GET_BE_U_4(ch->rip_seq_num));
+                       ND_PRINT(" MBZ %u,", GET_BE_U_4(ch->rip_mbz1));
+                       ND_PRINT(" MBZ %u", GET_BE_U_4(ch->rip_mbz2));
                } else if (auth_type == 1) {
                } else if (auth_type == 1) {
-                       printf("\n\t  Auth trailer:");
-                       print_unknown_data((u_int8_t *)&ni->rip_dest,"\n\t  ",remaining);
-                       return remaining; /* AT spans till the packet end */
-                } else {
-                       printf("\n\t  Unknown (%u) Authentication data:",
-                              EXTRACT_16BITS(&ni->rip_tag));
-                       print_unknown_data((u_int8_t *)&ni->rip_dest,"\n\t  ",remaining);
+                       ND_PRINT("\n\t  Auth trailer:");
+                       print_unknown_data(ndo, p, "\n\t  ", remaining);
+                       return (sizeof(*eh) + remaining); /* AT spans till the packet end */
+               } else {
+                       ND_PRINT("\n\t  Unknown (%u) Authentication data:",
+                                auth_type);
+                       print_unknown_data(ndo, p, "\n\t  ", remaining);
+                       return (sizeof(*eh) + remaining); /* we don't know how long this is, so we go to the packet end */
                }
                }
-       } else if (family != BSD_AFNUM_INET && family != 0) {
-               printf("\n\t  AFI %s", tok2str(bsd_af_values, "Unknown (%u)", family));
-                print_unknown_data((u_int8_t *)&ni->rip_tag,"\n\t  ",RIP_ROUTELEN-2);
-       } else { /* BSD_AFNUM_INET or AFI 0 */
-               printf("\n\t  AFI %s, %15s/%-2d, tag 0x%04x, metric: %u, next-hop: ",
-                       tok2str(bsd_af_values, "%u", family),
-                       ipaddr_string(&ni->rip_dest),
-                      mask2plen(EXTRACT_32BITS(&ni->rip_dest_mask)),
-                       EXTRACT_16BITS(&ni->rip_tag),
-                       EXTRACT_32BITS(&ni->rip_metric));
-               if (EXTRACT_32BITS(&ni->rip_router))
-                       printf("%s", ipaddr_string(&ni->rip_router));
-                else
-                    printf("self");
+       } else if (family != BSD_AF_INET && family != 0) {
+               ND_PRINT("\n\t  AFI %s", tok2str(bsd_af_values, "Unknown (%u)", family));
+               print_unknown_data(ndo, p + sizeof(*eh), "\n\t  ", RIP_ROUTELEN - sizeof(*eh));
+       } else { /* BSD_AF_INET or AFI 0 */
+               ni = (const struct rip_netinfo_v2 *)p;
+               ND_ICHECKMSG_ZU("remaining data length", remaining, <,
+                               sizeof(*ni));
+               ND_PRINT("\n\t  AFI %s, %15s/%-2d, tag 0x%04x, metric: %u, next-hop: ",
+                        tok2str(bsd_af_values, "%u", family),
+                        GET_IPADDR_STRING(ni->rip_dest),
+                        mask2plen(GET_BE_U_4(ni->rip_dest_mask)),
+                        GET_BE_U_2(ni->rip_tag),
+                        GET_BE_U_4(ni->rip_metric));
+               if (GET_BE_U_4(ni->rip_router))
+                       ND_PRINT("%s", GET_IPADDR_STRING(ni->rip_router));
+               else
+                       ND_PRINT("self");
        }
        }
-       return sizeof (*ni);
+       return (RIP_ROUTELEN);
+invalid:
+       return 0;
 }
 
 void
 }
 
 void
-rip_print(const u_char *dat, u_int length)
+rip_print(netdissect_options *ndo,
+         const u_char *p, u_int len)
 {
 {
-       register const struct rip *rp;
-       register const struct rip_netinfo *ni;
-       register u_int i, j;
+       const struct rip *rp;
+       uint8_t vers, cmd;
+       unsigned entry_size;
 
 
-       if (snapend < dat) {
-               printf(" %s", tstr);
-               return;
+       ndo->ndo_protocol = "rip";
+       ND_PRINT("%s", (ndo->ndo_vflag >= 1) ? "\n\t" : "");
+       nd_print_protocol_caps(ndo);
+       ND_ICHECKMSG_ZU("packet length", len, <, sizeof(*rp));
+
+       rp = (const struct rip *)p;
+
+       vers = GET_U_1(rp->rip_vers);
+       ND_PRINT("v%u", vers);
+       if (vers != 1 && vers != 2) {
+               ND_PRINT(" [version != 1 && version != 2]");
+               goto invalid;
        }
        }
-       i = snapend - dat;
-       if (i > length)
-               i = length;
-       if (i < sizeof(*rp)) {
-               printf(" %s", tstr);
+
+       /* dump version and lets see if we know the commands name*/
+       cmd = GET_U_1(rp->rip_cmd);
+       ND_PRINT(", %s, length: %u",
+               tok2str(rip_cmd_values, "unknown command (%u)", cmd),
+               len);
+
+       ND_TCHECK_SIZE(rp);
+       if (ndo->ndo_vflag < 1)
                return;
                return;
-       }
-       i -= sizeof(*rp);
-
-       rp = (struct rip *)dat;
-
-        printf("%sRIPv%u",
-               (vflag >= 1) ? "\n\t" : "",
-               rp->rip_vers);
-
-       switch (rp->rip_vers) {
-       case 0:
-               /*
-                * RFC 1058.
-                *
-                * XXX - RFC 1058 says
-                *
-                * 0  Datagrams whose version number is zero are to be ignored.
-                *    These are from a previous version of the protocol, whose
-                *    packet format was machine-specific.
-                *
-                * so perhaps we should just dump the packet, in hex.
-                */
-                print_unknown_data((u_int8_t *)&rp->rip_cmd,"\n\t",length);
-               break;
-       default:
-                /* dump version and lets see if we know the commands name*/
-                printf(", %s, length: %u",
-                       tok2str(rip_cmd_values,
-                               "unknown command (%u)",
-                               rp->rip_cmd),
-                       length);
-
-                if (vflag < 1)
-                    return;
-
-               switch (rp->rip_cmd) {
-               case RIPCMD_REQUEST:
-               case RIPCMD_RESPONSE:
-                       j = length / sizeof(*ni);
-                        printf(", routes: %u%s", j, rp->rip_vers == 2 ? " or less" : "");
-                       ni = (struct rip_netinfo *)(rp + 1);
-                       for (; i >= sizeof(*ni); ++ni) {
-                               if (rp->rip_vers == 1)
-                               {
-                                       rip_entry_print_v1(ni);
-                                       i -= sizeof(*ni);
+       p += sizeof(*rp);
+       len -= sizeof(*rp);
+
+       switch (cmd) {
+
+       case RIPCMD_REQUEST:
+       case RIPCMD_RESPONSE:
+               switch (vers) {
+
+               case 1:
+                       ND_PRINT(", routes: %u", len / RIP_ROUTELEN);
+                       while (len != 0) {
+                               entry_size = rip_entry_print_v1(ndo, p, len);
+                               if (entry_size == 0) {
+                                       /* Error */
+                                       goto invalid;
                                }
                                }
-                               else if (rp->rip_vers == 2)
-                                       i -= rip_entry_print_v2(ni, i);
-                                else
-                                    break;
+                               ND_ICHECKMSG_U("remaining entries length",
+                                              len, <, entry_size);
+                               p += entry_size;
+                               len -= entry_size;
                        }
                        }
-                       if (i)
-                               printf("%s", tstr);
                        break;
 
                        break;
 
-               case RIPCMD_TRACEOFF:
-               case RIPCMD_POLL:
-               case RIPCMD_POLLENTRY:
+               case 2:
+                       ND_PRINT(", routes: %u or less", len / RIP_ROUTELEN);
+                       while (len != 0) {
+                               entry_size = rip_entry_print_v2(ndo, p, len);
+                               if (entry_size == 0) {
+                                       /* Error */
+                                       goto invalid;
+                               }
+                               ND_ICHECKMSG_U("remaining entries length",
+                                              len, <, entry_size);
+                               p += entry_size;
+                               len -= entry_size;
+                       }
                        break;
 
                        break;
 
-               case RIPCMD_TRACEON:
-                    /* fall through */
-               default:
-                    if (vflag <= 1) {
-                        if(!print_unknown_data((u_int8_t *)rp,"\n\t",length))
-                            return;
-                    }
-                    break;
-                }
-                /* do we want to see an additionally hexdump ? */
-                if (vflag> 1) {
-                    if(!print_unknown_data((u_int8_t *)rp,"\n\t",length))
-                        return;
-                }
-        }
-}
+               default:
+                       ND_PRINT(", unknown version");
+                       break;
+               }
+               break;
 
 
+       case RIPCMD_TRACEON:
+       case RIPCMD_TRACEOFF:
+       case RIPCMD_TRIGREQ:
+       case RIPCMD_TRIGRESP:
+       case RIPCMD_TRIGACK:
+       case RIPCMD_UPDREQ:
+       case RIPCMD_UPDRESP:
+       case RIPCMD_UPDACK:
+               break;
 
 
+       default:
+               if (ndo->ndo_vflag <= 1) {
+                       if (!print_unknown_data(ndo, p, "\n\t", len))
+                               return;
+               }
+               break;
+       }
+       /* do we want to see an additionally hexdump ? */
+       if (ndo->ndo_vflag > 1 && ND_TTEST_LEN(p, len)) {
+               if (!print_unknown_data(ndo, p, "\n\t", len))
+                       return;
+       }
+       return;
+invalid:
+       nd_print_invalid(ndo);
+       ND_TCHECK_LEN(p, len);
+}
[mirror] the TCPdump network dissector