]> The Tcpdump Group git mirrors - tcpdump/blobdiff - print-ripng.c
projects / tcpdump / blobdiff
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Revert partially the commit 21b1273
[tcpdump] / print-ripng.c
diff --git a/print-ripng.c b/print-ripng.c
index afe1c5e6dd2d5291a8fb10c39b82ded8108969da..e030c000cdce74939e4be3b2bddb0b39dfddbbec 100644 (file)
--- a/print-ripng.c
+++ b/print-ripng.c
@@ -19,15 +19,15 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+/* \summary: IPv6 Routing Information Protocol (RIPng) printer */
+
 #ifdef HAVE_CONFIG_H
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #endif
 
-#ifdef INET6
-
-#include <tcpdump-stdinc.h>
+#include "netdissect-stdinc.h"
 
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 
 #include "addrtoname.h"
 #include "extract.h"
 
@@ -65,19 +65,19 @@
 #define        RIP6_RESPONSE   2
 
 struct netinfo6 {
 #define        RIP6_RESPONSE   2
 
 struct netinfo6 {
-       struct in6_addr rip6_dest;
-       uint16_t        rip6_tag;
-       uint8_t         rip6_plen;
-       uint8_t         rip6_metric;
+       nd_ipv6         rip6_dest;
+       nd_uint16_t     rip6_tag;
+       nd_uint8_t      rip6_plen;
+       nd_uint8_t      rip6_metric;
 };
 
 struct rip6 {
 };
 
 struct rip6 {
-       uint8_t         rip6_cmd;
-       uint8_t         rip6_vers;
-       uint8_t         rip6_res1[2];
+       nd_uint8_t      rip6_cmd;
+       nd_uint8_t      rip6_vers;
+       nd_byte         rip6_res1[2];
        union {
                struct  netinfo6        ru6_nets[1];
        union {
                struct  netinfo6        ru6_nets[1];
-               char    ru6_tracefile[1];
+               nd_byte ru6_tracefile[1];
        } rip6un;
 #define        rip6_nets       rip6un.ru6_nets
 #define        rip6_tracefile  rip6un.ru6_tracefile
        } rip6un;
 #define        rip6_nets       rip6un.ru6_nets
 #define        rip6_tracefile  rip6un.ru6_tracefile
@@ -85,91 +85,102 @@ struct     rip6 {
 
 #define        HOPCNT_INFINITY6        16
 
 
 #define        HOPCNT_INFINITY6        16
 
-#if !defined(IN6_IS_ADDR_UNSPECIFIED) && !defined(_MSC_VER) /* MSVC inline */
-static int IN6_IS_ADDR_UNSPECIFIED(const struct in6_addr *addr)
+static int ND_IN6_IS_ADDR_UNSPECIFIED(const nd_ipv6 *addr)
 {
 {
-    static const struct in6_addr in6addr_any;        /* :: */
-    return (memcmp(addr, &in6addr_any, sizeof(*addr)) == 0);
+    static const nd_ipv6 in6addr_any_val = { 0 };        /* :: */
+    return (memcmp(addr, &in6addr_any_val, sizeof(*addr)) == 0);
 }
 }
-#endif
 
 static int
 
 static int
-rip6_entry_print(netdissect_options *ndo, register const struct netinfo6 *ni, int metric)
+rip6_entry_print(netdissect_options *ndo, const struct netinfo6 *ni, u_int metric)
 {
        int l;
 {
        int l;
-       l = ND_PRINT((ndo, "%s/%d", ip6addr_string(ndo, &ni->rip6_dest), ni->rip6_plen));
-       if (ni->rip6_tag)
-               l += ND_PRINT((ndo, " [%d]", EXTRACT_16BITS(&ni->rip6_tag)));
+       uint16_t tag;
+
+       l = ND_PRINT("%s/%u", GET_IP6ADDR_STRING(ni->rip6_dest),
+                    GET_U_1(ni->rip6_plen));
+       tag = GET_BE_U_2(ni->rip6_tag);
+       if (tag)
+               l += ND_PRINT(" [%u]", tag);
        if (metric)
        if (metric)
-               l += ND_PRINT((ndo, " (%d)", ni->rip6_metric));
+               l += ND_PRINT(" (%u)", metric);
        return l;
 }
 
 void
 ripng_print(netdissect_options *ndo, const u_char *dat, unsigned int length)
 {
        return l;
 }
 
 void
 ripng_print(netdissect_options *ndo, const u_char *dat, unsigned int length)
 {
-       register const struct rip6 *rp = (const struct rip6 *)dat;
-       register const struct netinfo6 *ni;
-       register u_int amt;
-       register u_int i;
-       int j;
-       int trunc;
-
-       if (ndo->ndo_snapend < dat)
-               return;
-       amt = ndo->ndo_snapend - dat;
-       i = min(length, amt);
-       if (i < (sizeof(struct rip6) - sizeof(struct netinfo6)))
-               return;
-       i -= (sizeof(struct rip6) - sizeof(struct netinfo6));
-
-       switch (rp->rip6_cmd) {
+       const struct rip6 *rp = (const struct rip6 *)dat;
+       uint8_t cmd;
+       const struct netinfo6 *ni;
+       unsigned int length_left;
+       u_int j;
+
+       ndo->ndo_protocol = "ripng";
+       cmd = GET_U_1(rp->rip6_cmd);
+       switch (cmd) {
 
        case RIP6_REQUEST:
 
        case RIP6_REQUEST:
-               j = length / sizeof(*ni);
-               if (j == 1
-                   &&  rp->rip6_nets->rip6_metric == HOPCNT_INFINITY6
-                   &&  IN6_IS_ADDR_UNSPECIFIED(&rp->rip6_nets->rip6_dest)) {
-                       ND_PRINT((ndo, " ripng-req dump"));
-                       break;
+               length_left = length;
+               if (length_left < (sizeof(struct rip6) - sizeof(struct netinfo6)))
+                       goto trunc;
+               length_left -= (sizeof(struct rip6) - sizeof(struct netinfo6));
+               j = length_left / sizeof(*ni);
+               if (j == 1) {
+                       ND_TCHECK_SIZE(rp->rip6_nets);
+                       if (GET_U_1(rp->rip6_nets->rip6_metric) == HOPCNT_INFINITY6
+                           && ND_IN6_IS_ADDR_UNSPECIFIED(&rp->rip6_nets->rip6_dest)) {
+                               ND_PRINT(" ripng-req dump");
+                               break;
+                       }
                }
                }
-               if (j * sizeof(*ni) != length - 4)
-                       ND_PRINT((ndo, " ripng-req %d[%u]:", j, length));
+               if (j * sizeof(*ni) != length_left)
+                       ND_PRINT(" ripng-req %u[%u]:", j, length);
                else
                else
-                       ND_PRINT((ndo, " ripng-req %d:", j));
-               trunc = ((i / sizeof(*ni)) * sizeof(*ni) != i);
-               for (ni = rp->rip6_nets; i >= sizeof(*ni);
-                   i -= sizeof(*ni), ++ni) {
+                       ND_PRINT(" ripng-req %u:", j);
+               for (ni = rp->rip6_nets; length_left >= sizeof(*ni);
+                   length_left -= sizeof(*ni), ++ni) {
+                       ND_TCHECK_SIZE(ni);
                        if (ndo->ndo_vflag > 1)
                        if (ndo->ndo_vflag > 1)
-                               ND_PRINT((ndo, "\n\t"));
+                               ND_PRINT("\n\t");
                        else
                        else
-                               ND_PRINT((ndo, " "));
+                               ND_PRINT(" ");
                        rip6_entry_print(ndo, ni, 0);
                }
                        rip6_entry_print(ndo, ni, 0);
                }
+               if (length_left != 0)
+                       goto trunc;
                break;
        case RIP6_RESPONSE:
                break;
        case RIP6_RESPONSE:
-               j = length / sizeof(*ni);
-               if (j * sizeof(*ni) != length - 4)
-                       ND_PRINT((ndo, " ripng-resp %d[%u]:", j, length));
+               length_left = length;
+               if (length_left < (sizeof(struct rip6) - sizeof(struct netinfo6)))
+                       goto trunc;
+               length_left -= (sizeof(struct rip6) - sizeof(struct netinfo6));
+               j = length_left / sizeof(*ni);
+               if (j * sizeof(*ni) != length_left)
+                       ND_PRINT(" ripng-resp %u[%u]:", j, length);
                else
                else
-                       ND_PRINT((ndo, " ripng-resp %d:", j));
-               trunc = ((i / sizeof(*ni)) * sizeof(*ni) != i);
-               for (ni = rp->rip6_nets; i >= sizeof(*ni);
-                   i -= sizeof(*ni), ++ni) {
+                       ND_PRINT(" ripng-resp %u:", j);
+               for (ni = rp->rip6_nets; length_left >= sizeof(*ni);
+                   length_left -= sizeof(*ni), ++ni) {
+                       ND_TCHECK_SIZE(ni);
                        if (ndo->ndo_vflag > 1)
                        if (ndo->ndo_vflag > 1)
-                               ND_PRINT((ndo, "\n\t"));
+                               ND_PRINT("\n\t");
                        else
                        else
-                               ND_PRINT((ndo, " "));
-                       rip6_entry_print(ndo, ni, ni->rip6_metric);
+                               ND_PRINT(" ");
+                       rip6_entry_print(ndo, ni, GET_U_1(ni->rip6_metric));
                }
                }
-               if (trunc)
-                       ND_PRINT((ndo, "[|ripng]"));
+               if (length_left != 0)
+                       goto trunc;
                break;
        default:
                break;
        default:
-               ND_PRINT((ndo, " ripng-%d ?? %u", rp->rip6_cmd, length));
+               ND_PRINT(" ripng-%u ?? %u", cmd, length);
                break;
        }
                break;
        }
-       if (rp->rip6_vers != RIP6_VERSION)
-               ND_PRINT((ndo, " [vers %d]", rp->rip6_vers));
+       if (GET_U_1(rp->rip6_vers) != RIP6_VERSION)
+               ND_PRINT(" [vers %u]", GET_U_1(rp->rip6_vers));
+       return;
+
+trunc:
+       nd_print_trunc(ndo);
+       return;
 }
 }
-#endif /* INET6 */
[mirror] the TCPdump network dissector