From 91fc581e384bca8ae8831d23b70ab73ab0dc1a21 Mon Sep 17 00:00:00 2001
From: fenner <fenner@FreeBSD.org>
Date: Fri, 21 Jun 2002 00:43:23 +0000
Subject: Import tcpdump 3.7.1, from 
 http://www.tcpdump.org/release/tcpdump-3.7.1.tar.gz

---
 contrib/tcpdump/print-isakmp.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'contrib/tcpdump/print-isakmp.c')

diff --git a/contrib/tcpdump/print-isakmp.c b/contrib/tcpdump/print-isakmp.c
index 66df93a..909f0b95 100644
--- a/contrib/tcpdump/print-isakmp.c
+++ b/contrib/tcpdump/print-isakmp.c
@@ -30,7 +30,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-isakmp.c,v 1.26 2000/12/12 09:20:26 itojun Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-isakmp.c,v 1.29 2001/10/26 03:41:29 itojun Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -702,12 +702,8 @@ isakmp_id_print(struct isakmp_gen *ext, u_char *ep, u_int32_t phase,
 		    {
 			int i;
 			printf(" len=%d ", len);
-			for (i = 0; i < len; i++) {
-				if (isprint(data[i]))
-					printf("%c", data[i]);
-				else
-					printf("\\%03o", data[i]);
-			}
+			for (i = 0; i < len; i++)
+				safeputchar(data[i]);
 			len = 0;
 			break;
 		    }
@@ -759,7 +755,6 @@ isakmp_id_print(struct isakmp_gen *ext, u_char *ep, u_int32_t phase,
 	    }
 	}
 	if (data && len) {
-		len -= sizeof(*p);
 		printf(" len=%d", len);
 		if (2 < vflag) {
 			printf(" ");
@@ -1188,7 +1183,7 @@ isakmp_print(const u_char *bp, u_int length, const u_char *bp2)
 		 * encrypted, nothing we can do right now.
 		 * we hope to decrypt the packet in the future...
 		 */
-		printf(" [|%s]", NPSTR(base.np));
+		printf(" [encrypted %s]", NPSTR(base.np));
 		goto done;
 	}
 
-- 
cgit v1.1