Skip to content

refactor(server): make UpdateEncoder::update() an iterator #733

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions crates/ironrdp-server/src/encoder/bitmap.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ use ironrdp_pdu::geometry::InclusiveRectangle;
use crate::BitmapUpdate;

// PERF: we could also remove the need for this buffer
#[derive(Clone)]
pub(crate) struct BitmapEncoder {
buffer: Vec<u8>,
}
Expand Down
183 changes: 183 additions & 0 deletions crates/ironrdp-server/src/encoder/fast_path.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,183 @@
use core::{cmp, fmt};

use ironrdp_pdu::{
fast_path::{EncryptionFlags, FastPathHeader, FastPathUpdatePdu, Fragmentation, UpdateCode},
Encode, WriteCursor,
};

// this is the maximum amount of data (not including headers) we can send in a single TS_FP_UPDATE_PDU
const MAX_FASTPATH_UPDATE_SIZE: usize = 16_374;

const FASTPATH_HEADER_SIZE: usize = 6;

pub(crate) struct UpdateFragmenter {
code: UpdateCode,
index: usize,
data: Vec<u8>,
position: usize,
}

impl fmt::Debug for UpdateFragmenter {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
f.debug_struct("UpdateFragmenter")
.field("len", &self.data.len())
.finish()
}
}

impl UpdateFragmenter {
pub(crate) fn new(code: UpdateCode, data: Vec<u8>) -> Self {
Self {
code,
index: 0,
data,
position: 0,
}
}

pub(crate) fn size_hint(&self) -> usize {
FASTPATH_HEADER_SIZE + cmp::min(self.data.len(), MAX_FASTPATH_UPDATE_SIZE)
}

pub(crate) fn next(&mut self, dst: &mut [u8]) -> Option<usize> {
let (consumed, written) = self.encode_next(dst)?;
self.position += consumed;
self.index = self.index.checked_add(1)?;
Some(written)
}

fn encode_next(&mut self, dst: &mut [u8]) -> Option<(usize, usize)> {
match self.data.len() - self.position {
0 => None,

1..=MAX_FASTPATH_UPDATE_SIZE => {
let frag = if self.index > 0 {
Fragmentation::Last
} else {
Fragmentation::Single
};

self.encode_fastpath(frag, &self.data[self.position..], dst)
.map(|written| (self.data.len() - self.position, written))
}

_ => {
let frag = if self.index > 0 {
Fragmentation::Next
} else {
Fragmentation::First
};

self.encode_fastpath(
frag,
&self.data[self.position..MAX_FASTPATH_UPDATE_SIZE + self.position],
dst,
)
.map(|written| (MAX_FASTPATH_UPDATE_SIZE, written))
}
}
}

fn encode_fastpath(&self, frag: Fragmentation, data: &[u8], dst: &mut [u8]) -> Option<usize> {
let mut cursor = WriteCursor::new(dst);

let update = FastPathUpdatePdu {
fragmentation: frag,
update_code: self.code,
compression_flags: None,
compression_type: None,
data,
};

let header = FastPathHeader::new(EncryptionFlags::empty(), update.size());

header.encode(&mut cursor).ok()?;
update.encode(&mut cursor).ok()?;

Some(cursor.pos())
}
}

#[cfg(test)]
mod tests {
use super::*;
use ironrdp_core::{decode_cursor, ReadCursor};

#[test]
fn test_single_fragment() {
let data = vec![1, 2, 3, 4];
let mut fragmenter = UpdateFragmenter::new(UpdateCode::Bitmap, data);
let mut buffer = vec![0; 100];
let written = fragmenter.next(&mut buffer).unwrap();
assert!(written > 0);
assert_eq!(fragmenter.index, 1);

let mut cursor = ReadCursor::new(&buffer);
let header: FastPathHeader = decode_cursor(&mut cursor).unwrap();
let update: FastPathUpdatePdu<'_> = decode_cursor(&mut cursor).unwrap();
assert!(matches!(header, FastPathHeader { data_length: 7, .. }));
assert!(matches!(
update,
FastPathUpdatePdu {
fragmentation: Fragmentation::Single,
..
}
));

assert!(fragmenter.next(&mut buffer).is_none());
}

#[test]
fn test_multi_fragment() {
let data = vec![0u8; MAX_FASTPATH_UPDATE_SIZE * 2 + 10];
let mut fragmenter = UpdateFragmenter::new(UpdateCode::Bitmap, data);
let mut buffer = vec![0u8; fragmenter.size_hint()];
let written = fragmenter.next(&mut buffer).unwrap();
assert!(written > 0);
assert_eq!(fragmenter.index, 1);

let mut cursor = ReadCursor::new(&buffer);
let _header: FastPathHeader = decode_cursor(&mut cursor).unwrap();
let update: FastPathUpdatePdu<'_> = decode_cursor(&mut cursor).unwrap();
assert!(matches!(
update,
FastPathUpdatePdu {
fragmentation: Fragmentation::First,
..
}
));
assert_eq!(update.data.len(), MAX_FASTPATH_UPDATE_SIZE);

let written = fragmenter.next(&mut buffer).unwrap();
assert!(written > 0);
assert_eq!(fragmenter.index, 2);
let mut cursor = ReadCursor::new(&buffer);
let _header: FastPathHeader = decode_cursor(&mut cursor).unwrap();
let update: FastPathUpdatePdu<'_> = decode_cursor(&mut cursor).unwrap();
assert!(matches!(
update,
FastPathUpdatePdu {
fragmentation: Fragmentation::Next,
..
}
));
assert_eq!(update.data.len(), MAX_FASTPATH_UPDATE_SIZE);

let written = fragmenter.next(&mut buffer).unwrap();
assert!(written > 0);
assert_eq!(fragmenter.index, 3);
let mut cursor = ReadCursor::new(&buffer);
let _header: FastPathHeader = decode_cursor(&mut cursor).unwrap();
let update: FastPathUpdatePdu<'_> = decode_cursor(&mut cursor).unwrap();
assert!(matches!(
update,
FastPathUpdatePdu {
fragmentation: Fragmentation::Last,
..
}
));
assert_eq!(update.data.len(), 10);

assert!(fragmenter.next(&mut buffer).is_none());
}
}
Loading
Loading