extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2025-03-11 05:08:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix abort

Browse Source
This commit is contained in:
Zoltán Papp 2024-11-28 18:11:15 +01:00
parent 5d4899cb78
commit a05117b737
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
relay/client/dialer/race_dialer.go
View File

@ -9,6 +9,10 @@ import (
log "github.com/sirupsen/logrus"
)
var (
connectionTimeout = 30 * time.Second
)
type DialerFn interface {
Dial(ctx context.Context, address string) (net.Conn, error)
Protocol() string
@ -28,7 +32,7 @@ func RaceDial(log *log.Entry, serverURL string, dialerFns ...DialerFn) (net.Conn
for _, d := range dialerFns {
go func() {
ctx, cancel := context.WithTimeout(abortCtx, 30*time.Second)
ctx, cancel := context.WithTimeout(abortCtx, connectionTimeout)
defer cancel()
log.Infof("dialing Relay server via %s", d.Protocol())
@ -45,20 +49,21 @@ func RaceDial(log *log.Entry, serverURL string, dialerFns ...DialerFn) (net.Conn
if errors.Is(dr.Err, context.Canceled) {
log.Infof("connection attempt aborted via: %s", dr.Protocol)
} else {
log.Errorf("failed to dial via: %s, %s", dr.Protocol, dr.Err)
log.Errorf("failed to dial via %s: %s", dr.Protocol, dr.Err)
}
continue
}
if hasWinner {
if cerr := dr.Conn.Close(); cerr != nil {
log.Warnf("failed to close connection via: %s, %s", dr.Protocol, cerr)
log.Warnf("failed to close connection via %s: %s", dr.Protocol, cerr)
}
continue
}
log.Infof("successfully dialed via: %s", dr.Protocol)
abort()
hasWinner = true
winnerConn <- dr.Conn
}