External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 21:55:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

wireshark: Include more of libvirt internals

Browse Source 
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>
This commit is contained in:
Michal Privoznik 2014-07-04 10:23:18 +02:00
parent a448713a45
commit 906d0abfe7
3 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/wireshark/src/Makefile.am
View File

@ -18,7 +18,7 @@
# #
# Author: Yuto KAWAMURA(kawamuray) # 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 ws_plugin_LTLIBRARIES = libvirt.la
libvirt_la_SOURCES = packet-libvirt.h packet-libvirt.c plugin.c libvirt_la_SOURCES = packet-libvirt.h packet-libvirt.c plugin.c

3
tools/wireshark/src/packet-libvirt.c
View File

@ -34,6 +34,7 @@
#endif #endif
#include <rpc/xdr.h> #include <rpc/xdr.h>
#include "packet-libvirt.h" #include "packet-libvirt.h"
#include "internal.h"
static int proto_libvirt = -1; static int proto_libvirt = -1;
static int hf_libvirt_length = -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 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); return tvb_get_ntohl(tvb, offset);
} }

18
tools/wireshark/src/packet-libvirt.h
View File

@ -21,6 +21,8 @@
#ifndef _PACKET_LIBVIRT_H_ #ifndef _PACKET_LIBVIRT_H_
# define _PACKET_LIBVIRT_H_ # define _PACKET_LIBVIRT_H_
# include "libvirt/libvirt.h"
# ifndef LIBVIRT_PORT # ifndef LIBVIRT_PORT
# define LIBVIRT_PORT 16509 # define LIBVIRT_PORT 16509
# endif # endif
@ -84,22 +86,6 @@ static const value_string status_strings[] = {
{ -1, NULL } { -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 # define VIR_ERROR_MESSAGE_DISSECTOR dissect_xdr_remote_error
static gboolean dissect_xdr_int(tvbuff_t *tvb, proto_tree *tree, XDR *xdrs, int hf); static gboolean dissect_xdr_int(tvbuff_t *tvb, proto_tree *tree, XDR *xdrs, int hf);