refactor(core): move WriteBuf

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>

Cargo.lock

@@ -1347,6 +1347,7 @@ dependencies = [
  "embed-resource",
  "ironrdp",
  "ironrdp-cliprdr-native",
+ "ironrdp-core",
  "sspi",
  "thiserror",
  "tracing",
@@ -2012,6 +2013,7 @@ version = "0.1.0"
 dependencies = [
  "ironrdp-async",
  "ironrdp-connector",
+ "ironrdp-core",
  "ironrdp-pdu",
  "ironrdp-svc",
  "tracing",
@@ -2035,6 +2037,7 @@ version = "0.1.0"
 dependencies = [
  "bytes",
  "ironrdp-connector",
+ "ironrdp-core",
  "ironrdp-pdu",
  "tracing",
 ]
@@ -2045,6 +2048,7 @@ version = "0.1.0"
 dependencies = [
  "bytes",
  "ironrdp-connector",
+ "ironrdp-core",
  "ironrdp-pdu",
  "tracing",
 ]
@@ -2058,6 +2062,7 @@ dependencies = [
  "inquire",
  "ironrdp",
  "ironrdp-cliprdr-native",
+ "ironrdp-core",
  "ironrdp-rdpsnd-native",
  "ironrdp-tls",
  "ironrdp-tokio",

crates/ironrdp-acceptor/Cargo.toml

@@ -21,6 +21,7 @@ ironrdp-svc.workspace = true
 ironrdp-connector.workspace = true
 ironrdp-async.workspace = true
 tracing.workspace = true
+ironrdp-core = { workspace = true, features = ["alloc"] }
 
 [lints]
 workspace = true

crates/ironrdp-acceptor/src/channel_connection.rs

@@ -1,9 +1,9 @@
 use std::collections::HashSet;
 
 use ironrdp_connector::{reason_err, ConnectorError, ConnectorErrorExt, ConnectorResult, Sequence, State, Written};
+use ironrdp_core::WriteBuf;
 use ironrdp_pdu as pdu;
 use pdu::mcs;
-use pdu::write_buf::WriteBuf;
 
 #[derive(Debug)]
 pub struct ChannelConnectionSequence {

crates/ironrdp-acceptor/src/connection.rs

@@ -5,12 +5,12 @@ use ironrdp_connector::{
     encode_x224_packet, reason_err, ConnectorError, ConnectorErrorExt, ConnectorResult, DesktopSize, Sequence, State,
     Written,
 };
+use ironrdp_core::WriteBuf;
 use ironrdp_pdu as pdu;
 use ironrdp_svc::{StaticChannelSet, SvcServerProcessor};
 use pdu::rdp::capability_sets::CapabilitySet;
 use pdu::rdp::headers::ShareControlPdu;
 use pdu::rdp::server_license::{LicensePdu, LicensingErrorMessage};
-use pdu::write_buf::WriteBuf;
 use pdu::{decode, gcc, mcs, nego, rdp};
 
 use super::channel_connection::ChannelConnectionSequence;

crates/ironrdp-acceptor/src/finalization.rs

@@ -1,7 +1,7 @@
 use ironrdp_connector::{ConnectorError, ConnectorErrorExt, ConnectorResult, Sequence, State, Written};
+use ironrdp_core::WriteBuf;
 use ironrdp_pdu as pdu;
 use pdu::rdp;
-use pdu::write_buf::WriteBuf;
 
 use crate::util::{self, wrap_share_data};
 

crates/ironrdp-acceptor/src/lib.rs

@@ -4,7 +4,7 @@ extern crate tracing;
 use ironrdp_async::bytes::Bytes;
 use ironrdp_async::{single_sequence_step, Framed, FramedRead, FramedWrite, StreamWrapper};
 use ironrdp_connector::ConnectorResult;
-use ironrdp_pdu::write_buf::WriteBuf;
+use ironrdp_core::WriteBuf;
 
 mod channel_connection;
 mod connection;

crates/ironrdp-acceptor/src/util.rs

@@ -1,7 +1,7 @@
 use std::borrow::Cow;
 
 use ironrdp_connector::{ConnectorError, ConnectorErrorExt, ConnectorResult};
-use ironrdp_pdu::write_buf::WriteBuf;
+use ironrdp_core::WriteBuf;
 use ironrdp_pdu::{encode_vec, rdp, PduEncode};
 
 pub(crate) fn encode_send_data_indication<T>(

crates/ironrdp-async/Cargo.toml

@@ -18,6 +18,7 @@ test = false
 [dependencies]
 bytes = "1"
 ironrdp-connector.workspace = true
+ironrdp-core = { workspace = true, features = ["alloc"] }
 ironrdp-pdu.workspace = true
 # ironrdp-session.workspace = true
 tracing.workspace = true

crates/ironrdp-async/src/connector.rs

@@ -5,7 +5,7 @@ use ironrdp_connector::{
     custom_err, general_err, ClientConnector, ClientConnectorState, ConnectionResult, ConnectorError, ConnectorResult,
     ServerName, State as _,
 };
-use ironrdp_pdu::write_buf::WriteBuf;
+use ironrdp_core::WriteBuf;
 
 use crate::framed::{Framed, FramedRead, FramedWrite};
 use crate::{single_sequence_step, AsyncNetworkClient};

crates/ironrdp-async/src/framed.rs

@@ -2,7 +2,8 @@ use std::io;
 
 use bytes::{Bytes, BytesMut};
 use ironrdp_connector::{ConnectorResult, Sequence, Written};
-use ironrdp_pdu::{write_buf::WriteBuf, PduHint};
+use ironrdp_core::WriteBuf;
+use ironrdp_pdu::PduHint;
 
 // TODO: investigate if we could use static async fn / return position impl trait in traits when stabilized:
 // https://github.com/rust-lang/rust/issues/91611

crates/ironrdp-blocking/Cargo.toml

@@ -18,6 +18,7 @@ test = false
 [dependencies]
 bytes = "1"
 ironrdp-connector.workspace = true
+ironrdp-core = { workspace = true, features = ["alloc"] }
 ironrdp-pdu.workspace = true
 # ironrdp-session.workspace = true
 tracing.workspace = true

crates/ironrdp-blocking/src/connector.rs

@@ -9,7 +9,7 @@ use ironrdp_connector::{
     general_err, ClientConnector, ClientConnectorState, ConnectionResult, ConnectorError, ConnectorResult,
     Sequence as _, ServerName, State as _,
 };
-use ironrdp_pdu::write_buf::WriteBuf;
+use ironrdp_core::WriteBuf;
 
 use crate::framed::Framed;
 

crates/ironrdp-client/Cargo.toml

@@ -72,6 +72,7 @@ semver = "1"
 reqwest = "0.12"
 url = "2.5"
 raw-window-handle = "0.6.2"
+ironrdp-core = { workspace = true, features = ["alloc"] }
 
 [target.'cfg(windows)'.dependencies]
 windows = { workspace = true, features = ["Win32_Foundation"] }

crates/ironrdp-client/src/rdp.rs

@@ -5,10 +5,10 @@ use ironrdp::displaycontrol::client::DisplayControlClient;
 use ironrdp::displaycontrol::pdu::MonitorLayoutEntry;
 use ironrdp::graphics::image_processing::PixelFormat;
 use ironrdp::pdu::input::fast_path::FastPathInputEvent;
-use ironrdp::pdu::write_buf::WriteBuf;
 use ironrdp::session::image::DecodedImage;
 use ironrdp::session::{fast_path, ActiveStage, ActiveStageOutput, GracefulDisconnectReason, SessionResult};
 use ironrdp::{cliprdr, connector, rdpdr, rdpsnd, session};
+use ironrdp_core::WriteBuf;
 use ironrdp_rdpsnd_native::cpal;
 use ironrdp_tokio::single_sequence_step_read;
 use rdpdr::NoopRdpdrBackend;

crates/ironrdp-connector/src/channel_connection.rs

@@ -1,7 +1,7 @@
 use std::collections::HashSet;
 use std::mem;
 
-use ironrdp_pdu::write_buf::WriteBuf;
+use ironrdp_core::WriteBuf;
 use ironrdp_pdu::{mcs, PduHint};
 
 use crate::{ConnectorError, ConnectorErrorExt as _, ConnectorResult, Sequence, State, Written};

crates/ironrdp-connector/src/connection.rs

@@ -2,8 +2,8 @@ use std::borrow::Cow;
 use std::mem;
 use std::net::SocketAddr;
 
+use ironrdp_core::WriteBuf;
 use ironrdp_pdu::rdp::client_info::TimezoneInfo;
-use ironrdp_pdu::write_buf::WriteBuf;
 use ironrdp_pdu::{decode, encode_vec, gcc, mcs, nego, rdp, PduEncode, PduHint};
 use ironrdp_svc::{StaticChannelSet, StaticVirtualChannel, SvcClientProcessor};
 

crates/ironrdp-connector/src/connection_activation.rs

@@ -83,7 +83,7 @@ impl Sequence for ConnectionActivationSequence {
         &self.state
     }
 
-    fn step(&mut self, input: &[u8], output: &mut ironrdp_pdu::write_buf::WriteBuf) -> ConnectorResult<Written> {
+    fn step(&mut self, input: &[u8], output: &mut ironrdp_core::WriteBuf) -> ConnectorResult<Written> {
         let (written, next_state) = match mem::take(&mut self.state) {
             ConnectionActivationState::Consumed | ConnectionActivationState::Finalized { .. } => {
                 return Err(general_err!(

crates/ironrdp-connector/src/connection_finalization.rs

@@ -1,9 +1,9 @@
 use std::mem;
 
+use ironrdp_core::WriteBuf;
 use ironrdp_pdu::rdp::capability_sets::SERVER_CHANNEL_ID;
 use ironrdp_pdu::rdp::headers::ShareDataPdu;
 use ironrdp_pdu::rdp::{finalization_messages, server_error_info};
-use ironrdp_pdu::write_buf::WriteBuf;
 use ironrdp_pdu::PduHint;
 
 use crate::{legacy, ConnectorResult, Sequence, State, Written};

crates/ironrdp-connector/src/credssp.rs

@@ -1,4 +1,4 @@
-use ironrdp_pdu::write_buf::WriteBuf;
+use ironrdp_core::WriteBuf;
 use ironrdp_pdu::{nego, PduHint};
 use picky::key::PrivateKey;
 use picky_asn1_x509::{oids, Certificate, ExtensionView, GeneralName};

crates/ironrdp-connector/src/legacy.rs

@@ -1,7 +1,7 @@
 use std::borrow::Cow;
 
+use ironrdp_core::WriteBuf;
 use ironrdp_pdu::rdp::headers::ServerDeactivateAll;
-use ironrdp_pdu::write_buf::WriteBuf;
 use ironrdp_pdu::{decode, encode_vec, rdp, PduDecode, PduEncode};
 
 use crate::{ConnectorError, ConnectorErrorExt as _, ConnectorResult};