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 --- asn1/atn-cm/packet-atn-cm-template.c | 2 +- asn1/atn-cpdlc/packet-atn-cpdlc-template.c | 2 +- asn1/atn-ulcs/packet-atn-ulcs-template.c | 2 +- asn1/credssp/packet-credssp-template.c | 2 +- asn1/mms/packet-mms-template.c | 4 ++-- asn1/mpeg-audio/packet-mpeg-audio-template.c | 2 +- asn1/mpeg-pes/packet-mpeg-pes-template.c | 2 +- asn1/ranap/packet-ranap-template.c | 9 +++------ asn1/rnsap/packet-rnsap-template.c | 7 ++----- asn1/t124/packet-t124-template.c | 2 +- asn1/t125/packet-t125-template.c | 4 ++-- 11 files changed, 16 insertions(+), 22 deletions(-) (limited to 'asn1') diff --git a/asn1/atn-cm/packet-atn-cm-template.c b/asn1/atn-cm/packet-atn-cm-template.c index eec0d0ec97..46373fd277 100644 --- a/asn1/atn-cm/packet-atn-cm-template.c +++ b/asn1/atn-cm/packet-atn-cm-template.c @@ -233,7 +233,7 @@ void proto_reg_handoff_atn_cm(void) dissect_atn_cm_heur, "ATN-CM over ATN-ULCS", "atn-cm-ulcs", - proto_atn_cm); + proto_atn_cm, HEURISTIC_ENABLE); } /* diff --git a/asn1/atn-cpdlc/packet-atn-cpdlc-template.c b/asn1/atn-cpdlc/packet-atn-cpdlc-template.c index e260860d5f..5db061e3d3 100644 --- a/asn1/atn-cpdlc/packet-atn-cpdlc-template.c +++ b/asn1/atn-cpdlc/packet-atn-cpdlc-template.c @@ -342,7 +342,7 @@ void proto_reg_handoff_atn_cpdlc(void) dissect_atn_cpdlc_heur, "ATN-CPDLC over ATN-ULCS", "atn-cpdlc-ulcs", - proto_atn_cpdlc); + proto_atn_cpdlc, HEURISTIC_ENABLE); } diff --git a/asn1/atn-ulcs/packet-atn-ulcs-template.c b/asn1/atn-ulcs/packet-atn-ulcs-template.c index 8634d5c15a..e5a9f3022d 100644 --- a/asn1/atn-ulcs/packet-atn-ulcs-template.c +++ b/asn1/atn-ulcs/packet-atn-ulcs-template.c @@ -891,7 +891,7 @@ void proto_reg_handoff_atn_ulcs(void) dissect_atn_ulcs_heur, "ATN-ULCS over COTP", "atn-ucls_cotp", - proto_atn_ulcs); + proto_atn_ulcs, HEURISTIC_ENABLE); } /* diff --git a/asn1/credssp/packet-credssp-template.c b/asn1/credssp/packet-credssp-template.c index 40ba87f0fa..111bd87a6d 100644 --- a/asn1/credssp/packet-credssp-template.c +++ b/asn1/credssp/packet-credssp-template.c @@ -176,7 +176,7 @@ void proto_register_credssp(void) { /*--- proto_reg_handoff_credssp --- */ void proto_reg_handoff_credssp(void) { - heur_dissector_add("ssl", dissect_credssp_heur, "CredSSP over SSL", "credssp_ssl", proto_credssp); + heur_dissector_add("ssl", dissect_credssp_heur, "CredSSP over SSL", "credssp_ssl", proto_credssp, HEURISTIC_ENABLE); exported_pdu_tap = find_tap_id(EXPORT_PDU_TAP_NAME_LAYER_7); } diff --git a/asn1/mms/packet-mms-template.c b/asn1/mms/packet-mms-template.c index 417a4e9187..53350f50e0 100644 --- a/asn1/mms/packet-mms-template.c +++ b/asn1/mms/packet-mms-template.c @@ -172,7 +172,7 @@ dissect_mms_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, voi void proto_reg_handoff_mms(void) { register_ber_oid_dissector("1.0.9506.2.3", dissect_mms, proto_mms,"MMS"); register_ber_oid_dissector("1.0.9506.2.1", dissect_mms, proto_mms,"mms-abstract-syntax-version1(1)"); - heur_dissector_add("cotp", dissect_mms_heur, "MMS over COTP", "mms_cotp", proto_mms); - heur_dissector_add("cotp_is", dissect_mms_heur, "MMS over COTP (inactive subset)", "mms_cotp_is", proto_mms); + heur_dissector_add("cotp", dissect_mms_heur, "MMS over COTP", "mms_cotp", proto_mms, HEURISTIC_ENABLE); + heur_dissector_add("cotp_is", dissect_mms_heur, "MMS over COTP (inactive subset)", "mms_cotp_is", proto_mms, HEURISTIC_ENABLE); } diff --git a/asn1/mpeg-audio/packet-mpeg-audio-template.c b/asn1/mpeg-audio/packet-mpeg-audio-template.c index c05a6731f4..8ae19bd9e4 100644 --- a/asn1/mpeg-audio/packet-mpeg-audio-template.c +++ b/asn1/mpeg-audio/packet-mpeg-audio-template.c @@ -176,5 +176,5 @@ proto_register_mpeg_audio(void) void proto_reg_handoff_mpeg_audio(void) { - heur_dissector_add("mpeg", dissect_mpeg_audio, "MPEG Audio", "mpeg_audio", proto_mpeg_audio); + heur_dissector_add("mpeg", dissect_mpeg_audio, "MPEG Audio", "mpeg_audio", proto_mpeg_audio, HEURISTIC_ENABLE); } diff --git a/asn1/mpeg-pes/packet-mpeg-pes-template.c b/asn1/mpeg-pes/packet-mpeg-pes-template.c index d473967d26..01e4f43ffc 100644 --- a/asn1/mpeg-pes/packet-mpeg-pes-template.c +++ b/asn1/mpeg-pes/packet-mpeg-pes-template.c @@ -674,5 +674,5 @@ proto_reg_handoff_mpeg_pes(void) dissector_handle_t mpeg_handle = find_dissector("mpeg"); dissector_add_uint("wtap_encap", WTAP_ENCAP_MPEG, mpeg_handle); - heur_dissector_add("mpeg", dissect_mpeg_pes, "MPEG PES", "mpeg_pes", proto_mpeg_pes); + heur_dissector_add("mpeg", dissect_mpeg_pes, "MPEG PES", "mpeg_pes", proto_mpeg_pes, HEURISTIC_ENABLE); } diff --git a/asn1/ranap/packet-ranap-template.c b/asn1/ranap/packet-ranap-template.c index 98c5efb3f2..57bd20a9a7 100644 --- a/asn1/ranap/packet-ranap-template.c +++ b/asn1/ranap/packet-ranap-template.c @@ -387,12 +387,9 @@ proto_reg_handoff_ranap(void) dissector_add_uint("sccp.ssn", global_ranap_sccp_ssn, ranap_handle); local_ranap_sccp_ssn = global_ranap_sccp_ssn; - /* Add heuristic dissector - * Perhaps we want a preference whether the heuristic dissector - * is or isn't enabled - */ - heur_dissector_add("sccp", dissect_sccp_ranap_heur, "RANAP over SCCP", "ranap_sccp", proto_ranap); - heur_dissector_add("sua", dissect_sccp_ranap_heur, "RANAP over SUA", "ranap_sua", proto_ranap); + + heur_dissector_add("sccp", dissect_sccp_ranap_heur, "RANAP over SCCP", "ranap_sccp", proto_ranap, HEURISTIC_ENABLE); + heur_dissector_add("sua", dissect_sccp_ranap_heur, "RANAP over SUA", "ranap_sua", proto_ranap, HEURISTIC_ENABLE); } diff --git a/asn1/rnsap/packet-rnsap-template.c b/asn1/rnsap/packet-rnsap-template.c index 4ac6e743d9..80fe3536a9 100644 --- a/asn1/rnsap/packet-rnsap-template.c +++ b/asn1/rnsap/packet-rnsap-template.c @@ -180,11 +180,8 @@ proto_reg_handoff_rnsap(void) rrc_dl_dcch_handle = find_dissector("rrc.dl.dcch"); dissector_add_uint("sccp.ssn", SCCP_SSN_RNSAP, rnsap_handle); - /* Add heuristic dissector - * Perhaps we want a preference whether the heuristic dissector - * is or isn't enabled - */ - /*heur_dissector_add("sccp", dissect_sccp_rnsap_heur, "RNSAP over SCCP", "ranap_sccp", proto_rnsap); */ + /* Add heuristic dissector */ + /*heur_dissector_add("sccp", dissect_sccp_rnsap_heur, "RNSAP over SCCP", "ranap_sccp", proto_rnsap, HEURISTIC_DISABLE); */ #include "packet-rnsap-dis-tab.c" } diff --git a/asn1/t124/packet-t124-template.c b/asn1/t124/packet-t124-template.c index 12bdd40419..87752ab2a3 100644 --- a/asn1/t124/packet-t124-template.c +++ b/asn1/t124/packet-t124-template.c @@ -225,6 +225,6 @@ proto_reg_handoff_t124(void) { register_ber_oid_dissector("0.0.20.124.0.1", dissect_t124, proto_t124, "Generic Conference Control"); - heur_dissector_add("t125", dissect_t124_heur, "T.124 over T.125", "t124_t125", proto_t124); + heur_dissector_add("t125", dissect_t124_heur, "T.124 over T.125", "t124_t125", proto_t124, HEURISTIC_ENABLE); } diff --git a/asn1/t125/packet-t125-template.c b/asn1/t125/packet-t125-template.c index cce1d890a4..70ae4b6fb5 100644 --- a/asn1/t125/packet-t125-template.c +++ b/asn1/t125/packet-t125-template.c @@ -146,6 +146,6 @@ void proto_register_t125(void) { /*--- proto_reg_handoff_t125 ---------------------------------------*/ void proto_reg_handoff_t125(void) { - heur_dissector_add("cotp", dissect_t125_heur, "T.125 over COTP", "t125_cotp", proto_t125); - heur_dissector_add("cotp_is", dissect_t125_heur, "T.125 over COTP (inactive subset)", "t125_cotp_is", proto_t125); + heur_dissector_add("cotp", dissect_t125_heur, "T.125 over COTP", "t125_cotp", proto_t125, HEURISTIC_ENABLE); + heur_dissector_add("cotp_is", dissect_t125_heur, "T.125 over COTP (inactive subset)", "t125_cotp_is", proto_t125, HEURISTIC_ENABLE); } -- cgit v1.2.1