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

refactor: follow up to PR 530 (#531)

Browse source
This commit is contained in:
Benoît Cortier 2024-08-14 07:30:51 -04:00 • committed by GitHub
parent a73e0b7870
commit a6d6c2728b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -97,7 +97,7 @@ impl Acceptor {
self.static_channels.insert(channel);
// restore channel id if it was already attached
// 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 {
@ -316,7 +316,7 @@ impl Sequence for Acceptor {
})
.unwrap_or_default();
#[allow(clippy::arithmetic_side_effects)] // IO channel ID is not big enough for overflowing
#[allow(clippy::arithmetic_side_effects)] // IO channel ID is not big enough for overflowing.
let channels = joined
.into_iter()
.enumerate()

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

@ -272,7 +272,7 @@ impl RdpServer {
let res = ironrdp_acceptor::accept_begin(framed, &mut acceptor)
.await
.context("Accept begin error")?;
.context("accept_begin failed")?;
match res {
BeginResult::ShouldUpgrade(stream) => {
@ -403,7 +403,7 @@ impl RdpServer {
DisplayUpdate::HidePointer => encoder.hide_pointer(),
DisplayUpdate::DefaultPointer => encoder.default_pointer(),
}
.context("Error during update encoding")?;
.context("error during update encoding")?;
if fragmenter.size_hint() > buffer.len() {
buffer.resize(fragmenter.size_hint(), 0);
@ -413,7 +413,7 @@ impl RdpServer {
framed
.write_all(&buffer[..len])
.await
.context("Write display update error")?;
.context("failed to write display update")?;
}
Ok(RunState::Continue)
@ -457,7 +457,7 @@ impl RdpServer {
continue;
}
}
.context("Sending rdpsnd event")?;
.context("failed to send rdpsnd event")?;
let channel_id = self
.get_channel_id_by_type::<RdpsndServer>()
.ok_or_else(|| anyhow!("SVC channel not found"))?;
@ -478,7 +478,7 @@ impl RdpServer {
continue;
}
}
.context("Sending clipboard event")?;
.context("failed to send clipboard event")?;
let channel_id = self
.get_channel_id_by_type::<CliprdrServer>()
.ok_or_else(|| anyhow!("SVC channel not found"))?;
@ -627,7 +627,7 @@ impl RdpServer {
let state = self
.client_loop(framed, result.io_channel_id, result.user_channel_id, encoder)
.await
.context("Error in client loop")?;
.context("client loop failure")?;
Ok(state)
}
@ -804,7 +804,7 @@ impl RdpServer {
loop {
let (new_framed, result) = ironrdp_acceptor::accept_finalize(framed, &mut acceptor)
.await
.context("Failed to accept client during finalize")?;
.context("failed to accept client during finalize")?;
framed = new_framed;
match self.client_accepted(&mut framed, result).await? {