diff options
| author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2012-09-10 21:40:21 +0000 |
|---|---|---|
| committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2012-09-10 21:40:21 +0000 |
| commit | 5a8783f5b12e017967ce178bac3d1826630dea1a (patch) | |
| tree | 72bd010e8f647ea2c4fbd0b8ace91952758f595e /epan/packet.c | |
| parent | f764eabb6725bf82f4f45ae12faa1f54860cf090 (diff) | |
| download | wireshark-5a8783f5b12e017967ce178bac3d1826630dea1a.tar.gz | |
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
Diffstat (limited to 'epan/packet.c')
| -rw-r--r-- | epan/packet.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; |