Patch from Onno van der Linden <[email protected]> to support Token Ring

on DLPI systems.

diff --git a/CREDITS b/CREDITS
index 7e9b75b8921abf58a24b6a4d94385907ceec1fe3..bc2507e8b2aaf10cf77cc05b544a223335938929 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -25,6 +25,7 @@ Additional people who have contributed patches:
        Love Hörnquist-Åstrand          <[email protected]>
        Monroe Williams                 <[email protected]>
        Olaf Kirch                      <[email protected]>
+       Onno van der Linden             <[email protected]>
        Peter Jeremy                    <[email protected]>
        Rafal Maszkowski                <[email protected]>
        Rick Jones                      <[email protected]>

diff --git a/pcap-dlpi.c b/pcap-dlpi.c
index e1bde1c3fe9aa92e2fe04175272ab4c5a636b03c..39a292718fd85d84fbee4b66bce841fb39d57aca 100644 (file)
--- 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);