forked from osmocom/wireshark
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
This commit is contained in:
Stephen Fisher
parent
772e36f433
commit
09a4f2af2f
|
|
@ -827,6 +827,7 @@ DISSECTOR_SRC = \
|
|||
packet-snaeth.c \
|
||||
packet-sndcp.c \
|
||||
packet-sndcp-xid.c \
|
||||
packet-socketcan.c \
|
||||
packet-socks.c \
|
||||
packet-nasdaq-soup.c \
|
||||
packet-spp.c \
|
||||
|
|
|
|||
|
|
@ -0,0 +1,200 @@
|
|||
/* packet-socketcan.c
|
||||
* Routines for disassembly of packets from SocketCAN
|
||||
*
|
||||
* Felix Obenhuber <felix@obenhuber.de>
|
||||
*
|
||||
* Wireshark - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@wireshark.org>
|
||||
* Copyright 1998 Gerald Combs
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
# include "config.h"
|
||||
#endif
|
||||
|
||||
#include <glib.h>
|
||||
#include <epan/packet.h>
|
||||
|
||||
/* controller area network (CAN) kernel definitions
|
||||
* This maskare usualy defined within <linux/can.h> but not
|
||||
* available on non-Linux platforms - that the reason for the
|
||||
* redefinition right here
|
||||
*
|
||||
* special address description flags for the CAN_ID */
|
||||
#define CAN_EFF_FLAG 0x80000000U /* EFF/SFF is set in the MSB */
|
||||
#define CAN_RTR_FLAG 0x40000000U /* remote transmission request */
|
||||
#define CAN_ERR_FLAG 0x20000000U /* error frame */
|
||||
#define CAN_EFF_MASK 0x1FFFFFFFU /* extended frame format (EFF) */
|
||||
|
||||
|
||||
static int hf_can_len = -1;
|
||||
static int hf_can_ident = -1;
|
||||
static int hf_can_extflag = -1;
|
||||
static int hf_can_rtrflag = -1;
|
||||
static int hf_can_errflag = -1;
|
||||
|
||||
static gint ett_can = -1;
|
||||
|
||||
static int proto_can = -1;
|
||||
|
||||
static dissector_handle_t data_handle;
|
||||
|
||||
#define LINUX_CAN_STD 0
|
||||
#define LINUX_CAN_EXT 1
|
||||
#define LINUX_CAN_RTR 2
|
||||
#define LINUX_CAN_ERR 3
|
||||
|
||||
#define CAN_LEN_OFFSET 4
|
||||
#define CAN_DATA_OFFSET 8
|
||||
|
||||
static const value_string frame_type_vals[] =
|
||||
{
|
||||
{ LINUX_CAN_STD, "STD" },
|
||||
{ LINUX_CAN_EXT, "XTD" },
|
||||
{ LINUX_CAN_RTR, "RTR" },
|
||||
{ LINUX_CAN_ERR, "ERR" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
static void
|
||||
dissect_socketcan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
||||
{
|
||||
guint8 frame_type = LINUX_CAN_STD;
|
||||
tvbuff_t *next_tvb;
|
||||
guint8 frame_len = tvb_get_guint8( tvb, CAN_LEN_OFFSET );
|
||||
guint32 id = tvb_get_letohl(tvb, 0);
|
||||
|
||||
if( id & CAN_RTR_FLAG )
|
||||
{
|
||||
frame_type = LINUX_CAN_RTR;
|
||||
}
|
||||
else if ( id & CAN_ERR_FLAG )
|
||||
{
|
||||
frame_type = LINUX_CAN_ERR;
|
||||
}
|
||||
else if( id & CAN_EFF_FLAG )
|
||||
{
|
||||
frame_type = LINUX_CAN_EXT;
|
||||
}
|
||||
|
||||
id &= CAN_EFF_MASK;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "CAN");
|
||||
col_clear(pinfo->cinfo,COL_INFO);
|
||||
col_add_fstr(pinfo->cinfo, COL_INFO, "%s: 0x%08x", val_to_str(frame_type, frame_type_vals, "Unknown (0x%02x)"), id );
|
||||
col_append_fstr(pinfo->cinfo, COL_INFO, " %s", tvb_bytes_to_str_punct(tvb, CAN_DATA_OFFSET, frame_len, ' '));
|
||||
|
||||
if (tree)
|
||||
{
|
||||
proto_tree *can_tree = NULL;
|
||||
proto_item *ti = proto_tree_add_item(tree, proto_can, tvb, 0, 1 , FALSE );
|
||||
can_tree = proto_item_add_subtree(ti, ett_can);
|
||||
|
||||
proto_tree_add_item(can_tree, hf_can_ident, tvb, 0, 4, TRUE );
|
||||
proto_tree_add_item(can_tree, hf_can_extflag, tvb, 0, 4, TRUE );
|
||||
proto_tree_add_item(can_tree, hf_can_rtrflag, tvb, 0, 4, TRUE );
|
||||
proto_tree_add_item(can_tree, hf_can_errflag, tvb, 0, 4, TRUE );
|
||||
proto_tree_add_item(can_tree, hf_can_len, tvb, CAN_LEN_OFFSET, 1, TRUE);
|
||||
|
||||
next_tvb = tvb_new_subset(tvb, CAN_DATA_OFFSET, tvb_get_guint8(tvb, CAN_LEN_OFFSET), 8 );
|
||||
call_dissector(data_handle, next_tvb, pinfo, tree );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
proto_register_socketcan(void)
|
||||
{
|
||||
static hf_register_info hf[] =
|
||||
{
|
||||
{
|
||||
&hf_can_ident,
|
||||
{
|
||||
"Identifier", "can.id",
|
||||
FT_UINT32, BASE_HEX,
|
||||
NULL, CAN_EFF_MASK,
|
||||
NULL, HFILL
|
||||
}
|
||||
},
|
||||
{
|
||||
&hf_can_extflag,
|
||||
{
|
||||
"Extended Flag", "can.flags.xtd",
|
||||
FT_BOOLEAN, 32,
|
||||
NULL, CAN_EFF_FLAG,
|
||||
NULL, HFILL
|
||||
}
|
||||
},
|
||||
{
|
||||
&hf_can_rtrflag,
|
||||
{
|
||||
"Remote Transmission Request Flag", "can.flags.rtr",
|
||||
FT_BOOLEAN, 32,
|
||||
NULL, CAN_RTR_FLAG,
|
||||
NULL, HFILL
|
||||
}
|
||||
},
|
||||
{
|
||||
&hf_can_errflag,
|
||||
{
|
||||
"Error Flag", "can.flags.err",
|
||||
FT_BOOLEAN, 32,
|
||||
NULL, CAN_ERR_FLAG,
|
||||
NULL, HFILL
|
||||
}
|
||||
},
|
||||
{
|
||||
&hf_can_len,
|
||||
{
|
||||
"Frame-Length", "can.len",
|
||||
FT_UINT8, BASE_DEC,
|
||||
NULL, 0x0,
|
||||
NULL, HFILL
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
/* Setup protocol subtree array */
|
||||
static gint *ett[] =
|
||||
{
|
||||
&ett_can
|
||||
};
|
||||
|
||||
proto_can = proto_register_protocol (
|
||||
"Controller Area Network",/* name */
|
||||
"CAN", /* short name */
|
||||
"can" /* abbrev */
|
||||
);
|
||||
|
||||
proto_register_field_array(proto_can, hf, array_length(hf));
|
||||
proto_register_subtree_array(ett, array_length(ett));
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
proto_reg_handoff_socketcan(void)
|
||||
{
|
||||
dissector_handle_t can_handle;
|
||||
|
||||
data_handle = find_dissector("data");
|
||||
|
||||
can_handle = create_dissector_handle(dissect_socketcan, proto_can);
|
||||
dissector_add("wtap_encap", WTAP_ENCAP_SOCKETCAN, can_handle);
|
||||
}
|
||||
|
||||
|
||||
/* eof */
|
||||
|
|
@ -356,6 +356,9 @@ static const struct {
|
|||
/* Solaris DLPI */
|
||||
{ 226, WTAP_ENCAP_IPNET },
|
||||
|
||||
/* SocketCAN frame */
|
||||
{ 227, WTAP_ENCAP_SOCKETCAN },
|
||||
|
||||
/*
|
||||
* To repeat:
|
||||
*
|
||||
|
|
|
|||
|
|
@ -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()
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue