derp/derpmap: add World.ForeachServer, check STUN server validity earlier

This commit is contained in:
Brad Fitzpatrick
2020-05-04 22:06:02 -07:00
parent 108237798d
commit 495796fff1
2 changed files with 18 additions and 4 deletions
+14
View File
@@ -7,6 +7,7 @@ package derpmap
import (
"fmt"
"net"
"tailscale.com/types/structs"
)
@@ -43,6 +44,13 @@ func (w *World) NodeIDOfSTUNServer(server string) int {
return 0
}
// ForeachServer calls fn for each DERP server, in an unspecified order.
func (w *World) ForeachServer(fn func(*Server)) {
for _, s := range w.byID {
fn(s)
}
}
// Prod returns the production DERP nodes.
func Prod() *World {
return prod
@@ -95,9 +103,15 @@ func (w *World) add(s *Server) {
w.servers = append(w.servers, s)
if s.STUN4 != "" {
w.stun4 = append(w.stun4, s.STUN4)
if _, _, err := net.SplitHostPort(s.STUN4); err != nil {
panic("not a host:port: " + s.STUN4)
}
}
if s.STUN6 != "" {
w.stun6 = append(w.stun6, s.STUN6)
if _, _, err := net.SplitHostPort(s.STUN6); err != nil {
panic("not a host:port: " + s.STUN6)
}
}
}