Skip to content

Commit

Permalink
fixes duplicate definition
Browse files Browse the repository at this point in the history
  • Loading branch information
Isaiah Becker-Mayer committed Sep 25, 2023
1 parent 42db2ba commit 056c8e2
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion crates/ironrdp-client/src/rdp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ async fn active_session(
None
}
} {
let frame = active_stage.process_svc_messages(svc_messages)?;
let frame = active_stage.process_svc_messages_for_p(svc_messages)?;
// Send the messages to the server
vec![ActiveStageOutput::ResponseFrame(frame)]
} else {
Expand Down
6 changes: 3 additions & 3 deletions crates/ironrdp-session/src/active_stage.rs
Original file line number Diff line number Diff line change
Expand Up @@ -161,11 +161,11 @@ impl ActiveStage {

/// Completes user's SVC request with data, required to sent it over the network and returns
/// a buffer with encoded data.
pub fn process_svc_messages<C: StaticVirtualChannelProcessor + 'static>(
pub fn process_svc_messages_for_p<C: StaticVirtualChannelProcessor + 'static>(
&self,
request: SvcMessagesForProcessor<C>,
messages: SvcMessagesForProcessor<C>,
) -> SessionResult<Vec<u8>> {
self.x224_processor.process_svc_messages(request)
self.x224_processor.process_svc_messages_for_p(messages)
}
}

Expand Down
6 changes: 3 additions & 3 deletions crates/ironrdp-session/src/x224/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -76,16 +76,16 @@ impl Processor {

/// Completes user's SVC request with data, required to sent it over the network and returns
/// a buffer with encoded data.
pub fn process_svc_messages<C: StaticVirtualChannelProcessor + 'static>(
pub fn process_svc_messages_for_p<C: StaticVirtualChannelProcessor + 'static>(
&self,
request: SvcMessagesForProcessor<C>,
messages: SvcMessagesForProcessor<C>,
) -> SessionResult<Vec<u8>> {
let channel_id = self
.static_channels
.get_channel_id_by_type::<C>()
.ok_or_else(|| reason_err!("SVC", "channel not found"))?;

self.process_svc_messages(request.into(), channel_id, self.user_channel_id)
self.process_svc_messages(messages.into(), channel_id, self.user_channel_id)
}

/// Processes a received PDU. Returns a buffer with encoded data to send to the server, if any.
Expand Down

0 comments on commit 056c8e2

Please sign in to comment.