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-redback.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'epan/dissectors/packet-redback.c') diff --git a/epan/dissectors/packet-redback.c b/epan/dissectors/packet-redback.c index 7c8736c02d..4f5b5aa5b7 100644 --- a/epan/dissectors/packet-redback.c +++ b/epan/dissectors/packet-redback.c @@ -236,14 +236,14 @@ proto_reg_handoff_redback(void) osinl_incl_subdissector_table = find_dissector_table("osinl.incl"); osinl_excl_subdissector_table = find_dissector_table("osinl.excl"); - ipv4_handle = find_dissector("ip"); - ipv6_handle = find_dissector("ipv6"); + ipv4_handle = find_dissector_add_dependency("ip", hfi_redback->id); + ipv6_handle = find_dissector_add_dependency("ipv6", hfi_redback->id); data_handle = find_dissector("data"); - ethnofcs_handle = find_dissector("eth_withoutfcs"); - clnp_handle = find_dissector("clnp"); - arp_handle = find_dissector("arp"); - ppp_handle = find_dissector("ppp"); - ppphdlc_handle = find_dissector("ppp_hdlc"); + ethnofcs_handle = find_dissector_add_dependency("eth_withoutfcs", hfi_redback->id); + clnp_handle = find_dissector_add_dependency("clnp", hfi_redback->id); + arp_handle = find_dissector_add_dependency("arp", hfi_redback->id); + ppp_handle = find_dissector_add_dependency("ppp", hfi_redback->id); + ppphdlc_handle = find_dissector_add_dependency("ppp_hdlc", hfi_redback->id); dissector_add_uint("wtap_encap", WTAP_ENCAP_REDBACK, redback_handle); } -- cgit v1.2.3