New DLT value for packets captured from u10 Networks boards; requested

by Phil Mulholland of u10.

diff --git a/pcap/bpf.h b/pcap/bpf.h
index 741c5b81c917f12504b009f1841be2ec0ad994a4..401c10e7a39fefb0cf0f0551968dc4dfece6cf05 100644 (file)
--- a/pcap/bpf.h
+++ b/pcap/bpf.h
@@ -37,7 +37,7 @@
  *
  *      @(#)bpf.h       7.1 (Berkeley) 5/7/91
  *
- * @(#) $Header: /tcpdump/master/libpcap/pcap/bpf.h,v 1.13 2007-08-07 23:51:53 guy Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/libpcap/pcap/bpf.h,v 1.14 2007-08-13 16:51:41 guy Exp $ (LBL)
  */
 
 /*
@@ -714,6 +714,13 @@ struct bpf_version {
  */
 #define DLT_ERF                        197
 
+/*
+ * Special header prepended to Ethernet packets when capturing from a
+ * u10 Networks board.  Requested by Phil Mulholland
+ * <[email protected]>.
+ */
+#define DLT_RAIF1              198
+
 
 /*
  * The instruction encodings.

diff --git a/savefile.c b/savefile.c
index 0cec20a71d61ca4eb24bf943c5836bc030f7dd25..9860dad442650de804ae57264c23fc25797e58c1 100644 (file)
--- a/savefile.c
+++ b/savefile.c
@@ -30,7 +30,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/libpcap/savefile.c,v 1.160 2007-08-07 23:51:53 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/libpcap/savefile.c,v 1.161 2007-08-13 16:51:41 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -538,6 +538,13 @@ static const char rcsid[] _U_ =
  */
 #define LINKTYPE_ERF           197
 
+/*
+ * Special header prepended to Ethernet packets when capturing from a
+ * u10 Networks board.  Requested by Phil Mulholland
+ * <[email protected]>.
+ */
+#define LINKTYPE_RAIF1         198
+
 
 static struct linktype_map {
        int     dlt;
@@ -792,6 +799,9 @@ static struct linktype_map {
        /* Various link-layer types for Endace */
        { DLT_ERF,              LINKTYPE_ERF },
 
+       /* Special header for u10 Networks boards */
+       { DLT_RAIF1,            LINKTYPE_RAIF1 },
+
        { -1,                   -1 }
 };