diff --git a/src/desktop_control_tests.rs b/src/desktop_control_tests.rs index 070b98c..7f92760 100644 --- a/src/desktop_control_tests.rs +++ b/src/desktop_control_tests.rs @@ -9,14 +9,16 @@ struct Viewer { pc: Arc, channels: HashMap>, messages: Messages, + router: Arc>, } async fn connect(input: Arc, desktop: bool, portal: Option>, labels: &[&str]) -> (WebRtcSession, Viewer) { + let (host_setting, viewer_setting, router) = crate::test_network::virtual_network().await; let screen = Arc::new(ScreenCapture::unavailable("synthetic locked desktop".into())); let host = WebRtcSession::new(screen, input, crate::signaling::SignalingClient::disconnected(), - desktop, crate::session_ice::SessionIce::local(), portal).await.unwrap(); - let pc = Arc::new(APIBuilder::new().build().new_peer_connection(RTCConfiguration::default()).await.unwrap()); + desktop, crate::session_ice::SessionIce::virtual_net(host_setting), portal).await.unwrap(); + let pc = Arc::new(APIBuilder::new().with_setting_engine(viewer_setting).build().new_peer_connection(RTCConfiguration::default()).await.unwrap()); let (tx, messages) = mpsc::unbounded_channel(); let mut channels = HashMap::new(); for label in labels { @@ -41,7 +43,7 @@ async fn connect(input: Arc, desktop: bool, tokio::time::sleep(Duration::from_millis(20)).await; } }).await.expect("local SCTP channels did not open"); - (host, Viewer { pc, channels, messages }) + (host, Viewer { pc, channels, messages, router }) } fn body(message: &[u8], number: u32) -> Option<&[u8]> { @@ -206,6 +208,9 @@ async fn locked_control_unlock_requests_and_tools_work_without_a_video_frame() { terminal_viewer.pc.close().await.unwrap(); file_viewer.pc.close().await.unwrap(); port_viewer.pc.close().await.unwrap(); + for router in [&viewer.router, &terminal_viewer.router, &file_viewer.router, &port_viewer.router] { + router.lock().await.stop().await.unwrap(); + } echo.abort(); drop(lock); }).await.expect("locked bootstrap/tool regression exceeded deadline"); diff --git a/src/session_ice.rs b/src/session_ice.rs index f68cf64..e1b754a 100644 --- a/src/session_ice.rs +++ b/src/session_ice.rs @@ -7,13 +7,20 @@ use webrtc::peer_connection::{configuration::RTCConfiguration,policy::ice_transp pub struct SessionIce { servers: Vec, relay_only: bool, + #[cfg(test)] + pub(crate) setting_engine: Option, } impl SessionIce { #[cfg(test)] pub fn local() -> Self { // A supplied empty URL list disables the public STUN defaults in local peer tests. - Self { servers: vec![RTCIceServer::default()], relay_only: false } + Self { servers: vec![RTCIceServer::default()], ..Default::default() } + } + + #[cfg(test)] + pub fn virtual_net(setting_engine: webrtc::api::setting_engine::SettingEngine) -> Self { + Self { setting_engine: Some(setting_engine), ..Self::local() } } pub fn from_header(header:&Value)->Self { diff --git a/src/webrtc.rs b/src/webrtc.rs index 90c6ec6..ae6ecb1 100644 --- a/src/webrtc.rs +++ b/src/webrtc.rs @@ -78,6 +78,8 @@ impl WebRtcSession { webrtc::interceptor::registry::Registry::new(), &mut m, ).map_err(|e| format!("Register RTP/RTCP interceptors failed: {}", e))?; let mut se = webrtc::api::setting_engine::SettingEngine::default(); + #[cfg(test)] + if let Some(setting) = &transport.setting_engine { se = setting.clone(); } se.set_answering_dtls_role(DTLSRole::Server) .map_err(|e| format!("Configure DTLS answer role failed: {}", e))?; se.set_ice_multicast_dns_mode(webrtc::ice::mdns::MulticastDnsMode::Disabled); diff --git a/src/webrtc_lifecycle_tests.rs b/src/webrtc_lifecycle_tests.rs index dc4823f..aac0a92 100644 --- a/src/webrtc_lifecycle_tests.rs +++ b/src/webrtc_lifecycle_tests.rs @@ -13,15 +13,17 @@ struct Viewer { pc: Arc, channels: HashMap>, messages: Messages, + router: Arc>, } async fn connect(desktop: bool, portal: Option>) -> (WebRtcSession, Viewer) { let input = Arc::new(InputInjector::without_desktop()); + let (host_setting, viewer_setting, router) = crate::test_network::virtual_network().await; let screen = Arc::new(ScreenCapture::unavailable("synthetic pending desktop".into())); let host = WebRtcSession::new(screen, input, crate::signaling::SignalingClient::disconnected(), - desktop, crate::session_ice::SessionIce::local(), portal).await.unwrap(); - let pc = Arc::new(APIBuilder::new().build().new_peer_connection(RTCConfiguration::default()).await.unwrap()); + desktop, crate::session_ice::SessionIce::virtual_net(host_setting), portal).await.unwrap(); + let pc = Arc::new(APIBuilder::new().with_setting_engine(viewer_setting).build().new_peer_connection(RTCConfiguration::default()).await.unwrap()); let (tx, messages) = mpsc::unbounded_channel(); let mut channels = HashMap::new(); for label in ["CONTROL_DATA_CHANNEL"] { @@ -46,7 +48,7 @@ async fn connect(desktop: bool, portal: Option Option<&[u8]> { @@ -137,6 +139,7 @@ async fn ready_without_portal_session_does_not_advertise_clipboard() { "Echo was re-sent without an established clipboard capability"); viewer.pc.close().await.unwrap(); host.pc.close().await.unwrap(); + viewer.router.lock().await.stop().await.unwrap(); }).await.expect("clipboard capability regression exceeded deadline"); } @@ -201,6 +204,7 @@ async fn pending_portal_answers_echo_immediately_and_defers_capture_settings() { viewer.pc.close().await.unwrap(); host.pc.close().await.unwrap(); + viewer.router.lock().await.stop().await.unwrap(); }).await.expect("pending-Portal lifecycle regression exceeded deadline"); } @@ -220,5 +224,6 @@ async fn tool_peer_applies_capture_settings_without_a_desktop() { assert_eq!((varint_of(sync, 5), varint_of(sync, 6)), (Some(1280), Some(720))); viewer.pc.close().await.unwrap(); host.pc.close().await.unwrap(); + viewer.router.lock().await.stop().await.unwrap(); }).await.expect("tool capture-setting regression exceeded deadline"); }