TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-02-19 19:38:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

tsnet: fix data race in TestFallbackTCPHandler

Browse Source 
Fixes #9805

Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2023-10-14 18:55:07 -07:00 committed by Brad Fitzpatrick
parent 18e2936d25
commit e89927de2b
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tsnet/tsnet_test.go
View File

@ -26,6 +26,7 @@ import (
"reflect" "reflect"
"strings" "strings"
"sync" "sync"
"sync/atomic"
"testing" "testing"
"time" "time"
@ -652,23 +653,23 @@ func TestFallbackTCPHandler(t *testing.T) {
} }
t.Logf("ping success: %#+v", res) t.Logf("ping success: %#+v", res)
s1TcpConnCount := 0 var s1TcpConnCount atomic.Int32
deregister := s1.RegisterFallbackTCPHandler(func(src, dst netip.AddrPort) (handler func(net.Conn), intercept bool) { deregister := s1.RegisterFallbackTCPHandler(func(src, dst netip.AddrPort) (handler func(net.Conn), intercept bool) {
s1TcpConnCount++ s1TcpConnCount.Add(1)
return nil, false return nil, false
}) })
if _, err = s2.Dial(ctx, "tcp", fmt.Sprintf("%s:8081", s1ip)); err == nil { if _, err := s2.Dial(ctx, "tcp", fmt.Sprintf("%s:8081", s1ip)); err == nil {
t.Fatal("Expected dial error because fallback handler did not intercept") t.Fatal("Expected dial error because fallback handler did not intercept")
} }
if s1TcpConnCount != 1 { if got := s1TcpConnCount.Load(); got != 1 {
t.Errorf("s1TcpConnCount = %d, want %d", s1TcpConnCount, 1) t.Errorf("s1TcpConnCount = %d, want %d", got, 1)
} }
deregister() deregister()
if _, err = s2.Dial(ctx, "tcp", fmt.Sprintf("%s:8081", s1ip)); err == nil { if _, err := s2.Dial(ctx, "tcp", fmt.Sprintf("%s:8081", s1ip)); err == nil {
t.Fatal("Expected dial error because nothing would intercept") t.Fatal("Expected dial error because nothing would intercept")
} }
if s1TcpConnCount != 1 { if got := s1TcpConnCount.Load(); got != 1 {
t.Errorf("s1TcpConnCount = %d, want %d", s1TcpConnCount, 1) t.Errorf("s1TcpConnCount = %d, want %d", got, 1)
} }
} }