diff options
| author | Michael Mann <mmann78@netscape.net> | 2016-12-16 20:06:11 -0500 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-12-31 07:31:42 +0000 |
| commit | f4b0abc7296bbb431e64e31f85b24c29196c2ae4 (patch) | |
| tree | 68394f5fdfa1987900f0b079d0ecfd34003e8a5a /epan/dissectors/packet-eth.c | |
| parent | 13964595ad09e5d1115f6c5cb604cded27f9f55d (diff) | |
Dissectors don't need a journey of self discovery.
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>
Diffstat (limited to 'epan/dissectors/packet-eth.c')
| -rw-r--r-- | epan/dissectors/packet-eth.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/epan/dissectors/packet-eth.c b/epan/dissectors/packet-eth.c index fc834c5759..a0b8b1a15d 100644 --- a/epan/dissectors/packet-eth.c +++ b/epan/dissectors/packet-eth.c @@ -97,6 +97,9 @@ static capture_dissector_handle_t ipx_cap_handle; static capture_dissector_handle_t llc_cap_handle; static heur_dissector_list_t heur_subdissector_list; static heur_dissector_list_t eth_trailer_subdissector_list; +static dissector_handle_t eth_withoutfcs_handle; +static dissector_handle_t eth_maybefcs_handle; + static int eth_tap = -1; @@ -991,9 +994,9 @@ proto_register_eth(void) "Set the condition that must be true for the CCSDS dissector to be called", &ccsds_heuristic_bit); - register_dissector("eth_withoutfcs", dissect_eth_withoutfcs, proto_eth); + eth_withoutfcs_handle = register_dissector("eth_withoutfcs", dissect_eth_withoutfcs, proto_eth); register_dissector("eth_withfcs", dissect_eth_withfcs, proto_eth); - register_dissector("eth_maybefcs", dissect_eth_maybefcs, proto_eth); + eth_maybefcs_handle = register_dissector("eth_maybefcs", dissect_eth_maybefcs, proto_eth); eth_tap = register_tap("eth"); register_conversation_table(proto_eth, TRUE, eth_conversation_packet, eth_hostlist_packet); @@ -1005,7 +1008,7 @@ proto_register_eth(void) void proto_reg_handoff_eth(void) { - dissector_handle_t eth_handle, eth_withoutfcs_handle, eth_maybefcs_handle; + dissector_handle_t eth_handle; capture_dissector_handle_t eth_cap_handle; /* Get a handle for the Firewall-1 dissector. */ @@ -1017,8 +1020,6 @@ proto_reg_handoff_eth(void) eth_handle = create_dissector_handle(dissect_eth, proto_eth); dissector_add_uint("wtap_encap", WTAP_ENCAP_ETHERNET, eth_handle); - 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); |