Skip to content

feat(server): make run_connection generic over stream type #1180

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
Greg Lamberson (glamberson) wants to merge 1 commit into from
+8 −5
Closed

feat(server): make run_connection generic over stream type #1180

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
13 changes: 8 additions & 5 deletions crates/ironrdp-server/src/server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ use ironrdp_svc::{ChannelFlags, StaticChannelId, StaticChannelSet, SvcProcessor,
use ironrdp_tokio::{FramedRead, FramedWrite, TokioFramed, split_tokio_framed, unsplit_tokio_framed};
use rdpsnd::server::{RdpsndServer, RdpsndServerMessage};
use tokio::io::{AsyncRead, AsyncWrite, AsyncWriteExt as _};
use tokio::net::{TcpListener, TcpStream};
use tokio::net::TcpListener;
use tokio::sync::{Mutex, mpsc, oneshot};
use tokio::task;
use tokio_rustls::TlsAcceptor;
Expand Down Expand Up @@ -380,7 +380,10 @@ impl RdpServer {
acceptor.attach_static_channel(dvc);
}

pub async fn run_connection(&mut self, stream: TcpStream) -> Result<()> {
pub async fn run_connection<S>(&mut self, stream: S) -> Result<()>
where
S: AsyncRead + AsyncWrite + Send + Sync + Unpin + 'static,
{
let framed = TokioFramed::new(stream);

let size = self.display.lock().await.size().await;
Expand Down Expand Up @@ -412,9 +415,9 @@ impl RdpServer {
acceptor.mark_security_upgrade_as_done();

if let RdpServerSecurity::Hybrid((_, pub_key)) = &self.opts.security {
// how to get the client name?
// doesn't seem to matter yet
let client_name = framed.get_inner().0.get_ref().0.peer_addr()?.to_string();
let client_name = self
.local_addr
.map_or_else(|| "rdp-client".to_owned(), |a| a.to_string());

ironrdp_acceptor::accept_credssp(
&mut framed,
Expand Down
Loading