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-mpls.c | |
parent | 13964595ad09e5d1115f6c5cb604cded27f9f55d (diff) | |
download | wireshark-f4b0abc7296bbb431e64e31f85b24c29196c2ae4.tar.gz |
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-mpls.c')
-rw-r--r-- | epan/dissectors/packet-mpls.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/epan/dissectors/packet-mpls.c b/epan/dissectors/packet-mpls.c index 3ae0761d9d..54dc835de5 100644 --- a/epan/dissectors/packet-mpls.c +++ b/epan/dissectors/packet-mpls.c @@ -120,6 +120,8 @@ static expert_field ei_mpls_pw_ach_res = EI_INIT; static expert_field ei_mpls_pw_mcw_error_processing_message = EI_INIT; static expert_field ei_mpls_invalid_label = EI_INIT; +static dissector_handle_t mpls_handle; + #if 0 /*not used yet*/ /* * MPLS PW types @@ -599,7 +601,7 @@ proto_register_mpls(void) expert_mpls = expert_register_protocol(proto_mpls); expert_register_field_array(expert_mpls, ei, array_length(ei)); - register_dissector("mpls", dissect_mpls, proto_mpls); + mpls_handle = register_dissector("mpls", dissect_mpls, proto_mpls); /* FF: mpls subdissector table is indexed by label */ mpls_subdissector_table = register_dissector_table("mpls.label", @@ -626,9 +628,8 @@ proto_register_mpls(void) void proto_reg_handoff_mpls(void) { - dissector_handle_t mpls_handle, mpls_pwcw_handle; + dissector_handle_t mpls_pwcw_handle; - mpls_handle = find_dissector("mpls"); dissector_add_uint("ethertype", ETHERTYPE_MPLS, mpls_handle); dissector_add_uint("ethertype", ETHERTYPE_MPLS_MULTI, mpls_handle); dissector_add_uint("ppp.protocol", PPP_MPLS_UNI, mpls_handle); |