Fix a typo.
Add some new link-layer types for automotive buses, as requested by Hannes Kaelber.
This commit is contained in:
parent
b9ec4e5223
commit
b322103696
26
pcap/bpf.h
26
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.23 2008-01-02 04:16:46 guy Exp $ (LBL)
|
* @(#) $Header: /tcpdump/master/libpcap/pcap/bpf.h,v 1.24 2008-02-18 20:21:00 guy Exp $ (LBL)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -772,13 +772,33 @@ struct bpf_version {
|
||||||
* type, as requested by Will Barker.
|
* type, as requested by Will Barker.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* IPMB with a Linux-specific pseudo-header; as equested by Alexey Neyman
|
* IPMB with a Linux-specific pseudo-header; as requested by Alexey Neyman
|
||||||
* <avn@pigeonpoint.com>.
|
* <avn@pigeonpoint.com>.
|
||||||
*/
|
*/
|
||||||
#define DLT_IPMB_LINUX 209
|
#define DLT_IPMB_LINUX 209
|
||||||
|
|
||||||
|
/*
|
||||||
|
* FlexRay automotive bus - http://www.flexray.com/ - as requested
|
||||||
|
* by Hannes Kaelber <hannes.kaelber@x2e.de>.
|
||||||
|
*/
|
||||||
|
#define DLT_FLEXRAY 210
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Media Oriented Systems Transport (MOST) bus for multimedia
|
||||||
|
* transport - http://www.mostcooperation.com/ - as requested
|
||||||
|
* by Hannes Kaelber <hannes.kaelber@x2e.de>.
|
||||||
|
*/
|
||||||
|
#define DLT_MOST 211
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Local Interconnect Network (LIN) bus for vehicle networks -
|
||||||
|
* http://www.lin-subbus.org/ - as requested by Hannes Kaelber
|
||||||
|
* <hannes.kaelber@x2e.de>.
|
||||||
|
*/
|
||||||
|
#define DLT_LIN 212
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* DLT and savefile link type values are split into a class and
|
* 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
|
* a member of that class. A class value of 0 indicates a regular
|
||||||
|
|
34
savefile.c
34
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.171 2007-12-23 04:40:45 guy Exp $ (LBL)";
|
"@(#) $Header: /tcpdump/master/libpcap/savefile.c,v 1.172 2008-02-18 20:21:00 guy Exp $ (LBL)";
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
#ifdef HAVE_CONFIG_H
|
||||||
|
@ -597,13 +597,32 @@ static const char rcsid[] _U_ =
|
||||||
* type, as requested by Will Barker.
|
* type, as requested by Will Barker.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* IPMB with a Linux-specific pseudo-header; as equested by Alexey Neyman
|
* IPMB with a Linux-specific pseudo-header; as requested by Alexey Neyman
|
||||||
* <avn@pigeonpoint.com>.
|
* <avn@pigeonpoint.com>.
|
||||||
*/
|
*/
|
||||||
#define LINKTYPE_IPMB_LINUX 209
|
#define LINKTYPE_IPMB_LINUX 209
|
||||||
|
|
||||||
|
/*
|
||||||
|
* FlexRay automotive bus - http://www.flexray.com/ - as requested
|
||||||
|
* by Hannes Kaelber <hannes.kaelber@x2e.de>.
|
||||||
|
*/
|
||||||
|
#define LINKTYPE_FLEXRAY 210
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Media Oriented Systems Transport (MOST) bus for multimedia
|
||||||
|
* transport - http://www.mostcooperation.com/ - as requested
|
||||||
|
* by Hannes Kaelber <hannes.kaelber@x2e.de>.
|
||||||
|
*/
|
||||||
|
#define LINKTYPE_MOST 211
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Local Interconnect Network (LIN) bus for vehicle networks -
|
||||||
|
* http://www.lin-subbus.org/ - as requested by Hannes Kaelber
|
||||||
|
* <hannes.kaelber@x2e.de>.
|
||||||
|
*/
|
||||||
|
#define LINKTYPE_LIN 212
|
||||||
|
|
||||||
|
|
||||||
static struct linktype_map {
|
static struct linktype_map {
|
||||||
int dlt;
|
int dlt;
|
||||||
|
@ -891,6 +910,15 @@ static struct linktype_map {
|
||||||
/* IPMB with Linux pseudo-header */
|
/* IPMB with Linux pseudo-header */
|
||||||
{ DLT_IPMB_LINUX, LINKTYPE_IPMB_LINUX },
|
{ DLT_IPMB_LINUX, LINKTYPE_IPMB_LINUX },
|
||||||
|
|
||||||
|
/* FlexRay */
|
||||||
|
{ DLT_FLEXRAY, LINKTYPE_FLEXRAY },
|
||||||
|
|
||||||
|
/* MOST */
|
||||||
|
{ DLT_MOST, LINKTYPE_MOST },
|
||||||
|
|
||||||
|
/* LIN */
|
||||||
|
{ DLT_LIN, LINKTYPE_LIN },
|
||||||
|
|
||||||
{ -1, -1 }
|
{ -1, -1 }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Reference in New Issue