From: guy <guy>
Date: Fri, 22 Dec 2000 11:53:27 +0000 (+0000)
Subject: Patch from Olaf Kirch to add support for ARPHRD_TUNNEL (or at least for
X-Git-Tag: libpcap-0.6.1~15
X-Git-Url: https://git.tcpdump.org/libpcap/commitdiff_plain/4ee46797c7f8719d26eb1c34b619c1c08cdc23f1

Patch from Olaf Kirch to add support for ARPHRD_TUNNEL (or at least for
some tunnels).
---

diff --git a/CREDITS b/CREDITS
index 61c9cbf7..5560f5fc 100644
--- a/CREDITS
+++ b/CREDITS
@@ -21,6 +21,7 @@ Additional people who have contributed patches:
 	Juergen Schoenwaelder		<schoenw@ibr.cs.tu-bs.de>
 	Love Hörnquist-Åstrand		<lha@stacken.kth.se>
 	Monroe Williams			<monroe@pobox.com>
+	Olaf Kirch			<okir@caldera.de>
 	Peter Jeremy			<peter.jeremy@alcatel.com.au>
 	Rafal Maszkowski		<rzm@icm.edu.pl>
 	Rick Jones			<raj@cup.hp.com>
diff --git a/pcap-linux.c b/pcap-linux.c
index 2beae0d0..288c88ce 100644
--- a/pcap-linux.c
+++ b/pcap-linux.c
@@ -26,7 +26,7 @@
  */
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/libpcap/pcap-linux.c,v 1.44 2000-12-21 10:29:23 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/libpcap/pcap-linux.c,v 1.45 2000-12-22 11:53:27 guy Exp $ (LBL)";
 #endif
 
 /*
@@ -629,8 +629,11 @@ static int map_arphrd_to_dlt(int arptype)
 #endif
 	case ARPHRD_ATM:	return DLT_ATM_CLIP;
 
-	case ARPHRD_SIT:
 	case ARPHRD_PPP:
+	/* Not sure if this is correct for all tunnels, but it
+	 * works for CIPE */
+	case ARPHRD_TUNNEL:
+	case ARPHRD_SIT:
 	case ARPHRD_CSLIP:
 	case ARPHRD_SLIP6:
 	case ARPHRD_CSLIP6: