mirror of
https://github.com/tailscale/tailscale.git
synced 2025-04-16 03:31:39 +00:00
derp/derphttp: fix reconnect behavior
I broke it in today's 752146a70f1aab08. Added some comments to prevent recurrences. Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
parent
d59d0576af
commit
517a91de75
@ -214,7 +214,7 @@ func (c *Client) Send(dstKey key.Public, b []byte) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if err := client.Send(dstKey, b); err != nil {
|
if err := client.Send(dstKey, b); err != nil {
|
||||||
c.Close()
|
c.closeForReconnect()
|
||||||
}
|
}
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@ -226,7 +226,7 @@ func (c *Client) Recv(b []byte) (derp.ReceivedMessage, error) {
|
|||||||
}
|
}
|
||||||
m, err := client.Recv(b)
|
m, err := client.Recv(b)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
c.Close()
|
c.closeForReconnect()
|
||||||
}
|
}
|
||||||
return m, err
|
return m, err
|
||||||
}
|
}
|
||||||
@ -244,10 +244,21 @@ func (c *Client) Close() error {
|
|||||||
c.closed = true
|
c.closed = true
|
||||||
if c.netConn != nil {
|
if c.netConn != nil {
|
||||||
c.netConn.Close()
|
c.netConn.Close()
|
||||||
c.netConn = nil
|
|
||||||
}
|
}
|
||||||
c.client = nil
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// closeForReconnect closes the underlying network connection and
|
||||||
|
// zeros out the client field so future calls to Connect will
|
||||||
|
// reconnect.
|
||||||
|
func (c *Client) closeForReconnect() {
|
||||||
|
c.mu.Lock()
|
||||||
|
defer c.mu.Unlock()
|
||||||
|
if c.netConn != nil {
|
||||||
|
c.netConn.Close()
|
||||||
|
c.netConn = nil
|
||||||
|
}
|
||||||
|
c.client = nil
|
||||||
|
}
|
||||||
|
|
||||||
var ErrClientClosed = errors.New("derphttp.Client closed")
|
var ErrClientClosed = errors.New("derphttp.Client closed")
|
||||||
|
Loading…
x
Reference in New Issue
Block a user