Import tcpdump 3.7.1, from

 http://www.tcpdump.org/release/tcpdump-3.7.1.tar.gz

1 files changed, 8 insertions, 8 deletions

diff --git a/contrib/tcpdump/print-ripng.c b/contrib/tcpdump/print-ripng.c
index e4d11a4..ad6d3f8 100644
--- a/contrib/tcpdump/print-ripng.c
+++ b/contrib/tcpdump/print-ripng.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ripng.c,v 1.7 2000/10/07 05:46:21 itojun Exp $";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ripng.c,v 1.10 2001/11/16 08:59:22 itojun Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -57,7 +57,7 @@ rip6_entry_print(register const struct netinfo6 *ni, int metric)
 }
 
 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;
@@ -81,12 +81,12 @@ 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)
+			if (vflag > 1)
 				printf("\n\t");
 			else
 				printf(" ");
@@ -96,22 +96,22 @@ 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)
+			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)