aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pcap-bpf.h9
-rw-r--r--pcap.c3
-rw-r--r--savefile.c12
3 files changed, 21 insertions, 3 deletions
diff --git a/pcap-bpf.h b/pcap-bpf.h
index 4d6acb0f..41676b53 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.29 2005-01-11 11:02:08 guy Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/libpcap/pcap-bpf.h,v 1.30 2005-01-12 09:15:05 hannes Exp $ (LBL)
*/
/*
@@ -543,6 +543,13 @@ struct bpf_version {
#define DLT_GCOM_SERIAL 173
/*
+ * Juniper-private data link type, as per request from
+ * Hannes Gredler <hannes@juniper.net>. The DLT_ is used
+ * for internal communication to Physical Interface Cards (PIC)
+ */
+#define DLT_JUNIPER_PIC_PEER 174
+
+/*
* The instruction encodings.
*/
/* instruction classes */
diff --git a/pcap.c b/pcap.c
index b7728d2b..4d0a3ad1 100644
--- a/pcap.c
+++ b/pcap.c
@@ -33,7 +33,7 @@
#ifndef lint
static const char rcsid[] _U_ =
- "@(#) $Header: /tcpdump/master/libpcap/pcap.c,v 1.82 2005-01-12 09:02:55 hannes Exp $ (LBL)";
+ "@(#) $Header: /tcpdump/master/libpcap/pcap.c,v 1.83 2005-01-12 09:15:05 hannes Exp $ (LBL)";
#endif
#ifdef HAVE_CONFIG_H
@@ -365,6 +365,7 @@ static struct dlt_choice dlt_choices[] = {
DLT_CHOICE(DLT_GPRS_LLC, "GPRS LLC"),
DLT_CHOICE(DLT_GPF_T, "GPF-T"),
DLT_CHOICE(DLT_GPF_F, "GPF-F"),
+ DLT_CHOICE(DLT_JUNIPER_PIC_PEER, "Juniper PIC Peer"),
DLT_CHOICE_SENTINEL
};
diff --git a/savefile.c b/savefile.c
index 0ca35289..65837754 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.122 2005-01-11 11:02:08 guy Exp $ (LBL)";
+ "@(#) $Header: /tcpdump/master/libpcap/savefile.c,v 1.123 2005-01-12 09:15:05 hannes Exp $ (LBL)";
#endif
#ifdef HAVE_CONFIG_H
@@ -379,6 +379,13 @@ static const char rcsid[] _U_ =
#define LINKTYPE_GCOM_T1E1 172
#define LINKTYPE_GCOM_SERIAL 173
+/*
+ * Juniper-private data link type, as per request from
+ * Hannes Gredler <hannes@juniper.net>. The DLT_ is used
+ * for internal communication to Physical Interface Cards (PIC)
+ */
+#define LINKTYPE_JUNIPER_PIC_PEER 174
+
static struct linktype_map {
int dlt;
int linktype;
@@ -562,6 +569,9 @@ static struct linktype_map {
{ DLT_GCOM_T1E1, LINKTYPE_GCOM_T1E1 },
{ DLT_GCOM_SERIAL, LINKTYPE_GCOM_SERIAL },
+ /* Juniper-internal chassis encapsulation */
+ { DLT_JUNIPER_PIC_PEER, LINKTYPE_JUNIPER_PIC_PEER },
+
{ -1, -1 }
};