From Jan-Philip Velders <[email protected]>: Linux 2.0[.x] kernels

didn't define ARPHRD_HDLC - define it as per Linux 2.1.13, if it's not
defined.

Do the same with ARPHRD_FDDI, as that's not defined by 2.0, either.

diff --git a/CREDITS b/CREDITS
index 77127dcfe9feee2466c6e9644f94638fc28869d9..3c39e5b4e3eb6336f269c36a26789ef7295e7fd1 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -23,6 +23,7 @@ Additional people who have contributed patches:
        Greg Troxel                     <[email protected]>
        Hyung Sik Yoon                  <[email protected]>
        Igor Khristophorov              <[email protected]>
+       Jan-Philip Velders              <[email protected]>
        Jason R. Thorpe                 <[email protected]>
        Javier Achirica                 <[email protected]>
        Jefferson Ogata                 <[email protected]>

diff --git a/pcap-linux.c b/pcap-linux.c
index 1265ae91e4f75466d221d87c035be9d4809a9cbf..baa06e7276482a266cae8754a160bf0c9497128f 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.73 2001-12-10 07:14:16 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/libpcap/pcap-linux.c,v 1.74 2002-02-03 23:02:07 guy Exp $ (LBL)";
 #endif
 
 /*
@@ -904,6 +904,9 @@ static void map_arphrd_to_dlt(pcap_t *handle, int arptype)
                handle->linktype = DLT_ARCNET;
                break;
 
+#ifndef ARPHRD_FDDI    /* From Linux 2.2.13 */
+#define ARPHRD_FDDI    774
+#endif
        case ARPHRD_FDDI:
                handle->linktype = DLT_FDDI;
                handle->offset = 3;
@@ -976,6 +979,9 @@ static void map_arphrd_to_dlt(pcap_t *handle, int arptype)
                handle->linktype = DLT_LINUX_SLL;
                break;
 
+#ifndef ARPHRD_HDLC
+#define ARPHRD_HDLC 513        /* From Linux 2.2.213 */
+#endif
        case ARPHRD_HDLC:
                handle->linktype = DLT_C_HDLC;
                break;
@@ -984,7 +990,7 @@ static void map_arphrd_to_dlt(pcap_t *handle, int arptype)
         * works for CIPE */
        case ARPHRD_TUNNEL:
 #ifndef ARPHRD_SIT
-#define ARPHRD_SIT 776 /* From Linux 2.2.14 */
+#define ARPHRD_SIT 776 /* From Linux 2.2.13 */
 #endif
        case ARPHRD_SIT:
        case ARPHRD_CSLIP: