Associate dissector tables and heuristic subdissector lists with a protocol.

This will make it easier to determine protocol dependencies.

Some LLC OUI dissector tables didn't have an associated protocol, so they were left without one (-1 used)

Change-Id: I6339f16476510ef3f393d6fb5d8946419bfb4b7d
Reviewed-on: https://code.wireshark.org/review/14446
Reviewed-by: Michael Mann <mmann78@netscape.net>

7 files changed, 16 insertions, 17 deletions

diff --git a/plugins/docsis/packet-docsis.c b/plugins/docsis/packet-docsis.c
index 2e229b894d..de78b83cfd 100644
--- a/plugins/docsis/packet-docsis.c
+++ b/plugins/docsis/packet-docsis.c
@@ -818,17 +818,17 @@ proto_register_docsis (void)
     &ett_ehdr,
   };
 
-#if 0
-  docsis_dissector_table = register_dissector_table ("docsis",
-                                                     "DOCSIS Encapsulation Type",
-                                                     FT_UINT8, BASE_DEC, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE);
-#endif
-
   proto_docsis = proto_register_protocol ("DOCSIS 1.1", "DOCSIS", "docsis");
 
   proto_register_field_array (proto_docsis, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
+#if 0
+  docsis_dissector_table = register_dissector_table ("docsis",
+                                                     "DOCSIS Encapsulation Type", proto_docsis,
+                                                     FT_UINT8, BASE_DEC, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE);
+#endif
+
   register_dissector ("docsis", dissect_docsis, proto_docsis);
 }
 
diff --git a/plugins/docsis/packet-macmgmt.c b/plugins/docsis/packet-macmgmt.c
index 6834118df5..90dc0b6e5d 100644
--- a/plugins/docsis/packet-macmgmt.c
+++ b/plugins/docsis/packet-macmgmt.c
@@ -255,11 +255,6 @@ proto_register_docsis_mgmt (void)
     &ett_mgmt_pay,
   };
 
-  docsis_mgmt_dissector_table = register_dissector_table ("docsis_mgmt",
-                                                          "DOCSIS Mac Management",
-                                                          FT_UINT8, BASE_DEC, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE);
-
-
   proto_docsis_mgmt = proto_register_protocol ("DOCSIS Mac Management",
                                                "DOCSIS MAC MGMT",
                                                "docsis_mgmt");
@@ -267,6 +262,10 @@ proto_register_docsis_mgmt (void)
   proto_register_field_array (proto_docsis_mgmt, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
+  docsis_mgmt_dissector_table = register_dissector_table ("docsis_mgmt",
+                                                          "DOCSIS Mac Management", proto_docsis_mgmt,
+                                                          FT_UINT8, BASE_DEC, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE);
+
   register_dissector ("docsis_mgmt", dissect_macmgmt, proto_docsis_mgmt);
 }
 
diff --git a/plugins/ethercat/packet-ethercat-datagram.c b/plugins/ethercat/packet-ethercat-datagram.c
index 971cf30160..a5387f5b2a 100644
--- a/plugins/ethercat/packet-ethercat-datagram.c
+++ b/plugins/ethercat/packet-ethercat-datagram.c
@@ -1683,7 +1683,7 @@ void proto_register_ecat(void)
    proto_register_subtree_array(ett, array_length(ett));
 
    /* Sub dissector code */
-   heur_subdissector_list = register_heur_dissector_list("ecat.data");
+   heur_subdissector_list = register_heur_dissector_list("ecat.data", proto_ecat_datagram);
 }
 
 /* The registration hand-off routing */
diff --git a/plugins/ethercat/packet-ethercat-frame.c b/plugins/ethercat/packet-ethercat-frame.c
index ca3f5e4c46..dd71c17cf6 100644
--- a/plugins/ethercat/packet-ethercat-frame.c
+++ b/plugins/ethercat/packet-ethercat-frame.c
@@ -139,8 +139,8 @@ void proto_register_ethercat_frame(void)
 
    /* Define a handle (ecatf.type) for sub dissectors that want to dissect
       the Ethercat frame ether type (E88A4) payload. */
-   ethercat_frame_dissector_table = register_dissector_table("ecatf.type",
-                                                             "EtherCAT frame type", FT_UINT8, BASE_DEC, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE);
+   ethercat_frame_dissector_table = register_dissector_table("ecatf.type", "EtherCAT frame type",
+                                                             proto_ethercat_frame, FT_UINT8, BASE_DEC, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE);
 }
 
 void proto_reg_handoff_ethercat_frame(void)
diff --git a/plugins/profinet/packet-dcerpc-pn-io.c b/plugins/profinet/packet-dcerpc-pn-io.c
index 6fa46b24df..e172ad3ec9 100644
--- a/plugins/profinet/packet-dcerpc-pn-io.c
+++ b/plugins/profinet/packet-dcerpc-pn-io.c
@@ -12306,7 +12306,7 @@ proto_register_pn_io (void)
 
     /* subdissector code */
     register_dissector("pn_io", dissect_PNIO_heur, proto_pn_io);
-    heur_pn_subdissector_list = register_heur_dissector_list("pn_io");
+    heur_pn_subdissector_list = register_heur_dissector_list("pn_io", proto_pn_io);
 
     register_cleanup_routine(pnio_cleanup);
 
diff --git a/plugins/profinet/packet-pn-rt.c b/plugins/profinet/packet-pn-rt.c
index 011ca3867e..ac0acb9e10 100644
--- a/plugins/profinet/packet-pn-rt.c
+++ b/plugins/profinet/packet-pn-rt.c
@@ -980,7 +980,7 @@ proto_register_pn_rt(void)
                                    &pnio_desegment);
 
     /* register heuristics anchor for payload dissectors */
-    heur_subdissector_list = register_heur_dissector_list("pn_rt");
+    heur_subdissector_list = register_heur_dissector_list("pn_rt", proto_pn_rt);
 
     init_pn (proto_pn_rt);
     register_init_routine(pnio_defragment_init);
diff --git a/plugins/wimax/mac_mgmt_msg_decoder.c b/plugins/wimax/mac_mgmt_msg_decoder.c
index 2f0df38fa2..c42d9c4246 100644
--- a/plugins/wimax/mac_mgmt_msg_decoder.c
+++ b/plugins/wimax/mac_mgmt_msg_decoder.c
@@ -214,7 +214,7 @@ void proto_register_mac_mgmt_msg(void)
 	expert_register_field_array(expert_mac_mgmt, ei, array_length(ei));
 
 	subdissector_message_table = register_dissector_table("wmx.mgmtmsg",
-		"WiMax MAC Management Message", FT_UINT8, BASE_DEC, DISSECTOR_TABLE_ALLOW_DUPLICATE);
+		"WiMax MAC Management Message", proto_mac_mgmt_msg_decoder, FT_UINT8, BASE_DEC, DISSECTOR_TABLE_ALLOW_DUPLICATE);
 
 	/* Register dissector by name */
 	register_dissector("wmx_mac_mgmt_msg_decoder", dissect_mac_mgmt_msg_decoder,