Fix mkdep invocations.

[tcpdump] / print-ripng.c

diff --git a/print-ripng.c b/print-ripng.c
index 6bd47e67a3d13559cb79e1a96d8c885c7470a45f..1939893189643b3511df3076987e12b74f4f3e3e 100644 (file)
--- a/print-ripng.c
+++ b/print-ripng.c
@@ -19,13 +19,13 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+/* \summary: IPv6 Routing Information Protocol (RIPng) printer */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#ifdef INET6
-
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
 
 #include "netdissect.h"
 #include "addrtoname.h"
@@ -66,15 +66,15 @@
 
 struct netinfo6 {
        struct in6_addr rip6_dest;
-       u_int16_t       rip6_tag;
-       u_int8_t        rip6_plen;
-       u_int8_t        rip6_metric;
+       uint16_t        rip6_tag;
+       uint8_t         rip6_plen;
+       uint8_t         rip6_metric;
 };
 
 struct rip6 {
-       u_int8_t        rip6_cmd;
-       u_int8_t        rip6_vers;
-       u_int8_t        rip6_res1[2];
+       uint8_t         rip6_cmd;
+       uint8_t         rip6_vers;
+       uint8_t         rip6_res1[2];
        union {
                struct  netinfo6        ru6_nets[1];
                char    ru6_tracefile[1];
@@ -97,9 +97,9 @@ static int
 rip6_entry_print(netdissect_options *ndo, register const struct netinfo6 *ni, int metric)
 {
        int l;
-       l = ND_PRINT((ndo, "%s/%d", ip6addr_string(&ni->rip6_dest), ni->rip6_plen));
+       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)));
+               l += ND_PRINT((ndo, " [%d]", EXTRACT_BE_U_2(&ni->rip6_tag)));
        if (metric)
                l += ND_PRINT((ndo, " (%d)", ni->rip6_metric));
        return l;
@@ -108,68 +108,76 @@ rip6_entry_print(netdissect_options *ndo, register const struct netinfo6 *ni, in
 void
 ripng_print(netdissect_options *ndo, const u_char *dat, unsigned int length)
 {
-       register const struct rip6 *rp = (struct rip6 *)dat;
+       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));
+       unsigned int length_left;
+       u_int j;
 
+       ND_TCHECK(rp->rip6_cmd);
        switch (rp->rip6_cmd) {
 
        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(rp->rip6_nets);
+                       if (rp->rip6_nets->rip6_metric == HOPCNT_INFINITY6
+                           &&  IN6_IS_ADDR_UNSPECIFIED(&rp->rip6_nets->rip6_dest)) {
+                               ND_PRINT((ndo, " 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((ndo, " ripng-req %u[%u]:", j, length));
                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((ndo, " ripng-req %u:", j));
+               for (ni = rp->rip6_nets; length_left >= sizeof(*ni);
+                   length_left -= sizeof(*ni), ++ni) {
+                       ND_TCHECK(*ni);
                        if (ndo->ndo_vflag > 1)
                                ND_PRINT((ndo, "\n\t"));
                        else
                                ND_PRINT((ndo, " "));
                        rip6_entry_print(ndo, ni, 0);
                }
+               if (length_left != 0)
+                       goto trunc;
                break;
        case RIP6_RESPONSE:
-               j = length / sizeof(*ni);
-               if (j * sizeof(*ni) != length - 4)
+               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((ndo, " ripng-resp %d[%u]:", j, length));
                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) {
+               for (ni = rp->rip6_nets; length_left >= sizeof(*ni);
+                   length_left -= sizeof(*ni), ++ni) {
+                       ND_TCHECK(*ni);
                        if (ndo->ndo_vflag > 1)
                                ND_PRINT((ndo, "\n\t"));
                        else
                                ND_PRINT((ndo, " "));
                        rip6_entry_print(ndo, ni, ni->rip6_metric);
                }
-               if (trunc)
-                       ND_PRINT((ndo, "[|ripng]"));
+               if (length_left != 0)
+                       goto trunc;
                break;
        default:
                ND_PRINT((ndo, " ripng-%d ?? %u", rp->rip6_cmd, length));
                break;
        }
+       ND_TCHECK(rp->rip6_vers);
        if (rp->rip6_vers != RIP6_VERSION)
                ND_PRINT((ndo, " [vers %d]", rp->rip6_vers));
+       return;
+
+trunc:
+       ND_PRINT((ndo, "[|ripng]"));
+       return;
 }
-#endif /* INET6 */