1berry/wireshark
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wsutil: Add a plugins log domain and use it

Browse Source
This commit is contained in:
João Valverde 2023-06-14 16:39:55 +01:00
parent 0c0485ff6b
commit 70255bed33
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/ws_log_defs.h
View File

@ -48,6 +48,8 @@
#define LOG_DOMAIN_EINVAL "InvalidArg"
#define LOG_DOMAIN_PLUGINS "Plugins"
/*
* Ascending order by priority needs to be maintained. Higher priorities have
* higher values.

11
wsutil/plugins.c
View File

@ -9,7 +9,7 @@
*/
#include "config.h"
#define WS_LOG_DOMAIN LOG_DOMAIN_WSUTIL
#define WS_LOG_DOMAIN LOG_DOMAIN_PLUGINS
#include "plugins.h"
#include <time.h>
@ -152,6 +152,8 @@ scan_plugins_dir(GHashTable *plugins_module, const char *dirpath, plugin_type_e
return;
}
ws_debug("Scanning plugins folder \"%s\"", plugin_folder);
while ((name = g_dir_read_name(dir)) != NULL) {
/* Skip anything but files with .dll or .so. */
if (!g_str_has_suffix(name, MODULE_SUFFIX))
@ -169,11 +171,11 @@ scan_plugins_dir(GHashTable *plugins_module, const char *dirpath, plugin_type_e
plugin_file = g_build_filename(plugin_folder, name, (gchar *)NULL);
handle = g_module_open(plugin_file, G_MODULE_BIND_LOCAL);
g_free(plugin_file);
if (handle == NULL) {
/* g_module_error() provides file path. */
report_failure("Couldn't load plugin '%s': %s", name,
g_module_error());
g_free(plugin_file);
continue;
}
@ -181,12 +183,14 @@ scan_plugins_dir(GHashTable *plugins_module, const char *dirpath, plugin_type_e
{
report_failure("The plugin '%s' has no \"plugin_version\" symbol", name);
g_module_close(handle);
g_free(plugin_file);
continue;
}
plug_version = (const char *)symbol;
if (!pass_plugin_version_compatibility(handle, name)) {
g_module_close(handle);
g_free(plugin_file);
continue;
}
@ -194,6 +198,7 @@ scan_plugins_dir(GHashTable *plugins_module, const char *dirpath, plugin_type_e
if (!g_module_symbol(handle, "plugin_register", &symbol)) {
report_failure("The plugin '%s' has no \"plugin_register\" symbol", name);
g_module_close(handle);
g_free(plugin_file);
continue;
}
@ -210,6 +215,8 @@ DIAG_ON_PEDANTIC
/* Add it to the list of plugins. */
g_hash_table_replace(plugins_module, new_plug->name, new_plug);
ws_info("Registered plugin: %s (%s)", new_plug->name, plugin_file);
g_free(plugin_file);
}
ws_dir_close(dir);
g_free(plugin_folder);