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(client): handle leftover bytes (#753)

Browse source
This commit is contained in:
Benoît Cortier 2025-04-15 14:33:17 +02:00 • committed by GitHub
parent ecd2450a7a
commit c09531ef0c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/ironrdp-client/src/rdp.rs
View file

@ -152,7 +152,7 @@ async fn connect(
debug!("TLS upgrade");
// Ensure there is no leftover
let initial_stream = framed.into_inner_no_leftover();
let (initial_stream, leftover_bytes) = framed.into_inner();
let (upgraded_stream, server_public_key) = ironrdp_tls::upgrade(initial_stream, config.destination.name())
.await
@ -161,7 +161,7 @@ async fn connect(
let upgraded = ironrdp_tokio::mark_as_upgraded(should_upgrade, &mut connector);
let erased_stream = Box::new(upgraded_stream) as Box<dyn AsyncReadWrite + Unpin + Send + Sync>;
let mut upgraded_framed = ironrdp_tokio::TokioFramed::new(erased_stream);
let mut upgraded_framed = ironrdp_tokio::TokioFramed::new_with_leftover(erased_stream, leftover_bytes);
let connection_result = ironrdp_tokio::connect_finalize(
upgraded,
@ -229,9 +229,9 @@ async fn connect_ws(
)
.await?;
let ws = framed.into_inner_no_leftover();
let (ws, leftover_bytes) = framed.into_inner();
let erased_stream = Box::new(ws) as Box<dyn AsyncReadWrite + Unpin + Send + Sync>;
let upgraded_framed = ironrdp_tokio::TokioFramed::new(erased_stream);
let upgraded_framed = ironrdp_tokio::TokioFramed::new_with_leftover(erased_stream, leftover_bytes);
Ok((connection_result, upgraded_framed))
}