allocate codepoint DLT_JUNIPER_ATM_CEMIC 238 as per request from Hannes Gredler ...

diff --git a/gencode.c b/gencode.c
index 9cef425d9e8f45b17dd4481a9e7da1cfdc8af68d..5ea0cfc561f1667e3ff225a2e1e17441f87fde54 100644 (file)
--- a/gencode.c
+++ b/gencode.c
@@ -1369,6 +1369,7 @@ init_linktype(p)
        case DLT_JUNIPER_VS:
        case DLT_JUNIPER_SRX_E2E:
        case DLT_JUNIPER_FIBRECHANNEL:
        case DLT_JUNIPER_VS:
        case DLT_JUNIPER_SRX_E2E:
        case DLT_JUNIPER_FIBRECHANNEL:

+       case DLT_JUNIPER_ATM_CEMIC:

                off_linktype = 8;
                off_macpl = -1;
                off_nl = -1;
                off_linktype = 8;
                off_macpl = -1;
                off_nl = -1;


@@ -3484,6 +3485,7 @@ gen_linktype(proto)
         case DLT_JUNIPER_VS:
         case DLT_JUNIPER_SRX_E2E:
         case DLT_JUNIPER_FIBRECHANNEL:
         case DLT_JUNIPER_VS:
         case DLT_JUNIPER_SRX_E2E:
         case DLT_JUNIPER_FIBRECHANNEL:

+       case DLT_JUNIPER_ATM_CEMIC:

 
                /* just lets verify the magic number for now -
                 * on ATM we may have up to 6 different encapsulations on the wire
 
                /* just lets verify the magic number for now -
                 * on ATM we may have up to 6 different encapsulations on the wire


@@ -7690,6 +7692,7 @@ gen_inbound(dir)
         case DLT_JUNIPER_VS:
         case DLT_JUNIPER_SRX_E2E:
         case DLT_JUNIPER_FIBRECHANNEL:
         case DLT_JUNIPER_VS:
         case DLT_JUNIPER_SRX_E2E:
         case DLT_JUNIPER_FIBRECHANNEL:

+       case DLT_JUNIPER_ATM_CEMIC:

 
                /* juniper flags (including direction) are stored
                 * the byte after the 3-byte magic number */
 
                /* juniper flags (including direction) are stored
                 * the byte after the 3-byte magic number */

diff --git a/pcap-common.c b/pcap-common.c
index a2625e3f98b3d1fd5ec3708ee4be2705baf74a29..da5b65183b0ecf264dd35c6115d5375e886808cd 100644 (file)
--- a/pcap-common.c
+++ b/pcap-common.c
@@ -785,6 +785,12 @@ static const char rcsid[] _U_ =
  */
 #define LINKTYPE_STANAG_5066_D_PDU             237
 
  */
 #define LINKTYPE_STANAG_5066_D_PDU             237
 

+/*
+ * Juniper-private data link type, as per request from
+ * Hannes Gredler <[email protected]>. 
+ */
+#define LINKTYPE_JUNIPER_ATM_CEMIC             238
+

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


@@ -1154,6 +1160,9 @@ static struct linktype_map {
        /* STANAG 5066 D_PDUs */
        { DLT_STANAG_5066_D_PDU, LINKTYPE_STANAG_5066_D_PDU },
 
        /* STANAG 5066 D_PDUs */
        { DLT_STANAG_5066_D_PDU, LINKTYPE_STANAG_5066_D_PDU },
 

+        /* Juniper ATM CE MIC */
+       { DLT_JUNIPER_ATM_CEMIC, LINKTYPE_JUNIPER_ATM_CEMIC },
+

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

diff --git a/pcap.c b/pcap.c
index b7d82cdf484d78c1d1d5e942a4ba82028d31e985..14c3717bd1dc966fcf0a4308f25b9816e6276c4b 100644 (file)
--- a/pcap.c
+++ b/pcap.c
@@ -851,6 +851,7 @@ static struct dlt_choice dlt_choices[] = {
        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(DLT_JUNIPER_SRX_E2E, "Juniper SRX E2E"),
        DLT_CHOICE(DLT_JUNIPER_FIBRECHANNEL, "Juniper Fibrechannel"),
        DLT_CHOICE(DLT_DVB_CI, "DVB-CI"),

+       DLT_CHOICE(DLT_JUNIPER_ATM_CEMIC, "Juniper ATM CEMIC"),

        DLT_CHOICE_SENTINEL
 };
 
        DLT_CHOICE_SENTINEL
 };
 

diff --git a/pcap/bpf.h b/pcap/bpf.h
index b0f31364615f1effdd7169934ef6ebbb92646c0c..131e352858afab9dad7d7a22ee487b92e346efbe 100644 (file)
--- a/pcap/bpf.h
+++ b/pcap/bpf.h
@@ -1019,8 +1019,13 @@ struct bpf_program {
  * <[email protected]>.
  */
 #define DLT_STANAG_5066_D_PDU          237
  * <[email protected]>.
  */
 #define DLT_STANAG_5066_D_PDU          237

- 

 
 

+/*
+ * Juniper-private data link type, as per request from
+ * Hannes Gredler <[email protected]>.
+ */
+#define DLT_JUNIPER_ATM_CEMIC          238
+ 

 /*
  * 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