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

server: proxy: only wait for server dynvc when needed

This commit is contained in:
kubistika 2019-08-28 18:25:23 +03:00 committed by akallabeth
parent ada078f67d
commit 62b32fbab9
2 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
server/proxy/pf_channels.c
View File

@ -44,6 +44,13 @@
#define TAG PROXY_TAG("channels") #define TAG PROXY_TAG("channels")
static void pf_channels_wait_for_server_dynvc(pServerContext* ps)
{
WLog_DBG(TAG, "pf_channels_wait_for_server_dynvc(): waiting for server's drdynvc to be ready");
WaitForSingleObject(ps->dynvcReady, INFINITE);
WLog_DBG(TAG, "pf_channels_wait_for_server_dynvc(): server's drdynvc is ready!");
}
void pf_OnChannelConnectedEventHandler(void* data, void pf_OnChannelConnectedEventHandler(void* data,
ChannelConnectedEventArgs* e) ChannelConnectedEventArgs* e)
{ {
@ -58,6 +65,8 @@ void pf_OnChannelConnectedEventHandler(void* data,
} }
else if (strcmp(e->name, RDPGFX_DVC_CHANNEL_NAME) == 0) else if (strcmp(e->name, RDPGFX_DVC_CHANNEL_NAME) == 0)
{ {
pf_channels_wait_for_server_dynvc(ps);
if (!ps->gfx->Open(ps->gfx)) if (!ps->gfx->Open(ps->gfx))
{ {
WLog_ERR(TAG, "failed to open GFX server"); WLog_ERR(TAG, "failed to open GFX server");
@ -69,13 +78,28 @@ void pf_OnChannelConnectedEventHandler(void* data,
} }
else if (strcmp(e->name, DISP_DVC_CHANNEL_NAME) == 0) else if (strcmp(e->name, DISP_DVC_CHANNEL_NAME) == 0)
{ {
UINT ret;
ret = ps->disp->Open(ps->disp);
if (ret != CHANNEL_RC_OK)
{
if (ret == ERROR_NOT_FOUND)
{
/* client did not connect with disp */
return;
}
}
else
{
pf_channels_wait_for_server_dynvc(ps);
if (ps->disp->Open(ps->disp) != CHANNEL_RC_OK) if (ps->disp->Open(ps->disp) != CHANNEL_RC_OK)
{ {
WLog_ERR(TAG, "failed to open disp channel"); WLog_ERR(TAG, "failed to open disp channel");
return; return;
} }
}
pc->disp = (DispClientContext*) e->pInterface; pc->disp = (DispClientContext*)e->pInterface;
pf_disp_register_callbacks(pc->disp, ps->disp, pc->pdata); pf_disp_register_callbacks(pc->disp, ps->disp, pc->pdata);
} }
else if (strcmp(e->name, CLIPRDR_SVC_CHANNEL_NAME) == 0) else if (strcmp(e->name, CLIPRDR_SVC_CHANNEL_NAME) == 0)

4
server/proxy/pf_client.c
View File

@ -155,10 +155,6 @@ static BOOL pf_client_pre_connect(freerdp* instance)
pf_OnChannelDisconnectedEventHandler); pf_OnChannelDisconnectedEventHandler);
PubSub_SubscribeErrorInfo(instance->context->pubSub, pf_OnErrorInfo); PubSub_SubscribeErrorInfo(instance->context->pubSub, pf_OnErrorInfo);
/* before loading client's channels, make sure proxy's dynvc is ready */
WLog_DBG(TAG, "pf_client_pre_connect(): Waiting for proxy's server dynvc to be ready");
WaitForSingleObject(ps->dynvcReady, INFINITE);
/** /**
* Load all required plugins / channels / libraries specified by current * Load all required plugins / channels / libraries specified by current
* settings. * settings.