aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-meta.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2016-03-16 09:02:52 -0400
committerMichael Mann <mmann78@netscape.net>2016-03-20 12:48:48 +0000
commit9bcac48403de9aff6435d0f48028ae1f72f64528 (patch)
tree16989d2207299572c970a79b6d4c4037fa975c55 /epan/dissectors/packet-meta.c
parent6da50e2fde7b678cfbee922e3b12d588d75b6eef (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 'epan/dissectors/packet-meta.c')
-rw-r--r--epan/dissectors/packet-meta.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/epan/dissectors/packet-meta.c b/epan/dissectors/packet-meta.c
index f0e093c189..76e3850666 100644
--- a/epan/dissectors/packet-meta.c
+++ b/epan/dissectors/packet-meta.c
@@ -810,14 +810,14 @@ proto_reg_handoff_meta(void)
dissector_add_uint("wtap_encap", WTAP_ENCAP_META, meta_handle);
#endif
data_handle = find_dissector("data");
- alcap_handle = find_dissector("alcap");
- atm_untrunc_handle = find_dissector("atm_untruncated");
- nbap_handle = find_dissector("nbap");
- sscf_nni_handle = find_dissector("sscf-nni");
- ethwithfcs_handle = find_dissector("eth_withfcs");
- ethwithoutfcs_handle = find_dissector("eth_withoutfcs");
- fphint_handle = find_dissector("fp_hint");
- mtp2_handle = find_dissector("mtp2");
+ alcap_handle = find_dissector_add_dependency("alcap", proto_meta);
+ atm_untrunc_handle = find_dissector_add_dependency("atm_untruncated", proto_meta);
+ nbap_handle = find_dissector_add_dependency("nbap", proto_meta);
+ sscf_nni_handle = find_dissector_add_dependency("sscf-nni", proto_meta);
+ ethwithfcs_handle = find_dissector_add_dependency("eth_withfcs", proto_meta);
+ ethwithoutfcs_handle = find_dissector_add_dependency("eth_withoutfcs", proto_meta);
+ fphint_handle = find_dissector_add_dependency("fp_hint", proto_meta);
+ mtp2_handle = find_dissector_add_dependency("mtp2", proto_meta);
}
/*