Add a link-layer type for DVB-CI.

diff --git a/pcap-common.c b/pcap-common.c
index 0833653fcc7578f737fa541d9944c0e86b8d051c..97488f12cd1944c9b5a60b6f27082e4690572c13 100644 (file)
--- 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
 
 #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 <[email protected]>.
+ */
+#define LINKTYPE_DVB_CI                                235
+

 static struct linktype_map {
        int     dlt;
        int     linktype;
 static struct linktype_map {
        int     dlt;
        int     linktype;


@@ -1121,6 +1133,9 @@ static struct linktype_map {
         /* Juniper Fibrechannel */
        { DLT_JUNIPER_FIBRECHANNEL, LINKTYPE_JUNIPER_FIBRECHANNEL },
 
         /* Juniper Fibrechannel */
        { DLT_JUNIPER_FIBRECHANNEL, LINKTYPE_JUNIPER_FIBRECHANNEL },
 

+        /* DVB-CI */
+       { DLT_DVB_CI,           LINKTYPE_DVB_CI },
+

        { -1,                   -1 }
 };
 
        { -1,                   -1 }
 };
 

diff --git a/pcap.c b/pcap.c
index d26bf212888d51bd39100181585ba8f821092ac2..b7d82cdf484d78c1d1d5e942a4ba82028d31e985 100644 (file)
--- 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_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
 };
 
        DLT_CHOICE_SENTINEL
 };
 

diff --git a/pcap/bpf.h b/pcap/bpf.h
index 67140ce7cef53b09194672675e8c8c4f6e1a3a65..ebd4483c067188714efd3fba910f3f2301728be6 100644 (file)
--- 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
 
 #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 <[email protected]>.
+ */
+#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
 /*
  * 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