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

[drdynvc] fix cleanup in case of no thread

Browse Source 
If drdynvc is used without an own thread the dynamic channels were not
properly cleaned up on disconnect.
This commit is contained in:
akallabeth 2022-11-17 16:37:58 +01:00 committed by akallabeth
parent 7a037d80df
commit 7c224c2427
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
channels/drdynvc/client/drdynvc_main.c
View File

@ -385,7 +385,7 @@ static UINT dvcchannel_send_close(DVCMAN_CHANNEL* channel)
return drdynvc_send(drdynvc, s);
}
static UINT dvcman_channel_close(DVCMAN_CHANNEL* channel, bool perRequest)
static UINT dvcman_channel_close(DVCMAN_CHANNEL* channel, BOOL perRequest)
{
UINT error = CHANNEL_RC_OK;
drdynvcPlugin* drdynvc;
@ -1687,6 +1687,17 @@ static UINT drdynvc_virtual_channel_event_disconnected(drdynvcPlugin* drdynvc)
CloseHandle(drdynvc->thread);
drdynvc->thread = NULL;
}
else
{
{
/* Disconnect remaining dynamic channels that the server did not.
* This is required to properly shut down channels by calling the appropriate
* event handlers. */
DVCMAN* drdynvcMgr = (DVCMAN*)drdynvc->channel_mgr;
HashTable_Foreach(drdynvcMgr->channelsById, channelByIdCleanerFn, drdynvc);
}
}
WINPR_ASSERT(drdynvc->channelEntryPoints.pVirtualChannelCloseEx);
status = drdynvc->channelEntryPoints.pVirtualChannelCloseEx(drdynvc->InitHandle,