wireshark: Include more of libvirt internals

The rationale is to not duplicate code which is done in
packet-libvirt.h for instance. Moreover, this way we can drop
__attribute_((unused)) used int packet-libvirt.c in favor of
ATTRIBUTE_UNUSED.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/tools/wireshark/src/Makefile.am b/tools/wireshark/src/Makefile.am
index 44f22be7912e076306321e24b9401782492ec42c..40fe36855ad639461c4e2de48572fcde54c4a730 100644 (file)
--- a/tools/wireshark/src/Makefile.am
+++ b/tools/wireshark/src/Makefile.am
@@ -18,7 +18,7 @@
 #
 # Author: Yuto KAWAMURA(kawamuray)
 
-INCLUDES = -I$(top_srcdir)
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/gnulib/lib
 
 ws_plugin_LTLIBRARIES     = libvirt.la
 libvirt_la_SOURCES        = packet-libvirt.h packet-libvirt.c plugin.c

diff --git a/tools/wireshark/src/packet-libvirt.c b/tools/wireshark/src/packet-libvirt.c
index 07098bf24ac1650508dd1a3856ed2daa8b9439c2..51384532f3531ddaf9b5df6b4ccbc8d35099829a 100644 (file)
--- a/tools/wireshark/src/packet-libvirt.c
+++ b/tools/wireshark/src/packet-libvirt.c
@@ -34,6 +34,7 @@
 #endif
 #include <rpc/xdr.h>
 #include "packet-libvirt.h"
+#include "internal.h"
 
 static int proto_libvirt = -1;
 static int hf_libvirt_length = -1;
@@ -413,7 +414,7 @@ dissect_libvirt_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 }
 
 static guint32
-get_message_len(packet_info *pinfo __attribute__((unused)), tvbuff_t *tvb, int offset)
+get_message_len(packet_info *pinfo ATTRIBUTE_UNUSED, tvbuff_t *tvb, int offset)
 {
     return tvb_get_ntohl(tvb, offset);
 }

diff --git a/tools/wireshark/src/packet-libvirt.h b/tools/wireshark/src/packet-libvirt.h
index 0cab63728e697777690c08e2d79a0996d5b32896..af54407f294df07dfb8b61eadb825e48b353fa09 100644 (file)
--- a/tools/wireshark/src/packet-libvirt.h
+++ b/tools/wireshark/src/packet-libvirt.h
@@ -21,6 +21,8 @@
 #ifndef _PACKET_LIBVIRT_H_
 # define _PACKET_LIBVIRT_H_
 
+# include "libvirt/libvirt.h"
+
 # ifndef LIBVIRT_PORT
 #  define LIBVIRT_PORT 16509
 # endif
@@ -84,22 +86,6 @@ static const value_string status_strings[] = {
     { -1, NULL }
 };
 
-/* TODO: These symbols will automatically included in generated headers in the feature */
-# define VIR_SECURITY_MODEL_BUFLEN (256 + 1)
-# define VIR_SECURITY_LABEL_BUFLEN (4096 + 1)
-# define VIR_SECURITY_DOI_BUFLEN (256 + 1)
-# define VIR_UUID_BUFLEN (16)
-enum {
-    VIR_TYPED_PARAM_INT     = 1, /* integer case */
-    VIR_TYPED_PARAM_UINT    = 2, /* unsigned integer case */
-    VIR_TYPED_PARAM_LLONG   = 3, /* long long case */
-    VIR_TYPED_PARAM_ULLONG  = 4, /* unsigned long long case */
-    VIR_TYPED_PARAM_DOUBLE  = 5, /* double case */
-    VIR_TYPED_PARAM_BOOLEAN = 6, /* boolean(character) case */
-    VIR_TYPED_PARAM_STRING  = 7, /* string case */
-};
-/* / */
-
 # define VIR_ERROR_MESSAGE_DISSECTOR dissect_xdr_remote_error
 
 static gboolean dissect_xdr_int(tvbuff_t *tvb, proto_tree *tree, XDR *xdrs, int hf);