From 5a8783f5b12e017967ce178bac3d1826630dea1a Mon Sep 17 00:00:00 2001 From: Jakub Zawadzki Date: Mon, 10 Sep 2012 21:40:21 +0000 Subject: Initial commit to support yet another method of passing data between dissectors. Add new parameter 'data' to heur_dissector_t and new_dissector_t, for now it's always NULL svn path=/trunk/; revision=44860 --- epan/packet.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'epan/packet.c') diff --git a/epan/packet.c b/epan/packet.c index 81d64f4bba..13fd473f5b 100644 --- a/epan/packet.c +++ b/epan/packet.c @@ -412,7 +412,7 @@ call_dissector_through_handle(dissector_handle_t handle, tvbuff_t *tvb, if (handle->is_new) { EP_CHECK_CANARY(("before calling handle->dissector.new for %s",handle->name)); - ret = (*handle->dissector.new)(tvb, pinfo, tree); + ret = (*handle->dissector.new)(tvb, pinfo, tree, NULL); EP_CHECK_CANARY(("after calling handle->dissector.new for %s",handle->name)); } else { EP_CHECK_CANARY(("before calling handle->dissector.old for %s",handle->name)); @@ -1764,7 +1764,7 @@ dissector_try_heuristic(heur_dissector_list_t sub_dissectors, } EP_CHECK_CANARY(("before calling heuristic dissector for protocol: %s", proto_get_protocol_filter_name(proto_get_id(hdtbl_entry->protocol)))); - if ((*hdtbl_entry->dissector)(tvb, pinfo, tree)) { + if ((*hdtbl_entry->dissector)(tvb, pinfo, tree, NULL)) { EP_CHECK_CANARY(("after heuristic dissector for protocol: %s has accepted and dissected packet", proto_get_protocol_filter_name(proto_get_id(hdtbl_entry->protocol)))); status = TRUE; -- cgit v1.2.3