External/qemu-display
1
0
Fork 0
mirror of https://gitlab.com/marcandre.lureau/qemu-display.git synced 2024-12-22 05:35:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

rdp: add .ListenAddress property

Browse Source 
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
This commit is contained in:
Marc-André Lureau 2024-12-03 16:01:55 +04:00
parent 56378e14b0
commit 6445ee03b8
2 changed files with 41 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qemu-rdp/src/args.rs
View File

@ -30,7 +30,7 @@ pub enum Commands {
pub struct ServerArgs {
/// IP address
#[clap(short, long, default_value = "0.0.0.0:3389")]
pub bind_addr: std::net::SocketAddr,
pub bind_address: std::net::SocketAddr,
/// Path to tls certificate
#[clap(short, long, value_parser)]

53
qemu-rdp/src/server/mod.rs
View File

@ -1,22 +1,19 @@
use anyhow::{bail, Error};
use enumflags2::BitFlags;
use ironrdp::server::{Credentials, ServerEvent, TlsIdentityCtx};
use std::path::PathBuf;
use tokio::sync::{mpsc::UnboundedSender, oneshot};
use tracing::{debug, error};
use ironrdp::server::RdpServer;
use qemu_display::{zbus, Display};
mod clipboard;
mod display;
mod input;
mod sound;
use std::path::PathBuf;
use anyhow::{bail, Error};
use enumflags2::BitFlags;
use ironrdp::server::{Credentials, ServerEvent, TlsIdentityCtx};
use qemu_display::{zbus, Display};
use tokio::sync::mpsc::UnboundedSender;
use tracing::debug;
use ironrdp::server::RdpServer;
use crate::args::ServerArgs;
use clipboard::ClipboardHandler;
use display::DisplayHandler;
use input::InputHandler;
@ -71,7 +68,7 @@ impl Server {
let tls = TlsIdentityCtx::init_from_paths(&cert, &key)?;
let mut server = RdpServer::builder()
.with_addr(self.args.bind_addr)
.with_addr(self.args.bind_address)
.with_hybrid(tls.make_acceptor()?, tls.pub_key)
.with_input_handler(handler)
.with_display_handler(display)
@ -94,7 +91,7 @@ impl Server {
let ev = server.event_sender().clone();
self.dbus
.object_server()
.at("/org/qemu_display/rdp", DBusCtrl { ev })
.at("/org/qemu_rdp", DBusCtrl { ev })
.await?;
self.dbus
.request_name_with_flags("org.QemuDisplay", BitFlags::EMPTY)
@ -108,11 +105,10 @@ impl Server {
}
}
#[zbus::interface(name = "org.QemuDisplay.RDP")]
#[zbus::interface(name = "org.QemuRDP")]
impl DBusCtrl {
async fn set_credentials(&self, username: &str, password: &str, domain: &str) {
self.ev
.send(ServerEvent::SetCredentials(Credentials {
if let Err(error) = self.ev.send(ServerEvent::SetCredentials(Credentials {
username: username.into(),
password: password.into(),
domain: if domain.is_empty() {
@ -120,7 +116,24 @@ impl DBusCtrl {
} else {
Some(domain.into())
},
}))
.unwrap();
})) {
error!(?error, "Failed to send SetCredentials")
}
}
#[zbus(property)]
async fn listen_address(&self) -> zbus::fdo::Result<String> {
let (tx, rx) = oneshot::channel();
if let Err(error) = self.ev.send(ServerEvent::GetLocalAddr(tx)) {
error!(?error, "Failed to send GetLocalAddr")
}
if let Some(addr) = rx
.await
.map_err(|e| zbus::fdo::Error::Failed(e.to_string()))?
{
Ok(addr.to_string())
} else {
Err(zbus::fdo::Error::Failed("Not yet available".into()))
}
}
}