Address Michael's comments.

[tcpdump] / print-ripng.c

diff --git a/print-ripng.c b/print-ripng.c
index 128b31a6323c7cd0dba25607c22cac24b08bee20..cef39daf1e0c9a0a3ba29b89e255d69a4bf332f9 100644 (file)
--- a/print-ripng.c
+++ b/print-ripng.c
@@ -20,8 +20,8 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ripng.c,v 1.14 2002-12-11 07:14:08 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
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -31,22 +31,6 @@ static const char rcsid[] =
 #ifdef INET6
 
 #include <tcpdump-stdinc.h>
 #ifdef INET6
 
 #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)
-{
-    return (memcmp(a, b, sizeof(struct in6_addr)) == 0);
-}
-
-#define IN6_IS_ADDR_UNSPECIFIED(a) IN6_ADDR_EQUAL((a), &in6addr_any)
-
-#endif /* __MINGW32__ */
-

 #include <stdio.h>
 
 #include "route6d.h"
 #include <stdio.h>
 
 #include "route6d.h"


@@ -54,6 +38,14 @@ IN6_ADDR_EQUAL(const struct in6_addr *a, const struct in6_addr *b)
 #include "addrtoname.h"
 #include "extract.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)
 {
 static int
 rip6_entry_print(register const struct netinfo6 *ni, int metric)
 {


@@ -71,14 +63,18 @@ ripng_print(const u_char *dat, unsigned int length)
 {
        register const struct rip6 *rp = (struct rip6 *)dat;
        register const struct netinfo6 *ni;
 {
        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;
 
        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;
                return;

+       i -= (sizeof(struct rip6) - sizeof(struct netinfo6));

 
        switch (rp->rip6_cmd) {
 
 
        switch (rp->rip6_cmd) {
 


@@ -95,7 +91,8 @@ ripng_print(const u_char *dat, unsigned int length)
                else
                        printf(" ripng-req %d:", j);
                trunc = ((i / sizeof(*ni)) * sizeof(*ni) != i);
                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
                        if (vflag > 1)
                                printf("\n\t");
                        else


@@ -110,7 +107,8 @@ ripng_print(const u_char *dat, unsigned int length)
                else
                        printf(" ripng-resp %d:", j);
                trunc = ((i / sizeof(*ni)) * sizeof(*ni) != i);
                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
                        if (vflag > 1)
                                printf("\n\t");
                        else