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: make sure module's pre connect only called once

Browse Source
This commit is contained in:
kubistika 2019-09-08 15:08:15 +03:00
parent 8cf8da3e41
commit 7ed39ce724
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/proxy/pf_client.c
View File

@ -122,9 +122,6 @@ static BOOL pf_client_pre_connect(freerdp* instance)
proxyConfig* config = ps->pdata->config; proxyConfig* config = ps->pdata->config;
rdpSettings* settings = instance->settings; rdpSettings* settings = instance->settings;
if (!pf_modules_run_hook(HOOK_TYPE_CLIENT_PRE_CONNECT, (rdpContext*)ps))
return FALSE;
/* /*
* as the client's settings are copied from the server's, GlyphSupportLevel might not be * as the client's settings are copied from the server's, GlyphSupportLevel might not be
* GLYPH_SUPPORT_NONE. the proxy currently do not support GDI & GLYPH_SUPPORT_CACHE, so * GLYPH_SUPPORT_NONE. the proxy currently do not support GDI & GLYPH_SUPPORT_CACHE, so
@ -266,11 +263,15 @@ static DWORD WINAPI pf_client_thread_proc(LPVOID arg)
{ {
freerdp* instance = (freerdp*)arg; freerdp* instance = (freerdp*)arg;
pClientContext* pc = (pClientContext*)instance->context; pClientContext* pc = (pClientContext*)instance->context;
pServerContext* ps = pc->pdata->ps;
proxyData* pdata = pc->pdata; proxyData* pdata = pc->pdata;
DWORD nCount; DWORD nCount;
DWORD status; DWORD status;
HANDLE handles[65]; HANDLE handles[65];
if (!pf_modules_run_hook(HOOK_TYPE_CLIENT_PRE_CONNECT, (rdpContext*) ps))
return FALSE;
/* /*
* during redirection, freerdp's abort event might be overriden (reset) by the library, after * during redirection, freerdp's abort event might be overriden (reset) by the library, after
* the server set it in order to shutdown the connection. it means that the server might signal * the server set it in order to shutdown the connection. it means that the server might signal