cwinfo/yggdrasil-go
5
0
Fork 0
mirror of https://github.com/cwinfo/yggdrasil-go.git synced 2024-11-26 18:51:38 +00:00
Code Releases Activity

Merge branch 'develop' into cryptokey

Browse Source
This commit is contained in:
Neil Alexander 2019-08-20 09:43:17 +01:00
commit b79829c43b
No known key found for this signature in database
GPG Key ID: A02A2019A2BB0944
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/yggdrasil/conn.go
View File

@ -137,20 +137,23 @@ func (c *Conn) doSearch() {
go func() { c.core.router.admin <- routerWork }() go func() { c.core.router.admin <- routerWork }()
} }
func (c *Conn) getDeadlineCancellation(value *atomic.Value) util.Cancellation { func (c *Conn) getDeadlineCancellation(value *atomic.Value) (util.Cancellation, bool) {
if deadline, ok := value.Load().(time.Time); ok { if deadline, ok := value.Load().(time.Time); ok {
// A deadline is set, so return a Cancellation that uses it // A deadline is set, so return a Cancellation that uses it
return util.CancellationWithDeadline(c.session.cancel, deadline) c := util.CancellationWithDeadline(c.session.cancel, deadline)
return c, true
} else { } else {
// No cancellation was set, so return a child cancellation with no timeout // No deadline was set, so just return the existinc cancellation and a dummy value
return util.CancellationChild(c.session.cancel) return c.session.cancel, false
} }
} }
// Used internally by Read, the caller is responsible for util.PutBytes when they're done. // Used internally by Read, the caller is responsible for util.PutBytes when they're done.
func (c *Conn) ReadNoCopy() ([]byte, error) { func (c *Conn) ReadNoCopy() ([]byte, error) {
cancel := c.getDeadlineCancellation(&c.readDeadline) cancel, doCancel := c.getDeadlineCancellation(&c.readDeadline)
if doCancel {
defer cancel.Cancel(nil) defer cancel.Cancel(nil)
}
// 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():
@ -207,8 +210,10 @@ func (c *Conn) WriteNoCopy(msg FlowKeyMessage) error {
} }
c.session.doFunc(sessionFunc) c.session.doFunc(sessionFunc)
if err == nil { if err == nil {
cancel := c.getDeadlineCancellation(&c.writeDeadline) cancel, doCancel := c.getDeadlineCancellation(&c.writeDeadline)
if doCancel {
defer cancel.Cancel(nil) defer cancel.Cancel(nil)
}
select { select {
case <-cancel.Finished(): case <-cancel.Finished():
if cancel.Error() == util.CancellationTimeoutError { if cancel.Error() == util.CancellationTimeoutError {