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-msrp.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-msrp.c')
| -rw-r--r-- | epan/dissectors/packet-msrp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-msrp.c b/epan/dissectors/packet-msrp.c index 405c7e4cc8..9439648e0d 100644 --- a/epan/dissectors/packet-msrp.c +++ b/epan/dissectors/packet-msrp.c @@ -143,7 +143,7 @@ static gboolean global_msrp_raw_text = TRUE; * http://www.iana.org/assignments/media-types/index.html */ static dissector_table_t media_type_dissector_table; -static int dissect_msrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); +static int dissect_msrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data); /* Displaying conversation setup info */ @@ -418,7 +418,7 @@ find_end_line(tvbuff_t *tvb, gint start) } static gboolean -dissect_msrp_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +dissect_msrp_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { conversation_t* conversation; @@ -438,7 +438,7 @@ dissect_msrp_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) conversation_set_dissector(conversation, msrp_handle); } } - dissect_msrp(tvb, pinfo, tree); + dissect_msrp(tvb, pinfo, tree, NULL); return TRUE; } return FALSE; @@ -446,7 +446,7 @@ dissect_msrp_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Code to actually dissect the packets */ static int -dissect_msrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +dissect_msrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { gint offset = 0; gint next_offset = 0; |