p2p/nat: use random server for STUN request

Also removes concurrency, since the requests will usually be quick.

p2p/nat/nat_stun.go

@@ -17,10 +17,13 @@
 package nat
 
 import (
+	"errors"
 	"fmt"
+	"math/rand"
 	"net"
 	"time"
 
+	"github.com/ethereum/go-ethereum/log"
 	stunV2 "github.com/pion/stun/v2"
 )
 
@@ -51,31 +54,27 @@ const requestLimit = 3
 
 type stun struct {
 	serverList []string
-	activeIndex     int // the server index which return the IP
-	pendingRequests int // request in flight
-	askedIndex      map[int]struct{}
-	replyCh         chan stunResponse
 }
 
 func newSTUN(serverAddr string) (Interface, error) {
-	serverList := make([]string, 0)
+	s := new(stun)
-	if serverAddr == "default" {
+	if serverAddr == "default" || serverAddr == "" {
-		serverList = stunDefaultServerList
+		s.serverList = stunDefaultServerList
 	} else {
 		_, err := net.ResolveUDPAddr("udp4", serverAddr)
 		if err != nil {
 			return nil, err
 		}
-		serverList = append(serverList, serverAddr)
+		s.serverList = []string{serverAddr}
 	}
-
+	return s, nil
-	return &stun{
-		serverList: serverList,
-	}, nil
 }
 
 func (s stun) String() string {
-	return fmt.Sprintf("STUN(%s)", s.serverList[s.activeIndex])
+	if len(s.serverList) == 1 {
+		return fmt.Sprintf("STUN(%s)", s.serverList[0])
+	}
+	return "STUN"
 }
 
 func (stun) SupportsMapping() bool {
@@ -90,50 +89,40 @@ func (stun) DeleteMapping(string, int, int) error {
 	return nil
 }
 
-type stunResponse struct {
-	ip    net.IP
-	err   error
-	index int
-}
-
 func (s *stun) ExternalIP() (net.IP, error) {
-	var err error
+	for _, server := range s.randomServers(requestLimit) {
-	s.replyCh = make(chan stunResponse, requestLimit)
+		ip, err := s.externalIP(server)
-	s.askedIndex = make(map[int]struct{})
+		if err != nil {
-	for s.startQueries() {
+			log.Debug("STUN request failed", "server", server, "err", err)
-		response := <-s.replyCh
-		s.pendingRequests--
-		if response.err != nil {
-			err = response.err
 			continue
 		}
-		s.activeIndex = response.index
+		return ip, nil
-		return response.ip, nil
 	}
-	return nil, err
+	return nil, errors.New("STUN requests failed")
 }
 
-func (s *stun) startQueries() bool {
+func (s *stun) randomServers(n int) []string {
-	for i := 0; s.pendingRequests < requestLimit && i < len(s.serverList); i++ {
+	n = min(n, len(s.serverList))
-		_, exist := s.askedIndex[i]
+	m := make(map[int]struct{}, n)
-		if exist {
+	list := make([]string, 0, n)
+	for i := 0; i < len(s.serverList)*2 && len(list) < n; i++ {
+		index := rand.Intn(len(s.serverList))
+		if _, alreadyHit := m[index]; alreadyHit {
 			continue
 		}
-		s.pendingRequests++
+		list = append(list, s.serverList[index])
-		s.askedIndex[i] = struct{}{}
+		m[index] = struct{}{}
-		go func(index int, server string) {
-			ip, err := externalIP(server)
-			s.replyCh <- stunResponse{
-				ip:    ip,
-				index: index,
-				err:   err,
 	}
-		}(i, s.serverList[i])
+	return list
-	}
-	return s.pendingRequests > 0
 }
 
-func externalIP(server string) (net.IP, error) {
+func (s *stun) externalIP(server string) (net.IP, error) {
+	_, _, err := net.SplitHostPort(server)
+	if err != nil {
+		server += ":3478"
+	}
+
+	log.Trace("Attempting STUN binding request", "server", server)
 	conn, err := stunV2.Dial("udp4", server)
 	if err != nil {
 		return nil, err
@@ -162,6 +151,6 @@ func externalIP(server string) (net.IP, error) {
 	if responseError != nil {
 		return nil, responseError
 	}
-
+	log.Trace("STUN returned IP", "server", server, "ip", mappedAddr.IP)
 	return mappedAddr.IP, nil
 }