Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-07 17:18:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Adding missing check that a plugin's API version matches what Bro defines.

Browse source
This commit is contained in:
Robin Sommer 2014-07-31 10:08:50 -07:00
parent 024c26d982
commit 382b946098
5 changed files with 27 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/plugin/Plugin.h
View file

@ -10,7 +10,10 @@
#include "analyzer/Component.h"
#include "file_analysis/Component.h"
static const int BRO_PLUGIN_API_VERSION = 2;
// We allow to override this externally for testing purposes.
#ifndef BRO_PLUGIN_API_VERSION
#define BRO_PLUGIN_API_VERSION 2
#endif
class ODesc;
class Func;
@ -75,13 +78,23 @@ public:
std::string description; //< A short textual description of the plugin. Mandatory.
VersionNumber version; //< THe plugin's version. Optional.
Configuration();
// We force this to inline so that the API version gets hardcoded
// into the external plugin. (Technically, it's not a "force", just a
// strong hint.). The attribute seems generally available.
inline Configuration() __attribute__((always_inline));
private:
friend class Plugin;
int api_version; // Current BRO_PLUGIN_API_VERSION. Automatically set.
};
inline Configuration::Configuration()
{
name = "";
description = "";
api_version = BRO_PLUGIN_API_VERSION;
}
/**
* A class describing an item defined in \c *.bif file.
*/