diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2018-01-09 09:55:37 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-01-09 21:25:06 +0000 |
| commit | fc9af81a13ec53ca15cbd28ce1896d407ab2bf8a (patch) | |
| tree | 30ff801215a7f4b8133aa83e65fe22e98fb3fe90 /wiretap/wtap.c | |
| parent | a7e29d8b66dd7c1cb691966938404dafc6b89689 (diff) | |
wiretap: add a parameter to wtap_init() indicating whether plugins must be loaded
g995812c5f1 moved wiretap plugins registration from applications to
wiretap library init function.
As we do not want to load plugins for all users of libwiretap, let's
make it configurable.
Bug: 14314
Change-Id: Id8fdcc484e2d0d31d3ab0bd357d3a6678570f700
Reviewed-on: https://code.wireshark.org/review/25194
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'wiretap/wtap.c')
| -rw-r--r-- | wiretap/wtap.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/wiretap/wtap.c b/wiretap/wtap.c index 58fd2c1d7b..bfff86786c 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -38,7 +38,7 @@ #ifdef HAVE_PLUGINS -static plugins_t *libwiretap_plugins; +static plugins_t *libwiretap_plugins = NULL; static GSList *wtap_plugins = NULL; void @@ -1427,14 +1427,16 @@ wtap_seek_read(wtap *wth, gint64 seek_off, * Initialize the library. */ void -wtap_init(void) +wtap_init(gboolean load_wiretap_plugins) { init_open_routines(); wtap_opttypes_initialize(); wtap_init_encap_types(); #ifdef HAVE_PLUGINS - libwiretap_plugins = plugins_init("wiretap"); - g_slist_foreach(wtap_plugins, call_plugin_register_wtap_module, NULL); + if (load_wiretap_plugins) { + libwiretap_plugins = plugins_init("wiretap"); + g_slist_foreach(wtap_plugins, call_plugin_register_wtap_module, NULL); + } #endif } |