diff options
| -rw-r--r-- | AUTHORS | 4 | ||||
| -rw-r--r-- | wiretap/libpcap.c | 8 | ||||
| -rw-r--r-- | wiretap/wtap.h | 7 |
3 files changed, 18 insertions, 1 deletions
@@ -2727,6 +2727,10 @@ Hariharan Ananthakrishnan <hariharan.a [AT] gmail.com> { ISIS LSP-ID and hostname enhancements } +Hannes Kälber <hannes.kaelber--wireshark [AT] x2e.de> { + Automotive DLTs +} + and by: Pavel Roskin <proski [AT] gnu.org> diff --git a/wiretap/libpcap.c b/wiretap/libpcap.c index 04f1d06077..1f227d511d 100644 --- a/wiretap/libpcap.c +++ b/wiretap/libpcap.c @@ -442,6 +442,8 @@ static const struct { { 188, WTAP_ENCAP_IEEE802_16_MAC_CPS }, /* USB packets with Linux-specified header */ { 189, WTAP_ENCAP_USB_LINUX }, + /* CAN 2.0b frame */ + { 190, WTAP_ENCAP_CAN20B }, /* Per-Packet Information header */ { 192, WTAP_ENCAP_PPI }, /* IEEE 802.15.4 Wireless PAN */ @@ -453,6 +455,12 @@ static const struct { { 199, WTAP_ENCAP_IPMB }, /* Bluetooth HCI UART transport (part H:4) frames, like hcidump */ { 201, WTAP_ENCAP_BLUETOOTH_H4_WITH_PHDR }, + /* FlexRay frame */ + { 210, WTAP_ENCAP_FLEXRAY }, + /* MOST frame */ + { 211, WTAP_ENCAP_MOST }, + /* LIN frame */ + { 212, WTAP_ENCAP_LIN }, /* * To repeat: diff --git a/wiretap/wtap.h b/wiretap/wtap.h index 9e6db49ec9..97b8e5e446 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -199,7 +199,11 @@ extern "C" { #define WTAP_ENCAP_BLUETOOTH_HCI 102 /*raw packets without a transport layer header e.g. H4*/ #define WTAP_ENCAP_IPMB 103 #define WTAP_ENCAP_IEEE802_15_4 104 - +#define WTAP_ENCAP_X2E_XORAYA 105 +#define WTAP_ENCAP_FLEXRAY 106 +#define WTAP_ENCAP_LIN 107 +#define WTAP_ENCAP_MOST 108 +#define WTAP_ENCAP_CAN20B 109 #define WTAP_NUM_ENCAP_TYPES wtap_get_num_encap_types() @@ -258,6 +262,7 @@ extern "C" { #define WTAP_FILE_COMMVIEW 49 #define WTAP_FILE_PCAPNG 50 #define WTAP_FILE_BTSNOOP 51 +#define WTAP_FILE_X2E_XORAYA 52 #define WTAP_NUM_FILE_TYPES wtap_get_num_file_types() |