Link-layer types for GSM Um and Abis interfaces.

diff --git a/pcap/bpf.h b/pcap/bpf.h
index c660292a0d6f2dc15c5e1b470ed92574b304e690..6091ffd1b103a2ff8e320476e6e89ad4c7d41568 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.28 2008-11-18 07:48:56 guy Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/libpcap/pcap/bpf.h,v 1.29 2008-11-27 19:47:54 guy Exp $ (LBL)
  */
 
 /*
@@ -829,6 +829,14 @@ struct bpf_version {
  */
 #define DLT_LINUX_EVDEV                        216
 
+/*
+ * GSM Um and Abis interfaces, preceded by a "gsmtap" header.
+ *
+ * Requested by Harald Welte <[email protected]>.
+ */
+#define DLT_GSMTAP_UM                  217
+#define DLT_GSMTAP_ABIS                        218
+
 
 /*
  * DLT and savefile link type values are split into a class and

diff --git a/savefile.c b/savefile.c
index 66ba16b587da44dc45f9e415ac5234fe9a8a9718..2650100ece1f9d3a9b5c2d28986d5e5f76924187 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.179 2008-11-18 07:48:56 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/libpcap/savefile.c,v 1.180 2008-11-27 19:47:54 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -655,6 +655,14 @@ static const char rcsid[] _U_ =
  */
 #define LINKTYPE_LINUX_EVDEV                   216
 
+/*
+ * GSM Um and Abis interfaces, preceded by a "gsmtap" header.
+ *
+ * Requested by Harald Welte <[email protected]>.
+ */
+#define LINKTYPE_GSMTAP_UM                     217
+#define LINKTYPE_GSMTAP_ABIS                   218
+
 
 static struct linktype_map {
        int     dlt;
@@ -963,6 +971,10 @@ static struct linktype_map {
        /* Input device events from Linux /dev/input/eventN devices */
        { DLT_LINUX_EVDEV,      LINKTYPE_LINUX_EVDEV },
 
+       /* GSM types */
+       { DLT_GSMTAP_UM,        LINKTYPE_GSMTAP_UM },
+       { DLT_GSMTAP_ABIS,      LINKTYPE_GSMTAP_ABIS },
+
        { -1,                   -1 }
 };