github/FreeRDP
7
0
Fork 0
mirror of https://github.com/FreeRDP/FreeRDP.git synced 2025-06-03 00:00:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added callback dictionary with context to allow client to communicate with plugin.

Browse Source
This commit is contained in:
Armin Novak 2014-05-23 13:04:51 +02:00
parent e69dc9b823
commit 3fde4f0bc2
2 changed files with 249 additions and 230 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

395
channels/drdynvc/client/dvcman.c
View File

@ -21,6 +21,8 @@
#include "config.h" #include "config.h"
#endif #endif
#include <assert.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -28,45 +30,45 @@
#include <winpr/crt.h> #include <winpr/crt.h>
#include <winpr/synch.h> #include <winpr/synch.h>
#include <winpr/stream.h> #include <winpr/stream.h>
#include <winpr/collections.h>
#include <freerdp/addin.h> #include <freerdp/addin.h>
#include "drdynvc_types.h" #include "drdynvc_types.h"
#include "dvcman.h" #include "dvcman.h"
static wListDictionary *cb_dict = NULL;
struct cb_value
{
void *fkt;
void *context;
};
static int dvcman_get_configuration(IWTSListener* pListener, void** ppPropertyBag) static int dvcman_get_configuration(IWTSListener *pListener, void **ppPropertyBag)
{ {
*ppPropertyBag = NULL; *ppPropertyBag = NULL;
return 1; return 1;
} }
static int dvcman_create_listener(IWTSVirtualChannelManager* pChannelMgr, static int dvcman_create_listener(IWTSVirtualChannelManager *pChannelMgr,
const char* pszChannelName, UINT32 ulFlags, const char *pszChannelName, UINT32 ulFlags,
IWTSListenerCallback* pListenerCallback, IWTSListener** ppListener) IWTSListenerCallback *pListenerCallback, IWTSListener **ppListener)
{ {
DVCMAN* dvcman = (DVCMAN*) pChannelMgr; DVCMAN *dvcman = (DVCMAN *) pChannelMgr;
DVCMAN_LISTENER* listener; DVCMAN_LISTENER *listener;
if(dvcman->num_listeners < MAX_PLUGINS)
if (dvcman->num_listeners < MAX_PLUGINS)
{ {
DEBUG_DVC("%d.%s.", dvcman->num_listeners, pszChannelName); DEBUG_DVC("%d.%s.", dvcman->num_listeners, pszChannelName);
listener = (DVCMAN_LISTENER *) malloc(sizeof(DVCMAN_LISTENER));
listener = (DVCMAN_LISTENER*) malloc(sizeof(DVCMAN_LISTENER));
ZeroMemory(listener, sizeof(DVCMAN_LISTENER)); ZeroMemory(listener, sizeof(DVCMAN_LISTENER));
listener->iface.GetConfiguration = dvcman_get_configuration; listener->iface.GetConfiguration = dvcman_get_configuration;
listener->iface.pInterface = NULL; listener->iface.pInterface = NULL;
listener->dvcman = dvcman; listener->dvcman = dvcman;
listener->channel_name = _strdup(pszChannelName); listener->channel_name = _strdup(pszChannelName);
listener->flags = ulFlags; listener->flags = ulFlags;
listener->listener_callback = pListenerCallback; listener->listener_callback = pListenerCallback;
if(ppListener)
if (ppListener) *ppListener = (IWTSListener *) listener;
*ppListener = (IWTSListener*) listener; dvcman->listeners[dvcman->num_listeners++] = (IWTSListener *) listener;
dvcman->listeners[dvcman->num_listeners++] = (IWTSListener*) listener;
return 0; return 0;
} }
else else
@ -76,14 +78,12 @@ static int dvcman_create_listener(IWTSVirtualChannelManager* pChannelMgr,
} }
} }
static int dvcman_push_event(IWTSVirtualChannelManager* pChannelMgr, wMessage* pEvent) static int dvcman_push_event(IWTSVirtualChannelManager *pChannelMgr, wMessage *pEvent)
{ {
int status; int status;
DVCMAN* dvcman = (DVCMAN*) pChannelMgr; DVCMAN *dvcman = (DVCMAN *) pChannelMgr;
status = drdynvc_push_event(dvcman->drdynvc, pEvent); status = drdynvc_push_event(dvcman->drdynvc, pEvent);
if(status == 0)
if (status == 0)
{ {
DEBUG_DVC("event_type %d pushed.", GetMessageType(pEvent->id)); DEBUG_DVC("event_type %d pushed.", GetMessageType(pEvent->id));
} }
@ -91,15 +91,13 @@ static int dvcman_push_event(IWTSVirtualChannelManager* pChannelMgr, wMessage* p
{ {
DEBUG_WARN("event_type %d push failed.", GetMessageType(pEvent->id)); DEBUG_WARN("event_type %d push failed.", GetMessageType(pEvent->id));
} }
return status; return status;
} }
static int dvcman_register_plugin(IDRDYNVC_ENTRY_POINTS* pEntryPoints, const char* name, IWTSPlugin* pPlugin) static int dvcman_register_plugin(IDRDYNVC_ENTRY_POINTS *pEntryPoints, const char *name, IWTSPlugin *pPlugin)
{ {
DVCMAN* dvcman = ((DVCMAN_ENTRY_POINTS*) pEntryPoints)->dvcman; DVCMAN *dvcman = ((DVCMAN_ENTRY_POINTS *) pEntryPoints)->dvcman;
if(dvcman->num_plugins < MAX_PLUGINS)
if (dvcman->num_plugins < MAX_PLUGINS)
{ {
DEBUG_DVC("num_plugins %d", dvcman->num_plugins); DEBUG_DVC("num_plugins %d", dvcman->num_plugins);
dvcman->plugin_names[dvcman->num_plugins] = name; dvcman->plugin_names[dvcman->num_plugins] = name;
@ -113,365 +111,299 @@ static int dvcman_register_plugin(IDRDYNVC_ENTRY_POINTS* pEntryPoints, const cha
} }
} }
IWTSPlugin* dvcman_get_plugin(IDRDYNVC_ENTRY_POINTS* pEntryPoints, const char* name) IWTSPlugin *dvcman_get_plugin(IDRDYNVC_ENTRY_POINTS *pEntryPoints, const char *name)
{ {
int i; int i;
DVCMAN* dvcman = ((DVCMAN_ENTRY_POINTS*) pEntryPoints)->dvcman; DVCMAN *dvcman = ((DVCMAN_ENTRY_POINTS *) pEntryPoints)->dvcman;
for(i = 0; i < dvcman->num_plugins; i++)
for (i = 0; i < dvcman->num_plugins; i++)
{ {
if (dvcman->plugin_names[i] == name || if(dvcman->plugin_names[i] == name ||
strcmp(dvcman->plugin_names[i], name) == 0) strcmp(dvcman->plugin_names[i], name) == 0)
{ {
return dvcman->plugins[i]; return dvcman->plugins[i];
} }
} }
return NULL; return NULL;
} }
ADDIN_ARGV* dvcman_get_plugin_data(IDRDYNVC_ENTRY_POINTS* pEntryPoints) ADDIN_ARGV *dvcman_get_plugin_data(IDRDYNVC_ENTRY_POINTS *pEntryPoints)
{ {
return ((DVCMAN_ENTRY_POINTS*) pEntryPoints)->args; return ((DVCMAN_ENTRY_POINTS *) pEntryPoints)->args;
} }
UINT32 dvcman_get_channel_id(IWTSVirtualChannel * channel) UINT32 dvcman_get_channel_id(IWTSVirtualChannel *channel)
{ {
return ((DVCMAN_CHANNEL*) channel)->channel_id; return ((DVCMAN_CHANNEL *) channel)->channel_id;
} }
IWTSVirtualChannel* dvcman_find_channel_by_id(IWTSVirtualChannelManager* pChannelMgr, UINT32 ChannelId) IWTSVirtualChannel *dvcman_find_channel_by_id(IWTSVirtualChannelManager *pChannelMgr, UINT32 ChannelId)
{ {
int index; int index;
BOOL found = FALSE; BOOL found = FALSE;
DVCMAN_CHANNEL* channel; DVCMAN_CHANNEL *channel;
DVCMAN* dvcman = (DVCMAN*) pChannelMgr; DVCMAN *dvcman = (DVCMAN *) pChannelMgr;
ArrayList_Lock(dvcman->channels); ArrayList_Lock(dvcman->channels);
index = 0; index = 0;
channel = (DVCMAN_CHANNEL*) ArrayList_GetItem(dvcman->channels, index++); channel = (DVCMAN_CHANNEL *) ArrayList_GetItem(dvcman->channels, index++);
while(channel)
while (channel)
{ {
if (channel->channel_id == ChannelId) if(channel->channel_id == ChannelId)
{ {
found = TRUE; found = TRUE;
break; break;
} }
channel = (DVCMAN_CHANNEL *) ArrayList_GetItem(dvcman->channels, index++);
channel = (DVCMAN_CHANNEL*) ArrayList_GetItem(dvcman->channels, index++);
} }
ArrayList_Unlock(dvcman->channels); ArrayList_Unlock(dvcman->channels);
return (found) ? ((IWTSVirtualChannel *) channel) : NULL;
return (found) ? ((IWTSVirtualChannel*) channel) : NULL;
} }
void* dvcman_get_channel_interface_by_name(IWTSVirtualChannelManager* pChannelMgr, const char* ChannelName) void *dvcman_get_channel_interface_by_name(IWTSVirtualChannelManager *pChannelMgr, const char *ChannelName)
{ {
int i; int i;
BOOL found = FALSE; BOOL found = FALSE;
void* pInterface = NULL; void *pInterface = NULL;
DVCMAN_LISTENER* listener; DVCMAN_LISTENER *listener;
DVCMAN* dvcman = (DVCMAN*) pChannelMgr; DVCMAN *dvcman = (DVCMAN *) pChannelMgr;
for(i = 0; i < dvcman->num_listeners; i++)
for (i = 0; i < dvcman->num_listeners; i++)
{ {
listener = (DVCMAN_LISTENER*) dvcman->listeners[i]; listener = (DVCMAN_LISTENER *) dvcman->listeners[i];
if(strcmp(listener->channel_name, ChannelName) == 0)
if (strcmp(listener->channel_name, ChannelName) == 0)
{ {
pInterface = listener->iface.pInterface; pInterface = listener->iface.pInterface;
found = TRUE; found = TRUE;
break; break;
} }
} }
return (found) ? pInterface : NULL; return (found) ? pInterface : NULL;
} }
IWTSVirtualChannelManager* dvcman_new(drdynvcPlugin* plugin) IWTSVirtualChannelManager *dvcman_new(drdynvcPlugin *plugin)
{ {
DVCMAN* dvcman; DVCMAN *dvcman;
dvcman = (DVCMAN *) malloc(sizeof(DVCMAN));
dvcman = (DVCMAN*) malloc(sizeof(DVCMAN));
ZeroMemory(dvcman, sizeof(DVCMAN)); ZeroMemory(dvcman, sizeof(DVCMAN));
dvcman->iface.CreateListener = dvcman_create_listener; dvcman->iface.CreateListener = dvcman_create_listener;
dvcman->iface.PushEvent = dvcman_push_event; dvcman->iface.PushEvent = dvcman_push_event;
dvcman->iface.FindChannelById = dvcman_find_channel_by_id; dvcman->iface.FindChannelById = dvcman_find_channel_by_id;
dvcman->iface.GetChannelId = dvcman_get_channel_id; dvcman->iface.GetChannelId = dvcman_get_channel_id;
dvcman->drdynvc = plugin; dvcman->drdynvc = plugin;
dvcman->channels = ArrayList_New(TRUE); dvcman->channels = ArrayList_New(TRUE);
return (IWTSVirtualChannelManager *) dvcman;
return (IWTSVirtualChannelManager*) dvcman;
} }
int dvcman_load_addin(IWTSVirtualChannelManager* pChannelMgr, ADDIN_ARGV* args) int dvcman_load_addin(IWTSVirtualChannelManager *pChannelMgr, ADDIN_ARGV *args)
{ {
DVCMAN_ENTRY_POINTS entryPoints; DVCMAN_ENTRY_POINTS entryPoints;
PDVC_PLUGIN_ENTRY pDVCPluginEntry = NULL; PDVC_PLUGIN_ENTRY pDVCPluginEntry = NULL;
fprintf(stderr, "Loading Dynamic Virtual Channel %s\n", args->argv[0]); fprintf(stderr, "Loading Dynamic Virtual Channel %s\n", args->argv[0]);
pDVCPluginEntry = (PDVC_PLUGIN_ENTRY) freerdp_load_channel_addin_entry(args->argv[0], pDVCPluginEntry = (PDVC_PLUGIN_ENTRY) freerdp_load_channel_addin_entry(args->argv[0],
NULL, NULL, FREERDP_ADDIN_CHANNEL_DYNAMIC); NULL, NULL, FREERDP_ADDIN_CHANNEL_DYNAMIC);
if(pDVCPluginEntry)
if (pDVCPluginEntry)
{ {
entryPoints.iface.RegisterPlugin = dvcman_register_plugin; entryPoints.iface.RegisterPlugin = dvcman_register_plugin;
entryPoints.iface.GetPlugin = dvcman_get_plugin; entryPoints.iface.GetPlugin = dvcman_get_plugin;
entryPoints.iface.GetPluginData = dvcman_get_plugin_data; entryPoints.iface.GetPluginData = dvcman_get_plugin_data;
entryPoints.dvcman = (DVCMAN*) pChannelMgr; entryPoints.dvcman = (DVCMAN *) pChannelMgr;
entryPoints.args = args; entryPoints.args = args;
pDVCPluginEntry((IDRDYNVC_ENTRY_POINTS *) &entryPoints);
pDVCPluginEntry((IDRDYNVC_ENTRY_POINTS*) &entryPoints);
} }
return 0; return 0;
} }
static void dvcman_channel_free(DVCMAN_CHANNEL* channel) static void dvcman_channel_free(DVCMAN_CHANNEL *channel)
{ {
if (channel->channel_callback) assert(channel);
if(channel->channel_callback)
channel->channel_callback->OnClose(channel->channel_callback); channel->channel_callback->OnClose(channel->channel_callback);
if(channel->channel_name)
free(channel->channel_name);
free(channel); free(channel);
} }
void dvcman_free(IWTSVirtualChannelManager* pChannelMgr) void dvcman_free(IWTSVirtualChannelManager *pChannelMgr)
{ {
int i; int i;
int count; int count;
IWTSPlugin* pPlugin; IWTSPlugin *pPlugin;
DVCMAN_LISTENER* listener; DVCMAN_LISTENER *listener;
DVCMAN_CHANNEL* channel; DVCMAN_CHANNEL *channel;
DVCMAN* dvcman = (DVCMAN*) pChannelMgr; DVCMAN *dvcman = (DVCMAN *) pChannelMgr;
ArrayList_Lock(dvcman->channels); ArrayList_Lock(dvcman->channels);
count = ArrayList_Count(dvcman->channels); count = ArrayList_Count(dvcman->channels);
for(i = 0; i < count; i++)
for (i = 0; i < count; i++)
{ {
channel = (DVCMAN_CHANNEL*) ArrayList_GetItem(dvcman->channels, i); channel = (DVCMAN_CHANNEL *) ArrayList_GetItem(dvcman->channels, i);
dvcman_channel_free(channel); dvcman_channel_free(channel);
} }
ArrayList_Unlock(dvcman->channels); ArrayList_Unlock(dvcman->channels);
ArrayList_Free(dvcman->channels); ArrayList_Free(dvcman->channels);
for(i = 0; i < dvcman->num_listeners; i++)
for (i = 0; i < dvcman->num_listeners; i++)
{ {
listener = (DVCMAN_LISTENER*) dvcman->listeners[i]; listener = (DVCMAN_LISTENER *) dvcman->listeners[i];
free(listener->channel_name); free(listener->channel_name);
free(listener); free(listener);
} }
for(i = 0; i < dvcman->num_plugins; i++)
for (i = 0; i < dvcman->num_plugins; i++)
{ {
pPlugin = dvcman->plugins[i]; pPlugin = dvcman->plugins[i];
if(pPlugin->Terminated)
if (pPlugin->Terminated)
pPlugin->Terminated(pPlugin); pPlugin->Terminated(pPlugin);
} }
free(dvcman); free(dvcman);
} }
int dvcman_init(IWTSVirtualChannelManager* pChannelMgr) int dvcman_init(IWTSVirtualChannelManager *pChannelMgr)
{ {
int i; int i;
IWTSPlugin* pPlugin; IWTSPlugin *pPlugin;
DVCMAN* dvcman = (DVCMAN*) pChannelMgr; DVCMAN *dvcman = (DVCMAN *) pChannelMgr;
for(i = 0; i < dvcman->num_plugins; i++)
for (i = 0; i < dvcman->num_plugins; i++)
{ {
pPlugin = dvcman->plugins[i]; pPlugin = dvcman->plugins[i];
if(pPlugin->Initialize)
if (pPlugin->Initialize)
pPlugin->Initialize(pPlugin, pChannelMgr); pPlugin->Initialize(pPlugin, pChannelMgr);
} }
return 0; return 0;
} }
static int dvcman_write_channel(IWTSVirtualChannel* pChannel, UINT32 cbSize, BYTE* pBuffer, void* pReserved) static int dvcman_write_channel(IWTSVirtualChannel *pChannel, UINT32 cbSize, BYTE *pBuffer, void *pReserved)
{ {
int status; int status;
DVCMAN_CHANNEL* channel = (DVCMAN_CHANNEL*) pChannel; DVCMAN_CHANNEL *channel = (DVCMAN_CHANNEL *) pChannel;
WaitForSingleObject(channel->dvc_chan_mutex, INFINITE); WaitForSingleObject(channel->dvc_chan_mutex, INFINITE);
status = drdynvc_write_data(channel->dvcman->drdynvc, channel->channel_id, pBuffer, cbSize); status = drdynvc_write_data(channel->dvcman->drdynvc, channel->channel_id, pBuffer, cbSize);
ReleaseMutex(channel->dvc_chan_mutex); ReleaseMutex(channel->dvc_chan_mutex);
return status; return status;
} }
static int dvcman_close_channel_iface(IWTSVirtualChannel* pChannel) static int dvcman_close_channel_iface(IWTSVirtualChannel *pChannel)
{ {
DVCMAN_CHANNEL* channel = (DVCMAN_CHANNEL*) pChannel; DVCMAN_CHANNEL *channel = (DVCMAN_CHANNEL *) pChannel;
DVCMAN* dvcman = channel->dvcman; DVCMAN *dvcman = channel->dvcman;
DEBUG_DVC("id=%d", channel->channel_id); DEBUG_DVC("id=%d", channel->channel_id);
ArrayList_Remove(dvcman->channels, channel); ArrayList_Remove(dvcman->channels, channel);
dvcman_channel_free(channel); dvcman_channel_free(channel);
return 1; return 1;
} }
int dvcman_create_channel(IWTSVirtualChannelManager* pChannelMgr, UINT32 ChannelId, const char* ChannelName) int dvcman_create_channel(IWTSVirtualChannelManager *pChannelMgr, UINT32 ChannelId, const char *ChannelName)
{ {
int i; int i;
int bAccept; int bAccept;
DVCMAN_LISTENER* listener; DVCMAN_LISTENER *listener;
DVCMAN_CHANNEL* channel; DVCMAN_CHANNEL *channel;
DrdynvcClientContext* context; DrdynvcClientContext *context;
IWTSVirtualChannelCallback* pCallback; IWTSVirtualChannelCallback *pCallback;
DVCMAN* dvcman = (DVCMAN*) pChannelMgr; DVCMAN *dvcman = (DVCMAN *) pChannelMgr;
channel = (DVCMAN_CHANNEL *) malloc(sizeof(DVCMAN_CHANNEL));
channel = (DVCMAN_CHANNEL*) malloc(sizeof(DVCMAN_CHANNEL));
ZeroMemory(channel, sizeof(DVCMAN_CHANNEL)); ZeroMemory(channel, sizeof(DVCMAN_CHANNEL));
channel->dvcman = dvcman; channel->dvcman = dvcman;
channel->channel_id = ChannelId; channel->channel_id = ChannelId;
channel->channel_name = _strdup(ChannelName); channel->channel_name = _strdup(ChannelName);
for(i = 0; i < dvcman->num_listeners; i++)
for (i = 0; i < dvcman->num_listeners; i++)
{ {
listener = (DVCMAN_LISTENER*) dvcman->listeners[i]; listener = (DVCMAN_LISTENER *) dvcman->listeners[i];
if(strcmp(listener->channel_name, ChannelName) == 0)
if (strcmp(listener->channel_name, ChannelName) == 0)
{ {
channel->iface.Write = dvcman_write_channel; channel->iface.Write = dvcman_write_channel;
channel->iface.Close = dvcman_close_channel_iface; channel->iface.Close = dvcman_close_channel_iface;
channel->dvc_chan_mutex = CreateMutex(NULL, FALSE, NULL); channel->dvc_chan_mutex = CreateMutex(NULL, FALSE, NULL);
bAccept = 1; bAccept = 1;
pCallback = NULL; pCallback = NULL;
if(listener->listener_callback->OnNewChannelConnection(listener->listener_callback,
if (listener->listener_callback->OnNewChannelConnection(listener->listener_callback, (IWTSVirtualChannel *) channel, NULL, &bAccept, &pCallback) == 0 && bAccept == 1)
(IWTSVirtualChannel*) channel, NULL, &bAccept, &pCallback) == 0 && bAccept == 1)
{ {
DEBUG_DVC("listener %s created new channel %d", DEBUG_DVC("listener %s created new channel %d",
listener->channel_name, channel->channel_id); listener->channel_name, channel->channel_id);
channel->status = 0; channel->status = 0;
channel->channel_callback = pCallback; channel->channel_callback = pCallback;
channel->pInterface = listener->iface.pInterface; channel->pInterface = listener->iface.pInterface;
ArrayList_Add(dvcman->channels, channel); ArrayList_Add(dvcman->channels, channel);
context = dvcman->drdynvc->context; context = dvcman->drdynvc->context;
IFCALL(context->OnChannelConnected, context, ChannelName, listener->iface.pInterface); IFCALL(context->OnChannelConnected, context, ChannelName, listener->iface.pInterface);
return 0; return 0;
} }
else else
{ {
DEBUG_WARN("channel rejected by plugin"); DEBUG_WARN("channel rejected by plugin");
free(channel); free(channel);
return 1; return 1;
} }
} }
} }
free(channel); free(channel);
return 1; return 1;
} }
int dvcman_close_channel(IWTSVirtualChannelManager* pChannelMgr, UINT32 ChannelId) int dvcman_close_channel(IWTSVirtualChannelManager *pChannelMgr, UINT32 ChannelId)
{ {
DVCMAN_CHANNEL* channel; DVCMAN_CHANNEL *channel;
IWTSVirtualChannel* ichannel; IWTSVirtualChannel *ichannel;
DrdynvcClientContext* context; DrdynvcClientContext *context;
DVCMAN* dvcman = (DVCMAN*) pChannelMgr; DVCMAN *dvcman = (DVCMAN *) pChannelMgr;
channel = (DVCMAN_CHANNEL *) dvcman_find_channel_by_id(pChannelMgr, ChannelId);
channel = (DVCMAN_CHANNEL*) dvcman_find_channel_by_id(pChannelMgr, ChannelId); if(!channel)
if (!channel)
{ {
DEBUG_WARN("ChannelId %d not found!", ChannelId); DEBUG_WARN("ChannelId %d not found!", ChannelId);
return 1; return 1;
} }
if(channel->dvc_data)
if (channel->dvc_data)
{ {
Stream_Free(channel->dvc_data, TRUE); Stream_Free(channel->dvc_data, TRUE);
channel->dvc_data = NULL; channel->dvc_data = NULL;
} }
if(channel->status == 0)
if (channel->status == 0)
{ {
context = dvcman->drdynvc->context; context = dvcman->drdynvc->context;
IFCALL(context->OnChannelDisconnected, context, channel->channel_name, channel->pInterface); IFCALL(context->OnChannelDisconnected, context, channel->channel_name, channel->pInterface);
free(channel->channel_name);
DEBUG_DVC("dvcman_close_channel: channel %d closed", ChannelId); DEBUG_DVC("dvcman_close_channel: channel %d closed", ChannelId);
ichannel = (IWTSVirtualChannel*) channel; ichannel = (IWTSVirtualChannel *) channel;
ichannel->Close(ichannel); ichannel->Close(ichannel);
} }
return 0; return 0;
} }
int dvcman_receive_channel_data_first(IWTSVirtualChannelManager* pChannelMgr, UINT32 ChannelId, UINT32 length) int dvcman_receive_channel_data_first(IWTSVirtualChannelManager *pChannelMgr, UINT32 ChannelId, UINT32 length)
{ {
DVCMAN_CHANNEL* channel; DVCMAN_CHANNEL *channel;
channel = (DVCMAN_CHANNEL *) dvcman_find_channel_by_id(pChannelMgr, ChannelId);
channel = (DVCMAN_CHANNEL*) dvcman_find_channel_by_id(pChannelMgr, ChannelId); if(!channel)
if (!channel)
{ {
DEBUG_WARN("ChannelId %d not found!", ChannelId); DEBUG_WARN("ChannelId %d not found!", ChannelId);
return 1; return 1;
} }
if(channel->dvc_data)
if (channel->dvc_data)
Stream_Free(channel->dvc_data, TRUE); Stream_Free(channel->dvc_data, TRUE);
channel->dvc_data = Stream_New(NULL, length); channel->dvc_data = Stream_New(NULL, length);
return 0; return 0;
} }
int dvcman_receive_channel_data(IWTSVirtualChannelManager* pChannelMgr, UINT32 ChannelId, BYTE* data, UINT32 data_size) int dvcman_receive_channel_data(IWTSVirtualChannelManager *pChannelMgr, UINT32 ChannelId, BYTE *data, UINT32 data_size)
{ {
int error = 0; int error = 0;
DVCMAN_CHANNEL* channel; DVCMAN_CHANNEL *channel;
channel = (DVCMAN_CHANNEL *) dvcman_find_channel_by_id(pChannelMgr, ChannelId);
channel = (DVCMAN_CHANNEL*) dvcman_find_channel_by_id(pChannelMgr, ChannelId); if(!channel)
if (!channel)
{ {
DEBUG_WARN("ChannelId %d not found!", ChannelId); DEBUG_WARN("ChannelId %d not found!", ChannelId);
return 1; return 1;
} }
if(channel->dvc_data)
if (channel->dvc_data)
{ {
/* Fragmented data */ /* Fragmented data */
if (Stream_GetPosition(channel->dvc_data) + data_size > (UINT32) Stream_Capacity(channel->dvc_data)) if(Stream_GetPosition(channel->dvc_data) + data_size > (UINT32) Stream_Capacity(channel->dvc_data))
{ {
DEBUG_WARN("data exceeding declared length!"); DEBUG_WARN("data exceeding declared length!");
Stream_Free(channel->dvc_data, TRUE); Stream_Free(channel->dvc_data, TRUE);
channel->dvc_data = NULL; channel->dvc_data = NULL;
return 1; return 1;
} }
Stream_Write(channel->dvc_data, data, data_size); Stream_Write(channel->dvc_data, data, data_size);
if(((size_t) Stream_GetPosition(channel->dvc_data)) >= Stream_Capacity(channel->dvc_data))
if (((size_t) Stream_GetPosition(channel->dvc_data)) >= Stream_Capacity(channel->dvc_data))
{ {
error = channel->channel_callback->OnDataReceived(channel->channel_callback, error = channel->channel_callback->OnDataReceived(channel->channel_callback,
Stream_Capacity(channel->dvc_data), Stream_Buffer(channel->dvc_data)); Stream_Capacity(channel->dvc_data), Stream_Buffer(channel->dvc_data));
Stream_Free(channel->dvc_data, TRUE); Stream_Free(channel->dvc_data, TRUE);
channel->dvc_data = NULL; channel->dvc_data = NULL;
} }
@ -480,6 +412,89 @@ int dvcman_receive_channel_data(IWTSVirtualChannelManager* pChannelMgr, UINT32 C
{ {
error = channel->channel_callback->OnDataReceived(channel->channel_callback, data_size, data); error = channel->channel_callback->OnDataReceived(channel->channel_callback, data_size, data);
} }
return error; return error;
} }
static void dump_callbacks(void)
{
wListDictionaryItem *cur;
DEBUG_DVC("Dumping all currently registered callbacks");
if(!cb_dict)
{
DEBUG_DVC("cb_dict=NULL");
return;
}
cur = cb_dict->head;
while(cur)
{
DEBUG_DVC("cb_dict %s:%p", cur->key, cur->value);
cur = cur->next;
}
}
void *get_callback_by_name(const char *name, void **context)
{
struct cb_value *rc;
if(!cb_dict)
{
DEBUG_WARN("'%s' not found, function list does not exist.",
name);
return NULL;
}
if(!ListDictionary_Contains(cb_dict, (void *)name))
{
DEBUG_WARN("'%s' not found", name);
return NULL;
}
rc = ListDictionary_GetItemValue(cb_dict, (void *)name);
DEBUG_DVC("'%s'=%p found", name, rc);
assert(context);
*context = rc->context;
return rc->fkt;
}
static BOOL callback_key_cmp(void *a, void *b)
{
return strcmp(a, b) ? FALSE : TRUE;
}
void add_callback_by_name(const char *name, void *fkt, void *context)
{
struct cb_value *value = calloc(1, sizeof(struct cb_value));
if(!cb_dict)
{
DEBUG_DVC("Function list is empty, allocating new.");
cb_dict = ListDictionary_New(TRUE);
ListDictionary_KeyObject(cb_dict)->fnObjectEquals = callback_key_cmp;
}
value->fkt = fkt;
value->context = context;
DEBUG_DVC("Adding '%s'=%p to function list.", name, fkt);
ListDictionary_Add(cb_dict, (void *)name, value);
dump_callbacks();
}
void remove_callback_by_name(const char *name, void *context)
{
if(!cb_dict)
{
DEBUG_WARN("trying to remove '%s', but function list does not exist.",
name);
return;
}
if(!ListDictionary_Contains(cb_dict, (void *)name))
{
DEBUG_WARN("trying to remove '%s', which is not in function list.",
name);
return;
}
DEBUG_DVC("Removing '%s' from function list.", name);
ListDictionary_Remove(cb_dict, (void *)name);
if(ListDictionary_Count(cb_dict) < 1)
{
DEBUG_DVC("Function list is empty, freeing resources.");
ListDictionary_Free(cb_dict);
cb_dict = NULL;
}
dump_callbacks();
}

84
include/freerdp/dvc.h
View File

@ -65,96 +65,100 @@ typedef struct _IWTSVirtualChannelCallback IWTSVirtualChannelCallback;
struct _IWTSListener struct _IWTSListener
{ {
/* Retrieves the listener-specific configuration. */ /* Retrieves the listener-specific configuration. */
int (*GetConfiguration) (IWTSListener* pListener, int (*GetConfiguration)(IWTSListener *pListener,
void** ppPropertyBag); void **ppPropertyBag);
void* pInterface; void *pInterface;
}; };
struct _IWTSVirtualChannel struct _IWTSVirtualChannel
{ {
/* Starts a write request on the channel. */ /* Starts a write request on the channel. */
int (*Write) (IWTSVirtualChannel* pChannel, int (*Write)(IWTSVirtualChannel *pChannel,
UINT32 cbSize, UINT32 cbSize,
BYTE* pBuffer, BYTE *pBuffer,
void* pReserved); void *pReserved);
/* Closes the channel. */ /* Closes the channel. */
int (*Close) (IWTSVirtualChannel* pChannel); int (*Close)(IWTSVirtualChannel *pChannel);
}; };
struct _IWTSVirtualChannelManager struct _IWTSVirtualChannelManager
{ {
/* Returns an instance of a listener object that listens on a specific /* Returns an instance of a listener object that listens on a specific
endpoint, or creates a static channel. */ endpoint, or creates a static channel. */
int (*CreateListener) (IWTSVirtualChannelManager* pChannelMgr, int (*CreateListener)(IWTSVirtualChannelManager *pChannelMgr,
const char* pszChannelName, const char *pszChannelName,
UINT32 ulFlags, UINT32 ulFlags,
IWTSListenerCallback* pListenerCallback, IWTSListenerCallback *pListenerCallback,
IWTSListener** ppListener); IWTSListener **ppListener);
/* Push a virtual channel event. /* Push a virtual channel event.
This is a FreeRDP extension to standard MS API. */ This is a FreeRDP extension to standard MS API. */
int (*PushEvent) (IWTSVirtualChannelManager* pChannelMgr, int (*PushEvent)(IWTSVirtualChannelManager *pChannelMgr,
wMessage* pEvent); wMessage *pEvent);
/* Find the channel or ID to send data to a specific endpoint. */ /* Find the channel or ID to send data to a specific endpoint. */
UINT32 (*GetChannelId) (IWTSVirtualChannel * channel); UINT32(*GetChannelId)(IWTSVirtualChannel *channel);
IWTSVirtualChannel* (*FindChannelById) (IWTSVirtualChannelManager* pChannelMgr, IWTSVirtualChannel *(*FindChannelById)(IWTSVirtualChannelManager *pChannelMgr,
UINT32 ChannelId); UINT32 ChannelId);
}; };
struct _IWTSPlugin struct _IWTSPlugin
{ {
/* Used for the first call that is made from the client to the plug-in. */ /* Used for the first call that is made from the client to the plug-in. */
int (*Initialize) (IWTSPlugin* pPlugin, int (*Initialize)(IWTSPlugin *pPlugin,
IWTSVirtualChannelManager* pChannelMgr); IWTSVirtualChannelManager *pChannelMgr);
/* Notifies the plug-in that the Remote Desktop Connection (RDC) client /* Notifies the plug-in that the Remote Desktop Connection (RDC) client
has successfully connected to the Remote Desktop Session Host (RD has successfully connected to the Remote Desktop Session Host (RD
Session Host) server. */ Session Host) server. */
int (*Connected) (IWTSPlugin* pPlugin); int (*Connected)(IWTSPlugin *pPlugin);
/* Notifies the plug-in that the Remote Desktop Connection (RDC) client /* Notifies the plug-in that the Remote Desktop Connection (RDC) client
has disconnected from the RD Session Host server. */ has disconnected from the RD Session Host server. */
int (*Disconnected) (IWTSPlugin* pPlugin, int (*Disconnected)(IWTSPlugin *pPlugin,
UINT32 dwDisconnectCode); UINT32 dwDisconnectCode);
/* Notifies the plug-in that the Remote Desktop Connection (RDC) client /* Notifies the plug-in that the Remote Desktop Connection (RDC) client
has terminated. */ has terminated. */
int (*Terminated) (IWTSPlugin* pPlugin); int (*Terminated)(IWTSPlugin *pPlugin);
/* Extended */ /* Extended */
void* pInterface; void *pInterface;
}; };
struct _IWTSListenerCallback struct _IWTSListenerCallback
{ {
/* Accepts or denies a connection request for an incoming connection to /* Accepts or denies a connection request for an incoming connection to
the associated listener. */ the associated listener. */
int (*OnNewChannelConnection) (IWTSListenerCallback* pListenerCallback, int (*OnNewChannelConnection)(IWTSListenerCallback *pListenerCallback,
IWTSVirtualChannel* pChannel, IWTSVirtualChannel *pChannel,
BYTE* Data, BYTE *Data,
int* pbAccept, int *pbAccept,
IWTSVirtualChannelCallback** ppCallback); IWTSVirtualChannelCallback **ppCallback);
}; };
struct _IWTSVirtualChannelCallback struct _IWTSVirtualChannelCallback
{ {
/* Notifies the user about data that is being received. */ /* Notifies the user about data that is being received. */
int (*OnDataReceived) (IWTSVirtualChannelCallback* pChannelCallback, int (*OnDataReceived)(IWTSVirtualChannelCallback *pChannelCallback,
UINT32 cbSize, UINT32 cbSize,
BYTE* pBuffer); BYTE *pBuffer);
/* Notifies the user that the channel has been closed. */ /* Notifies the user that the channel has been closed. */
int (*OnClose) (IWTSVirtualChannelCallback* pChannelCallback); int (*OnClose)(IWTSVirtualChannelCallback *pChannelCallback);
}; };
/* The DVC Plugin entry points */ /* The DVC Plugin entry points */
typedef struct _IDRDYNVC_ENTRY_POINTS IDRDYNVC_ENTRY_POINTS; typedef struct _IDRDYNVC_ENTRY_POINTS IDRDYNVC_ENTRY_POINTS;
struct _IDRDYNVC_ENTRY_POINTS struct _IDRDYNVC_ENTRY_POINTS
{ {
int (*RegisterPlugin) (IDRDYNVC_ENTRY_POINTS* pEntryPoints, int (*RegisterPlugin)(IDRDYNVC_ENTRY_POINTS *pEntryPoints,
const char* name, IWTSPlugin* pPlugin); const char *name, IWTSPlugin *pPlugin);
IWTSPlugin* (*GetPlugin) (IDRDYNVC_ENTRY_POINTS* pEntryPoints, IWTSPlugin *(*GetPlugin)(IDRDYNVC_ENTRY_POINTS *pEntryPoints,
const char* name); const char *name);
ADDIN_ARGV* (*GetPluginData) (IDRDYNVC_ENTRY_POINTS* pEntryPoints); ADDIN_ARGV *(*GetPluginData)(IDRDYNVC_ENTRY_POINTS *pEntryPoints);
}; };
typedef int (*PDVC_PLUGIN_ENTRY) (IDRDYNVC_ENTRY_POINTS*); typedef int (*PDVC_PLUGIN_ENTRY)(IDRDYNVC_ENTRY_POINTS *);
void *get_callback_by_name(const char *name, void **context);
void add_callback_by_name(const char *name, void *fkt, void *context);
void remove_callback_by_name(const char *name, void *context);
#endif /* FREERDP_DVC_H */ #endif /* FREERDP_DVC_H */