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-fr.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-fr.c')
-rw-r--r-- | epan/dissectors/packet-fr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-fr.c b/epan/dissectors/packet-fr.c index 779da67994..21c42e975a 100644 --- a/epan/dissectors/packet-fr.c +++ b/epan/dissectors/packet-fr.c @@ -122,6 +122,7 @@ static expert_field ei_fr_frame_relay_xid = EI_INIT; static dissector_handle_t eth_withfcs_handle; static dissector_handle_t gprs_ns_handle; static dissector_handle_t data_handle; +static dissector_handle_t fr_handle; static capture_dissector_handle_t chdlc_cap_handle; static capture_dissector_handle_t eth_cap_handle; @@ -961,7 +962,7 @@ proto_register_fr(void) "Frame Relay OSI NLPID", proto_fr, FT_UINT8, BASE_HEX); register_dissector("fr_uncompressed", dissect_fr_uncompressed, proto_fr); - register_dissector("fr", dissect_fr, proto_fr); + fr_handle = register_dissector("fr", dissect_fr, proto_fr); register_dissector("fr_stripped_address", dissect_fr_stripped_address, proto_fr); frencap_module = prefs_register_protocol(proto_fr, NULL); @@ -983,10 +984,9 @@ proto_register_fr(void) void proto_reg_handoff_fr(void) { - dissector_handle_t fr_handle, fr_phdr_handle; + dissector_handle_t fr_phdr_handle; capture_dissector_handle_t fr_cap_handle; - fr_handle = find_dissector("fr"); dissector_add_uint("gre.proto", ETHERTYPE_RAW_FR, fr_handle); dissector_add_uint("wtap_encap", WTAP_ENCAP_FRELAY, fr_handle); dissector_add_uint("juniper.proto", JUNIPER_PROTO_FRELAY, fr_handle); |