Skip to content

feat(client): make rdpsnd-native an optional default-enabled dependency #1306

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Copilot wants to merge 1 commit into from
Closed

feat(client): make rdpsnd-native an optional default-enabled dependency #1306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions crates/ironrdp-client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,10 @@ name = "ironrdp-client"
test = false

[features]
default = ["rustls"]
default = ["rustls", "native-rdpsnd"]
rustls = ["ironrdp-tls/rustls", "tokio-tungstenite/rustls-tls-native-roots", "ironrdp-mstsgu/rustls"]
native-tls = ["ironrdp-tls/native-tls", "tokio-tungstenite/native-tls", "ironrdp-mstsgu/native-tls"]
native-rdpsnd = ["dep:ironrdp-rdpsnd-native"]
qoi = ["ironrdp/qoi"]
qoiz = ["ironrdp/qoiz"]

Expand All @@ -47,7 +48,7 @@ ironrdp = { path = "../ironrdp", version = "0.14", features = [
] }
ironrdp-core = { path = "../ironrdp-core", version = "0.1", features = ["alloc"] }
ironrdp-cliprdr-native = { path = "../ironrdp-cliprdr-native", version = "0.5" }
ironrdp-rdpsnd-native = { path = "../ironrdp-rdpsnd-native", version = "0.5" }
ironrdp-rdpsnd-native = { path = "../ironrdp-rdpsnd-native", version = "0.5", optional = true }
ironrdp-tls = { path = "../ironrdp-tls", version = "0.2" }
ironrdp-mstsgu = { path = "../ironrdp-mstsgu" }
ironrdp-tokio = { path = "../ironrdp-tokio", version = "0.8", features = ["reqwest"] }
Expand Down
15 changes: 12 additions & 3 deletions crates/ironrdp-client/src/rdp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,12 @@ use ironrdp::pdu::{PduResult, pdu_other_err};
use ironrdp::session::image::DecodedImage;
use ironrdp::session::{ActiveStage, ActiveStageOutput, GracefulDisconnectReason, SessionResult, fast_path};
use ironrdp::svc::SvcMessage;
use ironrdp::{cliprdr, connector, rdpdr, rdpsnd, session};
use ironrdp::{cliprdr, connector, rdpdr, session};
use ironrdp_core::WriteBuf;
#[cfg(windows)]
use ironrdp_dvc_com_plugin::load_dvc_plugin;
use ironrdp_dvc_pipe_proxy::DvcNamedPipeProxy;
#[cfg(feature = "native-rdpsnd")]
use ironrdp_rdpsnd_native::cpal;
use ironrdp_tokio::reqwest::ReqwestNetworkClient;
use ironrdp_tokio::{FramedWrite, single_sequence_step_read, split_tokio_framed};
Expand Down Expand Up @@ -252,9 +253,13 @@ async fn connect(

let mut connector = connector::ClientConnector::new(config.connector.clone(), client_addr)
.with_static_channel(drdynvc)
.with_static_channel(rdpsnd::client::Rdpsnd::new(Box::new(cpal::RdpsndBackend::new())))
.with_static_channel(rdpdr::Rdpdr::new(Box::new(NoopRdpdrBackend {}), "IronRDP".to_owned()).with_smartcard(0));

#[cfg(feature = "native-rdpsnd")]
connector.attach_static_channel(ironrdp::rdpsnd::client::Rdpsnd::new(Box::new(
cpal::RdpsndBackend::new(),
)));

if let Some(builder) = cliprdr_factory {
let backend = builder.build_cliprdr_backend();

Expand Down Expand Up @@ -376,9 +381,13 @@ async fn connect_ws(

let mut connector = connector::ClientConnector::new(config.connector.clone(), client_addr)
.with_static_channel(drdynvc)
.with_static_channel(rdpsnd::client::Rdpsnd::new(Box::new(cpal::RdpsndBackend::new())))
.with_static_channel(rdpdr::Rdpdr::new(Box::new(NoopRdpdrBackend {}), "IronRDP".to_owned()).with_smartcard(0));

#[cfg(feature = "native-rdpsnd")]
connector.attach_static_channel(ironrdp::rdpsnd::client::Rdpsnd::new(Box::new(
cpal::RdpsndBackend::new(),
)));

if let Some(builder) = cliprdr_factory {
let backend = builder.build_cliprdr_backend();

Expand Down