denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed plugin constructors from plugin_create to plugin_name_plugin_create.

Browse Source
This commit is contained in:
Tobias Brunner
2010-03-02 09:10:26 +01:00
parent 6cc13cd9c5
commit 9ce567f895
61 changed files with 92 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/plugins/plugin_loader.c
+30 -5
View File
@@ -1,4 +1,5 @@
/*
* Copyright (C) 2010 Tobias Brunner
* Copyright (C) 2007 Martin Willi
* Hochschule fuer Technik Rapperswil
*
@@ -49,19 +50,43 @@ struct private_plugin_loader_t {
linked_list_t *names;
};
/**
* Replace '-' with '_' to use str as identifier.
*/
static char* sanitize(char *str)
{
char *pos = str;
while (pos && *pos)
{
if (*pos == '-')
{
*pos = '_';
}
pos++;
}
return str;
}
/**
* load a single plugin
*/
static plugin_t* load_plugin(private_plugin_loader_t *this,
char *path, char *name)
{
char create[128];
char file[PATH_MAX];
void *handle;
plugin_t *plugin;
plugin_constructor_t constructor;
snprintf(file, sizeof(file), "%s/libstrongswan-%s.so", path, name);
if (snprintf(file, sizeof(file), "%s/libstrongswan-%s.so", path,
name) >= sizeof(file) ||
snprintf(create, sizeof(create), "%s_plugin_create",
name) >= sizeof(create))
{
return NULL;
}
sanitize(create);
if (lib->integrity)
{
if (!lib->integrity->check_file(lib->integrity, name, file))
@@ -76,10 +101,10 @@ static plugin_t* load_plugin(private_plugin_loader_t *this,
DBG1("plugin '%s': failed to load '%s' - %s", name, file, dlerror());
return NULL;
}
constructor = dlsym(handle, "plugin_create");
constructor = dlsym(handle, create);
if (constructor == NULL)
{
DBG1("plugin '%s': failed to load - no plugin_create() function", name);
DBG1("plugin '%s': failed to load - %s not found", name, create);
dlclose(handle);
return NULL;
}
@@ -96,7 +121,7 @@ static plugin_t* load_plugin(private_plugin_loader_t *this,
plugin = constructor();
if (plugin == NULL)
{
DBG1("plugin '%s': failed to load - plugin_create() returned NULL", name);
DBG1("plugin '%s': failed to load - %s returned NULL", name, create);
dlclose(handle);
return NULL;
}