dvc server and client trait bound

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

Author: uchouT

crates/ironrdp-dvc/src/client.rs

@@ -29,18 +29,18 @@ pub trait DvcChannelListener: Send {
 
     /// Called for each incoming DYNVC_CREATE_REQ matching this name.
     /// Return `None` to reject (NO_LISTENER).
-    fn create(&mut self, channel_id: DynamicChannelId) -> Option<Box<dyn DvcProcessor>>;
+    fn create(&mut self, channel_id: DynamicChannelId) -> Option<Box<dyn DvcClientProcessor>>;
 }
 
 pub type DynamicChannelListener = Box<dyn DvcChannelListener>;
 
 /// For pre-registered DVC
 struct OnceListener {
-    inner: Option<Box<dyn DvcProcessor>>,
+    inner: Option<Box<dyn DvcClientProcessor>>,
 }
 
 impl OnceListener {
-    fn new(dvc_processor: impl DvcProcessor + 'static) -> Self {
+    fn new(dvc_processor: impl DvcClientProcessor + 'static) -> Self {
         Self {
             inner: Some(Box::new(dvc_processor)),
         }
@@ -55,13 +55,13 @@ impl DvcChannelListener for OnceListener {
             .channel_name()
     }
 
-    fn create(&mut self, _channel_id: DynamicChannelId) -> Option<Box<dyn DvcProcessor>> {
+    fn create(&mut self, _channel_id: DynamicChannelId) -> Option<Box<dyn DvcClientProcessor>> {
         self.inner.take()
     }
 }
 
 struct DynamicVirtualChannel {
-    channel_processor: Box<dyn DvcProcessor + Send>,
+    channel_processor: Box<dyn DvcClientProcessor + Send>,
     complete_data: CompleteData,
     /// The channel ID assigned by the server.
     ///
@@ -78,7 +78,7 @@ impl Drop for DynamicVirtualChannel {
 }
 
 impl DynamicVirtualChannel {
-    fn from_boxed(processor: Box<dyn DvcProcessor + Send>) -> Self {
+    fn from_boxed(processor: Box<dyn DvcClientProcessor + Send>) -> Self {
         Self {
             channel_processor: processor,
             complete_data: CompleteData::new(),
@@ -155,7 +155,7 @@ impl DrdynvcClient {
     #[must_use]
     pub fn with_dynamic_channel<T>(mut self, channel: T) -> Self
     where
-        T: DvcProcessor + 'static,
+        T: DvcClientProcessor + 'static,
     {
         self.dynamic_channels.register_once(channel);
         self
@@ -170,7 +170,7 @@ impl DrdynvcClient {
     /// it will be silently overwritten.
     pub fn attach_dynamic_channel<T>(&mut self, channel: T)
     where
-        T: DvcProcessor + 'static,
+        T: DvcClientProcessor + 'static,
     {
         self.dynamic_channels.register_once(channel);
     }
@@ -393,7 +393,7 @@ impl DynamicChannelSet {
         );
     }
 
-    fn register_once<T: DvcProcessor + 'static>(&mut self, channel: T) {
+    fn register_once<T: DvcClientProcessor + 'static>(&mut self, channel: T) {
         let name = channel.channel_name().to_owned();
         self.listeners.insert(
             name,

crates/ironrdp-dvc/src/server.rs

@@ -29,7 +29,7 @@ enum ChannelState {
 
 struct DynamicChannel {
     state: ChannelState,
-    processor: Box<dyn DvcProcessor>,
+    processor: Box<dyn DvcServerProcessor>,
     complete_data: CompleteData,
     channel_id: u32,
 }

ffi/src/connector/mod.rs

@@ -10,7 +10,7 @@ pub mod ffi {
     use diplomat_runtime::DiplomatWriteable;
     use ironrdp::connector::Sequence as _;
     use ironrdp::displaycontrol::client::DisplayControlClient;
-    use ironrdp::dvc::DvcProcessor;
+    use ironrdp::dvc::DvcClientProcessor;
     use ironrdp_dvc_pipe_proxy::DvcNamedPipeProxy;
     use tracing::info;
 
@@ -74,7 +74,7 @@ pub mod ffi {
 
         fn with_dvc<T>(&mut self, processor: T) -> Result<(), Box<IronRdpError>>
         where
-            T: DvcProcessor + 'static,
+            T: DvcClientProcessor + 'static,
         {
             let Some(connector) = &mut self.0 else {
                 return Err(ValueConsumedError::for_item("connector").into());