Add a link-layer type for DVB-CI.

mcr · Mar 2, 2011 · dcd09c5 · dcd09c5
1 parent 6840a15
commit dcd09c5
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 0 deletions.
diff --git 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
@@ -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
@@ -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