sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-04-27 12:46:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle IPv6 candidates in userspace bind

Browse Source
This commit is contained in:
Viktor Liu
2025-07-09 12:22:30 +02:00
parent 90c5244a40
commit 4cff2a09a3
8 changed files with 253 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
client/internal/peer/worker_ice.go
View File

@@ -146,8 +146,8 @@ func (w *WorkerICE) OnNewOffer(remoteOfferAnswer *OfferAnswer) {
RosenpassAddr: remoteOfferAnswer.RosenpassAddr,
LocalIceCandidateType: pair.Local.Type().String(),
RemoteIceCandidateType: pair.Remote.Type().String(),
LocalIceCandidateEndpoint: fmt.Sprintf("%s:%d", pair.Local.Address(), pair.Local.Port()),
RemoteIceCandidateEndpoint: fmt.Sprintf("%s:%d", pair.Remote.Address(), pair.Remote.Port()),
LocalIceCandidateEndpoint: formatEndpoint(pair.Local.Address(), pair.Local.Port()),
RemoteIceCandidateEndpoint: formatEndpoint(pair.Remote.Address(), pair.Remote.Port()),
Relayed: isRelayed(pair),
RelayedOnLocal: isRelayCandidate(pair.Local),
}
@@ -405,3 +405,12 @@ func selectedPriority(pair *ice.CandidatePair) conntype.ConnPriority {
return conntype.ICEP2P
}
}
// formatEndpoint formats an IP address and port for display, adding brackets around IPv6 addresses
func formatEndpoint(addr string, port int) string {
parsed, err := netip.ParseAddr(addr)
if err == nil && parsed.Is6() {
return fmt.Sprintf("[%s]:%d", addr, port)
}
return fmt.Sprintf("%s:%d", addr, port)
}