self-hosted/teleport
self-hosted/teleport
1
0
Fork 0
mirror of https://github.com/gravitational/teleport synced 2024-10-21 01:34:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove data race on channel close

Browse source
This commit is contained in:
Sasha Klizhentas 2017-10-13 10:21:10 -07:00
parent 6471bc32da
commit 4b36d77f31
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/reversetunnel/srv.go
View file

@ -622,6 +622,7 @@ type remoteConn struct {
counter int32
discoveryC ssh.Channel
discoveryErr error
closed int32
}
func (rc *remoteConn) openDiscoveryChannel() (ssh.Channel, error) {
@ -645,6 +646,10 @@ func (rc *remoteConn) String() string {
}
func (rc *remoteConn) Close() error {
if !atomic.CompareAndSwapInt32(&rc.closed, 0, 1) {
// already closed
return nil
}
if rc.discoveryC != nil {
rc.discoveryC.Close()
rc.discoveryC = nil