Merging upstream version 4.4.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 9 insertions, 1 deletions

diff --git a/wsutil/plugins.h b/wsutil/plugins.h
index 96f3ac03..113f1f68 100644
--- a/wsutil/plugins.h
+++ b/wsutil/plugins.h
@@ -18,6 +18,7 @@ extern "C" {
 #endif /* __cplusplus */
 
 typedef void (*plugin_register_func)(void);
+typedef uint32_t (*plugin_describe_func)(void);
 
 typedef void plugins_t;
 
@@ -27,10 +28,17 @@ typedef enum {
     WS_PLUGIN_CODEC
 } plugin_type_e;
 
+#define WS_PLUGIN_DESC_DISSECTOR    (1UL << 0)
+#define WS_PLUGIN_DESC_FILE_TYPE    (1UL << 1)
+#define WS_PLUGIN_DESC_CODEC        (1UL << 2)
+#define WS_PLUGIN_DESC_EPAN         (1UL << 3)
+#define WS_PLUGIN_DESC_TAP_LISTENER (1UL << 4)
+#define WS_PLUGIN_DESC_DFILTER      (1UL << 5)
+
 WS_DLL_PUBLIC plugins_t *plugins_init(plugin_type_e type);
 
 typedef void (*plugin_description_callback)(const char *name, const char *version,
-                                            const char *types, const char *filename,
+                                            uint32_t flags, const char *filename,
                                             void *user_data);
 
 WS_DLL_PUBLIC void plugins_get_descriptions(plugin_description_callback callback, void *user_data);