From c38e40e8e3930dae7bf29fabceaf46fb4aeba5f7 Mon Sep 17 00:00:00 2001 From: Arceliar Date: Sat, 5 Oct 2019 12:23:21 -0500 Subject: [PATCH] actually use doCancel in writeNoCopy --- src/yggdrasil/conn.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/yggdrasil/conn.go b/src/yggdrasil/conn.go index 0a0fc83..4daf6a4 100644 --- a/src/yggdrasil/conn.go +++ b/src/yggdrasil/conn.go @@ -292,6 +292,9 @@ func (c *Conn) writeNoCopy(msg FlowKeyMessage) error { var cancel util.Cancellation var doCancel bool phony.Block(c, func() { cancel, doCancel = c._getDeadlineCancellation(c.writeDeadline) }) + if doCancel { + defer cancel.Cancel(nil) + } var err error select { case <-cancel.Finished():