Address Michael's comments.

[tcpdump] / print-ripng.c

diff --git a/print-ripng.c b/print-ripng.c
index c514791157df07f30463988fc413ac1735270e8d..cef39daf1e0c9a0a3ba29b89e255d69a4bf332f9 100644 (file)
--- a/print-ripng.c
+++ b/print-ripng.c
@@ -20,8 +20,8 @@
  */
 
 #ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ripng.c,v 1.6 2000-09-29 04:58:47 guy Exp $";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ripng.c,v 1.18 2005-01-04 00:15:54 guy Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -30,21 +30,21 @@ static const char rcsid[] =
 
 #ifdef INET6
 
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-
-#include <errno.h>
+#include <tcpdump-stdinc.h>
 #include <stdio.h>
 
-#include <netinet/ip6.h>
-
 #include "route6d.h"
 #include "interface.h"
 #include "addrtoname.h"
+#include "extract.h"
+
+#if !defined(IN6_IS_ADDR_UNSPECIFIED) && !defined(_MSC_VER) /* MSVC inline */
+static int IN6_IS_ADDR_UNSPECIFIED(const struct in6_addr *addr)
+{
+    static const struct in6_addr in6addr_any;        /* :: */
+    return (memcmp(addr, &in6addr_any, sizeof(*addr)) == 0);
+}
+#endif
 
 static int
 rip6_entry_print(register const struct netinfo6 *ni, int metric)
@@ -52,25 +52,29 @@ rip6_entry_print(register const struct netinfo6 *ni, int metric)
        int l;
        l = printf("%s/%d", ip6addr_string(&ni->rip6_dest), ni->rip6_plen);
        if (ni->rip6_tag)
-               l += printf(" [%d]", ntohs(ni->rip6_tag));
+               l += printf(" [%d]", EXTRACT_16BITS(&ni->rip6_tag));
        if (metric)
                l += printf(" (%d)", ni->rip6_metric);
        return l;
 }
 
 void
-ripng_print(const u_char *dat, int length)
+ripng_print(const u_char *dat, unsigned int length)
 {
        register const struct rip6 *rp = (struct rip6 *)dat;
        register const struct netinfo6 *ni;
-       register int amt = snapend - dat;
-       register int i = min(length, amt) -
-                        (sizeof(struct rip6) - sizeof(struct netinfo6));
+       register u_int amt;
+       register u_int i;
        int j;
        int trunc;
 
-       if (i < 0)
+       if (snapend < dat)
+               return;
+       amt = 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) {
 
@@ -83,12 +87,13 @@ ripng_print(const u_char *dat, int length)
                        break;
                }
                if (j * sizeof(*ni) != length - 4)
-                       printf(" ripng-req %d[%d]:", j, length);
+                       printf(" ripng-req %d[%u]:", j, length);
                else
                        printf(" ripng-req %d:", j);
                trunc = ((i / sizeof(*ni)) * sizeof(*ni) != i);
-               for (ni = rp->rip6_nets; (i -= sizeof(*ni)) >= 0; ++ni) {
-                       if (vflag)
+               for (ni = rp->rip6_nets; i >= sizeof(*ni);
+                   i -= sizeof(*ni), ++ni) {
+                       if (vflag > 1)
                                printf("\n\t");
                        else
                                printf(" ");
@@ -98,22 +103,23 @@ ripng_print(const u_char *dat, int length)
        case RIP6_RESPONSE:
                j = length / sizeof(*ni);
                if (j * sizeof(*ni) != length - 4)
-                       printf(" ripng-resp %d[%d]:", j, length);
+                       printf(" ripng-resp %d[%u]:", j, length);
                else
                        printf(" ripng-resp %d:", j);
                trunc = ((i / sizeof(*ni)) * sizeof(*ni) != i);
-               for (ni = rp->rip6_nets; (i -= sizeof(*ni)) >= 0; ++ni) {
-                       if (vflag)
+               for (ni = rp->rip6_nets; i >= sizeof(*ni);
+                   i -= sizeof(*ni), ++ni) {
+                       if (vflag > 1)
                                printf("\n\t");
                        else
                                printf(" ");
                        rip6_entry_print(ni, ni->rip6_metric);
                }
                if (trunc)
-                       printf("[|rip]");
+                       printf("[|ripng]");
                break;
        default:
-               printf(" ripng-%d ?? %d", rp->rip6_cmd, length);
+               printf(" ripng-%d ?? %u", rp->rip6_cmd, length);
                break;
        }
        if (rp->rip6_vers != RIP6_VERSION)