Link-layer types for GSM Um and Abis interfaces.
diff --git a/pcap/bpf.h b/pcap/bpf.h
index c660292..6091ffd 100644
--- 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 @@
*/
#define DLT_LINUX_EVDEV 216
+/*
+ * GSM Um and Abis interfaces, preceded by a "gsmtap" header.
+ *
+ * Requested by Harald Welte <laforge@gnumonks.org>.
+ */
+#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 66ba16b..2650100 100644
--- 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 @@
*/
#define LINKTYPE_LINUX_EVDEV 216
+/*
+ * GSM Um and Abis interfaces, preceded by a "gsmtap" header.
+ *
+ * Requested by Harald Welte <laforge@gnumonks.org>.
+ */
+#define LINKTYPE_GSMTAP_UM 217
+#define LINKTYPE_GSMTAP_ABIS 218
+
static struct linktype_map {
int dlt;
@@ -963,6 +971,10 @@
/* 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 }
};
