From 222d30b340b18481c730cdae72b529f720fb221f Mon Sep 17 00:00:00 2001 From: Joerg Mayer Date: Wed, 23 Mar 2016 20:40:39 +0100 Subject: Mikrotik has a protocol that they name Ethernet over IP (EoIP) which has nothing to do with IP protocol 97 called EoIP. Instead it is a GRE encapsulation with Ethertype 0x6400. It sets the GRE version to 1 but doesn't use a sequence number (in violation of RFC2637). Welcome to the real world. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I3d916f8fc134ef14bcaf0b946a10f7170a9f6a75 Reviewed-on: https://code.wireshark.org/review/14596 Reviewed-by: Jörg Mayer --- epan/dissectors/packet-eth.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'epan/dissectors/packet-eth.c') diff --git a/epan/dissectors/packet-eth.c b/epan/dissectors/packet-eth.c index cb735f9d85..68e33c5dbe 100644 --- a/epan/dissectors/packet-eth.c +++ b/epan/dissectors/packet-eth.c @@ -33,6 +33,7 @@ #include #include #include "packet-eth.h" +#include "packet-gre.h" #include "packet-ieee8023.h" #include "packet-ipx.h" #include "packet-isl.h" @@ -1053,6 +1054,7 @@ proto_reg_handoff_eth(void) dissector_add_uint("erf.types.type", ERF_TYPE_ETH, eth_withoutfcs_handle); dissector_add_uint("chdlc.protocol", ETHERTYPE_ETHBRIDGE, eth_withoutfcs_handle); dissector_add_uint("gre.proto", ETHERTYPE_ETHBRIDGE, eth_withoutfcs_handle); + dissector_add_uint("gre.proto", GRE_MIKROTIK_EOIP, eth_withoutfcs_handle); dissector_add_uint("juniper.proto", JUNIPER_PROTO_ETHER, eth_withoutfcs_handle); dissector_add_uint("sflow_245.header_protocol", SFLOW_245_HEADER_ETHERNET, eth_withoutfcs_handle); dissector_add_uint("l2tp.pw_type", L2TPv3_PROTOCOL_ETH, eth_withoutfcs_handle); -- cgit v1.2.3