Skip to content

Commit 9f2fd45

Browse files
committed
listener use DvcClientProcessor bound
Signed-off-by: uchouT <i@uchout.moe>
1 parent 3c97019 commit 9f2fd45

2 files changed

Lines changed: 9 additions & 9 deletions

File tree

crates/ironrdp-dvc/src/client.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,18 @@ pub trait DvcChannelListener: Send {
2525

2626
/// Called for each incoming DYNVC_CREATE_REQ matching this name.
2727
/// Return `None` to reject (NO_LISTENER).
28-
fn create(&mut self, channel_id: DynamicChannelId) -> Option<Box<dyn DvcProcessor>>;
28+
fn create(&mut self, channel_id: DynamicChannelId) -> Option<Box<dyn DvcClientProcessor>>;
2929
}
3030

3131
pub type DynamicChannelListener = Box<dyn DvcChannelListener>;
3232

3333
/// For pre-registered DVC
3434
struct OnceListener {
35-
inner: Option<Box<dyn DvcProcessor>>,
35+
inner: Option<Box<dyn DvcClientProcessor>>,
3636
}
3737

3838
impl OnceListener {
39-
fn new(dvc_processor: impl DvcProcessor + 'static) -> Self {
39+
fn new(dvc_processor: impl DvcClientProcessor + 'static) -> Self {
4040
Self {
4141
inner: Some(Box::new(dvc_processor)),
4242
}
@@ -51,7 +51,7 @@ impl DvcChannelListener for OnceListener {
5151
.channel_name()
5252
}
5353

54-
fn create(&mut self, _channel_id: DynamicChannelId) -> Option<Box<dyn DvcProcessor>> {
54+
fn create(&mut self, _channel_id: DynamicChannelId) -> Option<Box<dyn DvcClientProcessor>> {
5555
self.inner.take()
5656
}
5757
}
@@ -100,7 +100,7 @@ impl DrdynvcClient {
100100
#[must_use]
101101
pub fn with_dynamic_channel<T>(mut self, channel: T) -> Self
102102
where
103-
T: DvcProcessor + 'static,
103+
T: DvcClientProcessor + 'static,
104104
{
105105
self.dynamic_channels.register_once(channel);
106106
self
@@ -115,7 +115,7 @@ impl DrdynvcClient {
115115
/// it will be silently overwritten.
116116
pub fn attach_dynamic_channel<T>(&mut self, channel: T)
117117
where
118-
T: DvcProcessor + 'static,
118+
T: DvcClientProcessor + 'static,
119119
{
120120
self.dynamic_channels.register_once(channel);
121121
}
@@ -307,7 +307,7 @@ impl DynamicChannelSet {
307307
);
308308
}
309309

310-
fn register_once<T: DvcProcessor + 'static>(&mut self, channel: T) {
310+
fn register_once<T: DvcClientProcessor + 'static>(&mut self, channel: T) {
311311
let name = channel.channel_name().to_owned();
312312
self.listeners.insert(
313313
name,

ffi/src/connector/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ pub mod ffi {
1010
use diplomat_runtime::DiplomatWriteable;
1111
use ironrdp::connector::Sequence as _;
1212
use ironrdp::displaycontrol::client::DisplayControlClient;
13-
use ironrdp::dvc::DvcProcessor;
13+
use ironrdp::dvc::DvcClientProcessor;
1414
use ironrdp_dvc_pipe_proxy::DvcNamedPipeProxy;
1515
use tracing::info;
1616

@@ -74,7 +74,7 @@ pub mod ffi {
7474

7575
fn with_dvc<T>(&mut self, processor: T) -> Result<(), Box<IronRdpError>>
7676
where
77-
T: DvcProcessor + 'static,
77+
T: DvcClientProcessor + 'static,
7878
{
7979
let Some(connector) = &mut self.0 else {
8080
return Err(ValueConsumedError::for_item("connector").into());

0 commit comments

Comments
 (0)