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 /epan/dissectors/packet-http.c | |
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 'epan/dissectors/packet-http.c')
-rw-r--r-- | epan/dissectors/packet-http.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c index 7665b91f57..9c56704b09 100644 --- a/epan/dissectors/packet-http.c +++ b/epan/dissectors/packet-http.c @@ -3570,8 +3570,8 @@ proto_reg_handoff_http(void) dissector_handle_t ssdp_handle; data_handle = find_dissector("data"); - media_handle = find_dissector("media"); - websocket_handle = find_dissector("websocket"); + media_handle = find_dissector_add_dependency("media", proto_http); + websocket_handle = find_dissector_add_dependency("websocket", proto_http); http2_handle = find_dissector("http2"); /* * XXX - is there anything to dissect in the body of an SSDP @@ -3580,9 +3580,9 @@ proto_reg_handoff_http(void) ssdp_handle = create_dissector_handle(dissect_ssdp, proto_ssdp); dissector_add_uint("udp.port", UDP_PORT_SSDP, ssdp_handle); - ntlmssp_handle = find_dissector("ntlmssp"); - gssapi_handle = find_dissector("gssapi"); - sstp_handle = find_dissector("sstp"); + ntlmssp_handle = find_dissector_add_dependency("ntlmssp", proto_http); + gssapi_handle = find_dissector_add_dependency("gssapi", proto_http); + sstp_handle = find_dissector_add_dependency("sstp", proto_http); stats_tree_register("http", "http", "HTTP/Packet Counter", 0, http_stats_tree_packet, http_stats_tree_init, NULL ); stats_tree_register("http", "http_req", "HTTP/Requests", 0, http_req_stats_tree_packet, http_req_stats_tree_init, NULL ); |