TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-07 16:54:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

wgengine/magicsock: don't deadlock on shutdown if sending blocks.

Browse Source 
Signed-off-by: David Anderson <danderson@tailscale.com>
This commit is contained in:
David Anderson 2020-07-27 20:32:45 +00:00 committed by Dave Anderson
parent 0249236cc0
commit 9265296b33
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wgengine/magicsock/magicsock_test.go
View File

@ -713,7 +713,11 @@ func newPinger(t *testing.T, logf logger.Logf, src, dst *magicStack) (cleanup fu
// acceptable to test instead of "every ping must // acceptable to test instead of "every ping must
// transit". // transit".
pkt := tuntest.Ping(dst.IP(t).IPAddr().IP, src.IP(t).IPAddr().IP) pkt := tuntest.Ping(dst.IP(t).IPAddr().IP, src.IP(t).IPAddr().IP)
src.tun.Outbound <- pkt select {
case src.tun.Outbound <- pkt:
case <-ctx.Done():
return false
}
select { select {
case <-dst.tun.Inbound: case <-dst.tun.Inbound:
return true return true