]> xenbits.xensource.com Git - libvirt.git/commitdiff
wireshark: Fix header of get_message_len()
authorMichal Privoznik <mprivozn@redhat.com>
Sun, 27 Dec 2015 10:00:22 +0000 (11:00 +0100)
committerMichal Privoznik <mprivozn@redhat.com>
Mon, 11 Jan 2016 16:23:42 +0000 (17:23 +0100)
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 <mprivozn@redhat.com>
tools/wireshark/src/packet-libvirt.c

index ac120b5237ab7dd2eee594277b9a2e07caf6ba19..aa1c3237f449cbb1b0f5c9c29ed4304b1700f401 100644 (file)
@@ -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);
 }