mirrors/yggdrasil-go
2
0
Fork 0
mirror of https://github.com/yggdrasil-network/yggdrasil-go synced 2024-11-10 07:20:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #447 from Arceliar/bugfixes

Browse Source 
Another Conn bugfix
This commit is contained in:
Arceliar 2019-07-01 19:09:36 -05:00 committed by GitHub
commit b2607a7205
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/yggdrasil/conn.go
View File

@ -159,6 +159,12 @@ func (c *Conn) Read(b []byte) (int, error) {
sinfo.bytesRecvd += uint64(len(b))
}
// Hand over to the session worker
defer func() {
if recover() != nil {
err = errors.New("read failed, session already closed")
close(done)
}
}() // In case we're racing with a close
select { // Send to worker
case sinfo.worker <- workerFunc:
case <-timer.C:
@ -238,7 +244,8 @@ func (c *Conn) Write(b []byte) (bytesWritten int, err error) {
// Hand over to the session worker
defer func() {
if recover() != nil {
err = errors.New("write failed")
err = errors.New("write failed, session already closed")
close(done)
}
}() // In case we're racing with a close
select { // Send to worker