add downcast_mut for the DynamicVirtualChannel

Signed-off-by: uchouT <i@uchout.moe>

Author: uchouT

crates/ironrdp-dvc/src/client.rs

@@ -5,6 +5,7 @@ use core::any::TypeId;
 use core::fmt;
 
 use crate::alloc::borrow::ToOwned as _;
+use crate::complete_data::CompleteData;
 use ironrdp_core::{Decode as _, DecodeResult, ReadCursor, impl_as_any};
 use ironrdp_pdu::{self as pdu, decode_err, encode_err, pdu_other_err};
 use ironrdp_svc::{ChannelFlags, CompressionCondition, SvcClientProcessor, SvcMessage, SvcProcessor};
@@ -14,9 +15,9 @@ use tracing::debug;
 
 use crate::pdu::{
     CapabilitiesResponsePdu, CapsVersion, ClosePdu, CreateResponsePdu, CreationStatus, DrdynvcClientPdu,
-    DrdynvcServerPdu,
+    DrdynvcDataPdu, DrdynvcServerPdu,
 };
-use crate::{DvcProcessor, DynamicChannelId, DynamicChannelName, DynamicVirtualChannel, encode_dvc_messages};
+use crate::{DvcMessage, DvcProcessor, DynamicChannelId, DynamicChannelName, encode_dvc_messages};
 
 pub trait DvcClientProcessor: DvcProcessor {}
 
@@ -56,6 +57,73 @@ impl DvcChannelListener for OnceListener {
     }
 }
 
+pub struct DynamicVirtualChannel {
+    channel_processor: Box<dyn DvcClientProcessor + Send>,
+    complete_data: CompleteData,
+    /// The channel ID assigned by the server.
+    ///
+    /// `Some` only after [`DynamicVirtualChannel::start`] has succeeded. This invariant
+    channel_id: Option<DynamicChannelId>,
+}
+
+impl Drop for DynamicVirtualChannel {
+    fn drop(&mut self) {
+        if let Some(id) = self.channel_id {
+            self.channel_processor.close(id);
+        }
+    }
+}
+
+impl DynamicVirtualChannel {
+    fn from_boxed(processor: Box<dyn DvcClientProcessor + Send>) -> Self {
+        Self {
+            channel_processor: processor,
+            complete_data: CompleteData::new(),
+            channel_id: None,
+        }
+    }
+
+    fn processor_type_id(&self) -> TypeId {
+        self.channel_processor.as_any().type_id()
+    }
+
+    pub fn is_open(&self) -> bool {
+        self.channel_id.is_some()
+    }
+
+    pub fn channel_id(&self) -> Option<DynamicChannelId> {
+        self.channel_id
+    }
+
+    pub fn channel_processor_downcast_ref<T: DvcClientProcessor>(&self) -> Option<&T> {
+        self.channel_processor.as_any().downcast_ref()
+    }
+
+    pub fn channel_processor_downcast_mut<T: DvcClientProcessor>(&mut self) -> Option<&mut T> {
+        self.channel_processor.as_any_mut().downcast_mut()
+    }
+
+    fn start(&mut self, channel_id: DynamicChannelId) -> PduResult<Vec<DvcMessage>> {
+        let messages = self.channel_processor.start(channel_id)?;
+        self.channel_id = Some(channel_id);
+        Ok(messages)
+    }
+
+    fn process(&mut self, pdu: DrdynvcDataPdu) -> PduResult<Vec<DvcMessage>> {
+        let channel_id = pdu.channel_id();
+        let complete_data = self.complete_data.process_data(pdu).map_err(|e| decode_err!(e))?;
+        if let Some(complete_data) = complete_data {
+            self.channel_processor.process(channel_id, &complete_data)
+        } else {
+            Ok(Vec::new())
+        }
+    }
+
+    fn channel_name(&self) -> &str {
+        self.channel_processor.channel_name()
+    }
+}
+
 /// DRDYNVC Static Virtual Channel (the Remote Desktop Protocol: Dynamic Virtual Channel Extension)
 ///
 /// It adds support for dynamic virtual channels (DVC).

crates/ironrdp-dvc/src/lib.rs

@@ -4,8 +4,6 @@
 
 extern crate alloc;
 
-use core::any::TypeId;
-
 use alloc::boxed::Box;
 use alloc::string::String;
 use alloc::vec::Vec;
@@ -16,7 +14,7 @@ use pdu::DrdynvcDataPdu;
 #[rustfmt::skip] // do not re-order this pub use
 pub use ironrdp_pdu;
 use ironrdp_core::{AsAny, Encode, EncodeResult, assert_obj_safe, cast_length, encode_vec, other_err};
-use ironrdp_pdu::{PduResult, decode_err};
+use ironrdp_pdu::PduResult;
 use ironrdp_svc::SvcMessage;
 
 mod complete_data;
@@ -100,68 +98,5 @@ pub fn encode_dvc_messages(
     Ok(res)
 }
 
-pub struct DynamicVirtualChannel {
-    channel_processor: Box<dyn DvcProcessor + Send>,
-    complete_data: CompleteData,
-    /// The channel ID assigned by the server.
-    ///
-    /// `Some` only after [`DynamicVirtualChannel::start`] has succeeded. This invariant
-    channel_id: Option<DynamicChannelId>,
-}
-
-impl Drop for DynamicVirtualChannel {
-    fn drop(&mut self) {
-        if let Some(id) = self.channel_id {
-            self.channel_processor.close(id);
-        }
-    }
-}
-
-impl DynamicVirtualChannel {
-    fn from_boxed(processor: Box<dyn DvcProcessor + Send>) -> Self {
-        Self {
-            channel_processor: processor,
-            complete_data: CompleteData::new(),
-            channel_id: None,
-        }
-    }
-
-    fn processor_type_id(&self) -> TypeId {
-        self.channel_processor.as_any().type_id()
-    }
-
-    pub fn is_open(&self) -> bool {
-        self.channel_id.is_some()
-    }
-
-    pub fn channel_id(&self) -> Option<DynamicChannelId> {
-        self.channel_id
-    }
-
-    pub fn channel_processor_downcast_ref<T: DvcProcessor>(&self) -> Option<&T> {
-        self.channel_processor.as_any().downcast_ref()
-    }
-
-    fn start(&mut self, channel_id: DynamicChannelId) -> PduResult<Vec<DvcMessage>> {
-        let messages = self.channel_processor.start(channel_id)?;
-        self.channel_id = Some(channel_id);
-        Ok(messages)
-    }
-
-    fn process(&mut self, pdu: DrdynvcDataPdu) -> PduResult<Vec<DvcMessage>> {
-        let channel_id = pdu.channel_id();
-        let complete_data = self.complete_data.process_data(pdu).map_err(|e| decode_err!(e))?;
-        if let Some(complete_data) = complete_data {
-            self.channel_processor.process(channel_id, &complete_data)
-        } else {
-            Ok(Vec::new())
-        }
-    }
-
-    fn channel_name(&self) -> &str {
-        self.channel_processor.channel_name()
-    }
-}
-
 pub type DynamicChannelName = String;
 pub type DynamicChannelId = u32;