From 9bcac48403de9aff6435d0f48028ae1f72f64528 Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Wed, 16 Mar 2016 09:02:52 -0400 Subject: 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 Reviewed-by: Michael Mann --- epan/dissectors/packet-atm.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'epan/dissectors/packet-atm.c') diff --git a/epan/dissectors/packet-atm.c b/epan/dissectors/packet-atm.c index bbf65e7076..2a23ffcb2e 100644 --- a/epan/dissectors/packet-atm.c +++ b/epan/dissectors/packet-atm.c @@ -2009,14 +2009,14 @@ proto_reg_handoff_atm(void) * Get handles for the Ethernet, Token Ring, Frame Relay, LLC, * SSCOP, LANE, and ILMI dissectors. */ - eth_withoutfcs_handle = find_dissector("eth_withoutfcs"); - tr_handle = find_dissector("tr"); - fr_handle = find_dissector("fr"); - llc_handle = find_dissector("llc"); - sscop_handle = find_dissector("sscop"); - ppp_handle = find_dissector("ppp"); - eth_maybefcs_handle = find_dissector("eth_maybefcs"); - ip_handle = find_dissector("ip"); + eth_withoutfcs_handle = find_dissector_add_dependency("eth_withoutfcs", proto_atm_lane); + tr_handle = find_dissector_add_dependency("tr", proto_atm_lane); + fr_handle = find_dissector_add_dependency("fr", proto_atm); + llc_handle = find_dissector_add_dependency("llc", proto_atm); + sscop_handle = find_dissector_add_dependency("sscop", proto_atm); + ppp_handle = find_dissector_add_dependency("ppp", proto_atm); + eth_maybefcs_handle = find_dissector_add_dependency("eth_maybefcs", proto_atm); + ip_handle = find_dissector_add_dependency("ip", proto_atm); data_handle = find_dissector("data"); dissector_add_uint("wtap_encap", WTAP_ENCAP_ATM_PDUS, atm_handle); -- cgit v1.2.3