mirrors/IronRDP
1
0
Fork 0
mirror of https://github.com/Devolutions/IronRDP.git synced 2025-08-04 15:18:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

fix(server): reattach existing channels

Browse source 
I couldn't find any explicit behaviour described in the specification,
but apparently, we must just keep the channel state as they were during
reactivation. This fixes various state issues during client resize.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
This commit is contained in:
Marc-André Lureau 2025-01-08 18:50:10 +04:00 • committed by Benoît Cortier
parent 63963182b5
commit c4587b537c
2 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

20
crates/ironrdp-acceptor/src/connection.rs
View file

@ -1,4 +1,3 @@
use core::any::TypeId;
use core::mem;
use ironrdp_connector::{
@ -67,7 +66,11 @@ impl Acceptor {
}
}
pub fn new_deactivation_reactivation(mut consumed: Acceptor, desktop_size: DesktopSize) -> Self {
pub fn new_deactivation_reactivation(
mut consumed: Acceptor,
static_channels: StaticChannelSet,
desktop_size: DesktopSize,
) -> Self {
let AcceptorState::CapabilitiesSendServer {
early_capability,
channels,
@ -97,7 +100,7 @@ impl Acceptor {
io_channel_id: consumed.io_channel_id,
desktop_size,
server_capabilities: consumed.server_capabilities,
static_channels: StaticChannelSet::new(),
static_channels,
saved_for_reactivation,
creds: consumed.creds,
reactivation: true,
@ -108,18 +111,7 @@ impl Acceptor {
where
T: SvcServerProcessor + 'static,
{
let channel_name = channel.channel_name();
self.static_channels.insert(channel);
// Restore channel id if it was already attached.
if let AcceptorState::CapabilitiesSendServer { channels, .. } = &self.state {
for (channel_id, c) in channels {
if c.name == channel_name {
self.static_channels.attach_channel_id(TypeId::of::<T>(), *channel_id);
}
}
}
}
pub fn reached_security_upgrade(&self) -> Option<SecurityProtocol> {

5
crates/ironrdp-server/src/server.rs
View file

@ -913,8 +913,13 @@ impl RdpServer {
unreachable!();
}
RunState::DeactivationReactivation { desktop_size } => {
// No description of such behavior was found in the
// specification, but apparently, we must keep the channel
// state as they were during reactivation. This fixes
// various state issues during client resize.
acceptor = Acceptor::new_deactivation_reactivation(
acceptor,
core::mem::take(&mut self.static_channels),
desktop_size,
);
framed = unsplit_tokio_framed(reader, writer);