Add BIF have_spicy_analyzers().

We previously used the Spicy plugin's `Spicy::available` to test for
Spicy support. However, having Spicy support does not necessarily mean that we
have built Zeek with its in-tree Spicy analyzers: the Spicy plugin
could have been pulled in from external. The new BIF now reliably
tells us whether the Spicy analyzers are available; its result
corresponds to what `zeek-config --have-spicy-analyzers` returns as
well.

We also move the two current checks over to use this BIF.

(Note: I refrained from renaming the CMake-side `USE_SPICY_ANALYERS`
to `HAVE_SPICY_ANALYZERS`. We should do this eventually for
consistency, but I didn't want to make more changes than necessary
right now.)
This commit is contained in:
Robin Sommer 2023-02-03 12:43:43 +01:00
parent 39f0b78043
commit bc252c63dc
No known key found for this signature in database
GPG key ID: 6BEDA4DA6B8B23E3
6 changed files with 17 additions and 3 deletions

View file

@ -1,6 +1,6 @@
##! Events generated by the Finger analyzer.
@ifdef ( Spicy::available ) # must not be used with legacy analyzer
@if ( have_spicy_analyzers() ) # prototypes below must not be used with legacy analyzer
## Generated for Finger requests.
##

View file

@ -1,6 +1,6 @@
##! Events generated by the Syslog analyzer.
@ifdef ( Spicy::available ) # must not be used with legacy analyzer
@if ( have_spicy_analyzers() ) # prototypes below must not be used with legacy analyzer
## Generated for monitored Syslog messages.
##