aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pcap-bpf.h16
-rw-r--r--savefile.c19
2 files changed, 33 insertions, 2 deletions
diff --git a/pcap-bpf.h b/pcap-bpf.h
index f37f9790..dd53ceaf 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.1 2003-02-11 01:46:06 guy Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/libpcap/pcap-bpf.h,v 1.2 2003-02-11 17:03:22 hannes Exp $ (LBL)
*/
/*
@@ -351,6 +351,20 @@ struct bpf_version {
#define DLT_ARCNET_LINUX 129 /* ARCNET */
/*
+ * juniper-private data link types, as per request from
+ * Hannes Gredler <hannes@juniper.net> the DLT_s are used
+ * for passing on chassis-internal metainformation like
+ * QOS profiles etc.
+ */
+#define DLT_JUNIPER_MLPPP 130
+#define DLT_JUNIPER_MLFR 131
+#define DLT_JUNIPER_ES 132
+#define DLT_JUNIPER_GGSN 133
+#define DLT_JUNIPER_MFR 134
+#define DLT_JUNIPER_ATM2 135
+#define DLT_JUNIPER_SERVICES 136
+
+/*
* The instruction encodings.
*/
/* instruction classes */
diff --git a/savefile.c b/savefile.c
index c703d1e3..f1bb3039 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.75 2003-01-23 07:24:53 guy Exp $ (LBL)";
+ "@(#) $Header: /tcpdump/master/libpcap/savefile.c,v 1.76 2003-02-11 17:03:22 hannes Exp $ (LBL)";
#endif
#ifdef HAVE_CONFIG_H
@@ -173,6 +173,14 @@ static const char rcsid[] =
#define LINKTYPE_ARCNET_LINUX 129 /* Linux-style headers */
+#define LINKTYPE_JUNIPER_MLPPP 130 /* Juniper-internal chassis encapsulation */
+#define LINKTYPE_JUNIPER_MLFR 131
+#define LINKTYPE_JUNIPER_ES 132
+#define LINKTYPE_JUNIPER_GGSN 133
+#define LINKTYPE_JUNIPER_MFR 134
+#define LINKTYPE_JUNIPER_ATM2 135
+#define LINKTYPE_JUNIPER_SERVICES 136
+
/*
* These types are reserved for future use.
*/
@@ -295,6 +303,15 @@ static struct linktype_map {
/* Arcnet with Linux-style link-layer headers */
{ DLT_ARCNET_LINUX, LINKTYPE_ARCNET_LINUX },
+ /* Juniper-internal chassis encapsulation */
+ { DLT_JUNIPER_MLPPP, LINKTYPE_JUNIPER_MLPPP },
+ { DLT_JUNIPER_MLFR, LINKTYPE_JUNIPER_MLFR },
+ { DLT_JUNIPER_ES, LINKTYPE_JUNIPER_ES },
+ { DLT_JUNIPER_GGSN, LINKTYPE_JUNIPER_GGSN },
+ { DLT_JUNIPER_MFR, LINKTYPE_JUNIPER_MFR },
+ { DLT_JUNIPER_ATM2, LINKTYPE_JUNIPER_ATM2 },
+ { DLT_JUNIPER_SERVICES, LINKTYPE_JUNIPER_SERVICES },
+
/*
* Any platform that defines additional DLT_* codes should:
*