From 21e5a950ade6a20260b63b5f5c055c52ac07b599 Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Sun, 12 Jul 2015 20:40:31 -0400 Subject: 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 Reviewed-by: Roland Knall Reviewed-by: Hadriel Kaplan Reviewed-by: Michael Mann --- epan/dissectors/packet-mp2t.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'epan/dissectors/packet-mp2t.c') diff --git a/epan/dissectors/packet-mp2t.c b/epan/dissectors/packet-mp2t.c index bad8e4866b..ea51a46639 100644 --- a/epan/dissectors/packet-mp2t.c +++ b/epan/dissectors/packet-mp2t.c @@ -1538,11 +1538,11 @@ proto_register_mp2t(void) void proto_reg_handoff_mp2t(void) { - heur_dissector_add("udp", heur_dissect_mp2t, "MP2T over UDP", "mp2t_udp", proto_mp2t); + heur_dissector_add("udp", heur_dissect_mp2t, "MP2T over UDP", "mp2t_udp", proto_mp2t, HEURISTIC_ENABLE); dissector_add_uint("rtp.pt", PT_MP2T, mp2t_handle); dissector_add_for_decode_as("udp.port", mp2t_handle); - heur_dissector_add("usb.bulk", heur_dissect_mp2t, "MP2T USB bulk endpoint", "mp2t_usb_bulk", proto_mp2t); + heur_dissector_add("usb.bulk", heur_dissect_mp2t, "MP2T USB bulk endpoint", "mp2t_usb_bulk", proto_mp2t, HEURISTIC_ENABLE); dissector_add_uint("wtap_encap", WTAP_ENCAP_MPEG_2_TS, mp2t_handle); dissector_add_uint("l2tp.pw_type", L2TPv3_PROTOCOL_DOCSIS_DMPT, mp2t_handle); -- cgit v1.2.3