aboutsummaryrefslogtreecommitdiffstats
path: root/epan/epan.c
diff options
context:
space:
mode:
Diffstat (limited to 'epan/epan.c')
-rw-r--r--epan/epan.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/epan/epan.c b/epan/epan.c
index 0927172570..82c5168297 100644
--- a/epan/epan.c
+++ b/epan/epan.c
@@ -24,6 +24,7 @@
#include <stdarg.h>
#include <wsutil/wsgcrypt.h>
+#include <wsutil/plugins.h>
#ifdef HAVE_LIBGNUTLS
#include <gnutls/gnutls.h>
@@ -118,6 +119,12 @@ epan_init(void (*register_all_protocols_func)(register_cb cb, gpointer client_da
#ifdef HAVE_LIBGNUTLS
gnutls_global_init();
#endif
+
+#ifdef HAVE_PLUGINS
+ /* Register all the plugin types we have. */
+ epan_register_plugin_types(); /* Types known to libwireshark */
+#endif
+
TRY {
tap_init();
prefs_init();
@@ -155,6 +162,13 @@ epan_init(void (*register_all_protocols_func)(register_cb cb, gpointer client_da
status = FALSE;
}
ENDTRY;
+
+#ifdef HAVE_PLUGINS
+ /* Scan for plugins. This does *not* call their registration routines;
+ that's done later. */
+ scan_plugins();
+#endif
+
return status;
}