mirror of
https://github.com/tailscale/tailscale.git
synced 2025-04-22 08:51:41 +00:00
wgengine/magicsock: merge errClosed and errConnClosed
This commit is contained in:
parent
7cc8fcb784
commit
c180abd7cf
@ -1531,7 +1531,7 @@ func (c *Conn) sendDiscoMessage(dst netaddr.IPPort, dstKey tailcfg.NodeKey, dstD
|
|||||||
c.mu.Lock()
|
c.mu.Lock()
|
||||||
if c.closed {
|
if c.closed {
|
||||||
c.mu.Unlock()
|
c.mu.Unlock()
|
||||||
return false, errClosed
|
return false, errConnClosed
|
||||||
}
|
}
|
||||||
var nonce [disco.NonceLen]byte
|
var nonce [disco.NonceLen]byte
|
||||||
if _, err := crand.Read(nonce[:]); err != nil {
|
if _, err := crand.Read(nonce[:]); err != nil {
|
||||||
@ -3497,5 +3497,3 @@ type ippCacheKey struct {
|
|||||||
|
|
||||||
// derpStr replaces DERP IPs in s with "derp-".
|
// derpStr replaces DERP IPs in s with "derp-".
|
||||||
func derpStr(s string) string { return strings.ReplaceAll(s, "127.3.3.40:", "derp-") }
|
func derpStr(s string) string { return strings.ReplaceAll(s, "127.3.3.40:", "derp-") }
|
||||||
|
|
||||||
var errClosed = errors.New("conn is closed")
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user