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-rnsap.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-rnsap.c')
| -rw-r--r-- | epan/dissectors/packet-rnsap.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/epan/dissectors/packet-rnsap.c b/epan/dissectors/packet-rnsap.c index 64b4772cdb..b9fc200dde 100644 --- a/epan/dissectors/packet-rnsap.c +++ b/epan/dissectors/packet-rnsap.c @@ -55371,11 +55371,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); */ /*--- Included file: packet-rnsap-dis-tab.c ---*/ @@ -56174,7 +56171,7 @@ proto_reg_handoff_rnsap(void) /*--- End of included file: packet-rnsap-dis-tab.c ---*/ -#line 190 "../../asn1/rnsap/packet-rnsap-template.c" +#line 187 "../../asn1/rnsap/packet-rnsap-template.c" } |