From: guy <guy>
Date: Wed, 21 Feb 2001 09:07:40 +0000 (+0000)
Subject: Patch from Onno van der Linden <onno@simplex.nl> to support Token Ring
X-Git-Tag: libpcap-0.7.1~95
X-Git-Url: https://git.tcpdump.org/libpcap/commitdiff_plain/bc0425f86cc148bba1a8c394c5734c3b55c3b6d2

Patch from Onno van der Linden <onno@simplex.nl> to support Token Ring
on DLPI systems.
---

diff --git a/CREDITS b/CREDITS
index 7e9b75b8..bc2507e8 100644
--- a/CREDITS
+++ b/CREDITS
@@ -25,6 +25,7 @@ Additional people who have contributed patches:
 	Love Hörnquist-Åstrand		<lha@stacken.kth.se>
 	Monroe Williams			<monroe@pobox.com>
 	Olaf Kirch			<okir@caldera.de>
+	Onno van der Linden		<onno@simplex.nl>
 	Peter Jeremy			<peter.jeremy@alcatel.com.au>
 	Rafal Maszkowski		<rzm@icm.edu.pl>
 	Rick Jones			<raj@cup.hp.com>
diff --git a/pcap-dlpi.c b/pcap-dlpi.c
index e1bde1c3..39a29271 100644
--- a/pcap-dlpi.c
+++ b/pcap-dlpi.c
@@ -38,7 +38,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/libpcap/pcap-dlpi.c,v 1.63 2000-11-22 05:32:55 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/libpcap/pcap-dlpi.c,v 1.64 2001-02-21 09:07:41 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -448,6 +448,11 @@ pcap_open_live(char *device, int snaplen, int promisc, int to_ms, char *ebuf)
 		p->offset = 3;
 		break;
 
+	case DL_TPR:
+		p->linktype = DLT_IEEE802;
+		p->offset = 2;
+		break;
+
 	default:
 		snprintf(ebuf, PCAP_ERRBUF_SIZE, "unknown mac type %lu",
 		    infop->dl_mac_type);