aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-eth.c
diff options
context:
space:
mode:
authorAnthony Coddington <anthony.coddington@endace.com>2016-05-12 19:10:37 +1200
committerMichael Mann <mmann78@netscape.net>2016-05-12 14:32:47 +0000
commit7623aed62a37d7281faeffcb173585dbe87e8e0c (patch)
tree9b5b8d67dadff75319f8d44a1c2b7da387a1b612 /epan/dissectors/packet-eth.c
parent8e0a9dc8bac4d066a48a79f7a399a928bc0cdb1d (diff)
ERF: In packet-eth register ERF_TYPE_ETH variants.
Register for: ERF_TYPE_COLOR_ETH ERF_TYPE_DSM_COLOR_ETH ERF_TYPE_COLOR_HASH_ETH Change-Id: I5877ca5721abaa269f937cca0414df4f6b1a5eef Reviewed-on: https://code.wireshark.org/review/15398 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-eth.c')
-rw-r--r--epan/dissectors/packet-eth.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/epan/dissectors/packet-eth.c b/epan/dissectors/packet-eth.c
index 168bfbafbc..10fdc180ae 100644
--- a/epan/dissectors/packet-eth.c
+++ b/epan/dissectors/packet-eth.c
@@ -1052,7 +1052,12 @@ proto_reg_handoff_eth(void)
eth_withoutfcs_handle = find_dissector("eth_withoutfcs");
eth_maybefcs_handle = find_dissector("eth_maybefcs");
dissector_add_uint("ethertype", ETHERTYPE_ETHBRIDGE, eth_withoutfcs_handle);
+
dissector_add_uint("erf.types.type", ERF_TYPE_ETH, eth_maybefcs_handle);
+ dissector_add_uint("erf.types.type", ERF_TYPE_COLOR_ETH, eth_maybefcs_handle);
+ dissector_add_uint("erf.types.type", ERF_TYPE_DSM_COLOR_ETH, eth_maybefcs_handle);
+ dissector_add_uint("erf.types.type", ERF_TYPE_COLOR_HASH_ETH, eth_maybefcs_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);