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-bpdu.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-bpdu.c')
| -rw-r--r-- | epan/dissectors/packet-bpdu.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/epan/dissectors/packet-bpdu.c b/epan/dissectors/packet-bpdu.c index 613e92c4cc..b6df47650c 100644 --- a/epan/dissectors/packet-bpdu.c +++ b/epan/dissectors/packet-bpdu.c @@ -197,6 +197,9 @@ static gboolean bpdu_use_system_id_extensions = TRUE; static dissector_handle_t gvrp_handle; static dissector_handle_t gmrp_handle; +static dissector_handle_t bpdu_handle = NULL; +static dissector_handle_t bpdu_cisco_handle = NULL; + static const value_string protocol_id_vals[] = { { 0, "Spanning Tree Protocol" }, { 0, NULL } @@ -1343,8 +1346,8 @@ proto_register_bpdu(void) proto_register_field_array(proto_bpdu, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - register_dissector("bpdu", dissect_bpdu_generic, proto_bpdu); - register_dissector("bpdu_cisco", dissect_bpdu_cisco, proto_bpdu); + bpdu_handle = register_dissector("bpdu", dissect_bpdu_generic, proto_bpdu); + bpdu_cisco_handle = register_dissector("bpdu_cisco", dissect_bpdu_cisco, proto_bpdu); expert_bpdu = expert_register_protocol(proto_bpdu); expert_register_field_array(expert_bpdu, ei, array_length(ei)); @@ -1359,8 +1362,6 @@ proto_register_bpdu(void) void proto_reg_handoff_bpdu(void) { - dissector_handle_t bpdu_handle; - /* * Get handle for the GVRP dissector. */ @@ -1371,7 +1372,6 @@ proto_reg_handoff_bpdu(void) */ gmrp_handle = find_dissector_add_dependency("gmrp", proto_bpdu); - bpdu_handle = find_dissector_add_dependency("bpdu", proto_bpdu); dissector_add_uint("llc.dsap", SAP_BPDU, bpdu_handle); dissector_add_uint("chdlc.protocol", CHDLCTYPE_BPDU, bpdu_handle); dissector_add_uint("ethertype", ETHERTYPE_STP, bpdu_handle); @@ -1379,9 +1379,7 @@ proto_reg_handoff_bpdu(void) dissector_add_uint("llc.cisco_pid", 0x0109, bpdu_handle); /* Cisco's RLQ is just plain STP */ dissector_add_uint("llc.cisco_pid", 0x010c, bpdu_handle); /* Cisco's VLAN-bridge STP is just plain STP */ - - bpdu_handle = find_dissector("bpdu_cisco"); - dissector_add_uint("llc.cisco_pid", 0x010b, bpdu_handle); /* Handle Cisco's (R)PVST+ TLV extensions */ + dissector_add_uint("llc.cisco_pid", 0x010b, bpdu_cisco_handle); /* Handle Cisco's (R)PVST+ TLV extensions */ } /* |