forked from osmocom/wireshark
Add Arista Vendor Specific Protocol (Ethertype) dissector
Bug: 14550 Change-Id: I08d54825eb054255167eb28469b7fb854507e4ed Reviewed-on: https://code.wireshark.org/review/26492 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
This commit is contained in:
Nikhil AP
Alexis La Goutte
parent
2e02b438cc
commit
c55d15783c
|
|
@ -100,6 +100,7 @@ since version 2.4.0:
|
||||||
--
|
--
|
||||||
ActiveMQ Artemis Core Protocol
|
ActiveMQ Artemis Core Protocol
|
||||||
AMT (Automatic Multicast Tunneling)
|
AMT (Automatic Multicast Tunneling)
|
||||||
|
AVSP (Arista Vendor Specific Protocol)
|
||||||
Bluetooth Mesh
|
Bluetooth Mesh
|
||||||
Broadcom tags (Broadcom Ethernet switch management frames)
|
Broadcom tags (Broadcom Ethernet switch management frames)
|
||||||
CVS password server
|
CVS password server
|
||||||
|
|
|
||||||
|
|
@ -675,6 +675,7 @@ set(DISSECTOR_SRC
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/packet-atm.c
|
${CMAKE_CURRENT_SOURCE_DIR}/packet-atm.c
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/packet-atmtcp.c
|
${CMAKE_CURRENT_SOURCE_DIR}/packet-atmtcp.c
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/packet-auto_rp.c
|
${CMAKE_CURRENT_SOURCE_DIR}/packet-auto_rp.c
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/packet-avsp.c
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/packet-ax25.c
|
${CMAKE_CURRENT_SOURCE_DIR}/packet-ax25.c
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/packet-ax25-kiss.c
|
${CMAKE_CURRENT_SOURCE_DIR}/packet-ax25-kiss.c
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/packet-ax25-nol3.c
|
${CMAKE_CURRENT_SOURCE_DIR}/packet-ax25-nol3.c
|
||||||
|
|
|
||||||
|
|
@ -293,6 +293,7 @@ DISSECTOR_SRC = \
|
||||||
packet-atm.c \
|
packet-atm.c \
|
||||||
packet-atmtcp.c \
|
packet-atmtcp.c \
|
||||||
packet-auto_rp.c \
|
packet-auto_rp.c \
|
||||||
|
packet-avsp.c \
|
||||||
packet-ax25.c \
|
packet-ax25.c \
|
||||||
packet-ax25-kiss.c \
|
packet-ax25-kiss.c \
|
||||||
packet-ax25-nol3.c \
|
packet-ax25-nol3.c \
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,224 @@
|
||||||
|
/* packet-avsp.c
|
||||||
|
* Arista Vendor Specific ethertype Protocol (AVSP)
|
||||||
|
*
|
||||||
|
* Copyright (c) 2018 by Arista Networks
|
||||||
|
* Author: Nikhil AP <nikhilap@arista.com>
|
||||||
|
*
|
||||||
|
* Wireshark - Network traffic analyzer
|
||||||
|
* By Gerald Combs <gerald@wireshark.org>
|
||||||
|
* Copyright 1999 Gerald Combs
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* Arista Vendor-Specific EtherType Protocol Identifier
|
||||||
|
*
|
||||||
|
* Arista applied for, and received the assignment of, a vendor-specific EtherType Protocol Identifier in May of 2016. Details below:
|
||||||
|
*
|
||||||
|
* Ethertype number is: D28B
|
||||||
|
* Issue date is: May 12, 2016
|
||||||
|
*
|
||||||
|
* Arista Subtype 0x01 is Timestamp L2 Header
|
||||||
|
*
|
||||||
|
* The timestamp L2 header consist of the following fields:
|
||||||
|
*
|
||||||
|
* Arista EtherType (0xD28B)
|
||||||
|
* Two-byte protocol subtype of 0x1
|
||||||
|
* Two-byte protocol version: 0x10 for 64-bit timestamp and 0x20 for 48-bit timestamp
|
||||||
|
* UTC timestamp value in IEEE 1588 time of day format (either 64-bit or 48-bit) with the lower 32-bits representing nanoseconds and upper bits representing seconds.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "config.h"
|
||||||
|
#include <epan/packet.h>
|
||||||
|
#include <epan/etypes.h>
|
||||||
|
#include <epan/expert.h>
|
||||||
|
|
||||||
|
#define ARISTA_TIMESTAMP_SUBTYPE 0x01
|
||||||
|
|
||||||
|
#define ARISTA_TIMESTAMP_V1 0x10
|
||||||
|
#define ARISTA_TIMESTAMP_V2 0x20
|
||||||
|
|
||||||
|
void proto_reg_handoff_avsp(void);
|
||||||
|
void proto_register_avsp(void);
|
||||||
|
|
||||||
|
static int proto_avsp = -1;
|
||||||
|
|
||||||
|
/* sub trees */
|
||||||
|
static gint ett_avsp = -1;
|
||||||
|
static gint ett_avsp_ts_48 = -1;
|
||||||
|
|
||||||
|
/* avsp variables */
|
||||||
|
static int hf_avsp_sub_type = -1;
|
||||||
|
static int hf_avsp_ts_version = -1;
|
||||||
|
static int hf_avsp_ts_64 = -1;
|
||||||
|
static int hf_avsp_ts_48 = -1;
|
||||||
|
static int hf_avsp_ts_48_sec = -1;
|
||||||
|
static int hf_avsp_ts_48_ns = -1;
|
||||||
|
|
||||||
|
static expert_field ei_avsp_ts_unknown_version = EI_INIT;
|
||||||
|
|
||||||
|
static const value_string arista_subtype[] = {
|
||||||
|
{ARISTA_TIMESTAMP_SUBTYPE, "timestamp"},
|
||||||
|
{0, NULL}
|
||||||
|
};
|
||||||
|
|
||||||
|
static const value_string ts_versions[] = {
|
||||||
|
{ARISTA_TIMESTAMP_V1, "Version 1"},
|
||||||
|
{ARISTA_TIMESTAMP_V2, "Version 2"},
|
||||||
|
{0, NULL}
|
||||||
|
};
|
||||||
|
|
||||||
|
static ei_register_info ei[] = {
|
||||||
|
{ &ei_avsp_ts_unknown_version, { "avsp.ts.unknown_version", PI_SEQUENCE, PI_WARN, "Unknown timestamp version", EXPFILL }},
|
||||||
|
};
|
||||||
|
|
||||||
|
static int
|
||||||
|
dissect_avsp(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void *data _U_)
|
||||||
|
{
|
||||||
|
guint8 offset = 0;
|
||||||
|
int version, subtype;
|
||||||
|
|
||||||
|
/* col_set_str() function is used to set the column string */
|
||||||
|
col_set_str(pinfo->cinfo, COL_PROTOCOL, "AVSP");
|
||||||
|
col_clear(pinfo->cinfo, COL_INFO);
|
||||||
|
|
||||||
|
proto_item *ti = NULL;
|
||||||
|
proto_tree *avsp_tree = NULL, *avsp_48_tree = NULL;
|
||||||
|
nstime_t ts_nstime;
|
||||||
|
|
||||||
|
/* Adding Items and Values to the Protocol Tree */
|
||||||
|
ti = proto_tree_add_item(tree, proto_avsp, tvb, 0, -1,
|
||||||
|
ENC_NA);
|
||||||
|
avsp_tree = proto_item_add_subtree(ti, ett_avsp);
|
||||||
|
|
||||||
|
/* adding each item to avsp */
|
||||||
|
proto_tree_add_item_ret_uint(avsp_tree, hf_avsp_sub_type, tvb,
|
||||||
|
offset, 2, ENC_BIG_ENDIAN, &subtype);
|
||||||
|
offset += 2;
|
||||||
|
|
||||||
|
if (subtype == ARISTA_TIMESTAMP_SUBTYPE) {
|
||||||
|
proto_tree_add_item_ret_uint(avsp_tree, hf_avsp_ts_version, tvb, offset,
|
||||||
|
2, ENC_BIG_ENDIAN, &version);
|
||||||
|
offset += 2;
|
||||||
|
|
||||||
|
switch (version) {
|
||||||
|
case ARISTA_TIMESTAMP_V1:
|
||||||
|
col_add_fstr(pinfo->cinfo, COL_INFO, "64bit-v1 timestamp");
|
||||||
|
ts_nstime.secs = tvb_get_guint32(tvb, offset, ENC_BIG_ENDIAN);
|
||||||
|
ts_nstime.nsecs = tvb_get_guint32(tvb, offset + 4, ENC_BIG_ENDIAN);
|
||||||
|
proto_tree_add_time(avsp_tree, hf_avsp_ts_64, tvb,
|
||||||
|
offset, 8, &ts_nstime);
|
||||||
|
offset += 8;
|
||||||
|
break;
|
||||||
|
case ARISTA_TIMESTAMP_V2:
|
||||||
|
ti = proto_tree_add_item(avsp_tree, hf_avsp_ts_48, tvb, 0, -1,
|
||||||
|
ENC_NA);
|
||||||
|
avsp_48_tree = proto_item_add_subtree(ti, ett_avsp);
|
||||||
|
col_add_fstr(pinfo->cinfo, COL_INFO, "48bit-v2 timestamp");
|
||||||
|
proto_tree_add_item(avsp_48_tree, hf_avsp_ts_48_sec, tvb, offset,
|
||||||
|
2, ENC_BIG_ENDIAN);
|
||||||
|
offset += 2;
|
||||||
|
proto_tree_add_item(avsp_48_tree, hf_avsp_ts_48_ns, tvb, offset,
|
||||||
|
4, ENC_BIG_ENDIAN);
|
||||||
|
offset += 4;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
expert_add_info_format(pinfo, ti, &ei_avsp_ts_unknown_version,
|
||||||
|
"Unknown timestamp version: 0x%0x", version);
|
||||||
|
return tvb_captured_length(tvb);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
call_data_dissector(tvb_new_subset_remaining (tvb, offset), pinfo, tree);
|
||||||
|
return tvb_captured_length(tvb);
|
||||||
|
}
|
||||||
|
|
||||||
|
void proto_reg_handoff_avsp(void)
|
||||||
|
{
|
||||||
|
/* the handle for the dynamic dissector */
|
||||||
|
dissector_handle_t avsp_handle;
|
||||||
|
|
||||||
|
avsp_handle =
|
||||||
|
create_dissector_handle(dissect_avsp, proto_avsp);
|
||||||
|
|
||||||
|
dissector_add_uint("ethertype", ETHERTYPE_AVSP, avsp_handle);
|
||||||
|
}
|
||||||
|
|
||||||
|
void proto_register_avsp(void)
|
||||||
|
{
|
||||||
|
/* Field Registration */
|
||||||
|
static hf_register_info hf[] = {
|
||||||
|
/* For avsp */
|
||||||
|
{&hf_avsp_sub_type,
|
||||||
|
{"Sub Type", "avsp.sub_type",
|
||||||
|
FT_UINT16, BASE_DEC,
|
||||||
|
VALS(arista_subtype), 0x0,
|
||||||
|
NULL, HFILL}
|
||||||
|
},
|
||||||
|
{&hf_avsp_ts_version,
|
||||||
|
{"Version", "avsp.ver",
|
||||||
|
FT_UINT16, BASE_HEX,
|
||||||
|
VALS(ts_versions), 0x0,
|
||||||
|
NULL, HFILL}
|
||||||
|
},
|
||||||
|
{&hf_avsp_ts_64,
|
||||||
|
{"Timestamp", "avsp.64ts",
|
||||||
|
FT_ABSOLUTE_TIME, ABSOLUTE_TIME_UTC,
|
||||||
|
NULL, 0x0,
|
||||||
|
NULL, HFILL}
|
||||||
|
},
|
||||||
|
{&hf_avsp_ts_48,
|
||||||
|
{"Timestamp", "avsp.48ts",
|
||||||
|
FT_NONE, BASE_NONE,
|
||||||
|
NULL, 0x0,
|
||||||
|
NULL, HFILL}
|
||||||
|
},
|
||||||
|
{&hf_avsp_ts_48_sec,
|
||||||
|
{"Seconds", "avsp.48sec",
|
||||||
|
FT_UINT16, BASE_DEC,
|
||||||
|
NULL, 0x0,
|
||||||
|
NULL, HFILL}
|
||||||
|
},
|
||||||
|
{&hf_avsp_ts_48_ns,
|
||||||
|
{"Nano Seconds", "avsp.48ns",
|
||||||
|
FT_UINT32, BASE_DEC,
|
||||||
|
NULL, 0x0,
|
||||||
|
NULL, HFILL}
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
/* Setup protocol subtree array */
|
||||||
|
static gint *ett[] = {
|
||||||
|
&ett_avsp, /* main avsp tree */
|
||||||
|
&ett_avsp_ts_48, /* subtree of above for 48 bit timestamp */
|
||||||
|
};
|
||||||
|
|
||||||
|
/* registering the avsp protocol with 3 names */
|
||||||
|
proto_avsp = proto_register_protocol("Arista Vendor Specific Protocol",
|
||||||
|
"avsp",
|
||||||
|
"avsp"
|
||||||
|
);
|
||||||
|
|
||||||
|
/* Register header fields and subtrees. */
|
||||||
|
proto_register_field_array(proto_avsp, hf, array_length(hf));
|
||||||
|
|
||||||
|
/* To register subtree types, pass an array of pointers */
|
||||||
|
proto_register_subtree_array(ett, array_length(ett));
|
||||||
|
|
||||||
|
expert_register_field_array(expert_register_protocol(proto_avsp),
|
||||||
|
ei, array_length(ei));
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Editor modelines - http://www.wireshark.org/tools/modelines.html
|
||||||
|
*
|
||||||
|
* Local variables:
|
||||||
|
* c-basic-offset: 4
|
||||||
|
* tab-width: 8
|
||||||
|
* indent-tabs-mode: nil
|
||||||
|
* End:
|
||||||
|
*
|
||||||
|
* vi: set shiftwidth=4 tabstop=8 expandtab:
|
||||||
|
* :indentSize=4:tabSize=8:noTabs=true:
|
||||||
|
*/
|
||||||
|
|
@ -178,6 +178,7 @@ const value_string etype_vals[] = {
|
||||||
{ ETHERTYPE_BLUECOM, "bluecom Protocol" },
|
{ ETHERTYPE_BLUECOM, "bluecom Protocol" },
|
||||||
{ ETHERTYPE_QINQ_OLD, "QinQ: old non-standard 802.1ad" },
|
{ ETHERTYPE_QINQ_OLD, "QinQ: old non-standard 802.1ad" },
|
||||||
{ ETHERTYPE_6LOWPAN, "6LoWPAN" },
|
{ ETHERTYPE_6LOWPAN, "6LoWPAN" },
|
||||||
|
{ ETHERTYPE_AVSP, "Arista Timestamp" },
|
||||||
{ 0, NULL }
|
{ 0, NULL }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -613,6 +613,10 @@ extern "C" {
|
||||||
#define ETHERTYPE_FCFT 0xFCFC /* used to transport FC frames+MDS hdr internal to Cisco's MDS switch */
|
#define ETHERTYPE_FCFT 0xFCFC /* used to transport FC frames+MDS hdr internal to Cisco's MDS switch */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef ETHERTYPE_AVSP
|
||||||
|
#define ETHERTYPE_AVSP 0xD28B /* Ethernet type for Arista vendor specific packet frames */
|
||||||
|
#endif
|
||||||
|
|
||||||
WS_DLL_PUBLIC const value_string etype_vals[];
|
WS_DLL_PUBLIC const value_string etype_vals[];
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue