From 2cfda31ff09893bd8c59acabc8faad7227f52ede Mon Sep 17 00:00:00 2001 From: AndersBroman Date: Tue, 20 May 2014 12:54:20 +0200 Subject: 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 Reviewed-by: Anders Broman --- epan/dissectors/packet-sercosiii.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'epan/dissectors/packet-sercosiii.c') diff --git a/epan/dissectors/packet-sercosiii.c b/epan/dissectors/packet-sercosiii.c index f18b766765..85241ad3b8 100644 --- a/epan/dissectors/packet-sercosiii.c +++ b/epan/dissectors/packet-sercosiii.c @@ -1187,6 +1187,7 @@ dissect_siii(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) const char *tel_ch = "?"; const char *tel_type = "?"; guint tel_no = 0; + heur_dtbl_entry_t *hdtbl_entry; /* setup columns */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "SERCOS III V1.1"); @@ -1197,7 +1198,7 @@ dissect_siii(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * give that protocol a chance to make a heuristic dissection, before we continue * to dissect it as a normal SercosIII packet. */ - if (dissector_try_heuristic(heur_subdissector_list, tvb, pinfo, tree, NULL)) + if (dissector_try_heuristic(heur_subdissector_list, tvb, pinfo, tree, &hdtbl_entry, NULL)) return; /* check what we got on our hand */ -- cgit v1.2.3