diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-07-12 20:40:31 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-07-17 17:12:22 +0000 |
| commit | 21e5a950ade6a20260b63b5f5c055c52ac07b599 (patch) | |
| tree | 417e76e5a3082c2431ce0f5c6d88cbf7701e0489 /epan/dissectors/packet-rtcp.c | |
| parent | 5bd6c4aff21dbc8a7ebf31c5d1510fcedf66d875 (diff) | |
Remove all preferences related to enabling/disabling heuristic dissectors.
The preferences are still supported for backwards compatibility, but the heuristic_protos file has final say on the "preference" to enable/disable a heuristic dissector.
Also add parameter to heur_dissector_add() for the "default" enable/disable of a heuristic dissector. With this parameter, a few more (presumably weak) heuristic dissectors have been "registered" but of course default to being disabled.
Change-Id: I51bebb2146ef3fbb8418d4f5c7f2cb2b58003a22
Reviewed-on: https://code.wireshark.org/review/9610
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-rtcp.c')
| -rw-r--r-- | epan/dissectors/packet-rtcp.c | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c index ab07249ec9..6681ff6dd8 100644 --- a/epan/dissectors/packet-rtcp.c +++ b/epan/dissectors/packet-rtcp.c @@ -697,9 +697,6 @@ static expert_field ei_rtcp_roundtrip_delay_negative = EI_INIT; static void dissect_rtcp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ); -/* Heuristic dissection */ -static gboolean global_rtcp_heur = FALSE; - /* Displaying set info */ static gboolean global_rtcp_show_setup_info = TRUE; static void show_setup_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); @@ -802,16 +799,6 @@ dissect_rtcp_heur( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da unsigned int first_byte; unsigned int packet_type; - /* This is a heuristic dissector, which means we get all the UDP - * traffic not sent to a known dissector and not claimed by - * a heuristic dissector called before us! - */ - - if (!global_rtcp_heur) - { - return FALSE; - } - /* Look at first byte */ first_byte = tvb_get_guint8(tvb, offset); @@ -6502,11 +6489,7 @@ proto_register_rtcp(void) "this RTCP stream to be created", &global_rtcp_show_setup_info); - prefs_register_bool_preference(rtcp_module, "heuristic_rtcp", - "Try to decode RTCP outside of conversations", - "If call control SIP/H.323/RTSP/.. messages are missing in the trace, " - "RTCP isn't decoded without this", - &global_rtcp_heur); + prefs_register_obsolete_preference(rtcp_module, "heuristic_rtcp"); prefs_register_bool_preference(rtcp_module, "show_roundtrip_calculation", "Show relative roundtrip calculations", @@ -6537,8 +6520,8 @@ proto_reg_handoff_rtcp(void) dissector_add_for_decode_as("udp.port", rtcp_handle); dissector_add_for_decode_as("flip.payload", rtcp_handle ); - heur_dissector_add( "udp", dissect_rtcp_heur_udp, "RTCP over UDP", "rtcp_udp", proto_rtcp); - heur_dissector_add("stun", dissect_rtcp_heur, "RTCP over TURN", "rtcp_stun", proto_rtcp); + heur_dissector_add( "udp", dissect_rtcp_heur_udp, "RTCP over UDP", "rtcp_udp", proto_rtcp, HEURISTIC_ENABLE); + heur_dissector_add("stun", dissect_rtcp_heur, "RTCP over TURN", "rtcp_stun", proto_rtcp, HEURISTIC_ENABLE); } /* |