aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pcap-bpf.h11
-rw-r--r--savefile.c9
2 files changed, 17 insertions, 3 deletions
diff --git a/pcap-bpf.h b/pcap-bpf.h
index a670480a..cbc2e61f 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.9 2003-06-27 07:59:20 guy Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/libpcap/pcap-bpf.h,v 1.10 2003-11-13 01:35:47 guy Exp $ (LBL)
*/
/*
@@ -395,6 +395,15 @@ struct bpf_version {
#define DLT_APPLE_IP_OVER_IEEE1394 138
/*
+ * 139 through 142 are reserved for SS7.
+ */
+
+/*
+ * DOCSIS MAC frames.
+ */
+#define DLT_DOCSIS 143
+
+/*
* The instruction encodings.
*/
/* instruction classes */
diff --git a/savefile.c b/savefile.c
index 390bc60c..466f478c 100644
--- a/savefile.c
+++ b/savefile.c
@@ -30,7 +30,7 @@
#ifndef lint
static const char rcsid[] =
- "@(#) $Header: /tcpdump/master/libpcap/savefile.c,v 1.92 2003-11-04 07:05:40 guy Exp $ (LBL)";
+ "@(#) $Header: /tcpdump/master/libpcap/savefile.c,v 1.93 2003-11-13 01:35:48 guy Exp $ (LBL)";
#endif
#ifdef HAVE_CONFIG_H
@@ -192,7 +192,9 @@ static const char rcsid[] =
#define LINKTYPE_RAWSS7 139 /* see rawss7.h for */
#define LINKTYPE_RAWSS7_MTP2 140 /* information on these */
#define LINKTYPE_RAWSS7_MTP3 141 /* definitions */
-#define LINKTYPE_RAWSS7_SCCP 142
+#define LINKTYPE_RAWSS7_SCCP 142
+
+#define LINKTYPE_DOCSIS 143 /* DOCSIS MAC frames */
/*
* These types are reserved for future use.
@@ -330,6 +332,9 @@ static struct linktype_map {
/* Apple IP-over-IEEE 1394 cooked header */
{ DLT_APPLE_IP_OVER_IEEE1394, LINKTYPE_APPLE_IP_OVER_IEEE1394 },
+ /* DOCSIS MAC frames */
+ { DLT_DOCSIS, LINKTYPE_DOCSIS },
+
/*
* Any platform that defines additional DLT_* codes should:
*