aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorguy <guy>2004-12-07 17:27:45 +0000
committerguy <guy>2004-12-07 17:27:45 +0000
commit1e5f231e7b4fbeabbfc2a319033ec4d83fc50055 (patch)
tree801826d0c25d3397424e5f039ed85510f6e19cd2
parent0b2386c1f1155b60ca2809c059c78f6907df4d4a (diff)
New link-layer header type for raw GPRS LLC frames, as per a request by
Marc Hermstein <mhermstein@yahoo.com>.
-rw-r--r--pcap-bpf.h4
-rw-r--r--savefile.c6
2 files changed, 8 insertions, 2 deletions
diff --git a/pcap-bpf.h b/pcap-bpf.h
index 7b2dc2b7..b9211c22 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.25 2004-10-29 02:15:08 guy Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/libpcap/pcap-bpf.h,v 1.26 2004-12-07 17:27:45 guy Exp $ (LBL)
*/
/*
@@ -526,6 +526,8 @@ struct bpf_version {
#define DLT_JUNIPER_PPPOE 167
#define DLT_JUNIPER_PPPOE_ATM 168
+#define DLT_GPRS_LLC 169 /* GPRS LLC */
+
/*
* The instruction encodings.
*/
diff --git a/savefile.c b/savefile.c
index de5e34f2..e1ba8b98 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.113 2004-11-30 10:51:42 guy Exp $ (LBL)";
+ "@(#) $Header: /tcpdump/master/libpcap/savefile.c,v 1.114 2004-12-07 17:27:45 guy Exp $ (LBL)";
#endif
#ifdef HAVE_CONFIG_H
@@ -349,6 +349,7 @@ static const char rcsid[] _U_ =
#define LINKTYPE_JUNIPER_PPPOE 167
#define LINKTYPE_JUNIPER_PPPOE_ATM 168
+#define LINKTYPE_GPRS_LLC 169 /* GPRS LLC */
static struct linktype_map {
int dlt;
@@ -521,6 +522,9 @@ static struct linktype_map {
{ DLT_JUNIPER_PPPOE, LINKTYPE_JUNIPER_PPPOE },
{ DLT_JUNIPER_PPPOE_ATM,LINKTYPE_JUNIPER_PPPOE_ATM },
+ /* GPRS LLC */
+ { DLT_GPRS_LLC, LINKTYPE_GPRS_LLC },
+
{ -1, -1 }
};