morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

[proxy,modules] add support for statically linked

Browse Source 
Look in proxy library/executable itself for a module entry point. This
allows statically linking in proxy modules.
This commit is contained in:
akallabeth
2025-08-11 08:56:32 +02:00
parent 3f7f3a3bd8
commit a2510d1f5d
1 changed files with 45 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
server/proxy/pf_modules.c
View File

@@ -479,10 +479,53 @@ void pf_modules_list_loaded_plugins(proxyModule* module)
ArrayList_ForEach(module->plugins, pf_modules_print_ArrayList_ForEachFkt);
}
static BOOL pf_modules_load_module(const char* module_path, proxyModule* module, void* userdata)
static BOOL pf_modules_load_static_module(const char* module_name, proxyModule* module,
void* userdata)
{
WINPR_ASSERT(module);
HANDLE handle = LoadLibraryX(NULL);
if (handle == NULL)
{
WLog_ERR(TAG, "failed loading static library: %s", module_name);
return FALSE;
}
char name[256] = { 0 };
(void)_snprintf(name, sizeof(name), "%s_%s", module_name, MODULE_ENTRY_POINT);
for (size_t x = 0; x < strnlen(name, sizeof(name)); x++)
{
if (name[x] == '-')
name[x] = '_';
}
proxyModuleEntryPoint pEntryPoint = GetProcAddressAs(handle, name, proxyModuleEntryPoint);
if (!pEntryPoint)
{
WLog_ERR(TAG, "GetProcAddress failed for static %s (module %s)", name, module_name);
goto error;
}
if (!ArrayList_Append(module->handles, handle))
{
WLog_ERR(TAG, "ArrayList_Append failed!");
goto error;
}
return pf_modules_add(module, pEntryPoint, userdata);
error:
FreeLibrary(handle);
return FALSE;
}
static BOOL pf_modules_load_module(const char* module_path, const char* module_name,
proxyModule* module, void* userdata)
{
WINPR_ASSERT(module);
if (pf_modules_load_static_module(module_name, module, userdata))
return TRUE;
HANDLE handle = LoadLibraryX(module_path);
if (handle == NULL)
@@ -585,7 +628,6 @@ proxyModule* pf_modules_new(const char* root_dir, const char** modules, size_t c
if (!winpr_PathMakePath(path, NULL))
{
WLog_ERR(TAG, "error occurred while creating modules directory: %s", root_dir);
goto error;
}
}
@@ -599,7 +641,7 @@ proxyModule* pf_modules_new(const char* root_dir, const char** modules, size_t c
(void)_snprintf(name, sizeof(name), "proxy-%s-plugin%s", modules[i],
FREERDP_SHARED_LIBRARY_SUFFIX);
fullpath = GetCombinedPath(path, name);
pf_modules_load_module(fullpath, module, NULL);
pf_modules_load_module(fullpath, modules[i], module, NULL);
free(fullpath);
}
}