Added a new DLT and LINKTYPE value for ARINC 653 Interpartition

Communication messages.

diff --git a/pcap-bpf.h b/pcap-bpf.h
index 84196dfe6b5c7a23ab408b3ec05a933f71713482..20ddc3aae412bc13b4a37e9dc4ea413954d05c30 100644 (file)
--- a/pcap-bpf.h
+++ b/pcap-bpf.h
@@ -37,7 +37,7 @@
  *
  *      @(#)bpf.h       7.1 (Berkeley) 5/7/91
  *
  *
  *      @(#)bpf.h       7.1 (Berkeley) 5/7/91
  *

- * @(#) $Header: /tcpdump/master/libpcap/pcap-bpf.h,v 1.34.2.10 2006-07-25 21:37:41 gianluca Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/libpcap/pcap-bpf.h,v 1.34.2.11 2006-07-27 21:06:17 gianluca Exp $ (LBL)

  */
 
 /*
  */
 
 /*


@@ -625,7 +625,14 @@ struct bpf_version {
  * More documentation on Arinc 429 can be found at
  * http://www.condoreng.com/support/downloads/tutorials/ARINCTutorial.pdf
  */
  * More documentation on Arinc 429 can be found at
  * http://www.condoreng.com/support/downloads/tutorials/ARINCTutorial.pdf
  */

-#define DLT_A429                       184
+#define DLT_A429                184
+
+/*
+ * Arinc 653 Interpartition Communication messages.
+ * DLT_ requested by Gianluca Varenni <[email protected]>.
+ * Please refer to the A653-1 standard for more information.
+ */
+#define DLT_A653_ICM            185

 
 /*
  * Controller Area Network (CAN) v. 2.0B packets.
 
 /*
  * Controller Area Network (CAN) v. 2.0B packets.


@@ -634,7 +641,7 @@ struct bpf_version {
  * More documentation on the CAN v2.0B frames can be found at
  * http://www.can-cia.org/downloads/?269
  */
  * More documentation on the CAN v2.0B frames can be found at
  * http://www.can-cia.org/downloads/?269
  */

-#define DLT_CAN20B                             190
+#define DLT_CAN20B              190

 
 
 /*
 
 
 /*

diff --git a/pcap.c b/pcap.c
index af0b30e1e5ad853aa24d33fda3f6e7dc590e7ed4..33588195a03a58cb18793c11727f5e928b5b6a6a 100644 (file)
--- a/pcap.c
+++ b/pcap.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
 
 #ifndef lint
 static const char rcsid[] _U_ =

-    "@(#) $Header: /tcpdump/master/libpcap/pcap.c,v 1.88.2.12 2006-07-19 20:59:14 gianluca Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/libpcap/pcap.c,v 1.88.2.13 2006-07-27 21:06:17 gianluca Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -383,6 +383,7 @@ static struct dlt_choice dlt_choices[] = {
        DLT_CHOICE(DLT_JUNIPER_VP, "Juniper Voice PIC"),
        DLT_CHOICE(DLT_A429, "Arinc 429"),
        DLT_CHOICE(DLT_CAN20B, "Controller Area Network (CAN) v. 2.0B"),
        DLT_CHOICE(DLT_JUNIPER_VP, "Juniper Voice PIC"),
        DLT_CHOICE(DLT_A429, "Arinc 429"),
        DLT_CHOICE(DLT_CAN20B, "Controller Area Network (CAN) v. 2.0B"),

+    DLT_CHOICE(DLT_A653_ICM, "Arinc 653 Interpartition Communication"),

        DLT_CHOICE_SENTINEL
 };
 
        DLT_CHOICE_SENTINEL
 };
 

diff --git a/savefile.c b/savefile.c
index 75d4e02dde07a563765cc70561133636425d8c96..62fea4f39a5ff45bb2b8e79178f345f4804728b1 100644 (file)
--- a/savefile.c
+++ b/savefile.c
@@ -30,7 +30,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
 
 #ifndef lint
 static const char rcsid[] _U_ =

-    "@(#) $Header: /tcpdump/master/libpcap/savefile.c,v 1.126.2.16 2006-07-19 20:59:15 gianluca Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/libpcap/savefile.c,v 1.126.2.17 2006-07-27 21:06:18 gianluca Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -450,7 +450,14 @@ static const char rcsid[] _U_ =
  * More documentation on Arinc 429 can be found at
  * http://www.condoreng.com/support/downloads/tutorials/ARINCTutorial.pdf
  */
  * More documentation on Arinc 429 can be found at
  * http://www.condoreng.com/support/downloads/tutorials/ARINCTutorial.pdf
  */

-#define LINKTYPE_A429          184
+#define LINKTYPE_A429           184
+
+/*
+ * Arinc 653 Interpartition Communication messages.
+ * DLT_ requested by Gianluca Varenni <[email protected]>.
+ * Please refer to the A653-1 standard for more information.
+ */
+#define LINKTYPE_A653_ICM       185

 
 /*
  * Controller Area Network (CAN) v. 2.0B packets.
 
 /*
  * Controller Area Network (CAN) v. 2.0B packets.


@@ -459,7 +466,7 @@ static const char rcsid[] _U_ =
  * More documentation on the CAN v2.0B frames can be found at
  * http://www.can-cia.org/downloads/?269
  */
  * More documentation on the CAN v2.0B frames can be found at
  * http://www.can-cia.org/downloads/?269
  */

-#define LINKTYPE_CAN20B                190
+#define LINKTYPE_CAN20B         190

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


@@ -678,6 +685,9 @@ static struct linktype_map {
                /* Controller Area Network (CAN) v2.0B */
                { DLT_CAN20B,                           LINKTYPE_CAN20B },
 
                /* Controller Area Network (CAN) v2.0B */
                { DLT_CAN20B,                           LINKTYPE_CAN20B },
 

+               /* Arinc 653 Interpartition Communication messages */
+               { DLT_A653_ICM,         LINKTYPE_A653_ICM },
+

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