Merge branch 'maint' into master

The traversal adoption log line moved from src/node/lifecycle.rs to
src/node/lifecycle/mod.rs on this line, which git saw as a modify/delete
rather than a rename, so the change was re-applied by hand at the new
path and the stray maint-path file dropped. Both fields it reads are
present on this line's BootstrapHandoffResult in src/nostr/handoff.rs.
This commit is contained in:
Johnathan Corgan
2026-07-29 23:27:04 +00:00
+14 -2
View File
@@ -954,8 +954,20 @@ impl Node {
}
}
match self.adopt_established_traversal(traversal).await {
Ok(_) => {
info!(peer_npub = %peer_npub, "Adopted NAT traversal socket");
Ok(handoff) => {
// `local_addr` lets an operator join a host socket
// table (ss/netstat) against our adoption events.
// `transport_id` separates several peers sharing one
// adopted transport from several adopted transports:
// an adopted transport inherits `accept_connections`,
// so it can admit peers beyond the one it was punched
// for, and the two cases are otherwise identical here.
info!(
peer_npub = %peer_npub,
transport_id = %handoff.transport_id,
local_addr = %handoff.local_addr,
"Adopted NAT traversal socket"
);
}
Err(err) => {
warn!(peer_npub = %peer_npub, error = %err, "Failed to adopt NAT traversal");