Skip to content

feat: collect ICE servers from all relays #8486

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

Merged
link2xt merged 1 commit into from
Aug 3, 2026
Merged

feat: collect ICE servers from all relays #8486

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
28 changes: 17 additions & 11 deletions src/calls.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,7 @@ pub async fn call_state(context: &Context, msg_id: MsgId) -> Result<CallState> {

/// ICE server for JSON serialization.
#[derive(Serialize, Debug, Clone, PartialEq)]
struct IceServer {
pub(crate) struct IceServer {
/// STUN or TURN URLs.
pub urls: Vec<String>,

Expand Down Expand Up @@ -655,7 +655,7 @@ pub(crate) async fn create_ice_servers_from_metadata(
}

/// STUN or TURN server with unresolved DNS name.
#[derive(Debug, Clone)]
#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
pub(crate) enum UnresolvedIceServer {
/// STUN server.
Stun { hostname: String, port: u16 },
Expand All @@ -676,7 +676,7 @@ pub(crate) enum UnresolvedIceServer {
pub(crate) async fn resolve_ice_servers(
context: &Context,
unresolved_ice_servers: Vec<UnresolvedIceServer>,
) -> Result<String> {
) -> Result<Vec<IceServer>> {
let mut result: Vec<IceServer> = Vec::new();

// Do not use cache because there is no TLS.
Expand Down Expand Up @@ -733,8 +733,7 @@ pub(crate) async fn resolve_ice_servers(
},
}
}
let json = serde_json::to_string(&result)?;
Ok(json)
Ok(result)
}

/// Creates JSON with ICE servers when no TURN servers are known.
Expand Down Expand Up @@ -770,12 +769,19 @@ pub(crate) fn create_fallback_ice_servers() -> Vec<UnresolvedIceServer> {
/// because it itself cannot utilize DNS. See
/// <https://github.com/deltachat/deltachat-desktop/issues/5447>.
pub async fn ice_servers(context: &Context) -> Result<String> {
if let Some(metadata) = context.metadata.read().await.values().next() {
let ice_servers = resolve_ice_servers(context, metadata.ice_servers.clone()).await?;
Ok(ice_servers)
} else {
Ok("[]".to_string())
}
let mut unresolved_ice_servers: Vec<UnresolvedIceServer> = context
.metadata
.read()
.await
.values()
.flat_map(|metadata| metadata.ice_servers.clone())
.collect();
unresolved_ice_servers.sort();

@hpk42 hpk42 Jul 29, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is sort needed?

@link2xt link2xt Jul 29, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because dedup on the next line only works after sorting. E.g. if we have multiple relays not returning the TURN server, they will all return a fallback which should be deduplicated.

unresolved_ice_servers.dedup();

let ice_servers = resolve_ice_servers(context, unresolved_ice_servers).await?;
let json = serde_json::to_string(&ice_servers)?;
Ok(json)
}

/// "Who can call me" config options.
Expand Down