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-dbus.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-dbus.c')
| -rw-r--r-- | epan/dissectors/packet-dbus.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-dbus.c b/epan/dissectors/packet-dbus.c index 9f9aaea3b7..edc01ca6fc 100644 --- a/epan/dissectors/packet-dbus.c +++ b/epan/dissectors/packet-dbus.c @@ -485,7 +485,7 @@ dissect_dbus_body(tvbuff_t *tvb, dbus_info_t *dinfo, proto_tree *tree, int offse } static int -dissect_dbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +dissect_dbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { proto_tree *dbus_tree = NULL; dbus_info_t dinfo; @@ -566,11 +566,11 @@ get_dbus_message_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset) static void dissect_dbus_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - dissect_dbus(tvb, pinfo, tree); + dissect_dbus(tvb, pinfo, tree, NULL); } static int -dissect_dbus_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +dissect_dbus_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { tcp_dissect_pdus(tvb, pinfo, tree, dbus_desegment, DBUS_HEADER_LEN, get_dbus_message_len, dissect_dbus_pdu); return tvb_length(tvb); |