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-iser.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-iser.c')
| -rw-r--r-- | epan/dissectors/packet-iser.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-iser.c b/epan/dissectors/packet-iser.c index c78a1298d8..cb37af4d7d 100644 --- a/epan/dissectors/packet-iser.c +++ b/epan/dissectors/packet-iser.c @@ -397,8 +397,8 @@ proto_reg_handoff_iser(void) if (!initialized) { new_create_dissector_handle(dissect_iser, proto_iser); - heur_dissector_add("infiniband.payload", dissect_iser, "iSER Infiniband", "iser_infiniband", proto_iser); - heur_dissector_add("infiniband.mad.cm.private", dissect_iser, "iSER in PrivateData of CM packets", "iser_ib_private", proto_iser); + heur_dissector_add("infiniband.payload", dissect_iser, "iSER Infiniband", "iser_infiniband", proto_iser, HEURISTIC_ENABLE); + heur_dissector_add("infiniband.mad.cm.private", dissect_iser, "iSER in PrivateData of CM packets", "iser_ib_private", proto_iser, HEURISTIC_ENABLE); /* allocate enough space in the addresses to store the largest address (a GID) */ manual_addr_data[0] = wmem_alloc(wmem_epan_scope(), GID_SIZE); |