mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-01-06 21:15:22 +00:00
e937929c16
The wireshark address.h header uses 'g_memdup2' but this triggers
warnings under clang due to the max version cap:
In file included from ../tools/wireshark/src/plugin.c:27:
In file included from /usr/include/wireshark/epan/proto.h:30:
In file included from /usr/include/wireshark/epan/packet_info.h:15:
/usr/include/wireshark/epan/address.h:107:18: error: 'g_memdup2' is deprecated: Not available before 2.68 [-Werror,-Wdeprecated-declarations]
107 | addr->priv = g_memdup2(&val, sizeof(val));
| ^
/usr/include/glib-2.0/glib/gstrfuncs.h:341:1: note: 'g_memdup2' has been explicitly marked deprecated here
341 | GLIB_AVAILABLE_IN_2_68
| ^
/usr/include/glib-2.0/glib/glib-visibility.h:771:32: note: expanded from macro 'GLIB_AVAILABLE_IN_2_68'
771 | #define GLIB_AVAILABLE_IN_2_68 GLIB_UNAVAILABLE (2, 68)
| ^
/usr/include/glib-2.0/glib/glib-visibility.h:32:35: note: expanded from macro 'GLIB_UNAVAILABLE'
32 | #define GLIB_UNAVAILABLE(maj,min) G_UNAVAILABLE(maj,min) _GLIB_EXTERN
| ^
/usr/include/glib-2.0/glib/gmacros.h:1285:47: note: expanded from macro 'G_UNAVAILABLE'
1285 | #define G_UNAVAILABLE(maj,min) __attribute__((deprecated("Not available before " #maj "." #min)))
| ^
1 error generated.
It is unclear why clang warns, but gcc does not. Our plugin doesn't
actually use the inline helper in address.h that references g_memdup2,
but we get the warning regardless.
Interestingly removing the 'gmodule.h' include avoids the warning. Since
there is nothing in plugin.c that appears to need gmodule.h, removing it
should be safe & done regardless.
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
94 lines
2.3 KiB
C
94 lines
2.3 KiB
C
/*
|
|
* plugin.c: Wireshark's plugin registration
|
|
*
|
|
* The registration routines were generated using wireshark's
|
|
* make-plugin-reg.py script (found under wirshark.git/tools/):
|
|
*
|
|
* libvirt.git/tools/wireshark/src $ \
|
|
* /path/to/wireshark.git/tools/make-plugin-reg.py \
|
|
* . plugin packet-libvirt.c
|
|
*
|
|
*/
|
|
|
|
#include <config.h>
|
|
|
|
#ifdef WITH_WS_VERSION
|
|
# include <wireshark/ws_version.h>
|
|
#else
|
|
# include <wireshark/config.h>
|
|
# define WIRESHARK_VERSION_MAJOR VERSION_MAJOR
|
|
# define WIRESHARK_VERSION_MINOR VERSION_MINOR
|
|
# define WIRESHARK_VERSION_MICRO VERSION_MICRO
|
|
#endif
|
|
|
|
#define HAVE_PLUGINS 1
|
|
#include <wireshark/epan/proto.h>
|
|
/* plugins are DLLs */
|
|
#define WS_BUILD_DLL
|
|
#include <wireshark/ws_symbol_export.h>
|
|
|
|
#include "packet-libvirt.h"
|
|
|
|
/* Let the plugin version be the version of libvirt */
|
|
#define PLUGIN_VERSION VERSION
|
|
|
|
#define WIRESHARK_VERSION \
|
|
((WIRESHARK_VERSION_MAJOR * 1000 * 1000) + \
|
|
(WIRESHARK_VERSION_MINOR * 1000) + \
|
|
(WIRESHARK_VERSION_MICRO))
|
|
|
|
#if WIRESHARK_VERSION < 2005000
|
|
|
|
WS_DLL_PUBLIC_DEF const gchar version[] = VERSION;
|
|
|
|
/* Start the functions we need for the plugin stuff */
|
|
|
|
WS_DLL_PUBLIC_DEF void
|
|
plugin_register(void)
|
|
{
|
|
proto_register_libvirt();
|
|
}
|
|
WS_DLL_PUBLIC_DEF void
|
|
plugin_reg_handoff(void)
|
|
{
|
|
proto_reg_handoff_libvirt();
|
|
}
|
|
|
|
#elif WIRESHARK_VERSION < 2009000
|
|
|
|
WS_DLL_PUBLIC_DEF const gchar plugin_version[] = PLUGIN_VERSION;
|
|
WS_DLL_PUBLIC_DEF const gchar plugin_release[] = VERSION_RELEASE;
|
|
|
|
WS_DLL_PUBLIC void plugin_register(void);
|
|
|
|
void plugin_register(void)
|
|
{
|
|
static proto_plugin plug_libvirt;
|
|
|
|
plug_libvirt.register_protoinfo = proto_register_libvirt;
|
|
plug_libvirt.register_handoff = proto_reg_handoff_libvirt;
|
|
proto_register_plugin(&plug_libvirt);
|
|
}
|
|
|
|
#else /* WIRESHARK_VERSION >= 2009000 */
|
|
|
|
void proto_register_libvirt(void);
|
|
void proto_reg_handoff_libvirt(void);
|
|
|
|
WS_DLL_PUBLIC_DEF const gchar plugin_version[] = PLUGIN_VERSION;
|
|
WS_DLL_PUBLIC_DEF const int plugin_want_major = WIRESHARK_VERSION_MAJOR;
|
|
WS_DLL_PUBLIC_DEF const int plugin_want_minor = WIRESHARK_VERSION_MINOR;
|
|
|
|
WS_DLL_PUBLIC void plugin_register(void);
|
|
|
|
void plugin_register(void)
|
|
{
|
|
static proto_plugin plug_libvirt;
|
|
|
|
plug_libvirt.register_protoinfo = proto_register_libvirt;
|
|
plug_libvirt.register_handoff = proto_reg_handoff_libvirt;
|
|
proto_register_plugin(&plug_libvirt);
|
|
}
|
|
|
|
#endif
|