Skip to content

fix(p2p): improve reacher address selection and transport filtering #5347

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
gacevicljubisa merged 7 commits into from
Feb 13, 2026
Merged

fix(p2p): improve reacher address selection and transport filtering #5347

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f866c76
fix(libp2p): improve reacher notify
gacevicljubisa Feb 4, 2026
3a5a181
fix(libp2p): rename argument for notifyReacherConnected to underlays
gacevicljubisa Feb 5, 2026
caa999f
fix(libp2p): use only supported addresses
gacevicljubisa Feb 5, 2026
e3e6938
fix(bzz): add header
gacevicljubisa Feb 5, 2026
f0a5fb3
refactor(p2p): use map for enabled transports instead of separate flags
gacevicljubisa Feb 5, 2026
23e2f06
fix(libp2p): remove unused field
gacevicljubisa Feb 9, 2026
06cb55f
Merge branch 'master' into fix/reacher-peerstore
gacevicljubisa Feb 13, 2026
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
4 changes: 4 additions & 0 deletions pkg/p2p/libp2p/internal/reacher/reacher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,10 @@ func (r *reacher) tryAcquirePeer() (*peer, time.Duration) {

// Connected adds a new peer to the queue for testing reachability.
func (r *reacher) Connected(overlay swarm.Address, addr ma.Multiaddr) {
if addr == nil {
return
}

r.mu.Lock()
defer r.mu.Unlock()

Expand Down
19 changes: 5 additions & 14 deletions pkg/p2p/libp2p/libp2p.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -789,7 +789,7 @@ func (s *Service) handleIncoming(stream network.Stream) {
return
}

s.notifyReacherConnected(overlay, peerID)
s.notifyReacherConnected(overlay, peerMultiaddrs)

peerUserAgent := appendSpace(s.peerUserAgent(s.ctx, peerID))
s.networkStatus.Store(int32(p2p.NetworkStatusAvailable))
Expand All @@ -798,23 +798,14 @@ func (s *Service) handleIncoming(stream network.Stream) {
s.logger.Debug("stream handler: successfully connected to peer (inbound)", "address", i.BzzAddress.Overlay, "light", i.LightString(), "user_agent", peerUserAgent)
}

func (s *Service) notifyReacherConnected(overlay swarm.Address, peerID libp2ppeer.ID) {
func (s *Service) notifyReacherConnected(overlay swarm.Address, underlay []ma.Multiaddr) {
if s.reacher == nil {
return
}

peerAddrs := s.host.Peerstore().Addrs(peerID)
bestAddr := bzz.SelectBestAdvertisedAddress(peerAddrs, nil)
bestAddr := bzz.SelectBestAdvertisedAddress(underlay, nil)

s.logger.Debug("selected reacher address", "peer_id", peerID, "selected_addr", bestAddr.String(), "advertised_count", len(peerAddrs))

underlay, err := buildFullMA(bestAddr, peerID)
if err != nil {
s.logger.Error(err, "stream handler: unable to build complete peer multiaddr", "peer", overlay, "multiaddr", bestAddr, "peer_id", peerID)
_ = s.Disconnect(overlay, "unable to build complete peer multiaddr")
return
}
s.reacher.Connected(overlay, underlay)
s.reacher.Connected(overlay, bestAddr)
}

func (s *Service) SetPickyNotifier(n p2p.PickyNotifier) {
Expand Down Expand Up @@ -1156,7 +1147,7 @@ func (s *Service) Connect(ctx context.Context, addrs []ma.Multiaddr) (address *b

s.metrics.CreatedConnectionCount.Inc()

s.notifyReacherConnected(overlay, peerID)
s.notifyReacherConnected(overlay, peerMultiaddrs)

peerUA := appendSpace(s.peerUserAgent(ctx, peerID))
loggerV1.Debug("successfully connected to peer (outbound)", "addresses", i.BzzAddress.ShortString(), "light", i.LightString(), "user_agent", peerUA)
Expand Down
Loading