Patch from Olaf Kirch to add support for ARPHRD_TUNNEL (or at least for

some tunnels).

diff --git a/CREDITS b/CREDITS
index 61c9cbf7a927ceb17b6d8a485ed928f2fa8f8390..5560f5fc383f583a52b5b3406f470799036ba05f 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -21,6 +21,7 @@ Additional people who have contributed patches:
        Juergen Schoenwaelder           <[email protected]>
        Love Hörnquist-Åstrand          <[email protected]>
        Monroe Williams                 <[email protected]>
+       Olaf Kirch                      <[email protected]>
        Peter Jeremy                    <[email protected]>
        Rafal Maszkowski                <[email protected]>
        Rick Jones                      <[email protected]>

diff --git a/pcap-linux.c b/pcap-linux.c
index 2beae0d059b91095ddd6189327b7de77bbd97772..288c88cee3e1e92ea2e9a945e6c7e69dab3e7c84 100644 (file)
--- 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: