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-usb-ccid.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'epan/dissectors/packet-usb-ccid.c') diff --git a/epan/dissectors/packet-usb-ccid.c b/epan/dissectors/packet-usb-ccid.c index 25e0b9738b..5b4164fa0a 100644 --- a/epan/dissectors/packet-usb-ccid.c +++ b/epan/dissectors/packet-usb-ccid.c @@ -758,11 +758,11 @@ proto_reg_handoff_ccid(void) dissector_add_for_decode_as("usb.protocol", usb_ccid_handle); sub_handles[SUB_DATA] = find_dissector("data"); - sub_handles[SUB_ISO7816] = find_dissector("iso7816"); - sub_handles[SUB_GSM_SIM_CMD] = find_dissector("gsm_sim.command"); - sub_handles[SUB_PN532] = find_dissector("pn532"); - sub_handles[SUB_ACR122_PN532] = find_dissector("acr122"); - sub_handles[SUB_GSM_SIM_RSP] = find_dissector("gsm_sim.response"); + sub_handles[SUB_ISO7816] = find_dissector_add_dependency("iso7816", proto_ccid); + sub_handles[SUB_GSM_SIM_CMD] = find_dissector_add_dependency("gsm_sim.command", proto_ccid); + sub_handles[SUB_PN532] = find_dissector_add_dependency("pn532", proto_ccid); + sub_handles[SUB_ACR122_PN532] = find_dissector_add_dependency("acr122", proto_ccid); + sub_handles[SUB_GSM_SIM_RSP] = find_dissector_add_dependency("gsm_sim.response", proto_ccid); } /* -- cgit v1.2.1