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>

1 files changed, 3 insertions, 4 deletions

diff --git a/epan/dissectors/packet-epmd.c b/epan/dissectors/packet-epmd.c
index d72067a8a7..3eea1d2ab1 100644
--- a/epan/dissectors/packet-epmd.c
+++ b/epan/dissectors/packet-epmd.c
@@ -59,6 +59,8 @@ static int hf_epmd_creation = -1;
 
 static gint ett_epmd = -1;
 
+static dissector_handle_t epmd_handle = NULL;
+
 /* Other dissectors */
 static dissector_handle_t edp_handle = NULL;
 
@@ -408,14 +410,11 @@ proto_register_epmd(void)
     proto_epmd = proto_register_protocol(PNAME, PSNAME, PFNAME);
     proto_register_field_array(proto_epmd, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
-    register_dissector(PFNAME, dissect_epmd, proto_epmd);
+    epmd_handle = register_dissector(PFNAME, dissect_epmd, proto_epmd);
 }
 
 void
 proto_reg_handoff_epmd(void) {
-    dissector_handle_t epmd_handle;
-
-    epmd_handle = find_dissector("epmd");
     edp_handle = find_dissector("erldp");
 
     dissector_add_uint_with_preference("tcp.port", EPMD_PORT, epmd_handle);