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

[client] refactor client activation timeout

Browse Source 
Move the code to a function to make it more readable
This commit is contained in:
Armin Novak 2022-11-30 14:33:08 +01:00 committed by akallabeth
parent 5f81005ecb
commit c22d3736a3
1 changed files with 54 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
libfreerdp/core/connection.c
View File

@ -226,6 +226,59 @@ static BOOL rdp_client_reset_codecs(rdpContext* context)
return TRUE; return TRUE;
} }
static BOOL rdp_client_wait_for_activation(rdpRdp* rdp)
{
WINPR_ASSERT(rdp);
const rdpSettings* settings = rdp->settings;
WINPR_ASSERT(settings);
UINT64 now = GetTickCount64();
UINT64 dueDate = now + freerdp_settings_get_uint32(settings, FreeRDP_TcpAckTimeout);
for (; now < dueDate; now = GetTickCount64())
{
HANDLE events[MAXIMUM_WAIT_OBJECTS] = { 0 };
DWORD wstatus = 0;
DWORD nevents = freerdp_get_event_handles(rdp->context, events, ARRAYSIZE(events));
if (!nevents)
{
WLog_ERR(TAG, "error retrieving connection events");
return FALSE;
}
wstatus = WaitForMultipleObjectsEx(nevents, events, FALSE, (dueDate - now), TRUE);
switch (wstatus)
{
case WAIT_TIMEOUT:
/* will make us quit with a timeout */
now = dueDate + 1;
break;
case WAIT_ABANDONED:
case WAIT_FAILED:
return FALSE;
case WAIT_IO_COMPLETION:
break;
case WAIT_OBJECT_0:
default:
/* handles all WAIT_OBJECT_0 + [0 .. MAXIMUM_WAIT_OBJECTS-1] cases */
if (rdp_check_fds(rdp) < 0)
{
freerdp_set_last_error_if_not(rdp->context,
FREERDP_ERROR_CONNECT_TRANSPORT_FAILED);
return FALSE;
}
break;
}
if (rdp_get_state(rdp) > CONNECTION_STATE_CAPABILITIES_EXCHANGE_CONFIRM_ACTIVE)
return TRUE;
}
WLog_ERR(TAG, "Timeout waiting for activation");
freerdp_set_last_error_if_not(rdp->context, FREERDP_ERROR_CONNECT_ACTIVATION_TIMEOUT);
return FALSE;
}
/** /**
* Establish RDP Connection based on the settings given in the 'rdp' parameter. * Establish RDP Connection based on the settings given in the 'rdp' parameter.
* @msdn{cc240452} * @msdn{cc240452}
@ -241,7 +294,6 @@ BOOL rdp_client_connect(rdpRdp* rdp)
/* make sure SSL is initialize for earlier enough for crypto, by taking advantage of winpr SSL /* make sure SSL is initialize for earlier enough for crypto, by taking advantage of winpr SSL
* FIPS flag for openssl initialization */ * FIPS flag for openssl initialization */
DWORD flags = WINPR_SSL_INIT_DEFAULT; DWORD flags = WINPR_SSL_INIT_DEFAULT;
UINT64 dueDate, now;
WINPR_ASSERT(rdp); WINPR_ASSERT(rdp);
@ -388,51 +440,7 @@ BOOL rdp_client_connect(rdpRdp* rdp)
if (!transport_set_recv_callbacks(rdp->transport, rdp_recv_callback, rdp)) if (!transport_set_recv_callbacks(rdp->transport, rdp_recv_callback, rdp))
return FALSE; return FALSE;
now = GetTickCount64(); return rdp_client_wait_for_activation(rdp);
dueDate = now + freerdp_settings_get_uint32(settings, FreeRDP_TcpAckTimeout);
for (; now < dueDate; now = GetTickCount64())
{
HANDLE events[MAXIMUM_WAIT_OBJECTS] = { 0 };
DWORD wstatus = 0;
DWORD nevents = freerdp_get_event_handles(rdp->context, events, ARRAYSIZE(events));
if (!nevents)
{
WLog_ERR(TAG, "error retrieving connection events");
return FALSE;
}
wstatus = WaitForMultipleObjectsEx(nevents, events, FALSE, (dueDate - now), TRUE);
switch (wstatus)
{
case WAIT_TIMEOUT:
/* will make us quit with a timeout */
now = dueDate + 1;
continue;
case WAIT_ABANDONED:
case WAIT_FAILED:
return FALSE;
case WAIT_IO_COMPLETION:
continue;
case WAIT_OBJECT_0:
default:
/* handles all WAIT_OBJECT_0 + [0 .. MAXIMUM_WAIT_OBJECTS-1] cases */
if (rdp_check_fds(rdp) < 0)
{
freerdp_set_last_error_if_not(rdp->context,
FREERDP_ERROR_CONNECT_TRANSPORT_FAILED);
return FALSE;
}
break;
}
if (rdp_get_state(rdp) == CONNECTION_STATE_ACTIVE)
return TRUE;
}
WLog_ERR(TAG, "Timeout waiting for activation");
freerdp_set_last_error_if_not(rdp->context, FREERDP_ERROR_CONNECT_ACTIVATION_TIMEOUT);
return FALSE;
} }
BOOL rdp_client_disconnect(rdpRdp* rdp) BOOL rdp_client_disconnect(rdpRdp* rdp)