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

[core,client] fixed connection timeout abort

Browse Source 
the abort condidion was not properly triggered.
This commit is contained in:
Armin Novak 2022-12-12 16:11:11 +01:00 committed by David Fort
parent 37ab25e19d
commit b41ef0cda7
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libfreerdp/core/connection.c
View File

@ -227,6 +227,7 @@ static BOOL rdp_client_reset_codecs(rdpContext* context)
static BOOL rdp_client_wait_for_activation(rdpRdp* rdp)
{
BOOL timedout = FALSE;
WINPR_ASSERT(rdp);
const rdpSettings* settings = rdp->settings;
@ -235,7 +236,7 @@ static BOOL rdp_client_wait_for_activation(rdpRdp* rdp)
UINT64 now = GetTickCount64();
UINT64 dueDate = now + freerdp_settings_get_uint32(settings, FreeRDP_TcpAckTimeout);
for (; now < dueDate; now = GetTickCount64())
for (; (now < dueDate) && !timedout; now = GetTickCount64())
{
HANDLE events[MAXIMUM_WAIT_OBJECTS] = { 0 };
DWORD wstatus = 0;
@ -251,7 +252,7 @@ static BOOL rdp_client_wait_for_activation(rdpRdp* rdp)
{
case WAIT_TIMEOUT:
/* will make us quit with a timeout */
now = dueDate + 1;
timedout = TRUE;
break;
case WAIT_ABANDONED:
case WAIT_FAILED: