Added a new DLT and LINKTYPE value for CAN v2.0B frames.
This commit is contained in:
parent
b7d2f597d1
commit
520a3ea559
11
pcap-bpf.h
11
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.42 2006-05-18 08:40:52 hannes Exp $ (LBL)
|
* @(#) $Header: /tcpdump/master/libpcap/pcap-bpf.h,v 1.43 2006-05-20 00:23:45 gianluca Exp $ (LBL)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -618,6 +618,15 @@ struct bpf_version {
|
||||||
*/
|
*/
|
||||||
#define DLT_JUNIPER_VP 183
|
#define DLT_JUNIPER_VP 183
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Controller Area Network (CAN) v. 2.0B packets.
|
||||||
|
* DLT_ requested by Gianluca Varenni <gianluca.varenni@cacetech.com>.
|
||||||
|
* Used to dump CAN packets coming from a CAN Vector board.
|
||||||
|
* More documentation on the CAN v2.0B frames can be found at
|
||||||
|
* http://www.can-cia.org/downloads/?269
|
||||||
|
*/
|
||||||
|
#define DLT_CAN20B 184
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The instruction encodings.
|
* The instruction encodings.
|
||||||
|
|
14
savefile.c
14
savefile.c
|
@ -30,7 +30,7 @@
|
||||||
|
|
||||||
#ifndef lint
|
#ifndef lint
|
||||||
static const char rcsid[] _U_ =
|
static const char rcsid[] _U_ =
|
||||||
"@(#) $Header: /tcpdump/master/libpcap/savefile.c,v 1.142 2006-05-18 08:40:52 hannes Exp $ (LBL)";
|
"@(#) $Header: /tcpdump/master/libpcap/savefile.c,v 1.143 2006-05-20 00:23:45 gianluca Exp $ (LBL)";
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
#ifdef HAVE_CONFIG_H
|
||||||
|
@ -443,6 +443,15 @@ static const char rcsid[] _U_ =
|
||||||
*/
|
*/
|
||||||
#define LINKTYPE_JUNIPER_VP 183
|
#define LINKTYPE_JUNIPER_VP 183
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Controller Area Network (CAN) v. 2.0B packets.
|
||||||
|
* DLT_ requested by Gianluca Varenni <gianluca.varenni@cacetech.com>.
|
||||||
|
* Used to dump CAN packets coming from a CAN Vector board.
|
||||||
|
* More documentation on the CAN v2.0B frames can be found at
|
||||||
|
* http://www.can-cia.org/downloads/?269
|
||||||
|
*/
|
||||||
|
#define LINKTYPE_CAN20B 184
|
||||||
|
|
||||||
static struct linktype_map {
|
static struct linktype_map {
|
||||||
int dlt;
|
int dlt;
|
||||||
int linktype;
|
int linktype;
|
||||||
|
@ -654,6 +663,9 @@ static struct linktype_map {
|
||||||
/* Juniper Voice PIC */
|
/* Juniper Voice PIC */
|
||||||
{ DLT_JUNIPER_VP, LINKTYPE_JUNIPER_VP },
|
{ DLT_JUNIPER_VP, LINKTYPE_JUNIPER_VP },
|
||||||
|
|
||||||
|
/* Controller Area Network (CAN) v2.0B */
|
||||||
|
{ DLT_CAN20B, LINKTYPE_CAN20B },
|
||||||
|
|
||||||
{ -1, -1 }
|
{ -1, -1 }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Reference in New Issue