Regenerate config files.

[tcpdump] / print-rip.c

diff --git a/print-rip.c b/print-rip.c
index 9f409eebe4b6ce344d9a487d870b77c1f860a1b3..cf661d03b38c0fc37a54f7cb62d020aa32777a0f 100644 (file)
--- a/print-rip.c
+++ b/print-rip.c
@@ -19,38 +19,30 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-rip.c,v 1.42 2000-07-01 03:39:09 assar Exp $ (LBL)";
-#endif
+/* \summary: Routing Information Protocol (RIP) printer */

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

-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/ip_var.h>
-#include <netinet/udp.h>
-#include <netinet/udp_var.h>
+#include <netdissect-stdinc.h>

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

-#include <ctype.h>

 
 

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

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

-#include "extract.h"                   /* must come after interface.h */
+#include "extract.h"
+
+#include "af.h"
+
+static const char tstr[] = "[|rip]";

 
 struct rip {
 
 struct rip {

-       u_char rip_cmd;                 /* request/response */
-       u_char rip_vers;                /* protocol version # */
-       u_short rip_zero2;              /* unused */
+       uint8_t rip_cmd;                /* request/response */
+       uint8_t rip_vers;               /* protocol version # */
+       uint8_t 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_REQUEST          1       /* want info */
 #define        RIPCMD_RESPONSE         2       /* responding to request */
 #define        RIPCMD_TRACEON          3       /* turn tracing on */


@@ -58,170 +50,224 @@ struct rip {
 #define        RIPCMD_POLL             5       /* want info from everybody */
 #define        RIPCMD_POLLENTRY        6       /* poll for entry */
 
 #define        RIPCMD_POLL             5       /* want info from everybody */
 #define        RIPCMD_POLLENTRY        6       /* poll for entry */
 

-#define RIP_AUTHLEN 16
+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" },
+    { 0, NULL}
+};
+
+#define RIP_AUTHLEN  16
+#define RIP_ROUTELEN 20
+
+/*
+ * rfc 1723
+ *
+ *  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)                        |
+ * +---------------------------------------------------------------+
+ * |                         Subnet Mask (4)                       |
+ * +---------------------------------------------------------------+
+ * |                         Next Hop (4)                          |
+ * +---------------------------------------------------------------+
+ * |                         Metric (4)                            |
+ * +---------------------------------------------------------------+
+ *
+ */

 
 struct rip_netinfo {
 
 struct rip_netinfo {

-       u_short rip_family;
-       u_short 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 */
+       uint16_t rip_family;
+       uint16_t rip_tag;
+       uint32_t rip_dest;
+       uint32_t rip_dest_mask;
+       uint32_t rip_router;
+       uint32_t rip_metric;            /* cost of route */

 };
 
 static void
 };
 
 static void

-rip_printblk(const u_char *cp, const u_char *ep)
-{
-       for (; cp < ep; cp += 2)
-               printf(" %04x", EXTRACT_16BITS(cp));
-       return;
-}
-
-static void
-rip_entry_print_v1(register int vers, register const struct rip_netinfo *ni)
+rip_entry_print_v1(netdissect_options *ndo,
+                   register const struct rip_netinfo *ni)

 {
        register u_short family;
 
        /* RFC 1058 */
        family = EXTRACT_16BITS(&ni->rip_family);
 {
        register u_short family;
 
        /* RFC 1058 */
        family = EXTRACT_16BITS(&ni->rip_family);

-       if (family != AF_INET) {
-               printf(" [family %d:", family);
-               rip_printblk((u_char *)&ni->rip_tag,
-                            (u_char *)&ni->rip_metric +
-                            sizeof(ni->rip_metric));
-               printf("]");
+       if (family != BSD_AFNUM_INET && family != 0) {
+               ND_PRINT((ndo, "\n\t AFI %s, ", tok2str(bsd_af_values, "Unknown (%u)", family)));
+               print_unknown_data(ndo, (const uint8_t *)&ni->rip_family, "\n\t  ", RIP_ROUTELEN);

                return;
        }
                return;
        }

-       if (ni->rip_tag || ni->rip_dest_mask || ni->rip_router) {
+       if (EXTRACT_16BITS(&ni->rip_tag) ||
+           EXTRACT_32BITS(&ni->rip_dest_mask) ||
+           EXTRACT_32BITS(&ni->rip_router)) {

                /* MBZ fields not zero */
                /* MBZ fields not zero */

-               printf(" [");
-               rip_printblk((u_char *)&ni->rip_family,
-                            (u_char *)&ni->rip_metric +
-                            sizeof(ni->rip_metric));
-               printf("]");
+                print_unknown_data(ndo, (const uint8_t *)&ni->rip_family, "\n\t  ", RIP_ROUTELEN);

                return;
        }
                return;
        }

-       printf(" {%s}(%d)", ipaddr_string(&ni->rip_dest),
-              EXTRACT_32BITS(&ni->rip_metric));
+       if (family == 0) {
+               ND_PRINT((ndo, "\n\t  AFI 0, %s, metric: %u",
+                       ipaddr_string(ndo, &ni->rip_dest),
+                       EXTRACT_32BITS(&ni->rip_metric)));
+               return;
+       } /* BSD_AFNUM_INET */
+       ND_PRINT((ndo, "\n\t  %s, metric: %u",
+               ipaddr_string(ndo, &ni->rip_dest),
+              EXTRACT_32BITS(&ni->rip_metric)));

 }
 
 }
 

-static void
-rip_entry_print_v2(register int vers, register const struct rip_netinfo *ni)
+static unsigned
+rip_entry_print_v2(netdissect_options *ndo,
+                   register const struct rip_netinfo *ni, const unsigned remaining)

 {
 {

-       register u_char *p;

        register u_short family;
        register u_short family;

-       char buf[RIP_AUTHLEN];

 
 

-       /* RFC 1723 */

        family = EXTRACT_16BITS(&ni->rip_family);
        family = EXTRACT_16BITS(&ni->rip_family);

-       if (family == 0xFFFF) {
-               if (EXTRACT_16BITS(&ni->rip_tag) == 2) {
-                       memcpy(buf, &ni->rip_dest, sizeof(buf));
-                       buf[sizeof(buf)-1] = '\0';
-                       for (p = buf; *p; p++) {
-                               if (!isprint(*p))
-                                       break;
-                       }
-                       if (!*p) {
-                               printf(" [password %s]", buf);
-                       } else {
-                               printf(" [password: ");
-                               rip_printblk((u_char *)&ni->rip_dest,
-                                            (u_char *)&ni->rip_metric +
-                                            sizeof(ni->rip_metric));
-                               printf("]");
-                       }
+       if (family == 0xFFFF) { /* variable-sized authentication structures */
+               uint16_t auth_type = EXTRACT_16BITS(&ni->rip_tag);
+               if (auth_type == 2) {
+                       register const u_char *p = (const u_char *)&ni->rip_dest;
+                       u_int i = 0;
+                       ND_PRINT((ndo, "\n\t  Simple Text Authentication data: "));
+                       for (; i < RIP_AUTHLEN; p++, i++)
+                               ND_PRINT((ndo, "%c", ND_ISPRINT(*p) ? *p : '.'));
+               } else if (auth_type == 3) {
+                       ND_PRINT((ndo, "\n\t  Auth header:"));
+                       ND_PRINT((ndo, " Packet Len %u,", EXTRACT_16BITS((const uint8_t *)ni + 4)));
+                       ND_PRINT((ndo, " Key-ID %u,", *((const uint8_t *)ni + 6)));
+                       ND_PRINT((ndo, " Auth Data Len %u,", *((const uint8_t *)ni + 7)));
+                       ND_PRINT((ndo, " SeqNo %u,", EXTRACT_32BITS(&ni->rip_dest_mask)));
+                       ND_PRINT((ndo, " MBZ %u,", EXTRACT_32BITS(&ni->rip_router)));
+                       ND_PRINT((ndo, " MBZ %u", EXTRACT_32BITS(&ni->rip_metric)));
+               } else if (auth_type == 1) {
+                       ND_PRINT((ndo, "\n\t  Auth trailer:"));
+                       print_unknown_data(ndo, (const uint8_t *)&ni->rip_dest, "\n\t  ", remaining);
+                       return remaining; /* AT spans till the packet end */

                } else {
                } else {

-                       printf(" [auth %d:",
-                              EXTRACT_16BITS(&ni->rip_tag));
-                       rip_printblk((u_char *)&ni->rip_dest,
-                                    (u_char *)&ni->rip_metric +
-                                    sizeof(ni->rip_metric));
-                       printf("]");
+                       ND_PRINT((ndo, "\n\t  Unknown (%u) Authentication data:",
+                              EXTRACT_16BITS(&ni->rip_tag)));
+                       print_unknown_data(ndo, (const uint8_t *)&ni->rip_dest, "\n\t  ", remaining);

                }
                }

-       } else if (family != AF_INET) {
-               printf(" [family %d:", family);
-               rip_printblk((u_char *)&ni->rip_tag,
-                            (u_char *)&ni->rip_metric +
-                            sizeof(ni->rip_metric));
-               printf("]");
-               return;
-       } else { /* AF_INET */
-               printf(" {%s", ipaddr_string(&ni->rip_dest));
-               if (ni->rip_dest_mask)
-                       printf("/%s", ipaddr_string(&ni->rip_dest_mask));
-               if (ni->rip_router)
-                       printf("->%s", ipaddr_string(&ni->rip_router));
-               if (ni->rip_tag)
-                       printf(" tag %04x", EXTRACT_16BITS(&ni->rip_tag));
-               printf("}(%d)", EXTRACT_32BITS(&ni->rip_metric));
+       } else if (family != BSD_AFNUM_INET && family != 0) {
+               ND_PRINT((ndo, "\n\t  AFI %s", tok2str(bsd_af_values, "Unknown (%u)", family)));
+                print_unknown_data(ndo, (const uint8_t *)&ni->rip_tag, "\n\t  ", RIP_ROUTELEN-2);
+       } else { /* BSD_AFNUM_INET or AFI 0 */
+               ND_PRINT((ndo, "\n\t  AFI %s, %15s/%-2d, tag 0x%04x, metric: %u, next-hop: ",
+                       tok2str(bsd_af_values, "%u", family),
+                       ipaddr_string(ndo, &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))
+                       ND_PRINT((ndo, "%s", ipaddr_string(ndo, &ni->rip_router)));
+               else
+                       ND_PRINT((ndo, "self"));

        }
        }

+       return sizeof (*ni);

 }
 
 void
 }
 
 void

-rip_print(const u_char *dat, u_int length)
+rip_print(netdissect_options *ndo,
+          const u_char *dat, u_int length)

 {
        register const struct rip *rp;
        register const struct rip_netinfo *ni;
 {
        register const struct rip *rp;
        register const struct rip_netinfo *ni;

-       register int i, j, trunc;
+       register u_int i, j;

 
 

-       i = min(length, snapend - dat) - sizeof(*rp);
-       if (i < 0) {
-               printf(" [|rip]");
+       if (ndo->ndo_snapend < dat) {
+               ND_PRINT((ndo, " %s", tstr));
+               return;
+       }
+       i = ndo->ndo_snapend - dat;
+       if (i > length)
+               i = length;
+       if (i < sizeof(*rp)) {
+               ND_PRINT((ndo, " %s", tstr));

                return;
        }
                return;
        }

+       i -= sizeof(*rp);
+
+       rp = (const struct rip *)dat;
+
+       ND_PRINT((ndo, "%sRIPv%u",
+               (ndo->ndo_vflag >= 1) ? "\n\t" : "",
+               rp->rip_vers));

 
 

-       rp = (struct rip *)dat;

        switch (rp->rip_vers) {
        case 0:
        switch (rp->rip_vers) {
        case 0:

-               /* RFC 1058 */
-               printf(" RIPv0: ");
-               rip_printblk((u_char *)&ni->rip_family,
-                            (u_char *)&ni->rip_metric +
-                            sizeof(ni->rip_metric));
+               /*
+                * 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(ndo, (const uint8_t *)&rp->rip_cmd, "\n\t", length);

                break;
        default:
                break;
        default:

+                /* dump version and lets see if we know the commands name*/
+                ND_PRINT((ndo, ", %s, length: %u",
+                       tok2str(rip_cmd_values,
+                               "unknown command (%u)",
+                               rp->rip_cmd),
+                       length));
+
+                if (ndo->ndo_vflag < 1)
+                    return;
+

                switch (rp->rip_cmd) {
                case RIPCMD_REQUEST:
                switch (rp->rip_cmd) {
                case RIPCMD_REQUEST:

-                       printf(" RIPv%d-req %d", rp->rip_vers, length);
-                       break;

                case RIPCMD_RESPONSE:
                        j = length / sizeof(*ni);
                case RIPCMD_RESPONSE:
                        j = length / sizeof(*ni);

-                       if (j * sizeof(*ni) != length - 4)
-                               printf(" RIPv%d-resp [items %d] [%d]:",
-                                      rp->rip_vers, j, length);
-                       else
-                               printf(" RIPv%d-resp [items %d]:",
-                                      rp->rip_vers, j);
-                       trunc = (i / sizeof(*ni)) != j;
-                       ni = (struct rip_netinfo *)(rp + 1);
-                       for (; (i -= sizeof(*ni)) >= 0; ++ni) {
+                       ND_PRINT((ndo, ", routes: %u%s", j, rp->rip_vers == 2 ? " or less" : ""));
+                       ni = (const struct rip_netinfo *)(rp + 1);
+                       for (; i >= sizeof(*ni); ++ni) {

                                if (rp->rip_vers == 1)
                                if (rp->rip_vers == 1)

-                                       rip_entry_print_v1(rp->rip_vers, ni);
-                               else
-                                       rip_entry_print_v2(rp->rip_vers, ni);
+                               {
+                                       rip_entry_print_v1(ndo, ni);
+                                       i -= sizeof(*ni);
+                               }
+                               else if (rp->rip_vers == 2)
+                                       i -= rip_entry_print_v2(ndo, ni, i);
+                                else
+                                    break;

                        }
                        }

-                       if (trunc)
-                               printf("[|rip]");
-                       break;
-               case RIPCMD_TRACEON:
-                       printf(" RIPv%d-traceon %d: \"", rp->rip_vers, length);
-                       (void)fn_print((const u_char *)(rp + 1), snapend);
-                       fputs("\"\n", stdout);
+                       if (i)
+                               ND_PRINT((ndo, "%s", tstr));

                        break;
                        break;

+

                case RIPCMD_TRACEOFF:
                case RIPCMD_TRACEOFF:

-                       printf(" RIPv%d-traceoff %d", rp->rip_vers, length);
-                       break;

                case RIPCMD_POLL:
                case RIPCMD_POLL:

-                       printf(" RIPv%d-poll %d", rp->rip_vers, length);
-                       break;

                case RIPCMD_POLLENTRY:
                case RIPCMD_POLLENTRY:

-                       printf(" RIPv%d-pollentry %d", rp->rip_vers, length);

                        break;
                        break;

-               default:
-                       printf(" RIPv%d-#%d %d", rp->rip_vers, rp->rip_cmd,
-                              length);
-                       break;
-               }
+
+               case RIPCMD_TRACEON:
+                    /* fall through */
+               default:
+                    if (ndo->ndo_vflag <= 1) {
+                        if(!print_unknown_data(ndo, (const uint8_t *)rp, "\n\t", length))
+                            return;
+                    }
+                    break;
+                }
+                /* do we want to see an additionally hexdump ? */
+                if (ndo->ndo_vflag> 1) {
+                    if(!print_unknown_data(ndo, (const uint8_t *)rp, "\n\t", length))
+                        return;
+                }

         }
 }
         }
 }

+
+