Commiting CISCO ERSPAN3 Marker dissector for pushing to upstream
Change-Id: Id0c583eacbef01d9dbdb54c27893d44cc32d9a31 Reviewed-on: https://code.wireshark.org/review/11680 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
parent
b6f060ee0e
commit
f38bd009af
|
@ -45,6 +45,7 @@ _Non-empty section placeholder._
|
|||
--sort-and-group--
|
||||
|
||||
=== New Protocol Support
|
||||
CISCO ERSPAN3 Marker
|
||||
Nokia Intelligent Service Interface (ISI)
|
||||
|
||||
// Items in --sort-and-group-- blocks will be sorted and comma-separated.
|
||||
|
|
|
@ -491,6 +491,7 @@ set(DISSECTOR_SRC
|
|||
dissectors/packet-cipmotion.c
|
||||
dissectors/packet-cipsafety.c
|
||||
dissectors/packet-cisco-erspan.c
|
||||
dissectors/packet-cisco-marker.c
|
||||
dissectors/packet-cisco-metadata.c
|
||||
dissectors/packet-cisco-oui.c
|
||||
dissectors/packet-cisco-sm.c
|
||||
|
|
|
@ -408,6 +408,7 @@ DISSECTOR_SRC = \
|
|||
packet-cipmotion.c \
|
||||
packet-cipsafety.c \
|
||||
packet-cisco-erspan.c \
|
||||
packet-cisco-marker.c \
|
||||
packet-cisco-metadata.c \
|
||||
packet-cisco-oui.c \
|
||||
packet-cisco-sm.c \
|
||||
|
|
|
@ -0,0 +1,225 @@
|
|||
/* packet-cisco-marker.c
|
||||
* Routines for CISCO's ERSPAN3 Marker Packet
|
||||
* See: http://www.cisco.com/c/en/us/products/collateral/switches/nexus-9000-series-switches/white-paper-c11-733921.html#_Toc413144488
|
||||
* Copyright 2015, Peter Membrey
|
||||
*
|
||||
* Wireshark - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@wireshark.org>
|
||||
* Copyright 1998 Gerald Combs
|
||||
*
|
||||
* Copied from packet-time.c
|
||||
*
|
||||
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
#define NEW_PROTO_TREE_API
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#include <epan/packet.h>
|
||||
|
||||
void proto_register_erspan_marker(void);
|
||||
void proto_reg_handoff_erspan_marker(void);
|
||||
void proto_register_erpsan_marker(void);
|
||||
|
||||
|
||||
static dissector_handle_t marker_handle;
|
||||
|
||||
static header_field_info *hfi_marker = NULL;
|
||||
|
||||
|
||||
#define CISCO_ERSPAN_MARKER_HFI_INIT HFI_INIT(proto_marker)
|
||||
|
||||
static header_field_info cisco_erspan_prop_header CISCO_ERSPAN_MARKER_HFI_INIT =
|
||||
{ "Proprietary CISCO Header", "cisco_erspan_marker.prop_header",
|
||||
FT_BYTES, BASE_NONE, NULL, 0x0,
|
||||
NULL, HFILL };
|
||||
|
||||
static header_field_info cisco_erspan_info CISCO_ERSPAN_MARKER_HFI_INIT =
|
||||
{ "Header", "cisco_erspan_marker.header",
|
||||
FT_BOOLEAN, 8, NULL, 0x0,
|
||||
NULL, HFILL };
|
||||
|
||||
static header_field_info cisco_erspan_version CISCO_ERSPAN_MARKER_HFI_INIT =
|
||||
{ "Version", "cisco_erspan_marker.version",
|
||||
FT_UINT16, BASE_DEC, NULL, 0xf000,
|
||||
NULL, HFILL };
|
||||
|
||||
static header_field_info cisco_erspan_type CISCO_ERSPAN_MARKER_HFI_INIT =
|
||||
{ "Type", "cisco_erspan_marker.type",
|
||||
FT_UINT16, BASE_DEC, NULL, 0x0f00,
|
||||
NULL, HFILL };
|
||||
|
||||
static header_field_info cisco_erspan_ssid CISCO_ERSPAN_MARKER_HFI_INIT =
|
||||
{ "SSID", "cisco_erspan_marker.ssid",
|
||||
FT_UINT16, BASE_DEC, NULL, 0x00ff,
|
||||
NULL, HFILL };
|
||||
|
||||
static header_field_info cisco_erspan_granularity CISCO_ERSPAN_MARKER_HFI_INIT =
|
||||
{ "Granularity", "cisco_erspan_marker.granularity",
|
||||
FT_UINT16, BASE_DEC, NULL, 0xff00,
|
||||
NULL, HFILL };
|
||||
|
||||
static header_field_info cisco_erspan_utcoffset CISCO_ERSPAN_MARKER_HFI_INIT =
|
||||
{ "UTC Offset", "cisco_erspan_marker.utc_offset",
|
||||
FT_UINT16, BASE_DEC, NULL, 0x00ff,
|
||||
NULL, HFILL };
|
||||
|
||||
static header_field_info cisco_erspan_timestamp CISCO_ERSPAN_MARKER_HFI_INIT =
|
||||
{ "Timestamp", "cisco_erspan_marker.timestamp",
|
||||
FT_UINT32, BASE_DEC, NULL, 0xffffffff,
|
||||
NULL, HFILL };
|
||||
|
||||
static header_field_info cisco_erspan_utc_sec CISCO_ERSPAN_MARKER_HFI_INIT =
|
||||
{ "UTC Seconds", "cisco_erspan_marker.utc_sec",
|
||||
FT_UINT32, BASE_DEC, NULL, 0xffffffff,
|
||||
NULL, HFILL };
|
||||
|
||||
static header_field_info cisco_erspan_utc_usec CISCO_ERSPAN_MARKER_HFI_INIT =
|
||||
{ "UTC Microseconds", "cisco_erspan_marker.utc_usec",
|
||||
FT_UINT32, BASE_DEC, NULL, 0xffffffff,
|
||||
NULL, HFILL };
|
||||
|
||||
static header_field_info cisco_erspan_sequence_number CISCO_ERSPAN_MARKER_HFI_INIT =
|
||||
{ "Sequence Number", "cisco_erspan_marker.sequence_number",
|
||||
FT_UINT32, BASE_DEC, NULL, 0xffffffff,
|
||||
NULL, HFILL };
|
||||
|
||||
static header_field_info cisco_erspan_reserved CISCO_ERSPAN_MARKER_HFI_INIT =
|
||||
{ "Reserved", "cisco_erspan_marker.sequence_number",
|
||||
FT_UINT32, BASE_DEC, NULL, 0xffffffff,
|
||||
NULL, HFILL };
|
||||
|
||||
static header_field_info cisco_erspan_tail CISCO_ERSPAN_MARKER_HFI_INIT =
|
||||
{ "TAIL", "cisco_erspan_marker.tail",
|
||||
FT_UINT32, BASE_DEC, NULL, 0xffffffff,
|
||||
NULL, HFILL };
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
static gint ett_marker = -1;
|
||||
|
||||
|
||||
static void
|
||||
dissect_marker(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
||||
{
|
||||
proto_tree *marker_tree;
|
||||
proto_item *ti;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "CISCO ERSPAN3 MARKER");
|
||||
|
||||
|
||||
if (tree) {
|
||||
|
||||
/* Skip the proprietary CISCO header - no docs have been released for this */
|
||||
guint32 offset = 20;
|
||||
|
||||
ti = proto_tree_add_item(tree, hfi_marker, tvb, 0, -1, ENC_NA);
|
||||
marker_tree = proto_item_add_subtree(ti, ett_marker);
|
||||
|
||||
proto_tree_add_item(marker_tree, &cisco_erspan_prop_header, tvb, 0, 20, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(marker_tree, &cisco_erspan_info, tvb, offset, 2, ENC_LITTLE_ENDIAN);
|
||||
offset += 2;
|
||||
|
||||
proto_tree_add_item(marker_tree, &cisco_erspan_version, tvb, offset, 2, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(marker_tree, &cisco_erspan_type, tvb, offset, 2, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(marker_tree, &cisco_erspan_ssid, tvb, offset, 2, ENC_LITTLE_ENDIAN);
|
||||
offset += 2;
|
||||
|
||||
proto_tree_add_item(marker_tree, &cisco_erspan_granularity, tvb, offset, 2, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_item(marker_tree, &cisco_erspan_utcoffset, tvb, offset, 2, ENC_LITTLE_ENDIAN);
|
||||
offset+= 2;
|
||||
|
||||
proto_tree_add_item(marker_tree, &cisco_erspan_timestamp, tvb, offset, 4, ENC_LITTLE_ENDIAN);
|
||||
offset+=4;
|
||||
|
||||
proto_tree_add_item(marker_tree, &cisco_erspan_utc_sec, tvb, offset, 4, ENC_LITTLE_ENDIAN);
|
||||
offset+=4;
|
||||
|
||||
proto_tree_add_item(marker_tree, &cisco_erspan_utc_usec, tvb, offset, 4, ENC_LITTLE_ENDIAN);
|
||||
offset+=4;
|
||||
|
||||
proto_tree_add_item(marker_tree, &cisco_erspan_sequence_number, tvb, offset, 4, ENC_LITTLE_ENDIAN);
|
||||
offset+=4;
|
||||
|
||||
proto_tree_add_item(marker_tree, &cisco_erspan_reserved, tvb, offset, 4, ENC_LITTLE_ENDIAN);
|
||||
offset+=4;
|
||||
|
||||
proto_tree_add_item(marker_tree, &cisco_erspan_tail, tvb, offset, 4, ENC_LITTLE_ENDIAN);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
proto_register_erpsan_marker(void)
|
||||
{
|
||||
|
||||
|
||||
#ifndef HAVE_HFI_SECTION_INIT
|
||||
static header_field_info *hfi[] = {
|
||||
&cisco_erspan_prop_header,
|
||||
&cisco_erspan_info,
|
||||
&cisco_erspan_version,
|
||||
&cisco_erspan_type,
|
||||
&cisco_erspan_ssid,
|
||||
&cisco_erspan_granularity,
|
||||
&cisco_erspan_utcoffset,
|
||||
&cisco_erspan_timestamp,
|
||||
&cisco_erspan_utc_sec,
|
||||
&cisco_erspan_utc_usec,
|
||||
&cisco_erspan_sequence_number,
|
||||
&cisco_erspan_reserved,
|
||||
&cisco_erspan_tail
|
||||
};
|
||||
#endif
|
||||
|
||||
static gint *ett[] = {
|
||||
&ett_marker,
|
||||
};
|
||||
|
||||
int proto_marker;
|
||||
|
||||
|
||||
|
||||
proto_marker = proto_register_protocol("CISCO ERSPAN3 Marker Packet", "CISCO3 ERSPAN MARKER", "cisco-erspan3-marker");
|
||||
|
||||
hfi_marker = proto_registrar_get_nth(proto_marker);
|
||||
|
||||
proto_register_fields(proto_marker, hfi, array_length(hfi));
|
||||
proto_register_subtree_array(ett, array_length(ett));
|
||||
|
||||
marker_handle = create_dissector_handle(dissect_marker, proto_marker);
|
||||
}
|
||||
|
||||
void
|
||||
proto_reg_handoff_erspan_marker(void)
|
||||
{
|
||||
dissector_add_for_decode_as("udp.port", marker_handle);
|
||||
}
|
||||
|
||||
/*
|
||||
* Editor modelines - http://www.wireshark.org/tools/modelines.html
|
||||
*
|
||||
* Local Variables:
|
||||
* c-basic-offset: 2
|
||||
* tab-width: 8
|
||||
* indent-tabs-mode: nil
|
||||
* End:
|
||||
*
|
||||
* ex: set shiftwidth=2 tabstop=8 expandtab:
|
||||
* :indentSize=2:tabSize=8:noTabs=true:
|
||||
*/
|
Loading…
Reference in New Issue