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>

49 files changed, 140 insertions, 198 deletions

diff --git a/plugins/docsis/packet-bintrngreq.c b/plugins/docsis/packet-bintrngreq.c
index 4741464f80..d85e34adc9 100644
--- a/plugins/docsis/packet-bintrngreq.c
+++ b/plugins/docsis/packet-bintrngreq.c
@@ -40,6 +40,8 @@ static int hf_docsis_bintrngreq_capflags_encrypt = -1;
 /* Initialize the subtree pointers */
 static gint ett_docsis_bintrngreq = -1;
 
+static dissector_handle_t docsis_bintrngreq_handle;
+
 /* Dissection */
 static int
 dissect_bintrngreq (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data _U_)
@@ -127,15 +129,12 @@ proto_register_docsis_bintrngreq (void)
   proto_register_field_array (proto_docsis_bintrngreq, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  register_dissector ("docsis_bintrngreq", dissect_bintrngreq, proto_docsis_bintrngreq);
+  docsis_bintrngreq_handle = register_dissector ("docsis_bintrngreq", dissect_bintrngreq, proto_docsis_bintrngreq);
 }
 
 void
 proto_reg_handoff_docsis_bintrngreq (void)
 {
-  dissector_handle_t docsis_bintrngreq_handle;
-
-  docsis_bintrngreq_handle = find_dissector ("docsis_bintrngreq");
   dissector_add_uint ("docsis_mgmt", 0x22, docsis_bintrngreq_handle);
 }
 
diff --git a/plugins/docsis/packet-bpkmreq.c b/plugins/docsis/packet-bpkmreq.c
index ae56563c01..e3e7a50db4 100644
--- a/plugins/docsis/packet-bpkmreq.c
+++ b/plugins/docsis/packet-bpkmreq.c
@@ -58,6 +58,7 @@ static const value_string code_field_vals[] = {
 static gint ett_docsis_bpkmreq = -1;
 
 static dissector_handle_t attrs_handle;
+static dissector_handle_t docsis_bpkmreq_handle;
 
 /* Dissection */
 static int
@@ -125,7 +126,7 @@ proto_register_docsis_bpkmreq (void)
   proto_register_field_array (proto_docsis_bpkmreq, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  register_dissector ("docsis_bpkmreq", dissect_bpkmreq,
+  docsis_bpkmreq_handle = register_dissector ("docsis_bpkmreq", dissect_bpkmreq,
                       proto_docsis_bpkmreq);
 }
 
@@ -133,9 +134,6 @@ proto_register_docsis_bpkmreq (void)
 void
 proto_reg_handoff_docsis_bpkmreq (void)
 {
-  dissector_handle_t docsis_bpkmreq_handle;
-
-  docsis_bpkmreq_handle = find_dissector ("docsis_bpkmreq");
   attrs_handle = find_dissector ("docsis_bpkmattr");
   dissector_add_uint ("docsis_mgmt", 0x0C, docsis_bpkmreq_handle);
 }
diff --git a/plugins/docsis/packet-bpkmrsp.c b/plugins/docsis/packet-bpkmrsp.c
index 962534b5d3..ba179dfb2e 100644
--- a/plugins/docsis/packet-bpkmrsp.c
+++ b/plugins/docsis/packet-bpkmrsp.c
@@ -58,6 +58,7 @@ static const value_string code_field_vals[] = {
 static gint ett_docsis_bpkmrsp = -1;
 
 static dissector_handle_t attrs_handle;
+static dissector_handle_t docsis_bpkmrsp_handle;
 
 /* Dissection */
 static int
@@ -127,16 +128,13 @@ proto_register_docsis_bpkmrsp (void)
   proto_register_field_array (proto_docsis_bpkmrsp, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  register_dissector ("docsis_bpkmrsp", dissect_bpkmrsp,
+  docsis_bpkmrsp_handle = register_dissector ("docsis_bpkmrsp", dissect_bpkmrsp,
                       proto_docsis_bpkmrsp);
 }
 
 void
 proto_reg_handoff_docsis_bpkmrsp (void)
 {
-  dissector_handle_t docsis_bpkmrsp_handle;
-
-  docsis_bpkmrsp_handle = find_dissector ("docsis_bpkmrsp");
   attrs_handle = find_dissector ("docsis_bpkmattr");
   dissector_add_uint ("docsis_mgmt", 0x0D, docsis_bpkmrsp_handle);
 }
diff --git a/plugins/docsis/packet-cmctrlreq.c b/plugins/docsis/packet-cmctrlreq.c
index 8b97240fc8..8a8c5c8c05 100644
--- a/plugins/docsis/packet-cmctrlreq.c
+++ b/plugins/docsis/packet-cmctrlreq.c
@@ -36,6 +36,8 @@ static dissector_handle_t cmctrl_tlv_handle;
 /* Initialize the subtree pointers */
 static gint ett_docsis_cmctrlreq = -1;
 
+static dissector_handle_t docsis_cmctrlreq_handle;
+
 /* Dissection */
 static int
 dissect_cmctrlreq (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data _U_)
@@ -89,15 +91,12 @@ proto_register_docsis_cmctrlreq (void)
   proto_register_field_array (proto_docsis_cmctrlreq, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  register_dissector ("docsis_cmctrlreq", dissect_cmctrlreq, proto_docsis_cmctrlreq);
+  docsis_cmctrlreq_handle = register_dissector ("docsis_cmctrlreq", dissect_cmctrlreq, proto_docsis_cmctrlreq);
 }
 
 void
 proto_reg_handoff_docsis_cmctrlreq (void)
 {
-  dissector_handle_t docsis_cmctrlreq_handle;
-
-  docsis_cmctrlreq_handle = find_dissector ("docsis_cmctrlreq");
   cmctrl_tlv_handle = find_dissector ("cmctrl_tlv");
   dissector_add_uint ("docsis_mgmt", 0x2A, docsis_cmctrlreq_handle);
 }
diff --git a/plugins/docsis/packet-cmctrlrsp.c b/plugins/docsis/packet-cmctrlrsp.c
index 86590eb7f6..b392ef9a7b 100644
--- a/plugins/docsis/packet-cmctrlrsp.c
+++ b/plugins/docsis/packet-cmctrlrsp.c
@@ -44,6 +44,8 @@ static dissector_handle_t cmctrl_tlv_handle;
 /* Initialize the subtree pointers */
 static gint ett_docsis_cmctrlrsp = -1;
 
+static dissector_handle_t docsis_cmctrlrsp_handle;
+
 /* Dissection */
 static int
 dissect_cmctrlrsp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data _U_)
@@ -97,15 +99,12 @@ proto_register_docsis_cmctrlrsp (void)
   proto_register_field_array (proto_docsis_cmctrlrsp, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  register_dissector ("docsis_cmctrlrsp", dissect_cmctrlrsp, proto_docsis_cmctrlrsp);
+  docsis_cmctrlrsp_handle = register_dissector ("docsis_cmctrlrsp", dissect_cmctrlrsp, proto_docsis_cmctrlrsp);
 }
 
 void
 proto_reg_handoff_docsis_cmctrlrsp (void)
 {
-  dissector_handle_t docsis_cmctrlrsp_handle;
-
-  docsis_cmctrlrsp_handle = find_dissector ("docsis_cmctrlrsp");
   cmctrl_tlv_handle = find_dissector ("cmctrl_tlv");
   dissector_add_uint ("docsis_mgmt", 0x2B, docsis_cmctrlrsp_handle);
 }
diff --git a/plugins/docsis/packet-cmstatus.c b/plugins/docsis/packet-cmstatus.c
index 9c8db4e80c..93404c18dc 100644
--- a/plugins/docsis/packet-cmstatus.c
+++ b/plugins/docsis/packet-cmstatus.c
@@ -67,6 +67,8 @@ static int hf_docsis_cmstatus_descr = -1;
 static gint ett_docsis_cmstatus = -1;
 static gint ett_docsis_cmstatus_tlv = -1;
 
+static dissector_handle_t docsis_cmstatus_handle;
+
 /* Dissection */
 /* See Table 6-52 in CM-SP-MULPIv3.0-I14-101008 */
 static void
@@ -265,14 +267,12 @@ static gint *ett[] = {
 
   proto_register_field_array (proto_docsis_cmstatus, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
-  register_dissector ("docsis_cmstatus", dissect_cmstatus, proto_docsis_cmstatus);
+  docsis_cmstatus_handle = register_dissector ("docsis_cmstatus", dissect_cmstatus, proto_docsis_cmstatus);
 }
 
 void
 proto_reg_handoff_docsis_cmstatus (void)
 {
-  dissector_handle_t docsis_cmstatus_handle;
-  docsis_cmstatus_handle = find_dissector ("docsis_cmstatus");
   dissector_add_uint ("docsis_mgmt", 0x29, docsis_cmstatus_handle);
 }
 
diff --git a/plugins/docsis/packet-dbcack.c b/plugins/docsis/packet-dbcack.c
index c00e48c8e2..03d94df321 100644
--- a/plugins/docsis/packet-dbcack.c
+++ b/plugins/docsis/packet-dbcack.c
@@ -36,6 +36,8 @@ static dissector_handle_t docsis_tlv_handle;
 /* Initialize the subtree pointers */
 static gint ett_docsis_dbcack = -1;
 
+static dissector_handle_t docsis_dbcack_handle;
+
 /* Dissection */
 static int
 dissect_dbcack (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data _U_)
@@ -88,15 +90,12 @@ proto_register_docsis_dbcack (void)
   proto_register_field_array (proto_docsis_dbcack, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  register_dissector ("docsis_dbcack", dissect_dbcack, proto_docsis_dbcack);
+  docsis_dbcack_handle = register_dissector ("docsis_dbcack", dissect_dbcack, proto_docsis_dbcack);
 }
 
 void
 proto_reg_handoff_docsis_dbcack (void)
 {
-  dissector_handle_t docsis_dbcack_handle;
-
-  docsis_dbcack_handle = find_dissector ("docsis_dbcack");
   docsis_tlv_handle = find_dissector ("docsis_tlv");
   dissector_add_uint ("docsis_mgmt", 0x26, docsis_dbcack_handle);
 }
diff --git a/plugins/docsis/packet-dbcreq.c b/plugins/docsis/packet-dbcreq.c
index e50e08af57..efa9c9755b 100644
--- a/plugins/docsis/packet-dbcreq.c
+++ b/plugins/docsis/packet-dbcreq.c
@@ -38,6 +38,8 @@ static dissector_handle_t docsis_tlv_handle;
 /* Initialize the subtree pointers */
 static gint ett_docsis_dbcreq = -1;
 
+static dissector_handle_t docsis_dbcreq_handle;
+
 /* Dissection */
 static int
 dissect_dbcreq (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data _U_)
@@ -104,15 +106,12 @@ proto_register_docsis_dbcreq (void)
   proto_register_field_array (proto_docsis_dbcreq, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  register_dissector ("docsis_dbcreq", dissect_dbcreq, proto_docsis_dbcreq);
+  docsis_dbcreq_handle = register_dissector ("docsis_dbcreq", dissect_dbcreq, proto_docsis_dbcreq);
 }
 
 void
 proto_reg_handoff_docsis_dbcreq (void)
 {
-  dissector_handle_t docsis_dbcreq_handle;
-
-  docsis_dbcreq_handle = find_dissector ("docsis_dbcreq");
   docsis_tlv_handle = find_dissector ("docsis_tlv");
   dissector_add_uint ("docsis_mgmt", 0x24, docsis_dbcreq_handle);
 }
diff --git a/plugins/docsis/packet-dbcrsp.c b/plugins/docsis/packet-dbcrsp.c
index c8f8b866ab..5e4ca2c619 100644
--- a/plugins/docsis/packet-dbcrsp.c
+++ b/plugins/docsis/packet-dbcrsp.c
@@ -39,6 +39,8 @@ static dissector_handle_t docsis_tlv_handle;
 /* Initialize the subtree pointers */
 static gint ett_docsis_dbcrsp = -1;
 
+static dissector_handle_t docsis_dbcrsp_handle;
+
 /* Dissection */
 static int
 dissect_dbcrsp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data _U_)
@@ -101,16 +103,13 @@ proto_register_docsis_dbcrsp (void)
   proto_register_field_array (proto_docsis_dbcrsp, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  register_dissector ("docsis_dbcrsp", dissect_dbcrsp, proto_docsis_dbcrsp);
+  docsis_dbcrsp_handle = register_dissector ("docsis_dbcrsp", dissect_dbcrsp, proto_docsis_dbcrsp);
 }
 
 
 void
 proto_reg_handoff_docsis_dbcrsp (void)
 {
-  dissector_handle_t docsis_dbcrsp_handle;
-
-  docsis_dbcrsp_handle = find_dissector ("docsis_dbcrsp");
   docsis_tlv_handle = find_dissector ("docsis_tlv");
   dissector_add_uint ("docsis_mgmt", 0x25, docsis_dbcrsp_handle);
 }
diff --git a/plugins/docsis/packet-dccack.c b/plugins/docsis/packet-dccack.c
index c93882c9ed..0d50933f66 100644
--- a/plugins/docsis/packet-dccack.c
+++ b/plugins/docsis/packet-dccack.c
@@ -42,6 +42,8 @@ static int hf_docsis_dccack_hmac_digest = -1;
 /* Initialize the subtree pointers */
 static gint ett_docsis_dccack = -1;
 
+static dissector_handle_t docsis_dccack_handle;
+
 /* Dissection */
 static int
 dissect_dccack (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data _U_)
@@ -146,15 +148,12 @@ proto_register_docsis_dccack (void)
   proto_register_field_array (proto_docsis_dccack, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  register_dissector ("docsis_dccack", dissect_dccack, proto_docsis_dccack);
+  docsis_dccack_handle = register_dissector ("docsis_dccack", dissect_dccack, proto_docsis_dccack);
 }
 
 void
 proto_reg_handoff_docsis_dccack (void)
 {
-  dissector_handle_t docsis_dccack_handle;
-
-  docsis_dccack_handle = find_dissector ("docsis_dccack");
   dissector_add_uint ("docsis_mgmt", 0x19, docsis_dccack_handle);
 
 }
diff --git a/plugins/docsis/packet-dccreq.c b/plugins/docsis/packet-dccreq.c
index d90a7af82f..04d5c35365 100644
--- a/plugins/docsis/packet-dccreq.c
+++ b/plugins/docsis/packet-dccreq.c
@@ -87,6 +87,8 @@ static gint ett_docsis_dccreq = -1;
 static gint ett_docsis_dccreq_ds_params = -1;
 static gint ett_docsis_dccreq_sf_sub = -1;
 
+static dissector_handle_t docsis_dccreq_handle;
+
 value_string ds_mod_type_vals[] = {
   {0 , "64 QAM"},
   {1 , "256 QAM"},
@@ -577,17 +579,13 @@ proto_register_docsis_dccreq (void)
   proto_register_field_array (proto_docsis_dccreq, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  register_dissector ("docsis_dccreq", dissect_dccreq, proto_docsis_dccreq);
+  docsis_dccreq_handle = register_dissector ("docsis_dccreq", dissect_dccreq, proto_docsis_dccreq);
 }
 
 void
 proto_reg_handoff_docsis_dccreq (void)
 {
-  dissector_handle_t docsis_dccreq_handle;
-
-  docsis_dccreq_handle = find_dissector ("docsis_dccreq");
   dissector_add_uint ("docsis_mgmt", 0x17, docsis_dccreq_handle);
-
 }
 
 /*
diff --git a/plugins/docsis/packet-dccrsp.c b/plugins/docsis/packet-dccrsp.c
index ecc7e20142..254df4161a 100644
--- a/plugins/docsis/packet-dccrsp.c
+++ b/plugins/docsis/packet-dccrsp.c
@@ -53,6 +53,8 @@ static int hf_docsis_dccrsp_hmac_digest = -1;
 static gint ett_docsis_dccrsp = -1;
 static gint ett_docsis_dccrsp_cm_jump_time = -1;
 
+static dissector_handle_t docsis_dccrsp_handle;
+
 /* Dissection */
 static void
 dissect_dccrsp_cm_jump_time (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len)
@@ -235,15 +237,12 @@ proto_register_docsis_dccrsp (void)
   proto_register_field_array (proto_docsis_dccrsp, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  register_dissector ("docsis_dccrsp", dissect_dccrsp, proto_docsis_dccrsp);
+  docsis_dccrsp_handle = register_dissector ("docsis_dccrsp", dissect_dccrsp, proto_docsis_dccrsp);
 }
 
 void
 proto_reg_handoff_docsis_dccrsp (void)
 {
-  dissector_handle_t docsis_dccrsp_handle;
-
-  docsis_dccrsp_handle = find_dissector ("docsis_dccrsp");
   dissector_add_uint ("docsis_mgmt", 0x18, docsis_dccrsp_handle);
 
 }
diff --git a/plugins/docsis/packet-dcd.c b/plugins/docsis/packet-dcd.c
index 7af0c0ff0d..f149c47d36 100644
--- a/plugins/docsis/packet-dcd.c
+++ b/plugins/docsis/packet-dcd.c
@@ -124,6 +124,8 @@ static gint ett_docsis_dcd_rule = -1;
 static gint ett_docsis_dcd_clid = -1;
 static gint ett_docsis_dcd_cfg = -1;
 
+static dissector_handle_t docsis_dcd_handle;
+
 /* Dissection */
 static void
 dissect_dcd_dsg_cfg (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len)
@@ -843,17 +845,13 @@ proto_register_docsis_dcd (void)
   proto_register_field_array (proto_docsis_dcd, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  register_dissector ("docsis_dcd", dissect_dcd, proto_docsis_dcd);
+  docsis_dcd_handle = register_dissector ("docsis_dcd", dissect_dcd, proto_docsis_dcd);
 }
 
 void
 proto_reg_handoff_docsis_dcd (void)
 {
-  dissector_handle_t docsis_dcd_handle;
-
-  docsis_dcd_handle = find_dissector ("docsis_dcd");
   dissector_add_uint ("docsis_mgmt", 0x20, docsis_dcd_handle);
-
 }
 
 /*
diff --git a/plugins/docsis/packet-docsis.c b/plugins/docsis/packet-docsis.c
index 2628ef80a6..e8bfd9d067 100644
--- a/plugins/docsis/packet-docsis.c
+++ b/plugins/docsis/packet-docsis.c
@@ -1157,7 +1157,7 @@ proto_register_docsis (void)
                                                      FT_UINT8, BASE_DEC);
 #endif
 
-  register_dissector ("docsis", dissect_docsis, proto_docsis);
+  docsis_handle = register_dissector ("docsis", dissect_docsis, proto_docsis);
   register_init_routine(docsis_defragment_init);
   register_cleanup_routine(docsis_defragment_cleanup);
 }
@@ -1165,8 +1165,6 @@ proto_register_docsis (void)
 void
 proto_reg_handoff_docsis (void)
 {
-
-  docsis_handle = find_dissector ("docsis");
   dissector_add_uint ("wtap_encap", WTAP_ENCAP_DOCSIS, docsis_handle);
 
   docsis_mgmt_handle = find_dissector ("docsis_mgmt");
diff --git a/plugins/docsis/packet-dpd.c b/plugins/docsis/packet-dpd.c
index edf3e87596..9743b6506d 100644
--- a/plugins/docsis/packet-dpd.c
+++ b/plugins/docsis/packet-dpd.c
@@ -69,6 +69,8 @@ static gint ett_docsis_dpd_tlv = -1;
 static gint ett_docsis_dpd_tlv_subcarrier_assignment = -1;
 static gint ett_docsis_dpd_tlv_subcarrier_assignment_vector = -1;
 
+static dissector_handle_t docsis_dpd_handle;
+
 /*BASE_CUSTOM function for subcarrier range*/
 static void
 subc_assign_range(
@@ -366,14 +368,12 @@ proto_register_docsis_dpd(void)
   proto_register_subtree_array (ett, array_length (ett));
   expert_docsis_dpd = expert_register_protocol(proto_docsis_dpd);
   expert_register_field_array(expert_docsis_dpd, ei, array_length(ei));
-  register_dissector ("docsis_dpd", dissect_dpd, proto_docsis_dpd);
+  docsis_dpd_handle = register_dissector ("docsis_dpd", dissect_dpd, proto_docsis_dpd);
 }
 
 void
 proto_reg_handoff_docsis_dpd (void)
 {
-  dissector_handle_t docsis_dpd_handle;
-  docsis_dpd_handle = find_dissector ("docsis_dpd");
   dissector_add_uint ("docsis_mgmt", 0x32, docsis_dpd_handle);
 }
 
diff --git a/plugins/docsis/packet-dpvreq.c b/plugins/docsis/packet-dpvreq.c
index 4b2fff6cd4..33b133fc38 100644
--- a/plugins/docsis/packet-dpvreq.c
+++ b/plugins/docsis/packet-dpvreq.c
@@ -43,6 +43,8 @@ static int hf_docsis_dpvreq_ts_end = -1;
 /* Initialize the subtree pointers */
 static gint ett_docsis_dpvreq = -1;
 
+static dissector_handle_t docsis_dpvreq_handle;
+
 /* Dissection */
 static int
 dissect_dpvreq (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data _U_)
@@ -150,15 +152,12 @@ proto_register_docsis_dpvreq (void)
   proto_register_field_array (proto_docsis_dpvreq, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  register_dissector ("docsis_dpvreq", dissect_dpvreq, proto_docsis_dpvreq);
+  docsis_dpvreq_handle = register_dissector ("docsis_dpvreq", dissect_dpvreq, proto_docsis_dpvreq);
 }
 
 void
 proto_reg_handoff_docsis_dpvreq (void)
 {
-  dissector_handle_t docsis_dpvreq_handle;
-
-  docsis_dpvreq_handle = find_dissector ("docsis_dpvreq");
   dissector_add_uint ("docsis_mgmt", 0x27, docsis_dpvreq_handle);
 }
 
diff --git a/plugins/docsis/packet-dpvrsp.c b/plugins/docsis/packet-dpvrsp.c
index 73dd0331eb..23e1d95f98 100644
--- a/plugins/docsis/packet-dpvrsp.c
+++ b/plugins/docsis/packet-dpvrsp.c
@@ -43,6 +43,8 @@ static int hf_docsis_dpvrsp_ts_end = -1;
 /* Initialize the subtree pointers */
 static gint ett_docsis_dpvrsp = -1;
 
+static dissector_handle_t docsis_dpvrsp_handle;
+
 /* Dissection */
 static int
 dissect_dpvrsp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data _U_)
@@ -150,15 +152,12 @@ proto_register_docsis_dpvrsp (void)
   proto_register_field_array (proto_docsis_dpvrsp, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  register_dissector ("docsis_dpvrsp", dissect_dpvrsp, proto_docsis_dpvrsp);
+  docsis_dpvrsp_handle = register_dissector ("docsis_dpvrsp", dissect_dpvrsp, proto_docsis_dpvrsp);
 }
 
 void
 proto_reg_handoff_docsis_dpvrsp (void)
 {
-  dissector_handle_t docsis_dpvrsp_handle;
-
-  docsis_dpvrsp_handle = find_dissector ("docsis_dpvrsp");
   dissector_add_uint ("docsis_mgmt", 0x28, docsis_dpvrsp_handle);
 }
 
diff --git a/plugins/docsis/packet-dsaack.c b/plugins/docsis/packet-dsaack.c
index 25d595c065..e684d7f23d 100644
--- a/plugins/docsis/packet-dsaack.c
+++ b/plugins/docsis/packet-dsaack.c
@@ -39,6 +39,8 @@ static gint ett_docsis_dsaack = -1;
 
 extern value_string docsis_conf_code[];
 
+static dissector_handle_t docsis_dsaack_handle;
+
 /* Dissection */
 static int
 dissect_dsaack (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data _U_)
@@ -102,15 +104,12 @@ proto_register_docsis_dsaack (void)
   proto_register_field_array (proto_docsis_dsaack, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  register_dissector ("docsis_dsaack", dissect_dsaack, proto_docsis_dsaack);
+  docsis_dsaack_handle = register_dissector ("docsis_dsaack", dissect_dsaack, proto_docsis_dsaack);
 }
 
 void
 proto_reg_handoff_docsis_dsaack (void)
 {
-  dissector_handle_t docsis_dsaack_handle;
-
-  docsis_dsaack_handle = find_dissector ("docsis_dsaack");
   docsis_tlv_handle = find_dissector ("docsis_tlv");
   dissector_add_uint ("docsis_mgmt", 0x11, docsis_dsaack_handle);
 }
diff --git a/plugins/docsis/packet-dsareq.c b/plugins/docsis/packet-dsareq.c
index f821ad3874..0a74cbccae 100644
--- a/plugins/docsis/packet-dsareq.c
+++ b/plugins/docsis/packet-dsareq.c
@@ -36,6 +36,8 @@ static dissector_handle_t docsis_tlv_handle;
 /* Initialize the subtree pointers */
 static gint ett_docsis_dsareq = -1;
 
+static dissector_handle_t docsis_dsareq_handle;
+
 /* Dissection */
 static int
 dissect_dsareq (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data _U_)
@@ -89,15 +91,12 @@ proto_register_docsis_dsareq (void)
   proto_register_field_array (proto_docsis_dsareq, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  register_dissector ("docsis_dsareq", dissect_dsareq, proto_docsis_dsareq);
+  docsis_dsareq_handle = register_dissector ("docsis_dsareq", dissect_dsareq, proto_docsis_dsareq);
 }
 
 void
 proto_reg_handoff_docsis_dsareq (void)
 {
-  dissector_handle_t docsis_dsareq_handle;
-
-  docsis_dsareq_handle = find_dissector ("docsis_dsareq");
   docsis_tlv_handle = find_dissector ("docsis_tlv");
   dissector_add_uint ("docsis_mgmt", 0x0F, docsis_dsareq_handle);
 }
diff --git a/plugins/docsis/packet-dsarsp.c b/plugins/docsis/packet-dsarsp.c
index 6f1edd3f5c..eb31168b15 100644
--- a/plugins/docsis/packet-dsarsp.c
+++ b/plugins/docsis/packet-dsarsp.c
@@ -37,6 +37,8 @@ static dissector_handle_t docsis_tlv_handle;
 /* Initialize the subtree pointers */
 static gint ett_docsis_dsarsp = -1;
 
+static dissector_handle_t docsis_dsarsp_handle;
+
 extern value_string docsis_conf_code[];
 
 /* Dissection */
@@ -102,15 +104,12 @@ proto_register_docsis_dsarsp (void)
   proto_register_field_array (proto_docsis_dsarsp, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  register_dissector ("docsis_dsarsp", dissect_dsarsp, proto_docsis_dsarsp);
+  docsis_dsarsp_handle = register_dissector ("docsis_dsarsp", dissect_dsarsp, proto_docsis_dsarsp);
 }
 
 void
 proto_reg_handoff_docsis_dsarsp (void)
 {
-  dissector_handle_t docsis_dsarsp_handle;
-
-  docsis_dsarsp_handle = find_dissector ("docsis_dsarsp");
   docsis_tlv_handle = find_dissector ("docsis_tlv");
   dissector_add_uint ("docsis_mgmt", 0x10, docsis_dsarsp_handle);
 
diff --git a/plugins/docsis/packet-dscack.c b/plugins/docsis/packet-dscack.c
index b22a2cb3c6..48a9f6dc0e 100644
--- a/plugins/docsis/packet-dscack.c
+++ b/plugins/docsis/packet-dscack.c
@@ -39,6 +39,8 @@ static gint ett_docsis_dscack = -1;
 
 extern value_string docsis_conf_code[];
 
+static dissector_handle_t docsis_dscack_handle;
+
 /* Dissection */
 static int
 dissect_dscack (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data _U_)
@@ -101,15 +103,12 @@ proto_register_docsis_dscack (void)
   proto_register_field_array (proto_docsis_dscack, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  register_dissector ("docsis_dscack", dissect_dscack, proto_docsis_dscack);
+  docsis_dscack_handle = register_dissector ("docsis_dscack", dissect_dscack, proto_docsis_dscack);
 }
 
 void
 proto_reg_handoff_docsis_dscack (void)
 {
-  dissector_handle_t docsis_dscack_handle;
-
-  docsis_dscack_handle = find_dissector ("docsis_dscack");
   docsis_tlv_handle = find_dissector ("docsis_tlv");
   dissector_add_uint ("docsis_mgmt", 0x14, docsis_dscack_handle);
 }
diff --git a/plugins/docsis/packet-dscreq.c b/plugins/docsis/packet-dscreq.c
index 59be9668f2..d94e23183c 100644
--- a/plugins/docsis/packet-dscreq.c
+++ b/plugins/docsis/packet-dscreq.c
@@ -36,6 +36,8 @@ static dissector_handle_t docsis_tlv_handle;
 /* Initialize the subtree pointers */
 static gint ett_docsis_dscreq = -1;
 
+static dissector_handle_t docsis_dscreq_handle;
+
 /* Dissection */
 static int
 dissect_dscreq (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data _U_)
@@ -89,15 +91,12 @@ proto_register_docsis_dscreq (void)
   proto_register_field_array (proto_docsis_dscreq, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  register_dissector ("docsis_dscreq", dissect_dscreq, proto_docsis_dscreq);
+  docsis_dscreq_handle = register_dissector ("docsis_dscreq", dissect_dscreq, proto_docsis_dscreq);
 }
 
 void
 proto_reg_handoff_docsis_dscreq (void)
 {
-  dissector_handle_t docsis_dscreq_handle;
-
-  docsis_dscreq_handle = find_dissector ("docsis_dscreq");
   docsis_tlv_handle = find_dissector ("docsis_tlv");
   dissector_add_uint ("docsis_mgmt", 0x12, docsis_dscreq_handle);
 }
diff --git a/plugins/docsis/packet-dscrsp.c b/plugins/docsis/packet-dscrsp.c
index ac52d2887e..684d98e69d 100644
--- a/plugins/docsis/packet-dscrsp.c
+++ b/plugins/docsis/packet-dscrsp.c
@@ -39,6 +39,8 @@ static gint ett_docsis_dscrsp = -1;
 
 extern value_string docsis_conf_code[];
 
+static dissector_handle_t docsis_dscrsp_handle;
+
 /* Dissection */
 static int
 dissect_dscrsp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data _U_)
@@ -102,15 +104,12 @@ proto_register_docsis_dscrsp (void)
   proto_register_field_array (proto_docsis_dscrsp, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  register_dissector ("docsis_dscrsp", dissect_dscrsp, proto_docsis_dscrsp);
+  docsis_dscrsp_handle = register_dissector ("docsis_dscrsp", dissect_dscrsp, proto_docsis_dscrsp);
 }
 
 void
 proto_reg_handoff_docsis_dscrsp (void)
 {
-  dissector_handle_t docsis_dscrsp_handle;
-
-  docsis_dscrsp_handle = find_dissector ("docsis_dscrsp");
   docsis_tlv_handle = find_dissector ("docsis_tlv");
   dissector_add_uint ("docsis_mgmt", 0x13, docsis_dscrsp_handle);
 
diff --git a/plugins/docsis/packet-dsdreq.c b/plugins/docsis/packet-dsdreq.c
index e059fc8f7c..98bc2ec136 100644
--- a/plugins/docsis/packet-dsdreq.c
+++ b/plugins/docsis/packet-dsdreq.c
@@ -39,6 +39,8 @@ static dissector_handle_t docsis_tlv_handle;
 /* Initialize the subtree pointers */
 static gint ett_docsis_dsdreq = -1;
 
+static dissector_handle_t docsis_dsdreq_handle;
+
 /* Dissection */
 static int
 dissect_dsdreq (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data _U_)
@@ -105,15 +107,12 @@ proto_register_docsis_dsdreq (void)
   proto_register_field_array (proto_docsis_dsdreq, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  register_dissector ("docsis_dsdreq", dissect_dsdreq, proto_docsis_dsdreq);
+  docsis_dsdreq_handle = register_dissector ("docsis_dsdreq", dissect_dsdreq, proto_docsis_dsdreq);
 }
 
 void
 proto_reg_handoff_docsis_dsdreq (void)
 {
-  dissector_handle_t docsis_dsdreq_handle;
-
-  docsis_dsdreq_handle = find_dissector ("docsis_dsdreq");
   docsis_tlv_handle = find_dissector ("docsis_tlv");
   dissector_add_uint ("docsis_mgmt", 0x15, docsis_dsdreq_handle);
 }
diff --git a/plugins/docsis/packet-dsdrsp.c b/plugins/docsis/packet-dsdrsp.c
index 095786aa15..e405e5aff9 100644
--- a/plugins/docsis/packet-dsdrsp.c
+++ b/plugins/docsis/packet-dsdrsp.c
@@ -39,6 +39,8 @@ extern value_string docsis_conf_code[];
 /* Initialize the subtree pointers */
 static gint ett_docsis_dsdrsp = -1;
 
+static dissector_handle_t docsis_dsdrsp_handle;
+
 /* Dissection */
 static int
 dissect_dsdrsp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data _U_)
@@ -105,17 +107,13 @@ proto_register_docsis_dsdrsp (void)
   proto_register_field_array (proto_docsis_dsdrsp, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  register_dissector ("docsis_dsdrsp", dissect_dsdrsp, proto_docsis_dsdrsp);
+  docsis_dsdrsp_handle = register_dissector ("docsis_dsdrsp", dissect_dsdrsp, proto_docsis_dsdrsp);
 }
 
 void
 proto_reg_handoff_docsis_dsdrsp (void)
 {
-  dissector_handle_t docsis_dsdrsp_handle;
-
-  docsis_dsdrsp_handle = find_dissector ("docsis_dsdrsp");
   dissector_add_uint ("docsis_mgmt", 0x16, docsis_dsdrsp_handle);
-
 }
 
 /*
diff --git a/plugins/docsis/packet-intrngreq.c b/plugins/docsis/packet-intrngreq.c
index 9a060e7fc4..b40593c084 100644
--- a/plugins/docsis/packet-intrngreq.c
+++ b/plugins/docsis/packet-intrngreq.c
@@ -37,6 +37,8 @@ void proto_reg_handoff_docsis_intrngreq(void);
 /* Initialize the subtree pointers */
 static gint ett_docsis_intrngreq = -1;
 
+static dissector_handle_t docsis_intrngreq_handle;
+
 /* Dissection */
 static int
 dissect_intrngreq (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data _U_)
@@ -100,15 +102,12 @@ proto_register_docsis_intrngreq (void)
   proto_register_field_array (proto_docsis_intrngreq, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  register_dissector ("docsis_intrngreq", dissect_intrngreq, proto_docsis_intrngreq);
+  docsis_intrngreq_handle = register_dissector ("docsis_intrngreq", dissect_intrngreq, proto_docsis_intrngreq);
 }
 
 void
 proto_reg_handoff_docsis_intrngreq (void)
 {
-  dissector_handle_t docsis_intrngreq_handle;
-
-  docsis_intrngreq_handle = find_dissector ("docsis_intrngreq");
   dissector_add_uint ("docsis_mgmt", 0x1E, docsis_intrngreq_handle);
 }
 
diff --git a/plugins/docsis/packet-map.c b/plugins/docsis/packet-map.c
index 362aa37bd2..e2beee53f0 100644
--- a/plugins/docsis/packet-map.c
+++ b/plugins/docsis/packet-map.c
@@ -63,6 +63,8 @@ static int hf_docsis_map_offset = -1;
 /* Initialize the subtree pointers */
 static gint ett_docsis_map = -1;
 
+static dissector_handle_t docsis_map_handle;
+
 static const value_string iuc_vals[] = {
   {IUC_REQUEST,                  "Request"},
   {IUC_REQ_DATA,                 "REQ/Data"},
@@ -261,15 +263,12 @@ proto_register_docsis_map (void)
   proto_register_field_array (proto_docsis_map, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  register_dissector ("docsis_map", dissect_map, proto_docsis_map);
+  docsis_map_handle = register_dissector ("docsis_map", dissect_map, proto_docsis_map);
 }
 
 void
 proto_reg_handoff_docsis_map (void)
 {
-  dissector_handle_t docsis_map_handle;
-
-  docsis_map_handle = find_dissector ("docsis_map");
   dissector_add_uint ("docsis_mgmt", 0x03, docsis_map_handle);
 }
 
diff --git a/plugins/docsis/packet-mdd.c b/plugins/docsis/packet-mdd.c
index afa1e91764..614da44357 100644
--- a/plugins/docsis/packet-mdd.c
+++ b/plugins/docsis/packet-mdd.c
@@ -354,6 +354,8 @@ static gint ett_docsis_mdd = -1;
 static gint ett_tlv = -1;
 static gint ett_sub_tlv = -1;
 
+static dissector_handle_t docsis_mdd_handle;
+
 /* Dissection */
 static int
 dissect_mdd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data _U_)
@@ -821,15 +823,12 @@ void proto_register_docsis_mdd (void)
   proto_register_field_array (proto_docsis_mdd, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  register_dissector ("docsis_mdd", dissect_mdd, proto_docsis_mdd);
+  docsis_mdd_handle = register_dissector ("docsis_mdd", dissect_mdd, proto_docsis_mdd);
 }
 
 void
 proto_reg_handoff_docsis_mdd (void)
 {
-  dissector_handle_t docsis_mdd_handle;
-
-  docsis_mdd_handle = find_dissector ("docsis_mdd");
   dissector_add_uint ("docsis_mgmt", 33, docsis_mdd_handle);
 }
 
diff --git a/plugins/docsis/packet-ocd.c b/plugins/docsis/packet-ocd.c
index db7dc8ef1c..fb16d152f5 100644
--- a/plugins/docsis/packet-ocd.c
+++ b/plugins/docsis/packet-ocd.c
@@ -72,6 +72,8 @@ static gint ett_docsis_ocd_tlv_subcarrier_assignment = -1;
 static expert_field ei_docsis_ocd_tlvlen_bad = EI_INIT;
 static expert_field ei_docsis_ocd_value_unknown = EI_INIT;
 
+static dissector_handle_t docsis_ocd_handle;
+
 static const value_string docsis_ocd_four_trans_size[] = {
   {0, "4096 subcarriers at 50 kHz spacing"},
   {1, "8192 subcarriers at 25 kHz spacing"},
@@ -381,14 +383,12 @@ proto_register_docsis_ocd(void)
   proto_register_subtree_array (ett, array_length (ett));
   expert_docsis_ocd = expert_register_protocol(proto_docsis_ocd);
   expert_register_field_array(expert_docsis_ocd, ei, array_length(ei));
-  register_dissector ("docsis_ocd", dissect_ocd, proto_docsis_ocd);
+  docsis_ocd_handle = register_dissector ("docsis_ocd", dissect_ocd, proto_docsis_ocd);
 }
 
 void
 proto_reg_handoff_docsis_ocd (void)
 {
-  dissector_handle_t docsis_ocd_handle;
-  docsis_ocd_handle = find_dissector ("docsis_ocd");
   dissector_add_uint ("docsis_mgmt", 0x31, docsis_ocd_handle);
 }
 
diff --git a/plugins/docsis/packet-regack.c b/plugins/docsis/packet-regack.c
index 861462fdb6..26d275249d 100644
--- a/plugins/docsis/packet-regack.c
+++ b/plugins/docsis/packet-regack.c
@@ -40,6 +40,8 @@ extern value_string docsis_conf_code[];
 /* Initialize the subtree pointers */
 static gint ett_docsis_regack = -1;
 
+static dissector_handle_t docsis_regack_handle;
+
 /* Dissection */
 static int
 dissect_regack (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data _U_)
@@ -102,15 +104,12 @@ proto_register_docsis_regack (void)
   proto_register_field_array (proto_docsis_regack, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  register_dissector ("docsis_regack", dissect_regack, proto_docsis_regack);
+  docsis_regack_handle = register_dissector ("docsis_regack", dissect_regack, proto_docsis_regack);
 }
 
 void
 proto_reg_handoff_docsis_regack (void)
 {
-  dissector_handle_t docsis_regack_handle;
-
-  docsis_regack_handle = find_dissector ("docsis_regack");
   docsis_tlv_handle = find_dissector ("docsis_tlv");
   dissector_add_uint ("docsis_mgmt", 0x0e, docsis_regack_handle);
 }
diff --git a/plugins/docsis/packet-regreq.c b/plugins/docsis/packet-regreq.c
index 03244259e1..53b5563549 100644
--- a/plugins/docsis/packet-regreq.c
+++ b/plugins/docsis/packet-regreq.c
@@ -37,6 +37,7 @@ static int hf_docsis_regreq_sid = -1;
 static gint ett_docsis_regreq = -1;
 
 static dissector_handle_t docsis_tlv_handle;
+static dissector_handle_t docsis_regreq_handle;
 
 /* Code to actually dissect the packets */
 static int
@@ -90,15 +91,12 @@ proto_register_docsis_regreq (void)
   proto_register_field_array (proto_docsis_regreq, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  register_dissector ("docsis_regreq", dissect_regreq, proto_docsis_regreq);
+  docsis_regreq_handle = register_dissector ("docsis_regreq", dissect_regreq, proto_docsis_regreq);
 }
 
 void
 proto_reg_handoff_docsis_regreq (void)
 {
-  dissector_handle_t docsis_regreq_handle;
-
-  docsis_regreq_handle = find_dissector ("docsis_regreq");
   docsis_tlv_handle = find_dissector ("docsis_tlv");
 
   dissector_add_uint ("docsis_mgmt", 0x06, docsis_regreq_handle);
diff --git a/plugins/docsis/packet-regreqmp.c b/plugins/docsis/packet-regreqmp.c
index 869a3b0042..5b6b9c00c8 100644
--- a/plugins/docsis/packet-regreqmp.c
+++ b/plugins/docsis/packet-regreqmp.c
@@ -39,6 +39,7 @@ static int hf_docsis_regreqmp_number_of_fragments = -1;
 static int hf_docsis_regreqmp_fragment_sequence_number = -1;
 
 static dissector_handle_t docsis_tlv_handle;
+static dissector_handle_t docsis_regreqmp_handle;
 
 /* Initialize the subtree pointers */
 static gint ett_docsis_regreqmp = -1;
@@ -102,16 +103,13 @@ proto_register_docsis_regreqmp (void)
   proto_register_field_array (proto_docsis_regreqmp, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  register_dissector ("docsis_regreqmp", dissect_regreqmp, proto_docsis_regreqmp);
+  docsis_regreqmp_handle = register_dissector ("docsis_regreqmp", dissect_regreqmp, proto_docsis_regreqmp);
 }
 
 void
 proto_reg_handoff_docsis_regreqmp (void)
 {
-  dissector_handle_t docsis_regreqmp_handle;
-
   docsis_tlv_handle = find_dissector ("docsis_tlv");
-  docsis_regreqmp_handle = find_dissector ("docsis_regreqmp");
   dissector_add_uint ("docsis_mgmt", 44, docsis_regreqmp_handle);
 }
 
diff --git a/plugins/docsis/packet-regrsp.c b/plugins/docsis/packet-regrsp.c
index f5645fa2f8..9bf578b3c0 100644
--- a/plugins/docsis/packet-regrsp.c
+++ b/plugins/docsis/packet-regrsp.c
@@ -40,6 +40,8 @@ extern value_string docsis_conf_code[];
 /* Initialize the subtree pointers */
 static gint ett_docsis_regrsp = -1;
 
+static dissector_handle_t docsis_regrsp_handle;
+
 /* Dissection */
 static int
 dissect_regrsp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data _U_)
@@ -102,15 +104,12 @@ proto_register_docsis_regrsp (void)
   proto_register_field_array (proto_docsis_regrsp, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  register_dissector ("docsis_regrsp", dissect_regrsp, proto_docsis_regrsp);
+  docsis_regrsp_handle = register_dissector ("docsis_regrsp", dissect_regrsp, proto_docsis_regrsp);
 }
 
 void
 proto_reg_handoff_docsis_regrsp (void)
 {
-  dissector_handle_t docsis_regrsp_handle;
-
-  docsis_regrsp_handle = find_dissector ("docsis_regrsp");
   docsis_tlv_handle = find_dissector ("docsis_tlv");
   dissector_add_uint ("docsis_mgmt", 0x07, docsis_regrsp_handle);
 }
diff --git a/plugins/docsis/packet-regrspmp.c b/plugins/docsis/packet-regrspmp.c
index b7e70b8c77..726f353dfb 100644
--- a/plugins/docsis/packet-regrspmp.c
+++ b/plugins/docsis/packet-regrspmp.c
@@ -45,6 +45,8 @@ static dissector_handle_t docsis_tlv_handle;
 /* Initialize the subtree pointers */
 static gint ett_docsis_regrspmp = -1;
 
+static dissector_handle_t docsis_regrspmp_handle;
+
 /* Dissection */
 static int
 dissect_regrspmp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data _U_)
@@ -110,16 +112,13 @@ proto_register_docsis_regrspmp (void)
   proto_register_field_array (proto_docsis_regrspmp, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  register_dissector ("docsis_regrspmp", dissect_regrspmp, proto_docsis_regrspmp);
+  docsis_regrspmp_handle = register_dissector ("docsis_regrspmp", dissect_regrspmp, proto_docsis_regrspmp);
 }
 
 void
 proto_reg_handoff_docsis_regrspmp (void)
 {
-  dissector_handle_t docsis_regrspmp_handle;
-
   docsis_tlv_handle = find_dissector ("docsis_tlv");
-  docsis_regrspmp_handle = find_dissector ("docsis_regrspmp");
   dissector_add_uint ("docsis_mgmt", 45, docsis_regrspmp_handle);
 }
 
diff --git a/plugins/docsis/packet-rngreq.c b/plugins/docsis/packet-rngreq.c
index dbcafc5c5b..94b99ef762 100644
--- a/plugins/docsis/packet-rngreq.c
+++ b/plugins/docsis/packet-rngreq.c
@@ -37,6 +37,8 @@ static int hf_docsis_rngreq_pend_compl = -1;
 /* Initialize the subtree pointers */
 static gint ett_docsis_rngreq = -1;
 
+static dissector_handle_t docsis_rngreq_handle;
+
 /* Dissection */
 static int
 dissect_rngreq (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data _U_)
@@ -103,17 +105,13 @@ proto_register_docsis_rngreq (void)
   proto_register_field_array (proto_docsis_rngreq, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  register_dissector ("docsis_rngreq", dissect_rngreq, proto_docsis_rngreq);
+  docsis_rngreq_handle = register_dissector ("docsis_rngreq", dissect_rngreq, proto_docsis_rngreq);
 }
 
 void
 proto_reg_handoff_docsis_rngreq (void)
 {
-  dissector_handle_t docsis_rngreq_handle;
-
-  docsis_rngreq_handle = find_dissector ("docsis_rngreq");
   dissector_add_uint ("docsis_mgmt", 0x04, docsis_rngreq_handle);
-
 }
 
 /*
diff --git a/plugins/docsis/packet-rngrsp.c b/plugins/docsis/packet-rngrsp.c
index 5bd142f689..3971e65e3c 100644
--- a/plugins/docsis/packet-rngrsp.c
+++ b/plugins/docsis/packet-rngrsp.c
@@ -62,6 +62,8 @@ static const value_string rng_stat_vals[] = {
 static gint ett_docsis_rngrsp = -1;
 static gint ett_docsis_rngrsptlv = -1;
 
+static dissector_handle_t docsis_rngrsp_handle;
+
 static const value_string rngrsp_tlv_vals[] = {
   {RNGRSP_TIMING,            "Timing Adjust (6.25us/64)"},
   {RNGRSP_PWR_LEVEL_ADJ,     "Power Level Adjust (0.25dB units)"},
@@ -266,7 +268,7 @@ proto_register_docsis_rngrsp (void)
   proto_register_field_array (proto_docsis_rngrsp, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  register_dissector ("docsis_rngrsp", dissect_rngrsp, proto_docsis_rngrsp);
+  docsis_rngrsp_handle = register_dissector ("docsis_rngrsp", dissect_rngrsp, proto_docsis_rngrsp);
 }
 
 
@@ -277,11 +279,7 @@ proto_register_docsis_rngrsp (void)
 void
 proto_reg_handoff_docsis_rngrsp (void)
 {
-  dissector_handle_t docsis_rngrsp_handle;
-
-  docsis_rngrsp_handle = find_dissector ("docsis_rngrsp");
   dissector_add_uint ("docsis_mgmt", 0x05, docsis_rngrsp_handle);
-
 }
 
 /*
diff --git a/plugins/docsis/packet-sync.c b/plugins/docsis/packet-sync.c
index 89421c91a4..9e2565ee43 100644
--- a/plugins/docsis/packet-sync.c
+++ b/plugins/docsis/packet-sync.c
@@ -36,6 +36,8 @@ static int hf_docsis_sync_cmts_timestamp = -1;
 /* Initialize the subtree pointers */
 static gint ett_docsis_sync = -1;
 
+static dissector_handle_t docsis_sync_handle;
+
 /* Dissection */
 static int
 dissect_sync (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data _U_)
@@ -80,15 +82,12 @@ proto_register_docsis_sync (void)
   proto_register_field_array (proto_docsis_sync, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  register_dissector ("docsis_sync", dissect_sync, proto_docsis_sync);
+  docsis_sync_handle = register_dissector ("docsis_sync", dissect_sync, proto_docsis_sync);
 }
 
 void
 proto_reg_handoff_docsis_sync (void)
 {
-  dissector_handle_t docsis_sync_handle;
-
-  docsis_sync_handle = find_dissector ("docsis_sync");
   dissector_add_uint ("docsis_mgmt", 1, docsis_sync_handle);
 }
 
diff --git a/plugins/docsis/packet-type29ucd.c b/plugins/docsis/packet-type29ucd.c
index 1f680e4b4d..1524bbed84 100644
--- a/plugins/docsis/packet-type29ucd.c
+++ b/plugins/docsis/packet-type29ucd.c
@@ -152,6 +152,8 @@ static gint ett_docsis_type29ucd = -1;
 static gint ett_docsis_type29tlv = -1;
 static gint ett_docsis_type29_burst_tlv = -1;
 
+static dissector_handle_t docsis_type29ucd_handle;
+
 static const value_string channel_tlv_vals[] _U_ = {
   {type29ucd_SYMBOL_RATE,                     "Symbol Rate"},
   {type29ucd_FREQUENCY,                       "Frequency"},
@@ -1082,15 +1084,12 @@ proto_register_docsis_type29ucd (void)
   expert_docsis_type29ucd = expert_register_protocol(proto_docsis_type29ucd);
   expert_register_field_array(expert_docsis_type29ucd, ei, array_length(ei));
 
-  register_dissector ("docsis_type29ucd", dissect_type29ucd, proto_docsis_type29ucd);
+  docsis_type29ucd_handle = register_dissector ("docsis_type29ucd", dissect_type29ucd, proto_docsis_type29ucd);
 }
 
 void
 proto_reg_handoff_docsis_type29ucd (void)
 {
-  dissector_handle_t docsis_type29ucd_handle;
-
-  docsis_type29ucd_handle = find_dissector ("docsis_type29ucd");
   dissector_add_uint ("docsis_mgmt", 0x1D, docsis_type29ucd_handle);
 }
 
diff --git a/plugins/docsis/packet-type35ucd.c b/plugins/docsis/packet-type35ucd.c
index 0bbee636cd..251a1732ee 100644
--- a/plugins/docsis/packet-type35ucd.c
+++ b/plugins/docsis/packet-type35ucd.c
@@ -158,6 +158,8 @@ static gint ett_docsis_type35ucd = -1;
 static gint ett_docsis_type35tlv = -1;
 static gint ett_docsis_type35_burst_tlv = -1;
 
+static dissector_handle_t docsis_type35ucd_handle;
+
 static const value_string channel_tlv_vals[] _U_ = {
   {type35ucd_SYMBOL_RATE,                     "Symbol Rate"},
   {type35ucd_FREQUENCY,                       "Frequency"},
@@ -1171,15 +1173,12 @@ proto_register_docsis_type35ucd (void)
   expert_docsis_type35ucd = expert_register_protocol(proto_docsis_type35ucd);
   expert_register_field_array(expert_docsis_type35ucd, ei, array_length(ei));
 
-  register_dissector ("docsis_type35ucd", dissect_type35ucd, proto_docsis_type35ucd);
+  docsis_type35ucd_handle = register_dissector ("docsis_type35ucd", dissect_type35ucd, proto_docsis_type35ucd);
 }
 
 void
 proto_reg_handoff_docsis_type35ucd (void)
 {
-  dissector_handle_t docsis_type35ucd_handle;
-
-  docsis_type35ucd_handle = find_dissector ("docsis_type35ucd");
   dissector_add_uint ("docsis_mgmt", 0x23, docsis_type35ucd_handle);
 }
 
diff --git a/plugins/docsis/packet-type51ucd.c b/plugins/docsis/packet-type51ucd.c
index 2b2b5ec13c..2557367218 100644
--- a/plugins/docsis/packet-type51ucd.c
+++ b/plugins/docsis/packet-type51ucd.c
@@ -200,6 +200,8 @@ static gint ett_docsis_type51ucd = -1;
 static gint ett_docsis_type51tlv = -1;
 static gint ett_docsis_type51_burst_tlv = -1;
 
+static dissector_handle_t docsis_type51ucd_handle;
+
 static const value_string channel_tlv_vals[] _U_ = {
   {type51ucd_SYMBOL_RATE,                     "Symbol Rate"},
   {type51ucd_FREQUENCY,                       "Frequency"},
@@ -1621,15 +1623,12 @@ proto_register_docsis_type51ucd (void)
   expert_docsis_type51ucd = expert_register_protocol(proto_docsis_type51ucd);
   expert_register_field_array(expert_docsis_type51ucd, ei, array_length(ei));
 
-  register_dissector ("docsis_type51ucd", dissect_type51ucd, proto_docsis_type51ucd);
+  docsis_type51ucd_handle = register_dissector ("docsis_type51ucd", dissect_type51ucd, proto_docsis_type51ucd);
 }
 
 void
 proto_reg_handoff_docsis_type51ucd (void)
 {
-  dissector_handle_t docsis_type51ucd_handle;
-
-  docsis_type51ucd_handle = find_dissector ("docsis_type51ucd");
   dissector_add_uint ("docsis_mgmt", 0x33, docsis_type51ucd_handle);
 }
 
diff --git a/plugins/docsis/packet-uccreq.c b/plugins/docsis/packet-uccreq.c
index ddc071d691..856112a103 100644
--- a/plugins/docsis/packet-uccreq.c
+++ b/plugins/docsis/packet-uccreq.c
@@ -36,6 +36,8 @@ static dissector_handle_t docsis_tlv_handle;
 /* Initialize the subtree pointers */
 static gint ett_docsis_uccreq = -1;
 
+static dissector_handle_t docsis_uccreq_handle;
+
 /* Dissection */
 static int
 dissect_uccreq (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data _U_)
@@ -90,15 +92,12 @@ proto_register_docsis_uccreq (void)
   proto_register_field_array (proto_docsis_uccreq, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  register_dissector ("docsis_uccreq", dissect_uccreq, proto_docsis_uccreq);
+  docsis_uccreq_handle = register_dissector ("docsis_uccreq", dissect_uccreq, proto_docsis_uccreq);
 }
 
 void
 proto_reg_handoff_docsis_uccreq (void)
 {
-  dissector_handle_t docsis_uccreq_handle;
-
-  docsis_uccreq_handle = find_dissector ("docsis_uccreq");
   docsis_tlv_handle = find_dissector ("docsis_tlv");
   dissector_add_uint ("docsis_mgmt", 0x08, docsis_uccreq_handle);
 }
diff --git a/plugins/docsis/packet-uccrsp.c b/plugins/docsis/packet-uccrsp.c
index b5e862aa5a..54b0d678a9 100644
--- a/plugins/docsis/packet-uccrsp.c
+++ b/plugins/docsis/packet-uccrsp.c
@@ -35,6 +35,8 @@ static int hf_docsis_uccrsp_upchid = -1;
 /* Initialize the subtree pointers */
 static gint ett_docsis_uccrsp = -1;
 
+static dissector_handle_t docsis_uccrsp_handle;
+
 /* Dissection */
 static int
 dissect_uccrsp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data _U_)
@@ -85,15 +87,12 @@ proto_register_docsis_uccrsp (void)
   proto_register_field_array (proto_docsis_uccrsp, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  register_dissector ("docsis_uccrsp", dissect_uccrsp, proto_docsis_uccrsp);
+  docsis_uccrsp_handle = register_dissector ("docsis_uccrsp", dissect_uccrsp, proto_docsis_uccrsp);
 }
 
 void
 proto_reg_handoff_docsis_uccrsp (void)
 {
-  dissector_handle_t docsis_uccrsp_handle;
-
-  docsis_uccrsp_handle = find_dissector ("docsis_uccrsp");
   dissector_add_uint ("docsis_mgmt", 0x09, docsis_uccrsp_handle);
 }
 
diff --git a/plugins/docsis/packet-ucd.c b/plugins/docsis/packet-ucd.c
index 3b0a8d45f5..02f0e5ed0b 100644
--- a/plugins/docsis/packet-ucd.c
+++ b/plugins/docsis/packet-ucd.c
@@ -127,6 +127,8 @@ static gint ett_docsis_ucd = -1;
 static gint ett_docsis_tlv = -1;
 static gint ett_docsis_burst_tlv = -1;
 
+static dissector_handle_t docsis_ucd_handle;
+
 static const value_string channel_tlv_vals[] = {
   {UCD_SYMBOL_RATE,  "Symbol Rate"},
   {UCD_FREQUENCY,    "Frequency"},
@@ -996,15 +998,12 @@ proto_register_docsis_ucd (void)
   expert_docsis_ucd = expert_register_protocol(proto_docsis_ucd);
   expert_register_field_array(expert_docsis_ucd, ei, array_length(ei));
 
-  register_dissector ("docsis_ucd", dissect_ucd, proto_docsis_ucd);
+  docsis_ucd_handle = register_dissector ("docsis_ucd", dissect_ucd, proto_docsis_ucd);
 }
 
 void
 proto_reg_handoff_docsis_ucd (void)
 {
-   dissector_handle_t docsis_ucd_handle;
-
-   docsis_ucd_handle = find_dissector ("docsis_ucd");
    dissector_add_uint ("docsis_mgmt", 0x02, docsis_ucd_handle);
 }
 
diff --git a/plugins/ethercat/packet-ams.c b/plugins/ethercat/packet-ams.c
index 1b40275b08..f91c344aa6 100644
--- a/plugins/ethercat/packet-ams.c
+++ b/plugins/ethercat/packet-ams.c
@@ -127,6 +127,8 @@ static int hf_ams_adscycletime = -1;
 /* static int hf_ams_adscmpmax = -1; */
 /* static int hf_ams_adscmpmin = -1; */
 
+static dissector_handle_t ams_handle;
+
 static const value_string TransMode[] =
 {
    {  0, "NO TRANS"},
@@ -1227,16 +1229,15 @@ void proto_register_ams(void)
    proto_register_field_array(proto_ams, hf, array_length(hf));
    proto_register_subtree_array(ett, array_length(ett));
 
-   register_dissector("ams", dissect_ams, proto_ams);
+   ams_handle = register_dissector("ams", dissect_ams, proto_ams);
 }
 
 /* The registration hand-off routing */
 
 void proto_reg_handoff_ams(void)
 {
-   dissector_handle_t ams_handle, amstcp_handle;
+   dissector_handle_t amstcp_handle;
 
-   ams_handle = find_dissector("ams");
    amstcp_handle = create_dissector_handle( dissect_amstcp, proto_ams );
    dissector_add_uint_with_preference("tcp.port", AMS_TCP_PORT, amstcp_handle);
    dissector_add_uint("ecatf.type", 2, ams_handle);
diff --git a/plugins/ethercat/packet-ecatmb.c b/plugins/ethercat/packet-ecatmb.c
index e43cc0f403..0f34931852 100644
--- a/plugins/ethercat/packet-ecatmb.c
+++ b/plugins/ethercat/packet-ecatmb.c
@@ -41,6 +41,7 @@ void proto_reg_handoff_ecat_mailbox(void);
 
 static dissector_handle_t eth_handle;
 static dissector_handle_t ams_handle;
+static dissector_handle_t ecat_mailbox_handle;
 
 /* Define the EtherCAT mailbox proto */
 int proto_ecat_mailbox  = -1;
@@ -1972,15 +1973,12 @@ void proto_register_ecat_mailbox(void)
    proto_register_field_array(proto_ecat_mailbox, hf,array_length(hf));
    proto_register_subtree_array(ett, array_length(ett));
 
-   register_dissector("ecat_mailbox", dissect_ecat_mailbox, proto_ecat_mailbox);
+   ecat_mailbox_handle = register_dissector("ecat_mailbox", dissect_ecat_mailbox, proto_ecat_mailbox);
 }
 
 void proto_reg_handoff_ecat_mailbox(void)
 {
-   dissector_handle_t ecat_mailbox_handle;
-
    /* Register this dissector as a sub dissector to E88A4 based on ether type. */
-   ecat_mailbox_handle = find_dissector("ecat_mailbox");
    dissector_add_uint("ecatf.type", 5, ecat_mailbox_handle);
 
    eth_handle = find_dissector_add_dependency("eth_withoutfcs", proto_ecat_mailbox);
diff --git a/plugins/ethercat/packet-ethercat-frame.c b/plugins/ethercat/packet-ethercat-frame.c
index 53b60b7112..bf59d6ca45 100644
--- a/plugins/ethercat/packet-ethercat-frame.c
+++ b/plugins/ethercat/packet-ethercat-frame.c
@@ -39,6 +39,8 @@ static int proto_ethercat_frame = -1;
 
 static dissector_table_t ethercat_frame_dissector_table;
 
+static dissector_handle_t ethercat_frame_handle;
+
 /* Define the tree for the EtherCAT frame */
 static int ett_ethercat_frame = -1;
 static int hf_ethercat_frame_length = -1;
@@ -133,7 +135,7 @@ void proto_register_ethercat_frame(void)
    proto_register_field_array(proto_ethercat_frame,hf,array_length(hf));
    proto_register_subtree_array(ett, array_length(ett));
 
-   register_dissector("ecatf", dissect_ethercat_frame, proto_ethercat_frame);
+   ethercat_frame_handle = register_dissector("ecatf", dissect_ethercat_frame, proto_ethercat_frame);
 
    /* Define a handle (ecatf.type) for sub dissectors that want to dissect
       the Ethercat frame ether type (E88A4) payload. */
@@ -143,9 +145,6 @@ void proto_register_ethercat_frame(void)
 
 void proto_reg_handoff_ethercat_frame(void)
 {
-   dissector_handle_t ethercat_frame_handle;
-
-   ethercat_frame_handle = find_dissector("ecatf");
    dissector_add_uint("ethertype", ETHERTYPE_ECATF, ethercat_frame_handle);
    dissector_add_uint_with_preference("udp.port", ETHERTYPE_ECATF, ethercat_frame_handle);
    dissector_add_uint_with_preference("tcp.port", ETHERTYPE_ECATF, ethercat_frame_handle);
diff --git a/plugins/irda/packet-ircomm.c b/plugins/irda/packet-ircomm.c
index e9d79c122c..df5d017c01 100644
--- a/plugins/irda/packet-ircomm.c
+++ b/plugins/irda/packet-ircomm.c
@@ -400,8 +400,8 @@ void proto_register_ircomm(void)
 
     /* Register protocol names and descriptions */
     proto_ircomm = proto_register_protocol("IrCOMM Protocol", "IrCOMM", "ircomm");
-    register_dissector("ircomm_raw", dissect_raw_ircomm, proto_ircomm);
-    register_dissector("ircomm_cooked", dissect_cooked_ircomm, proto_ircomm);
+    ircomm_raw_handle = register_dissector("ircomm_raw", dissect_raw_ircomm, proto_ircomm);
+    ircomm_cooked_handle = register_dissector("ircomm_cooked", dissect_cooked_ircomm, proto_ircomm);
 
     /* Required function calls to register the header fields */
     proto_register_field_array(proto_ircomm, hf_ircomm, array_length(hf_ircomm));
@@ -416,12 +416,6 @@ void proto_register_ircomm(void)
     proto_register_subtree_array(ett_p, MAX_IAP_ENTRIES * MAX_PARAMETERS);
 }
 
-void
-proto_reg_handoff_ircomm(void) {
-    ircomm_raw_handle = find_dissector("ircomm_raw");
-    ircomm_cooked_handle = find_dissector("ircomm_cooked");
-}
-
 /*
  * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
  *
diff --git a/plugins/irda/packet-irda.c b/plugins/irda/packet-irda.c
index af19f3f3c0..52b28812df 100644
--- a/plugins/irda/packet-irda.c
+++ b/plugins/irda/packet-irda.c
@@ -241,6 +241,8 @@ static gint ett_iap_entry[MAX_IAP_ENTRIES];
 
 static int irda_address_type = -1;
 
+static dissector_handle_t irda_handle;
+
 static const xdlc_cf_items irlap_cf_items = {
     &hf_lap_c_nr,
     &hf_lap_c_ns,
@@ -2206,7 +2208,7 @@ void proto_register_irda(void)
     proto_ttp   = proto_register_protocol("Tiny Transport Protocol", "TTP", "ttp");
 
     /* Register the dissector */
-    register_dissector("irda", dissect_irda, proto_irlap);
+    irda_handle = register_dissector("irda", dissect_irda, proto_irlap);
 
     /* Required function calls to register the header fields */
     proto_register_field_array(proto_irlap, hf_lap, array_length(hf_lap));
@@ -2241,9 +2243,6 @@ void proto_register_irda(void)
 
 void proto_reg_handoff_irda(void)
 {
-    dissector_handle_t irda_handle;
-
-    irda_handle = find_dissector("irda");
     dissector_add_uint("wtap_encap", WTAP_ENCAP_IRDA, irda_handle);
     dissector_add_uint("sll.ltype", LINUX_SLL_P_IRDA_LAP, irda_handle);
 }
diff --git a/plugins/irda/packet-sir.c b/plugins/irda/packet-sir.c
index 57bdbc9da8..9060e42ece 100644
--- a/plugins/irda/packet-sir.c
+++ b/plugins/irda/packet-sir.c
@@ -49,6 +49,7 @@ void proto_register_irsir(void);
 
 /** Protocol handles. */
 static dissector_handle_t irda_handle;
+static dissector_handle_t sir_handle;
 
 /** Protocol fields. */
 static int proto_sir = -1;
@@ -174,7 +175,7 @@ dissect_sir(tvbuff_t *tvb, packet_info *pinfo, proto_tree *root, void* data _U_)
 void
 proto_reg_handoff_irsir(void)
 {
-	dissector_add_uint_with_preference("tcp.port", TCP_PORT_SIR, find_dissector("sir"));
+	dissector_add_uint_with_preference("tcp.port", TCP_PORT_SIR, sir_handle);
 
 	irda_handle = find_dissector("irda");
 }
@@ -226,7 +227,7 @@ proto_register_irsir(void)
 	expert_module_t* expert_sir;
 
 	proto_sir = proto_register_protocol("Serial Infrared", "SIR", "sir");
-	register_dissector("sir", dissect_sir, proto_sir);
+	sir_handle = register_dissector("sir", dissect_sir, proto_sir);
 	proto_register_subtree_array(ett, array_length(ett));
 	proto_register_field_array( proto_sir, hf_sir, array_length(hf_sir));
 	expert_sir = expert_register_protocol(proto_sir);