netconn.go: Cleanup contexts on close

Updates #255

Author: nhooyr

netconn.go

@@ -50,16 +50,14 @@ func NetConn(ctx context.Context, c *Conn, msgType MessageType) net.Conn{
 writeMu: newMu(c),
  }
 
-varwriteCancel context.CancelFunc
-nc.writeCtx, writeCancel=context.WithCancel(ctx)
-varreadCancel context.CancelFunc
-nc.readCtx, readCancel=context.WithCancel(ctx)
+nc.writeCtx, nc.writeCancel=context.WithCancel(ctx)
+nc.readCtx, nc.readCancel=context.WithCancel(ctx)
 
 nc.writeTimer=time.AfterFunc(math.MaxInt64, func(){
 if!nc.writeMu.tryLock(){
 // If the lock cannot be acquired, then there is an
 // active write goroutine and so we should cancel the context.
-writeCancel()
+nc.writeCancel()
 return
  }
 defernc.writeMu.unlock()
@@ -75,7 +73,7 @@ func NetConn(ctx context.Context, c *Conn, msgType MessageType) net.Conn{
 if!nc.readMu.tryLock(){
 // If the lock cannot be acquired, then there is an
 // active read goroutine and so we should cancel the context.
-readCancel()
+nc.readCancel()
 return
  }
 defernc.readMu.unlock()
@@ -98,11 +96,13 @@ type netConn struct{
 writeMu*mu
 writeExpiredint64
 writeCtx context.Context
+writeCancel context.CancelFunc
 
 readTimer*time.Timer
 readMu*mu
 readExpiredint64
 readCtx context.Context
+readCancel context.CancelFunc
 readEOFedbool
 reader io.Reader
 }
@@ -111,7 +111,9 @@ var _ net.Conn = &netConn{}
 
 func (nc*netConn) Close() error{
 nc.writeTimer.Stop()
+nc.writeCancel()
 nc.readTimer.Stop()
+nc.readCancel()
 returnnc.c.Close(StatusNormalClosure, "")
 }