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-vssmonitoring.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-vssmonitoring.c')
| -rw-r--r-- | epan/dissectors/packet-vssmonitoring.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/epan/dissectors/packet-vssmonitoring.c b/epan/dissectors/packet-vssmonitoring.c index 1ac887c4da..ecb719bce0 100644 --- a/epan/dissectors/packet-vssmonitoring.c +++ b/epan/dissectors/packet-vssmonitoring.c @@ -57,8 +57,6 @@ static int hf_vssmonitoring_srcport = -1; static gint ett_vssmonitoring = -1; -static gboolean vssmonitoring_use_heuristics = TRUE; - static int dissect_vssmonitoring(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { @@ -124,9 +122,6 @@ dissect_vssmonitoring(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void vssmonitoring_clksrc = (guint8)(((guint32)vssmonitoring_time.nsecs) >> CLKSRC_SHIFT); vssmonitoring_time.nsecs &= VSS_NS_MASK; - /* There are only heuristics for timestamps, the port stamp can be any value */ - if ( vssmonitoring_use_heuristics ) { - /* The timestamp will be based on the uptime until the TAP is completely booted, * this takes about 60s, but use 1 hour to be sure */ @@ -155,7 +150,6 @@ dissect_vssmonitoring(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void */ if ( vssmonitoring_time.nsecs >= 1000000000 ) return 0; - } } /* All systems are go, lets dissect the VSS-Monitoring trailer */ @@ -233,17 +227,13 @@ proto_register_vssmonitoring(void) vssmonitoring_module = prefs_register_protocol(proto_vssmonitoring, NULL); - prefs_register_bool_preference(vssmonitoring_module, "use_heuristics", - "Use heuristics to verify if trailer contains VSS-Monitoring data", - "When enabled, Wireshark will do a check on the trailer data to verify" - "whether it contains VSS-Monitoring time- and port-stamps.", - &vssmonitoring_use_heuristics); + prefs_register_obsolete_preference(vssmonitoring_module, "use_heuristics"); } void proto_reg_handoff_vssmonitoring(void) { - heur_dissector_add("eth.trailer", dissect_vssmonitoring, "VSS-Monitoring ethernet trailer", "vssmonitoring_eth", proto_vssmonitoring); + heur_dissector_add("eth.trailer", dissect_vssmonitoring, "VSS-Monitoring ethernet trailer", "vssmonitoring_eth", proto_vssmonitoring, HEURISTIC_ENABLE); } /* |