diff options
| author | Joerg Mayer <jmayer@loplof.de> | 2016-03-23 20:40:39 +0100 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2016-03-23 19:45:29 +0000 |
| commit | 222d30b340b18481c730cdae72b529f720fb221f (patch) | |
| tree | f96c35d5678ada2e352a5b45dac06d882cf79eaa /epan/dissectors/packet-eth.c | |
| parent | e947d362f87534027e6daa75aae531901e077e31 (diff) | |
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.
Change-Id: I3d916f8fc134ef14bcaf0b946a10f7170a9f6a75
Reviewed-on: https://code.wireshark.org/review/14596
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Diffstat (limited to 'epan/dissectors/packet-eth.c')
| -rw-r--r-- | epan/dissectors/packet-eth.c | 2 |
1 files changed, 2 insertions, 0 deletions
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 <epan/capture_dissectors.h> #include <wsutil/pint.h> #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); |