From 4f477785915fcbf0c5d02463e3bd7f47646074a8 Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Sun, 27 Dec 2015 11:00:22 +0100 Subject: [PATCH] wireshark: Fix header of get_message_len() In wireshark commit ceb8d954 (v1.99.2) they have changed the signature of a function that determines how long a libvirt packet is. Now it accepts a void pointer for passing data into the function. Well, this is nice, but we don't need it right now. Anyway, we have to change our code. Signed-off-by: Michal Privoznik --- tools/wireshark/src/packet-libvirt.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/wireshark/src/packet-libvirt.c b/tools/wireshark/src/packet-libvirt.c index ac120b5237..aa1c3237f4 100644 --- a/tools/wireshark/src/packet-libvirt.c +++ b/tools/wireshark/src/packet-libvirt.c @@ -431,8 +431,13 @@ dissect_libvirt_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, #endif } +#if WIRESHARK_VERSION >= 1099002 +static guint +get_message_len(packet_info *pinfo ATTRIBUTE_UNUSED, tvbuff_t *tvb, int offset, void *data ATTRIBUTE_UNUSED) +#else static guint32 get_message_len(packet_info *pinfo ATTRIBUTE_UNUSED, tvbuff_t *tvb, int offset) +#endif { return tvb_get_ntohl(tvb, offset); }