From fc8f787565a485b2b932bd4f58069cfbe59edc1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stig=20Bj=C3=B8rlykke?= Date: Tue, 13 Dec 2016 19:28:29 +0100 Subject: Skip loading the Nordic BLE Sniffer dll on WIN32 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- wsutil/plugins.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'wsutil') 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) -- cgit v1.2.1