fix(server): reattach existing channels

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 <[email protected]>
Devolutions · Jan 8, 2025 · f3a30c0 · f3a30c0
1 parent 1884eba
commit f3a30c0
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/crates/ironrdp-acceptor/src/connection.rs b/crates/ironrdp-acceptor/src/connection.rs
@@ -95,7 +95,7 @@ impl Acceptor {
             io_channel_id: consumed.io_channel_id,
             desktop_size,
             server_capabilities: consumed.server_capabilities,
-            static_channels: StaticChannelSet::new(),
+            static_channels: consumed.static_channels,
             saved_for_reactivation,
             creds: consumed.creds,
         }

diff --git a/crates/ironrdp-server/src/server.rs b/crates/ironrdp-server/src/server.rs
@@ -916,7 +916,6 @@ impl RdpServer {
                 }
                 RunState::DeactivationReactivation { desktop_size } => {
                     acceptor = Acceptor::new_deactivation_reactivation(acceptor, desktop_size);
-                    self.attach_channels(&mut acceptor);
                     framed = unsplit_tokio_framed(reader, writer);
                     ignore_unexpected_pdu = true;
                     continue;