jimzah/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2025-01-31 01:57:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'srv-matrix-fed-record' into 'next'

Browse Source 
feat: use _matrix-fed._tcp SRV record, fallback to _matrix._tcp

See merge request famedly/conduit!616
This commit is contained in:
Timo Kösters 2024-04-01 21:30:58 +00:00
commit 33fb32be9a
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/api/server_server.rs
View File

@ -476,12 +476,11 @@ async fn find_actual_destination(destination: &'_ ServerName) -> (FedDest, FedDe
(actual_destination, hostname) (actual_destination, hostname)
} }
async fn query_srv_record(hostname: &'_ str) -> Option<FedDest> { async fn query_given_srv_record(record: &str) -> Option<FedDest> {
let hostname = hostname.trim_end_matches('.'); services()
if let Ok(Some(host_port)) = services()
.globals .globals
.dns_resolver() .dns_resolver()
.srv_lookup(format!("_matrix._tcp.{hostname}.")) .srv_lookup(record)
.await .await
.map(|srv| { .map(|srv| {
srv.iter().next().map(|result| { srv.iter().next().map(|result| {
@ -491,10 +490,17 @@ async fn query_srv_record(hostname: &'_ str) -> Option<FedDest> {
) )
}) })
}) })
.unwrap_or(None)
}
async fn query_srv_record(hostname: &'_ str) -> Option<FedDest> {
let hostname = hostname.trim_end_matches('.');
if let Some(host_port) = query_given_srv_record(&format!("_matrix-fed._tcp.{hostname}.")).await
{ {
Some(host_port) Some(host_port)
} else { } else {
None query_given_srv_record(&format!("_matrix._tcp.{hostname}.")).await
} }
} }