TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-02-27 10:47:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

tstest/natlab: use net.ErrClosed

Browse Source 
We are now on 1.16.
And wgconn.NetErrClosed has been removed upstream.

Signed-off-by: Josh Bleecher Snyder <josh@tailscale.com>
This commit is contained in:
Josh Bleecher Snyder 2021-03-23 11:55:28 -07:00 committed by Josh Bleecher Snyder
parent c99f260e40
commit d31eff8473
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tstest/natlab/natlab.go
View File

@ -26,7 +26,6 @@ import (
"sync" "sync"
"time" "time"
wgconn "github.com/tailscale/wireguard-go/conn"
"inet.af/netaddr" "inet.af/netaddr"
) )
@ -759,8 +758,7 @@ func (c *conn) canRead() error {
c.mu.Lock() c.mu.Lock()
defer c.mu.Unlock() defer c.mu.Unlock()
if c.closed { if c.closed {
// TODO: when we switch to Go 1.16, replace this with net.ErrClosed return net.ErrClosed
return wgconn.NetErrClosed
} }
if !c.readDeadline.IsZero() && c.readDeadline.Before(time.Now()) { if !c.readDeadline.IsZero() && c.readDeadline.Before(time.Now()) {
return errors.New("read deadline exceeded") return errors.New("read deadline exceeded")