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/dissectors/packet-spice.c | |
| parent | f764eabb6725bf82f4f45ae12faa1f54860cf090 (diff) | |
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/dissectors/packet-spice.c')
| -rw-r--r-- | epan/dissectors/packet-spice.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-spice.c b/epan/dissectors/packet-spice.c index 20a3f944c2..613b463eac 100644 --- a/epan/dissectors/packet-spice.c +++ b/epan/dissectors/packet-spice.c @@ -3051,7 +3051,7 @@ dissect_spice_link_server_pdu(tvbuff_t *tvb, proto_tree *tree, spice_conversatio } static int -dissect_spice(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +dissect_spice(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { conversation_t *conversation; @@ -3453,11 +3453,11 @@ dissect_spice(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } static gboolean -test_spice_protocol(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +test_spice_protocol(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { if (tvb_reported_length(tvb) >= 4 && tvb_get_ntohl(tvb, 0) == SPICE_MAGIC) { - dissect_spice(tvb, pinfo, tree); + dissect_spice(tvb, pinfo, tree, NULL); return TRUE; } return FALSE; |