diff options
| author | Michael Mann <mmann78@netscape.net> | 2016-03-16 09:02:52 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-03-20 12:48:48 +0000 |
| commit | 9bcac48403de9aff6435d0f48028ae1f72f64528 (patch) | |
| tree | 16989d2207299572c970a79b6d4c4037fa975c55 /plugins | |
| parent | 6da50e2fde7b678cfbee922e3b12d588d75b6eef (diff) | |
Manually add protocol dependencies derived from find_dissector.
Started by grepping call_dissector_with_data, call_dissector_only and call_dissector and traced the handles passed into them to a find_dissector within the dissector. Then replaced find_dissector with find_dissector_add_dependency and added the protocol id from the dissector.
"data" dissector was not considered to be a dependency.
Change-Id: I15d0d77301306587ef8e7af5876e74231816890d
Reviewed-on: https://code.wireshark.org/review/14509
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/docsis/packet-docsis.c | 2 | ||||
| -rw-r--r-- | plugins/ethercat/packet-ecatmb.c | 4 | ||||
| -rw-r--r-- | plugins/ethercat/packet-esl.c | 2 | ||||
| -rw-r--r-- | plugins/ethercat/packet-ethercat-datagram.c | 2 | ||||
| -rw-r--r-- | plugins/wimaxasncp/packet-wimaxasncp.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/plugins/docsis/packet-docsis.c b/plugins/docsis/packet-docsis.c index de78b83cfd..58b8a88cab 100644 --- a/plugins/docsis/packet-docsis.c +++ b/plugins/docsis/packet-docsis.c @@ -841,7 +841,7 @@ proto_reg_handoff_docsis (void) dissector_add_uint ("wtap_encap", WTAP_ENCAP_DOCSIS, docsis_handle); docsis_mgmt_handle = find_dissector ("docsis_mgmt"); - eth_withoutfcs_handle = find_dissector ("eth_withoutfcs"); + eth_withoutfcs_handle = find_dissector_add_dependency("eth_withoutfcs", proto_docsis); } /* diff --git a/plugins/ethercat/packet-ecatmb.c b/plugins/ethercat/packet-ecatmb.c index 217b99d29f..91c90ddc00 100644 --- a/plugins/ethercat/packet-ecatmb.c +++ b/plugins/ethercat/packet-ecatmb.c @@ -1983,8 +1983,8 @@ void proto_reg_handoff_ecat_mailbox(void) ecat_mailbox_handle = find_dissector("ecat_mailbox"); dissector_add_uint("ecatf.type", 5, ecat_mailbox_handle); - eth_handle = find_dissector("eth_withoutfcs"); - ams_handle = find_dissector("ams"); + eth_handle = find_dissector_add_dependency("eth_withoutfcs", proto_ecat_mailbox); + ams_handle = find_dissector_add_dependency("ams", proto_ecat_mailbox); } /* diff --git a/plugins/ethercat/packet-esl.c b/plugins/ethercat/packet-esl.c index aed683517c..38049d63b2 100644 --- a/plugins/ethercat/packet-esl.c +++ b/plugins/ethercat/packet-esl.c @@ -363,7 +363,7 @@ proto_reg_handoff_esl(void) { static gboolean initialized = FALSE; if (!initialized) { - eth_withoutfcs_handle = find_dissector("eth_withoutfcs"); + eth_withoutfcs_handle = find_dissector_add_dependency("eth_withoutfcs", proto_esl); heur_dissector_add("eth", dissect_esl_heur, "EtherCAT over Ethernet", "esl_eth", proto_esl, HEURISTIC_DISABLE); initialized = TRUE; } diff --git a/plugins/ethercat/packet-ethercat-datagram.c b/plugins/ethercat/packet-ethercat-datagram.c index a5387f5b2a..437973c7ea 100644 --- a/plugins/ethercat/packet-ethercat-datagram.c +++ b/plugins/ethercat/packet-ethercat-datagram.c @@ -1696,7 +1696,7 @@ void proto_reg_handoff_ecat(void) ecat_handle = create_dissector_handle(dissect_ecat_datagram, proto_ecat_datagram); dissector_add_uint("ecatf.type", 1 /* EtherCAT type */, ecat_handle); - ecat_mailbox_handle = find_dissector("ecat_mailbox"); + ecat_mailbox_handle = find_dissector_add_dependency("ecat_mailbox", proto_ecat_datagram); } /* diff --git a/plugins/wimaxasncp/packet-wimaxasncp.c b/plugins/wimaxasncp/packet-wimaxasncp.c index 28e8a7d349..d1dca91b70 100644 --- a/plugins/wimaxasncp/packet-wimaxasncp.c +++ b/plugins/wimaxasncp/packet-wimaxasncp.c @@ -3467,7 +3467,7 @@ proto_reg_handoff_wimaxasncp(void) { /* Find the EAP dissector */ - eap_handle = find_dissector("eap"); + eap_handle = find_dissector_add_dependency("eap", proto_wimaxasncp); inited = TRUE; } |