diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2016-12-13 19:28:29 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-12-14 11:49:45 +0000 |
| commit | fc8f787565a485b2b932bd4f58069cfbe59edc1d (patch) | |
| tree | 4c82fa6e0550f56506614d01a980ccff00fee5f0 | |
| parent | 1c2d224647f7223a6f26e16fda5edba99b33d4bb (diff) | |
| download | wireshark-fc8f787565a485b2b932bd4f58069cfbe59edc1d.tar.gz | |
Skip loading the Nordic BLE Sniffer dll on WIN32
The dissector for the Nordic BLE Sniffer was added as internal in
g7844a118, so ensure we don’t load this third party dll on WIN32.
Change-Id: I74c200d42793f3c1e764bc9f6c3a9a795d38a5a7
Reviewed-on: https://code.wireshark.org/review/19259
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
| -rw-r--r-- | wsutil/plugins.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/wsutil/plugins.c b/wsutil/plugins.c index 12f85c962d..1f637c552b 100644 --- a/wsutil/plugins.c +++ b/wsutil/plugins.c @@ -170,7 +170,14 @@ plugins_scan_dir(const char *dirname, plugin_load_failure_mode mode) dot = strrchr(name, '.'); if (dot == NULL || strcmp(dot+1, G_MODULE_SUFFIX) != 0) continue; - +#if WIN32 + if (strncmp(name, "nordic_ble.dll", 14) == 0) + /* + * Skip the Nordic BLE Sniffer dll on WIN32 because + * the dissector has been added as internal. + */ + continue; +#endif g_snprintf(filename, FILENAME_LEN, "%s" G_DIR_SEPARATOR_S "%s", dirname, name); if ((handle = g_module_open(filename, G_MODULE_BIND_LOCAL)) == NULL) |