When checking for pcap_if_t, add $V_INCLS to CFLAGS, so we look at the

[tcpdump] / print-ripng.c

diff --git a/print-ripng.c b/print-ripng.c
index 1b421d0cb99f82c8c55374e78b01d18b00907b55..54a89d3d0cbd56aec39781107af9644b5a9d7d5e 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.11 2002-08-01 08:53:26 risso Exp $";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ripng.c,v 1.17 2003-11-16 09:36:34 guy Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -32,6 +32,10 @@ static const char rcsid[] =
 
 #include <tcpdump-stdinc.h>
 
+#ifdef WIN32
+const struct in6_addr in6addr_any;        /* :: */
+#endif /* WIN32 */
+
 #ifdef __MINGW32__
 int
 IN6_ADDR_EQUAL(const struct in6_addr *a, const struct in6_addr *b)
@@ -40,14 +44,15 @@ IN6_ADDR_EQUAL(const struct in6_addr *a, const struct in6_addr *b)
 }
 
 #define IN6_IS_ADDR_UNSPECIFIED(a) IN6_ADDR_EQUAL((a), &in6addr_any)
+
 #endif /* __MINGW32__ */
 
-#include <errno.h>
 #include <stdio.h>
 
 #include "route6d.h"
 #include "interface.h"
 #include "addrtoname.h"
+#include "extract.h"
 
 static int
 rip6_entry_print(register const struct netinfo6 *ni, int metric)
@@ -55,7 +60,7 @@ 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;
@@ -66,14 +71,18 @@ 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) {
 
@@ -90,7 +99,8 @@ ripng_print(const u_char *dat, unsigned int length)
                else
                        printf(" ripng-req %d:", j);
                trunc = ((i / sizeof(*ni)) * sizeof(*ni) != i);
-               for (ni = rp->rip6_nets; (i -= sizeof(*ni)) >= 0; ++ni) {
+               for (ni = rp->rip6_nets; i >= sizeof(*ni);
+                   i -= sizeof(*ni), ++ni) {
                        if (vflag > 1)
                                printf("\n\t");
                        else
@@ -105,7 +115,8 @@ ripng_print(const u_char *dat, unsigned int length)
                else
                        printf(" ripng-resp %d:", j);
                trunc = ((i / sizeof(*ni)) * sizeof(*ni) != i);
-               for (ni = rp->rip6_nets; (i -= sizeof(*ni)) >= 0; ++ni) {
+               for (ni = rp->rip6_nets; i >= sizeof(*ni);
+                   i -= sizeof(*ni), ++ni) {
                        if (vflag > 1)
                                printf("\n\t");
                        else