Log more details about ephemeral exchange

This commit is contained in:
David Lönnhager committed 2026-09-22 15:51:10 +02:00
1 parent adef9f9144
commit 716f93d13c
1 file changed
+20 -2
+20 -2
View File
@@ -150,15 +150,28 @@ pub async fn negotiate_ephemeral_peers<F: UdpTransportFactory>(
) -> Result<NegotiatedPeers, NegotiationError> {
let ephemeral_key = PrivateKey::new_from_random();
log::debug!("Negotiating ephemeral peer with the ingress relay");
log::debug!(
"Negotiating ephemeral peer with the ingress relay {} (pq={}, daita={})",
config.relays.ingress().endpoint,
negotiate.post_quantum,
negotiate.daita
);
let ingress_peer =
negotiate_with_ingress(config, negotiate, &ingress_transport, &ephemeral_key).await?;
log::debug!(
"Negotiated ephemeral peer with the ingress relay (psk={}, daita={})",
ingress_peer.psk.is_some(),
ingress_peer.daita.is_some()
);
let (exit_private_key, exit_psk) = match &config.relays {
Relays::Singlehop(_) => (None, None),
Relays::Multihop { entry, exit } => {
let exit_private_key = config.separate_exit_key.then(PrivateKey::new_from_random);
log::debug!("Negotiating ephemeral peer with the exit relay");
log::debug!(
"Negotiating ephemeral peer with the exit relay {}",
exit.endpoint
);
let exit_peer = negotiate_through_entry(
config,
negotiate,
@@ -170,6 +183,10 @@ pub async fn negotiate_ephemeral_peers<F: UdpTransportFactory>(
exit_private_key.as_ref().unwrap_or(&ephemeral_key),
)
.await?;
log::debug!(
"Negotiated ephemeral peer with the exit relay (psk={})",
exit_peer.psk.is_some()
);
(exit_private_key, exit_peer.psk)
}
};
@@ -296,6 +313,7 @@ async fn fail_without_handshake(
loop {
let peers = device.read(async |device| device.peers().await).await;
if peers.iter().all(|peer| peer.stats.last_handshake.is_some()) {
log::debug!("Handshake with relays complete");
return;
}
tokio::time::sleep(HANDSHAKE_POLL_INTERVAL).await;