diff options
| author | Gerald Combs <gerald@wireshark.org> | 2008-03-14 00:01:51 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2008-03-14 00:01:51 +0000 |
| commit | 335927f46fcbdf0400150708459e4982329ed429 (patch) | |
| tree | 5f5c61fbbc68aa230d6efccdfd5eafc7925ad8d0 /wiretap/libpcap.c | |
| parent | 106968d7e89cc3b714ee1c0879559bd819262eb6 (diff) | |
From Hannes Kalber:
This patch adds some new ENCAP and FILE types for wiretap. It also adds new
entries to pcap_to_wtap_map[] to provide a mapping of the new types to some
pcap DLTs.
svn path=/trunk/; revision=24622
Diffstat (limited to 'wiretap/libpcap.c')
| -rw-r--r-- | wiretap/libpcap.c | 8 |
1 files changed, 8 insertions, 0 deletions
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: |