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

[core,connection] code cleanups

Browse Source
This commit is contained in:
akallabeth 2023-01-19 11:28:10 +01:00 committed by Martin Fleisz
parent d2b50a06b5
commit f2b934866a
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libfreerdp/core/connection.c
View File

@ -1432,13 +1432,10 @@ BOOL rdp_server_accept_nego(rdpRdp* rdp, wStream* s)
BOOL rdp_server_accept_mcs_connect_initial(rdpRdp* rdp, wStream* s)
{
UINT32 i;
rdpMcs* mcs;
WINPR_ASSERT(rdp);
WINPR_ASSERT(s);
mcs = rdp->mcs;
rdpMcs* mcs = rdp->mcs;
WINPR_ASSERT(mcs);
WINPR_ASSERT(rdp_get_state(rdp) == CONNECTION_STATE_MCS_CREATE_REQUEST);
@ -1453,7 +1450,7 @@ BOOL rdp_server_accept_mcs_connect_initial(rdpRdp* rdp, wStream* s)
WLog_INFO(TAG, "Accepted channels:");
WINPR_ASSERT(mcs->channels || (mcs->channelCount == 0));
for (i = 0; i < mcs->channelCount; i++)
for (UINT32 i = 0; i < mcs->channelCount; i++)
{
ADDIN_ARGV* arg;
rdpMcsChannel* cur = &mcs->channels[i];
@ -1542,7 +1539,7 @@ BOOL rdp_server_accept_mcs_channel_join_request(rdpRdp* rdp, wStream* s)
WINPR_ASSERT(rdp_get_state(rdp) == CONNECTION_STATE_MCS_CHANNEL_JOIN_REQUEST);
if (!mcs_recv_channel_join_request(mcs, rdp->context->settings, s, &channelId))
if (!mcs_recv_channel_join_request(mcs, rdp->settings, s, &channelId))
return FALSE;
if (!rdp_server_transition_to_state(rdp, CONNECTION_STATE_MCS_CHANNEL_JOIN_RESPONSE))