diff options
| author | Stephen Fisher <steve@stephen-fisher.com> | 2009-12-08 07:21:33 +0000 |
|---|---|---|
| committer | Stephen Fisher <steve@stephen-fisher.com> | 2009-12-08 07:21:33 +0000 |
| commit | 09a4f2af2f0a1b53a967fc31c66e055cda6a7c16 (patch) | |
| tree | e4d815f6b5eccf03804a1b186254eaaffb32a8dc /wiretap | |
| parent | 772e36f433e0094746ed8614ae3103a489dcfde2 (diff) | |
| download | wireshark-09a4f2af2f0a1b53a967fc31c66e055cda6a7c16.tar.gz | |
From Felix Obenhuber via bug #4299: SocketCAN dissector patch
From me: Remove changes related to the ARP protocol because it doesn't
appear to be necessary for SocketCAN. Will add later if Felix says it is
needed.
svn path=/trunk/; revision=31196
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/pcap-common.c | 3 | ||||
| -rw-r--r-- | wiretap/wtap.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/wiretap/pcap-common.c b/wiretap/pcap-common.c index 23c060a02f..46d8328f1f 100644 --- a/wiretap/pcap-common.c +++ b/wiretap/pcap-common.c @@ -356,6 +356,9 @@ static const struct { /* Solaris DLPI */ { 226, WTAP_ENCAP_IPNET }, + /* SocketCAN frame */ + { 227, WTAP_ENCAP_SOCKETCAN }, + /* * To repeat: * diff --git a/wiretap/wtap.h b/wiretap/wtap.h index 6f6d7158fd..1cfe5e0571 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -214,6 +214,7 @@ extern "C" { #define WTAP_ENCAP_FIBRE_CHANNEL_FC2_WITH_FRAME_DELIMS 122 #define WTAP_ENCAP_JPEG_JFIF 123 #define WTAP_ENCAP_IPNET 124 +#define WTAP_ENCAP_SOCKETCAN 125 #define WTAP_NUM_ENCAP_TYPES wtap_get_num_encap_types() |