osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Stig Bjørlykke 2016-12-13 19:28:29 +01:00 committed by Anders Broman
parent 1c2d224647
commit fc8f787565
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wsutil/plugins.c
View File

@ -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)