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-reload-framing.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-reload-framing.c')
| -rw-r--r-- | epan/dissectors/packet-reload-framing.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-reload-framing.c b/epan/dissectors/packet-reload-framing.c index b7a7883358..36c3f2563c 100644 --- a/epan/dissectors/packet-reload-framing.c +++ b/epan/dissectors/packet-reload-framing.c @@ -599,9 +599,9 @@ proto_reg_handoff_reload_framing(void) dissector_add_uint("tcp.port", TCP_PORT_RELOAD, reload_framing_tcp_handle); dissector_add_uint("udp.port", UDP_PORT_RELOAD, reload_framing_udp_handle); - heur_dissector_add("udp", dissect_reload_framing_heur, "RELOAD Framing over UDP", "reload_framing_udp", proto_reload_framing); - heur_dissector_add("tcp", dissect_reload_framing_heur, "RELOAD Framing over TCP", "reload_framing_tcp", proto_reload_framing); - heur_dissector_add("dtls", dissect_reload_framing_heur_dtls, "RELOAD Framing over DTLS", "reload_framing_dtls", proto_reload_framing); + heur_dissector_add("udp", dissect_reload_framing_heur, "RELOAD Framing over UDP", "reload_framing_udp", proto_reload_framing, HEURISTIC_ENABLE); + heur_dissector_add("tcp", dissect_reload_framing_heur, "RELOAD Framing over TCP", "reload_framing_tcp", proto_reload_framing, HEURISTIC_ENABLE); + heur_dissector_add("dtls", dissect_reload_framing_heur_dtls, "RELOAD Framing over DTLS", "reload_framing_dtls", proto_reload_framing, HEURISTIC_ENABLE); exported_pdu_tap = find_tap_id(EXPORT_PDU_TAP_NAME_LAYER_7); } |