TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-18 12:32:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

derp/derphttp: fix reconnect behavior

Browse Source 
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:
Brad Fitzpatrick 2020-02-28 13:38:45 -08:00
parent d59d0576af
commit 517a91de75
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
derp/derphttp/derphttp_client.go
View File

@ -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")