From: guy <guy>
Date: Wed, 6 Feb 2008 10:34:15 +0000 (+0000)
Subject: From Bjoern A. Zeeb: add IPv6 support.
X-Git-Tag: tcpdump-4.0.0~30
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/9e8bbb6a4e695d171d37d1cb01052954e908cf7c?ds=sidebyside

From Bjoern A. Zeeb: add IPv6 support.
---

diff --git a/CREDITS b/CREDITS
index fef18c47..ff9500ed 100644
--- a/CREDITS
+++ b/CREDITS
@@ -25,6 +25,7 @@ Additional people who have contributed patches:
 	Ben Byer			<bushing at sourceforge dot net>
 	Atsushi Onoe			<onoe at netbsd dot org>
 	Ben Smithurst			<ben at scientia dot demon dot co dot uk>
+	Bjoern A. Zeeb			<bzeeb at Zabbadoz dot NeT>
 	Brent L. Bates			<blbates at vigyan dot com>
 	Brian Ginsbach			<ginsbach at cray dot com>
 	Bruce M. Simpson		<bms at spc dot org>
diff --git a/print-enc.c b/print-enc.c
index 605ca33d..9569534c 100644
--- a/print-enc.c
+++ b/print-enc.c
@@ -23,7 +23,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-enc.c,v 1.4 2005-04-06 21:32:39 mcr Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-enc.c,v 1.4.4.1 2008-02-06 10:34:15 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -70,8 +70,17 @@ enc_if_print(const struct pcap_pkthdr *h, register const u_char *p)
 	printf("SPI 0x%08x: ", (u_int32_t)ntohl(hdr->spi));
 
 	length -= ENC_HDRLEN;
-	/* XXX - use the address family */
-	ip_print(gndo, p + ENC_HDRLEN, length);
+	caplen -= ENC_HDRLEN;
+	p += ENC_HDRLEN;
+	
+	switch (hdr->af) {
+	case AF_INET:
+		ip_print(gndo, p, length);
+		break;
+	case AF_INET6:
+		ip6_print(p, length);
+		break;
+	}
 
 out:
 	return (ENC_HDRLEN);