Add more data types for X2E, requested by Hannes Kaelber.

diff --git a/pcap/bpf.h b/pcap/bpf.h
index 50473f8efb55e4f145e72693137e25399ba0014c..e9ccdf72a67372657b0c3491bc281d023432b9a6 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.24 2008-02-18 20:21:00 guy Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/libpcap/pcap/bpf.h,v 1.25 2008-04-06 18:09:48 guy Exp $ (LBL)
  */
 
 /*
@@ -798,6 +798,18 @@ struct bpf_version {
  */
 #define DLT_LIN                        212
 
+/*
+ * X2E-private data link type used for serial line capture,
+ * as requested by Hannes Kaelber <[email protected]>.
+ */
+#define DLT_X2E_SERIAL         213
+
+/*
+ * X2E-private data link type used for the Xoraya data logger
+ * family, as requested by Hannes Kaelber <[email protected]>.
+ */
+#define DLT_X2E_XORAYA         214
+
 
 /*
  * DLT and savefile link type values are split into a class and

diff --git a/savefile.c b/savefile.c
index 142458cb9f9d7f368aab40a66a95a402587e774e..0f156642a9f969ab62fc26fb6a896bbfa92de689 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.173 2008-04-04 19:37:45 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/libpcap/savefile.c,v 1.174 2008-04-06 18:09:48 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -623,6 +623,18 @@ static const char rcsid[] _U_ =
  */
 #define LINKTYPE_LIN                   212
 
+/*
+ * X2E-private data link type used for serial line capture,
+ * as requested by Hannes Kaelber <[email protected]>.
+ */
+#define LINKTYPE_X2E_SERIAL            213
+
+/*
+ * X2E-private data link type used for the Xoraya data logger
+ * family, as requested by Hannes Kaelber <[email protected]>.
+ */
+#define LINKTYPE_X2E_XORAYA            214
+
 
 static struct linktype_map {
        int     dlt;
@@ -919,6 +931,12 @@ static struct linktype_map {
        /* LIN */
        { DLT_LIN,              LINKTYPE_LIN },
 
+       /* X2E-private serial line capture */
+       { DLT_X2E_SERIAL,       LINKTYPE_X2E_SERIAL },
+
+       /* X2E-private for Xoraya data logger family */
+       { DLT_X2E_XORAYA,       LINKTYPE_X2E_XORAYA },
+
        { -1,                   -1 }
 };