benjamyn/any-sync
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix handshake race

Browse Source
This commit is contained in:
Sergey Cherepanov 2023-06-06 18:43:46 +02:00
parent 156f3387eb
commit 5090006e2d
No known key found for this signature in database
GPG Key ID: 87F8EDE8FBDF637C
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
net/secureservice/handshake/credential.go
View File

@ -12,13 +12,17 @@ func OutgoingHandshake(ctx context.Context, conn io.ReadWriteCloser, peerId stri
} }
h := newHandshake() h := newHandshake()
done := make(chan struct{}) done := make(chan struct{})
var (
resIdentity []byte
resErr error
)
go func() { go func() {
defer close(done) defer close(done)
identity, err = outgoingHandshake(h, conn, peerId, cc) resIdentity, resErr = outgoingHandshake(h, conn, peerId, cc)
}() }()
select { select {
case <-done: case <-done:
return return resIdentity, resErr
case <-ctx.Done(): case <-ctx.Done():
_ = conn.Close() _ = conn.Close()
return nil, ctx.Err() return nil, ctx.Err()
@ -74,13 +78,17 @@ func IncomingHandshake(ctx context.Context, conn io.ReadWriteCloser, peerId stri
} }
h := newHandshake() h := newHandshake()
done := make(chan struct{}) done := make(chan struct{})
var (
resIdentity []byte
resError error
)
go func() { go func() {
defer close(done) defer close(done)
identity, err = incomingHandshake(h, conn, peerId, cc) resIdentity, resError = incomingHandshake(h, conn, peerId, cc)
}() }()
select { select {
case <-done: case <-done:
return return resIdentity, resError
case <-ctx.Done(): case <-ctx.Done():
_ = conn.Close() _ = conn.Close()
return nil, ctx.Err() return nil, ctx.Err()