From: Guy Harris <guy@alum.mit.edu>
Date: Wed, 2 Mar 2011 00:07:20 +0000 (-0800)
Subject: Add a link-layer type for DVB-CI.
X-Git-Tag: libpcap-1.2.1~83
X-Git-Url: https://git.tcpdump.org/libpcap/commitdiff_plain/dcd09c5fccbf10bfc308c04bb49baba61746e579

Add a link-layer type for DVB-CI.
---

diff --git a/pcap-common.c b/pcap-common.c
index 0833653f..97488f12 100644
--- a/pcap-common.c
+++ b/pcap-common.c
@@ -761,6 +761,18 @@ static const char rcsid[] _U_ =
 #define LINKTYPE_JUNIPER_SRX_E2E		233
 #define LINKTYPE_JUNIPER_FIBRECHANNEL		234
 
+/*
+ * DVB-CI (DVB Common Interface for communication between a PC Card
+ * module and a DVB receiver).  See
+ *
+ *	http://www.kaiser.cx/pcap-dvbci.html
+ *
+ * for the specification.
+ *
+ * Requested by Martin Kaiser <martin@kaiser.cx>.
+ */
+#define LINKTYPE_DVB_CI				235
+
 static struct linktype_map {
 	int	dlt;
 	int	linktype;
@@ -1121,6 +1133,9 @@ static struct linktype_map {
         /* Juniper Fibrechannel */
 	{ DLT_JUNIPER_FIBRECHANNEL, LINKTYPE_JUNIPER_FIBRECHANNEL },
 
+        /* DVB-CI */
+	{ DLT_DVB_CI,		LINKTYPE_DVB_CI },
+
 	{ -1,			-1 }
 };
 
diff --git a/pcap.c b/pcap.c
index d26bf212..b7d82cdf 100644
--- a/pcap.c
+++ b/pcap.c
@@ -850,6 +850,7 @@ static struct dlt_choice dlt_choices[] = {
 	DLT_CHOICE(DLT_JUNIPER_VS, "Juniper Virtual Server"),
 	DLT_CHOICE(DLT_JUNIPER_SRX_E2E, "Juniper SRX E2E"),
 	DLT_CHOICE(DLT_JUNIPER_FIBRECHANNEL, "Juniper Fibrechannel"),
+	DLT_CHOICE(DLT_DVB_CI, "DVB-CI"),
 	DLT_CHOICE_SENTINEL
 };
 
diff --git a/pcap/bpf.h b/pcap/bpf.h
index 67140ce7..ebd4483c 100644
--- a/pcap/bpf.h
+++ b/pcap/bpf.h
@@ -995,6 +995,18 @@ struct bpf_program {
 #define DLT_JUNIPER_SRX_E2E		233
 #define DLT_JUNIPER_FIBRECHANNEL	234
 
+/*
+ * DVB-CI (DVB Common Interface for communication between a PC Card
+ * module and a DVB receiver).  See
+ *
+ *	http://www.kaiser.cx/pcap-dvbci.html
+ *
+ * for the specification.
+ *
+ * Requested by Martin Kaiser <martin@kaiser.cx>.
+ */
+#define DLT_DVB_CI			235
+
 /*
  * DLT and savefile link type values are split into a class and
  * a member of that class.  A class value of 0 indicates a regular