diff options
| author | AndersBroman <anders.broman@ericsson.com> | 2014-05-20 12:54:20 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-05-21 20:17:29 +0000 |
| commit | 2cfda31ff09893bd8c59acabc8faad7227f52ede (patch) | |
| tree | a0bee1c33fe7bc2eeced9c2f7fe0bbe7628cebcd /epan/dissectors/packet-tipc.c | |
| parent | bb01c7ac380a2978d8e1c5ca8fa7f2dd523a8323 (diff) | |
Change the signature of dissector_try_heuristic() to return hdtbl_entry
which can be used to call the found heuristic dissector on the next pass.
Introduce call_heur_dissector_direct() to be used to call a heuristic
dissector which accepted the frame on the first pass.
Change-Id: I524edd717b7d92b510bd60acfeea686d5f2b4582
Reviewed-on: https://code.wireshark.org/review/1697
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-tipc.c')
| -rw-r--r-- | epan/dissectors/packet-tipc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/epan/dissectors/packet-tipc.c b/epan/dissectors/packet-tipc.c index 88155cc9ae..a900dc635c 100644 --- a/epan/dissectors/packet-tipc.c +++ b/epan/dissectors/packet-tipc.c @@ -1558,12 +1558,13 @@ static void call_tipc_v2_data_subdissectors(tvbuff_t *data_tvb, packet_info *pinfo, guint32 *name_type_p, guint8 user) { if (dissect_tipc_data) { + heur_dtbl_entry_t *hdtbl_entry; /* dissection of TIPC data is set in preferences */ /* check for heuristic dissectors if specified in the * preferences to try them first */ if (try_heuristic_first) { - if (dissector_try_heuristic(tipc_heur_subdissector_list, data_tvb, pinfo, top_tree, NULL)) + if (dissector_try_heuristic(tipc_heur_subdissector_list, data_tvb, pinfo, top_tree, &hdtbl_entry, NULL)) return; } /* This triggers if a dissectors if @@ -1607,7 +1608,7 @@ call_tipc_v2_data_subdissectors(tvbuff_t *data_tvb, packet_info *pinfo, guint32 /* check for heuristic dissectors if specified in the * preferences not to try them first */ if (!try_heuristic_first) { - if (dissector_try_heuristic(tipc_heur_subdissector_list, data_tvb, pinfo, top_tree, NULL)) + if (dissector_try_heuristic(tipc_heur_subdissector_list, data_tvb, pinfo, top_tree, &hdtbl_entry, NULL)) return; } } |