mirror of
https://github.com/tailscale/tailscale.git
synced 2025-08-14 23:17:29 +00:00
wgengine/magicsock,all: allocate peer relay over disco instead of PeerAPI (#16603)
Updates tailscale/corp#30583 Updates tailscale/corp#30534 Updates tailscale/corp#30557 Signed-off-by: Dylan Bargatze <dylan@tailscale.com> Signed-off-by: Jordan Whited <jordan@tailscale.com> Co-authored-by: Dylan Bargatze <dylan@tailscale.com>
This commit is contained in:
@@ -6957,7 +6957,7 @@ func (b *LocalBackend) DebugReSTUN() error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (b *LocalBackend) DebugPeerRelayServers() set.Set[netip.AddrPort] {
|
||||
func (b *LocalBackend) DebugPeerRelayServers() set.Set[netip.Addr] {
|
||||
return b.MagicConn().PeerRelays()
|
||||
}
|
||||
|
||||
|
@@ -699,7 +699,7 @@ func (h *Handler) serveDebug(w http.ResponseWriter, r *http.Request) {
|
||||
h.b.DebugForcePreferDERP(n)
|
||||
case "peer-relay-servers":
|
||||
servers := h.b.DebugPeerRelayServers().Slice()
|
||||
slices.SortFunc(servers, func(a, b netip.AddrPort) int {
|
||||
slices.SortFunc(servers, func(a, b netip.Addr) int {
|
||||
return a.Compare(b)
|
||||
})
|
||||
err = json.NewEncoder(w).Encode(servers)
|
||||
|
Reference in New Issue
Block a user