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-umts_fp.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-umts_fp.c')
| -rw-r--r-- | epan/dissectors/packet-umts_fp.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/epan/dissectors/packet-umts_fp.c b/epan/dissectors/packet-umts_fp.c index ad185464c1..95e6329ce9 100644 --- a/epan/dissectors/packet-umts_fp.c +++ b/epan/dissectors/packet-umts_fp.c @@ -251,7 +251,6 @@ static gboolean preferences_call_mac_dissectors = TRUE; static gboolean preferences_show_release_info = TRUE; static gboolean preferences_payload_checksum = TRUE; static gboolean preferences_header_checksum = TRUE; -static gboolean preferences_udp_do_heur = FALSE; #define UMTS_FP_USE_UAT 1 @@ -3760,10 +3759,6 @@ heur_dissect_fp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data { struct fp_info *p_fp_info; - if (!preferences_udp_do_heur) { - return FALSE; - } - p_fp_info = (fp_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_fp, 0); /* if no FP info is present, this might be FP in a pcap(ng) file */ @@ -5609,10 +5604,7 @@ void proto_register_fp(void) "Validate FP header checksums", &preferences_header_checksum); /* Determines whether or not to validate FP header checksums */ - prefs_register_bool_preference(fp_module, "udp_heur", - "Enable UDP heur dissector", - "Enable UDP heur dissector", - &preferences_udp_do_heur); + prefs_register_obsolete_preference(fp_module, "udp_heur"); #ifdef UMTS_FP_USE_UAT umts_fp_uat = uat_new("Endpoint and Channel Configuration", @@ -5653,7 +5645,7 @@ void proto_reg_handoff_fp(void) mac_fdd_hsdsch_handle = find_dissector("mac.fdd.hsdsch"); fp_handle = find_dissector("fp"); - heur_dissector_add("udp", heur_dissect_fp, "FP over UDP", "fp_udp", proto_fp); + heur_dissector_add("udp", heur_dissect_fp, "FP over UDP", "fp_udp", proto_fp, HEURISTIC_DISABLE); dissector_add_uint("atm.aal2.type", TRAF_UMTS_FP, fp_handle); } |