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

server/proxy: Proxy errors back to client

Browse Source
This commit is contained in:
kubistika 2019-05-19 14:35:06 +03:00
parent ef3a3ae9e6
commit 6bb5a1d579
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
server/proxy/pf_client.c
View File

@ -90,6 +90,23 @@ static BOOL pf_client_end_paint(rdpContext* context)
return ps->update->EndPaint(ps); return ps->update->EndPaint(ps);
} }
static void pf_OnErrorInfo(void* ctx, ErrorInfoEventArgs* e)
{
pClientContext* pc = (pClientContext*) ctx;
proxyData* pdata = pc->pdata;
rdpContext* ps = (rdpContext*)pdata->ps;
if (e->code != ERRINFO_NONE)
{
const char* errorMessage = freerdp_get_error_info_string(e->code);
WLog_DBG(TAG, "Client received error info (0x%08"PRIu32"): %s", e->code, errorMessage);
/* forward error back to client */
freerdp_set_error_info(ps->rdp, e->code);
freerdp_send_error_info(ps->rdp);
}
}
/** /**
* Called before a connection is established. * Called before a connection is established.
* *
@ -114,6 +131,7 @@ static BOOL pf_client_pre_connect(freerdp* instance)
pf_OnChannelConnectedEventHandler); pf_OnChannelConnectedEventHandler);
PubSub_SubscribeChannelDisconnected(instance->context->pubSub, PubSub_SubscribeChannelDisconnected(instance->context->pubSub,
pf_OnChannelDisconnectedEventHandler); pf_OnChannelDisconnectedEventHandler);
PubSub_SubscribeErrorInfo(instance->context->pubSub, pf_OnErrorInfo);
/** /**
* Load all required plugins / channels / libraries specified by current * Load all required plugins / channels / libraries specified by current
* settings. * settings.
@ -219,18 +237,20 @@ static void pf_client_post_disconnect(freerdp* instance)
context = (pClientContext*) instance->context; context = (pClientContext*) instance->context;
pdata = context->pdata; pdata = context->pdata;
ps = (rdpContext*) pdata->ps;
peer = ps->peer;
PubSub_UnsubscribeChannelConnected(instance->context->pubSub, PubSub_UnsubscribeChannelConnected(instance->context->pubSub,
pf_OnChannelConnectedEventHandler); pf_OnChannelConnectedEventHandler);
PubSub_UnsubscribeChannelDisconnected(instance->context->pubSub, PubSub_UnsubscribeChannelDisconnected(instance->context->pubSub,
pf_OnChannelDisconnectedEventHandler); pf_OnChannelDisconnectedEventHandler);
PubSub_UnsubscribeErrorInfo(instance->context->pubSub, pf_OnErrorInfo);
gdi_free(instance); gdi_free(instance);
ps = (rdpContext*) pdata->ps;
if (!pf_common_connection_aborted_by_peer(pdata)) if (!pf_common_connection_aborted_by_peer(pdata))
{ {
SetEvent(pdata->connectionClosed); SetEvent(pdata->connectionClosed);
WLog_INFO(TAG, "connectionClosed event is not set; closing connection with client"); WLog_INFO(TAG, "connectionClosed event is not set; closing connection with client");
peer = ps->peer;
peer->Disconnect(peer); peer->Disconnect(peer);
} }