From: Michal Privoznik <mprivozn@redhat.com>
Date: Sun, 27 Dec 2015 09:55:29 +0000 (+0100)
Subject: wireshark: s/tvb_length/tvb_captured_length/
X-Git-Tag: v1.2.18.3~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=662b9afee96df4cbf0b4974b4e4097afae3ec18d;p=thirdparty%2Flibvirt.git

wireshark: s/tvb_length/tvb_captured_length/

In wireshak commit 22149c55 (v.1.11.3) the API was renamed.
Follow the change in our code too. Since the wireshark change was
made in the very same version that we require at least we are
good to go.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
(cherry picked from commit fcbae1017a568b748597948d250f15948117d4f8)
---

diff --git a/tools/wireshark/src/packet-libvirt.c b/tools/wireshark/src/packet-libvirt.c
index f7c8e0c288..d0b0852f01 100644
--- a/tools/wireshark/src/packet-libvirt.c
+++ b/tools/wireshark/src/packet-libvirt.c
@@ -338,7 +338,7 @@ dissect_libvirt_payload(tvbuff_t *tvb, proto_tree *tree,
 {
     gssize payload_length;
 
-    payload_length = tvb_length(tvb) - VIR_HEADER_LEN;
+    payload_length = tvb_captured_length(tvb) - VIR_HEADER_LEN;
     if (payload_length <= 0)
         return; /* No payload */
 
@@ -405,7 +405,7 @@ dissect_libvirt_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
         proto_item *ti;
         proto_tree *libvirt_tree;
 
-        ti = proto_tree_add_item(tree, proto_libvirt, tvb, 0, tvb_length(tvb), ENC_NA);
+        ti = proto_tree_add_item(tree, proto_libvirt, tvb, 0, tvb_captured_length(tvb), ENC_NA);
         libvirt_tree = proto_item_add_subtree(ti, ett_libvirt);
 
         offset = 0;