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

[server] Fix state transition return value

Browse Source 
When transitioning from CONNECTION_STATE_FINALIZATION_FONT_LIST to
CONNECTION_STATE_ACTIVE we must return a value > 0 so that the
state machine can properly initialize the new state.
This commit is contained in:
Armin Novak 2022-11-08 14:19:16 +01:00 committed by Martin Fleisz
parent 367ecf3c0b
commit 12f0e996c0
1 changed files with 64 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
libfreerdp/core/peer.c
View File

@ -724,6 +724,57 @@ int rdp_peer_handle_state_demand_active(freerdp_peer* client)
return ret; return ret;
} }
/** \brief Handle server peer state ACTIVE:
* On initial run (not connected, not activated) do not read data
*
* \return -1 in case of an error, 0 if no data needs to be processed, 1 to let
* the state machine run again and 2 if peer_recv_pdu must be called.
*/
static int rdp_peer_handle_state_active(freerdp_peer* client)
{
int ret = -1;
WINPR_ASSERT(client);
WINPR_ASSERT(client->context);
rdpRdp* rdp = client->context->rdp;
WINPR_ASSERT(rdp);
if (!client->connected)
{
/**
* PostConnect should only be called once and should not
* be called after a reactivation sequence.
*/
IFCALLRET(client->PostConnect, client->connected, client);
}
if (!client->connected)
{
switch (rdp_get_state(rdp))
{
case CONNECTION_STATE_CAPABILITIES_EXCHANGE_DEMAND_ACTIVE:
ret = 1;
break;
case CONNECTION_STATE_ACTIVE:
default:
ret = -24;
break;
}
}
else if (!client->activated)
{
IFCALLRET(client->Activate, client->activated, client);
if (!client->activated)
ret = -23;
else
ret = 0;
}
else
ret = 2;
return ret;
}
static int peer_recv_callback_internal(rdpTransport* transport, wStream* s, void* extra) static int peer_recv_callback_internal(rdpTransport* transport, wStream* s, void* extra)
{ {
UINT32 SelectedProtocol; UINT32 SelectedProtocol;
@ -1040,48 +1091,24 @@ static int peer_recv_callback_internal(rdpTransport* transport, wStream* s, void
break; break;
case CONNECTION_STATE_FINALIZATION_FONT_LIST: case CONNECTION_STATE_FINALIZATION_FONT_LIST:
ret = peer_recv_pdu(client, s); ret = peer_recv_pdu(client, s);
if (rdp_finalize_is_flag_set(rdp, FINALIZE_CS_FONT_LIST_PDU)) if (ret >= 0)
{ {
if (!rdp_server_transition_to_state(rdp, CONNECTION_STATE_ACTIVE)) if (rdp_finalize_is_flag_set(rdp, FINALIZE_CS_FONT_LIST_PDU))
ret = -2; {
update_reset_state(rdp->update); if (!rdp_server_transition_to_state(rdp, CONNECTION_STATE_ACTIVE))
ret = -2;
update_reset_state(rdp->update);
ret = 1;
}
else
ret = peer_unexpected_client_message(rdp, FINALIZE_CS_FONT_LIST_PDU);
} }
else
ret = peer_unexpected_client_message(rdp, FINALIZE_CS_FONT_LIST_PDU);
break; break;
case CONNECTION_STATE_ACTIVE: case CONNECTION_STATE_ACTIVE:
if (!client->connected) ret = rdp_peer_handle_state_active(client);
{ if (ret > 1)
/** ret = peer_recv_pdu(client, s);
* PostConnect should only be called once and should not
* be called after a reactivation sequence.
*/
IFCALLRET(client->PostConnect, client->connected, client);
}
if (!client->connected)
{
switch (rdp_get_state(rdp))
{
case CONNECTION_STATE_CAPABILITIES_EXCHANGE_DEMAND_ACTIVE:
ret = 1;
break;
case CONNECTION_STATE_ACTIVE:
default:
ret = -24;
break;
}
}
else
{
if (!client->activated)
IFCALLRET(client->Activate, client->activated, client);
if (!client->activated)
ret = -23;
else
ret = peer_recv_pdu(client, s);
}
break; break;
/* States that must not happen in server state machine */ /* States that must not happen in server state machine */