mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[channel,dvc] unify and log DVC callbacks

Browse Source 
* Added a check function that logs errors if the required callbacks are
  not set.
* Encapsulate calling in (static) helper functions
This commit is contained in:
akallabeth 2022-12-15 14:02:01 +01:00 committed by Martin Fleisz
parent 1f16250a7b
commit 3b5347e229
2 changed files with 49 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
channels/drdynvc/client/drdynvc_main.c
View File

@ -415,6 +415,36 @@ static UINT dvcchannel_send_close(DVCMAN_CHANNEL* channel)
return drdynvc_send(drdynvc, s);
}
static void check_open_close_receive(DVCMAN_CHANNEL* channel)
{
WINPR_ASSERT(channel);
IWTSVirtualChannelCallback* cb = channel->channel_callback;
const char* name = channel->channel_name;
const UINT32 id = channel->channel_id;
WINPR_ASSERT(cb);
if (cb->OnOpen || cb->OnClose)
{
if (!cb->OnOpen || !cb->OnClose)
WLog_WARN(TAG, "[%s] {%s:%" PRIu32 "} OnOpen=%p, OnClose=%p", __FUNCTION__, name, id,
cb->OnOpen, cb->OnClose);
}
}
static UINT dvcman_call_on_receive(DVCMAN_CHANNEL* channel, wStream* data)
{
WINPR_ASSERT(channel);
WINPR_ASSERT(data);
IWTSVirtualChannelCallback* cb = channel->channel_callback;
WINPR_ASSERT(cb);
check_open_close_receive(channel);
WINPR_ASSERT(cb->OnDataReceived);
return cb->OnDataReceived(cb, data);
}
static UINT dvcman_channel_close(DVCMAN_CHANNEL* channel, BOOL perRequest, BOOL fromHashTableFn)
{
UINT error = CHANNEL_RC_OK;
@ -445,12 +475,15 @@ static UINT dvcman_channel_close(DVCMAN_CHANNEL* channel, BOOL perRequest, BOOL
channel->state = DVC_CHANNEL_CLOSED;
if (channel->channel_callback)
IWTSVirtualChannelCallback* cb = channel->channel_callback;
if (cb)
{
IFCALL(channel->channel_callback->OnClose, channel->channel_callback);
channel->channel_callback = NULL;
check_open_close_receive(channel);
IFCALL(cb->OnClose, cb);
}
channel->channel_callback = NULL;
if (channel->dvcman && channel->dvcman->drdynvc)
{
if (context)
@ -733,6 +766,7 @@ static UINT dvcman_open_channel(drdynvcPlugin* drdynvc, DVCMAN_CHANNEL* channel)
if (pCallback->OnOpen)
{
check_open_close_receive(channel);
error = pCallback->OnOpen(pCallback);
if (error)
{
@ -808,16 +842,14 @@ static UINT dvcman_receive_channel_data(DVCMAN_CHANNEL* channel, wStream* data,
{
Stream_SealLength(channel->dvc_data);
Stream_SetPosition(channel->dvc_data, 0);
status = channel->channel_callback->OnDataReceived(channel->channel_callback,
channel->dvc_data);
status = dvcman_call_on_receive(channel, channel->dvc_data);
Stream_Release(channel->dvc_data);
channel->dvc_data = NULL;
}
}
else
{
status = channel->channel_callback->OnDataReceived(channel->channel_callback, data);
}
status = dvcman_call_on_receive(channel, data);
out:
return status;

15
include/freerdp/dvc.h
View File

@ -130,12 +130,15 @@ struct s_IWTSListenerCallback
struct s_IWTSVirtualChannelCallback
{
/* Notifies the user about data that is being received. */
UINT (*OnDataReceived)(IWTSVirtualChannelCallback* pChannelCallback, wStream* data);
/* Notifies the user that the channel has been opened. */
UINT (*OnOpen)(IWTSVirtualChannelCallback* pChannelCallback);
/* Notifies the user that the channel has been closed. */
UINT (*OnClose)(IWTSVirtualChannelCallback* pChannelCallback);
UINT(*OnDataReceived)
(IWTSVirtualChannelCallback* pChannelCallback,
wStream* data); /**< Notifies the user about data that is being received. */
UINT(*OnOpen)
(IWTSVirtualChannelCallback*
pChannelCallback); /**< Notifies the user that the channel has been opened. */
UINT(*OnClose)
(IWTSVirtualChannelCallback*
pChannelCallback); /**< Notifies the user that the channel has been closed. */
};
/* The DVC Plugin entry points */