mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libfreerdp-core: port extension plugin interface (untested)

This commit is contained in:
Marc-André Moreau 2011-11-09 15:59:03 -05:00
parent 0043b16472
commit 4221065c88
7 changed files with 58 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/freerdp/extension.h
View File

@ -24,9 +24,6 @@
#include <freerdp/types.h>
#include <freerdp/freerdp.h>
/* Extensions ought to check for it to ensure compatibility */
#define FREERDP_EXT_API 1
#define FREERDP_EXT_EXPORT_FUNC_NAME "FreeRDPExtensionEntry"
typedef struct rdp_ext_plugin rdpExtPlugin;

81
libfreerdp-core/extension.c
View File

@ -24,7 +24,6 @@
#include <freerdp/freerdp.h>
#include <freerdp/utils/memory.h>
#include "rdp.h"
#include "extension.h"
#ifdef _WIN32
@ -42,13 +41,13 @@
#define PLUGIN_EXT "so"
#endif
static uint32 FREERDP_CC freerdp_ext_register_extension(rdpExtPlugin* plugin)
static uint32 FREERDP_CC extension_register_plugin(rdpExtPlugin* plugin)
{
rdpExt* ext = (rdpExt*) plugin->ext;
rdpExtension* ext = (rdpExtension*) plugin->ext;
if (ext->num_plugins >= FREERDP_EXT_MAX_COUNT)
{
printf("freerdp_ext_register_extension: maximum number of plugins reached.\n");
printf("extension_register_extension: maximum number of plugins reached.\n");
return 1;
}
@ -56,13 +55,13 @@ static uint32 FREERDP_CC freerdp_ext_register_extension(rdpExtPlugin* plugin)
return 0;
}
static uint32 FREERDP_CC freerdp_ext_register_pre_connect_hook(rdpExtPlugin* plugin, PFREERDP_EXTENSION_HOOK hook)
static uint32 FREERDP_CC extension_register_pre_connect_hook(rdpExtPlugin* plugin, PFREERDP_EXTENSION_HOOK hook)
{
rdpExt* ext = (rdpExt*) plugin->ext;
rdpExtension* ext = (rdpExtension*) plugin->ext;
if (ext->num_pre_connect_hooks >= FREERDP_EXT_MAX_COUNT)
{
printf("freerdp_ext_register_pre_connect_hook: maximum plugin reached.\n");
printf("extension_register_pre_connect_hook: maximum plugin reached.\n");
return 1;
}
@ -72,13 +71,13 @@ static uint32 FREERDP_CC freerdp_ext_register_pre_connect_hook(rdpExtPlugin* plu
return 0;
}
static uint32 FREERDP_CC freerdp_ext_register_post_connect_hook(rdpExtPlugin* plugin, PFREERDP_EXTENSION_HOOK hook)
static uint32 FREERDP_CC extension_register_post_connect_hook(rdpExtPlugin* plugin, PFREERDP_EXTENSION_HOOK hook)
{
rdpExt* ext = (rdpExt*) plugin->ext;
rdpExtension* ext = (rdpExtension*) plugin->ext;
if (ext->num_post_connect_hooks >= FREERDP_EXT_MAX_COUNT)
{
printf("freerdp_ext_register_post_connect_hook: maximum plugin reached.\n");
printf("extension_register_post_connect_hook: maximum plugin reached.\n");
return 1;
}
@ -89,7 +88,7 @@ static uint32 FREERDP_CC freerdp_ext_register_post_connect_hook(rdpExtPlugin* pl
return 0;
}
static int freerdp_ext_load_plugins(rdpExt* ext)
static int extension_load_plugins(rdpExtension* extension)
{
int i;
void* han;
@ -98,12 +97,12 @@ static int freerdp_ext_load_plugins(rdpExt* ext)
PFREERDP_EXTENSION_ENTRY entry;
FREERDP_EXTENSION_ENTRY_POINTS entryPoints;
settings = ext->instance->settings;
settings = extension->instance->settings;
entryPoints.ext = ext;
entryPoints.pRegisterExtension = freerdp_ext_register_extension;
entryPoints.pRegisterPreConnectHook = freerdp_ext_register_pre_connect_hook;
entryPoints.pRegisterPostConnectHook = freerdp_ext_register_post_connect_hook;
entryPoints.ext = extension;
entryPoints.pRegisterExtension = extension_register_plugin;
entryPoints.pRegisterPreConnectHook = extension_register_pre_connect_hook;
entryPoints.pRegisterPostConnectHook = extension_register_post_connect_hook;
for (i = 0; settings->extensions[i].name[0]; i++)
{
@ -113,10 +112,10 @@ static int freerdp_ext_load_plugins(rdpExt* ext)
snprintf(path, sizeof(path), "%s", settings->extensions[i].name);
han = DLOPEN(path);
printf("freerdp_ext_load_plugins: %s\n", path);
printf("extension_load_plugins: %s\n", path);
if (han == NULL)
{
printf("freerdp_ext_load_plugins: failed to load %s\n", path);
printf("extension_load_plugins: failed to load %s\n", path);
continue;
}
@ -124,15 +123,15 @@ static int freerdp_ext_load_plugins(rdpExt* ext)
if (entry == NULL)
{
DLCLOSE(han);
printf("freerdp_ext_load_plugins: failed to find export function in %s\n", path);
printf("extension_load_plugins: failed to find export function in %s\n", path);
continue;
}
entryPoints.data = ext->instance->settings->extensions[i].data;
entryPoints.data = extension->instance->settings->extensions[i].data;
if (entry(&entryPoints) != 0)
{
DLCLOSE(han);
printf("freerdp_ext_load_plugins: %s entry returns error.\n", path);
printf("extension_load_plugins: %s entry returns error.\n", path);
continue;
}
}
@ -140,38 +139,38 @@ static int freerdp_ext_load_plugins(rdpExt* ext)
return 0;
}
static int freerdp_ext_call_init(rdpExt* ext)
static int extension_init_plugins(rdpExtension* extension)
{
int i;
for (i = 0; i < ext->num_plugins; i++)
ext->plugins[i]->init(ext->plugins[i], ext->instance);
for (i = 0; i < extension->num_plugins; i++)
extension->plugins[i]->init(extension->plugins[i], extension->instance);
return 0;
}
static int freerdp_ext_call_uninit(rdpExt* ext)
static int extension_uninit_plugins(rdpExtension* extension)
{
int i;
for (i = 0; i < ext->num_plugins; i++)
ext->plugins[i]->uninit(ext->plugins[i], ext->instance);
for (i = 0; i < extension->num_plugins; i++)
extension->plugins[i]->uninit(extension->plugins[i], extension->instance);
return 0;
}
int freerdp_ext_pre_connect(rdpExt* ext)
int extension_pre_connect(rdpExtension* extension)
{
int i;
for (i = 0; i < ext->num_pre_connect_hooks; i++)
ext->pre_connect_hooks[i](ext->pre_connect_hooks_instances[i], ext->instance);
for (i = 0; i < extension->num_pre_connect_hooks; i++)
extension->pre_connect_hooks[i](extension->pre_connect_hooks_instances[i], extension->instance);
return 0;
}
int freerdp_ext_post_connect(rdpExt* ext)
int extension_post_connect(rdpExtension* ext)
{
int i;
@ -181,22 +180,22 @@ int freerdp_ext_post_connect(rdpExt* ext)
return 0;
}
rdpExt* freerdp_ext_new(rdpRdp* rdp)
rdpExtension* extension_new(freerdp* instance)
{
rdpExt* ext;
rdpExtension* extension;
ext = xnew(rdpExt);
extension = xnew(rdpExtension);
ext->instance = rdp->instance;
extension->instance = instance;
freerdp_ext_load_plugins(ext);
freerdp_ext_call_init(ext);
extension_load_plugins(extension);
extension_init_plugins(extension);
return ext;
return extension;
}
void freerdp_ext_free(rdpExt* ext)
void extension_free(rdpExtension* extension)
{
freerdp_ext_call_uninit(ext);
xfree(ext);
extension_uninit_plugins(extension);
xfree(extension);
}

14
libfreerdp-core/extension.h
View File

@ -24,11 +24,9 @@
#include <freerdp/freerdp.h>
#include <freerdp/extension.h>
#include "rdp.h"
#define FREERDP_EXT_MAX_COUNT 16
struct rdp_ext
struct rdp_extension
{
freerdp* instance;
rdpExtPlugin* plugins[FREERDP_EXT_MAX_COUNT];
@ -40,13 +38,13 @@ struct rdp_ext
rdpExtPlugin* post_connect_hooks_instances[FREERDP_EXT_MAX_COUNT];
int num_post_connect_hooks;
};
typedef struct rdp_ext rdpExt;
typedef struct rdp_extension rdpExtension;
int freerdp_ext_pre_connect(rdpExt* ext);
int freerdp_ext_post_connect(rdpExt* ext);
int extension_pre_connect(rdpExtension* extension);
int extension_post_connect(rdpExtension* extension);
rdpExt* freerdp_ext_new(rdpRdp* rdp);
void freerdp_ext_free(rdpExt* ext);
rdpExtension* extension_new(freerdp* instance);
void extension_free(rdpExtension* extension);
#endif /* __EXTENSION_H */

5
libfreerdp-core/freerdp.c
View File

@ -23,6 +23,7 @@
#include "surface.h"
#include "transport.h"
#include "connection.h"
#include "extension.h"
#include <freerdp/freerdp.h>
#include <freerdp/utils/memory.h>
@ -34,6 +35,8 @@ boolean freerdp_connect(freerdp* instance)
rdp = instance->context->rdp;
extension_pre_connect(rdp->extension);
IFCALL(instance->PreConnect, instance);
status = rdp_client_connect(rdp);
@ -47,6 +50,8 @@ boolean freerdp_connect(freerdp* instance)
instance->update->dump_rfx = True;
}
extension_post_connect(rdp->extension);
IFCALL(instance->PostConnect, instance);
if (instance->settings->play_rfx)

6
libfreerdp-core/rdp.c
View File

@ -247,12 +247,12 @@ boolean rdp_read_header(rdpRdp* rdp, STREAM* s, uint16* length, uint16* channel_
void rdp_write_header(rdpRdp* rdp, STREAM* s, uint16 length, uint16 channel_id)
{
enum DomainMCSPDU MCSPDU;
int body_length;
enum DomainMCSPDU MCSPDU;
MCSPDU = (rdp->settings->server_mode) ? DomainMCSPDU_SendDataIndication : DomainMCSPDU_SendDataRequest;
if (rdp->sec_flags & SEC_ENCRYPT && rdp->settings->encryption_method == ENCRYPTION_METHOD_FIPS)
if ((rdp->sec_flags & SEC_ENCRYPT) && (rdp->settings->encryption_method == ENCRYPTION_METHOD_FIPS))
{
int pad;
@ -807,6 +807,7 @@ rdpRdp* rdp_new(freerdp* instance)
{
rdp->instance = instance;
rdp->settings = settings_new((void*) instance);
rdp->extension = extension_new(instance);
rdp->transport = transport_new(rdp->settings);
rdp->license = license_new(rdp);
rdp->input = input_new(rdp);
@ -830,6 +831,7 @@ void rdp_free(rdpRdp* rdp)
{
if (rdp != NULL)
{
extension_free(rdp->extension);
settings_free(rdp->settings);
transport_free(rdp->transport);
license_free(rdp->license);

2
libfreerdp-core/rdp.h
View File

@ -29,6 +29,7 @@
#include "update.h"
#include "license.h"
#include "errinfo.h"
#include "extension.h"
#include "security.h"
#include "transport.h"
#include "connection.h"
@ -125,6 +126,7 @@ struct rdp_rdp
struct rdp_redirection* redirection;
struct rdp_settings* settings;
struct rdp_transport* transport;
struct rdp_extension* extension;
struct rdp_mppc* mppc;
struct crypto_rc4_struct* rc4_decrypt_key;
int decrypt_use_count;

1
libfreerdp-core/settings.c
View File

@ -38,6 +38,7 @@ rdpSettings* settings_new(void* instance)
if (settings != NULL)
{
settings->instance = instance;
((freerdp*) instance)->settings = settings;
settings->width = 1024;
settings->height = 768;