Skip to content

Conversation

@sanity
Copy link
Collaborator

@sanity sanity commented Nov 30, 2025

Summary

Reverts #2158 ("fix: use Joiner enum to properly handle NAT peer address discovery")

Why

PR #2158 was merged to fix NAT peer address discovery, but it conflicts with the pending PR stack (#2167#2169#2171#2172#2174#2175) which takes a more comprehensive approach to the same problem.

The PR stack:

  • Implements PeerAddr enum (Unknown/Known) - similar concept but integrated with broader refactoring
  • Changes routing to use SocketAddr directly instead of relying on embedded addresses
  • Removes from/sender fields from wire protocol messages
  • Is awaiting human review

By reverting #2158, the PR stack will merge cleanly and CI can run on those PRs. The PR stack's approach supersedes and improves upon #2158's Joiner enum.

Impact

[AI-assisted - Claude]

@sanity sanity merged commit 84683d9 into main Nov 30, 2025
4 of 5 checks passed
@sanity sanity deleted the revert-2158-joiner-enum branch November 30, 2025 22:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants