Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix VPN client duplicates #642

Merged
merged 1 commit into from
Dec 17, 2020
Merged

Fix VPN client duplicates #642

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions internal/vpn/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,12 +667,25 @@ func (c *Client) dialServer(appCl *app.Client, pk cipher.PubKey) (net.Conn, erro
PubKey: pk,
Port: vpnPort,
})

if c.isClosed() {
// in this case client got closed, we return no error,
// so that retrier could stop gracefully
return nil
}

return err
})
if err != nil {
return nil, err
}

if c.isClosed() {
// we need to signal outer code that connection object is inalid
// in this case
return nil, errors.New("client got closed")
}

return conn, nil
}

Expand Down