On Mon, 2020-09-07 at 20:30 +0200, Michal Privoznik wrote: > A wireshark plugin must declare what major and minor version it > was built with as these are checked when wireshark loads plugins. > On the top of that, we use major + minor + micro to adapt to > changed API between releases. So far, we were getting these > version numbers from wireshark/config.h. > > And while most distributions install wireshark/config.h file some > don't. On distros shipping it it's hack^Wsaved during built by > packaging system and installed later. But some distros are not > doing that. At least not for new enough wireshark because as of > wireshark's commit v2.9.0~1273 the ws_version.h is installed > which contains the version macros we need and is installed by > wireshark itself. > > But of course, some distros which have new enough wireshark > packaged do not ship ws_version.h and stick to the hack. That is > why we can't simply bump the minimal version and switch to the > new header file. We need a configure check and adopt our code to > deal with both ways. At least for the time being. > > Based on Andrea's original patch: > > https://www.redhat.com/archives/libvir-list/2020-September/msg00156.html > > Closes: https://gitlab.com/libvirt/libvirt/-/issues/74 > Signed-off-by: Michal Privoznik <mprivozn@xxxxxxxxxx> > --- > meson.build | 6 ++++++ > tools/wireshark/src/packet-libvirt.c | 1 - > tools/wireshark/src/plugin.c | 21 +++++++++++++++------ > 3 files changed, 21 insertions(+), 7 deletions(-) Thanks for finishing what I started! Reviewed-by: Andrea Bolognani <abologna@xxxxxxxxxx> -- Andrea Bolognani / Red Hat / Virtualization
