forked from osmocom/wireshark
f4b0abc729
They already know who they are when they register themselves. Saving the handle then to avoid finding it later. Not sure if this will increase unnecessary register_dissector functions (instead of using create_dissector_handle in proto_reg_handoff function) when other dissectors copy/paste, but it should make startup time a few microseconds better. Change-Id: I3839be791b32b84887ac51a6a65fb5733e9f1f43 Reviewed-on: https://code.wireshark.org/review/19481 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
150 lines
4.8 KiB
C
150 lines
4.8 KiB
C
/*
|
|
* Copyright (c) 2003 Markus Friedl. All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
|
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include <epan/packet.h>
|
|
#include <epan/ipproto.h>
|
|
#include <epan/expert.h>
|
|
|
|
void proto_register_etherip(void);
|
|
void proto_reg_handoff_etherip(void);
|
|
|
|
static int proto_etherip = -1;
|
|
static int hf_etherip_ver = -1;
|
|
static int hf_etherip_reserved = -1;
|
|
|
|
static gint ett_etherip = -1;
|
|
|
|
static expert_field ei_etherip_ver_3 = EI_INIT;
|
|
static expert_field ei_etherip_reserved_0 = EI_INIT;
|
|
|
|
static dissector_handle_t eth_withoutfcs_handle;
|
|
static dissector_handle_t etherip_handle;
|
|
|
|
/*
|
|
* RFC 3378: EtherIP: Tunneling Ethernet Frames in IP Datagrams
|
|
*
|
|
* Bits 0-3: Protocol version
|
|
* Bits 4-15: Reserved for future use
|
|
*/
|
|
|
|
#define ETHERIP_VERS_MASK 0xF000
|
|
#define ETHERIP_RESERVE_MASK 0x0FFF
|
|
|
|
|
|
static int
|
|
dissect_etherip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
|
|
{
|
|
tvbuff_t *next_tvb;
|
|
proto_tree *etherip_tree;
|
|
proto_item *ti;
|
|
guint16 field, version;
|
|
|
|
col_set_str(pinfo->cinfo, COL_PROTOCOL, "ETHERIP");
|
|
|
|
field = tvb_get_ntohs(tvb, 0);
|
|
version = (field & ETHERIP_VERS_MASK) >> 12;
|
|
|
|
if (tree) {
|
|
ti = proto_tree_add_protocol_format(tree, proto_etherip, tvb, 0,
|
|
2,
|
|
"EtherIP, Version %d",
|
|
version
|
|
);
|
|
etherip_tree = proto_item_add_subtree(ti, ett_etherip);
|
|
|
|
ti = proto_tree_add_item(etherip_tree, hf_etherip_ver, tvb,
|
|
0, 2, ENC_BIG_ENDIAN);
|
|
if (version != 3) {
|
|
expert_add_info(pinfo, ti, &ei_etherip_ver_3);
|
|
}
|
|
|
|
ti = proto_tree_add_item(etherip_tree, hf_etherip_reserved, tvb,
|
|
0, 2, ENC_BIG_ENDIAN);
|
|
if ((field & ETHERIP_RESERVE_MASK) != 0) {
|
|
expert_add_info(pinfo, ti, &ei_etherip_reserved_0);
|
|
}
|
|
}
|
|
|
|
/* Set the tvbuff for the payload after the header */
|
|
next_tvb = tvb_new_subset_remaining(tvb, 2);
|
|
|
|
call_dissector(eth_withoutfcs_handle, next_tvb, pinfo, tree);
|
|
return tvb_captured_length(tvb);
|
|
}
|
|
|
|
void
|
|
proto_register_etherip(void)
|
|
{
|
|
static hf_register_info hf_etherip[] = {
|
|
{ &hf_etherip_ver,
|
|
{ "Version", "etherip.ver", FT_UINT16, BASE_DEC, NULL, ETHERIP_VERS_MASK,
|
|
NULL, HFILL }},
|
|
{ &hf_etherip_reserved,
|
|
{ "Reserved", "etherip.reserved", FT_UINT16, BASE_HEX, NULL, ETHERIP_RESERVE_MASK,
|
|
"Reserved (must be 0)", HFILL }},
|
|
};
|
|
|
|
static gint *ett[] = {
|
|
&ett_etherip,
|
|
};
|
|
|
|
static ei_register_info ei[] = {
|
|
{ &ei_etherip_ver_3, { "etherip.ver.not3", PI_PROTOCOL, PI_WARN, "Version must be 3", EXPFILL }},
|
|
{ &ei_etherip_reserved_0, { "etherip.reserved.not0", PI_PROTOCOL, PI_WARN, "Reserved field must be 0", EXPFILL }},
|
|
};
|
|
|
|
expert_module_t* expert_etherip;
|
|
|
|
proto_etherip = proto_register_protocol("Ethernet over IP",
|
|
"ETHERIP", "etherip");
|
|
proto_register_field_array(proto_etherip, hf_etherip, array_length(hf_etherip));
|
|
proto_register_subtree_array(ett, array_length(ett));
|
|
expert_etherip = expert_register_protocol(proto_etherip);
|
|
expert_register_field_array(expert_etherip, ei, array_length(ei));
|
|
|
|
etherip_handle = register_dissector("etherip", dissect_etherip, proto_etherip);
|
|
}
|
|
|
|
void
|
|
proto_reg_handoff_etherip(void)
|
|
{
|
|
eth_withoutfcs_handle = find_dissector_add_dependency("eth_withoutfcs", proto_etherip);
|
|
dissector_add_uint("ip.proto", IP_PROTO_ETHERIP, etherip_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:
|
|
*/
|