TheArchive/yggdrasil-go
1
0
Fork 0
mirror of https://github.com/yggdrasil-network/yggdrasil-go.git synced 2024-12-02 14:35:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

don't block forever in Write if the session is cancelled, cleanup Conn.Read slightly

Browse Source
This commit is contained in:
Arceliar 2019-08-04 02:08:47 -05:00
parent 144c823bee
commit 6da5802ae5
1 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/yggdrasil/conn.go
View File

@ -154,7 +154,6 @@ func (c *Conn) Read(b []byte) (int, error) {
sinfo := c.session sinfo := c.session
cancel := c.getDeadlineCancellation(&c.readDeadline) cancel := c.getDeadlineCancellation(&c.readDeadline)
defer cancel.Cancel(nil) defer cancel.Cancel(nil)
for {
// Wait for some traffic to come through from the session // Wait for some traffic to come through from the session
select { select {
case <-cancel.Finished(): case <-cancel.Finished():
@ -178,7 +177,6 @@ func (c *Conn) Read(b []byte) (int, error) {
return n, err return n, err
} }
} }
}
func (c *Conn) Write(b []byte) (bytesWritten int, err error) { func (c *Conn) Write(b []byte) (bytesWritten int, err error) {
sinfo := c.session sinfo := c.session
@ -206,7 +204,17 @@ func (c *Conn) Write(b []byte) (bytesWritten int, err error) {
sinfo.doFunc(sessionFunc) sinfo.doFunc(sessionFunc)
if written > 0 { if written > 0 {
bs := append(util.GetBytes(), b...) bs := append(util.GetBytes(), b...)
sinfo.send <- bs cancel := c.getDeadlineCancellation(&c.writeDeadline)
defer cancel.Cancel(nil)
select {
case <-cancel.Finished():
if cancel.Error() == util.CancellationTimeoutError {
return 0, ConnError{errors.New("write timeout"), true, false, false, 0}
} else {
return 0, ConnError{errors.New("session closed"), false, false, true, 0}
}
case sinfo.send <- bs:
}
} }
return written, err return written, err
} }