From 60cfa732dabe3a82a436d725e5f4176c2199391f Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Thu, 6 Jun 2019 16:01:29 -0700
Subject: [PATCH] avoid holding the message writer longer than necessary

We only need it for the handshake.
---
 protocol.go | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/protocol.go b/protocol.go
index 4e54d87..ea5c170 100644
--- a/protocol.go
+++ b/protocol.go
@@ -50,8 +50,7 @@ const nonceSize = 16
 type secureSession struct {
 	msgio.ReadWriteCloser
 
-	insecure  net.Conn
-	insecureM msgio.ReadWriter
+	insecure net.Conn
 
 	localKey   ci.PrivKey
 	localPeer  peer.ID
@@ -88,7 +87,6 @@ func newSecureSession(ctx context.Context, local peer.ID, key ci.PrivKey, insecu
 	}
 
 	s.insecure = insecure
-	s.insecureM = msgio.NewReadWriter(insecure)
 	s.remotePeer = remotePeer
 
 	handshakeCtx, cancel := context.WithTimeout(ctx, HandshakeTimeout) // remove
@@ -135,6 +133,7 @@ func (s *secureSession) runHandshake(ctx context.Context) error {
 }
 
 func (s *secureSession) runHandshakeSync() error {
+	insecureM := msgio.NewReadWriter(s.insecure)
 	// =============================================================================
 	// step 1. Propose -- propose cipher suite + send pubkeys + nonce
 
@@ -169,11 +168,11 @@ func (s *secureSession) runHandshakeSync() error {
 	}
 
 	// Send Propose packet and Receive their Propose packet
-	proposeInBytes, err := readWriteMsg(s.insecureM, proposeOutBytes)
+	proposeInBytes, err := readWriteMsg(insecureM, proposeOutBytes)
 	if err != nil {
 		return err
 	}
-	defer s.insecureM.ReleaseMsg(proposeInBytes)
+	defer insecureM.ReleaseMsg(proposeInBytes)
 
 	// Parse their propose packet
 	proposeIn := new(pb.Propose)
@@ -280,11 +279,11 @@ func (s *secureSession) runHandshakeSync() error {
 	}
 
 	// Send Exchange packet and receive their Exchange packet
-	exchangeInBytes, err := readWriteMsg(s.insecureM, exchangeOutBytes)
+	exchangeInBytes, err := readWriteMsg(insecureM, exchangeOutBytes)
 	if err != nil {
 		return err
 	}
-	defer s.insecureM.ReleaseMsg(exchangeInBytes)
+	defer insecureM.ReleaseMsg(exchangeInBytes)
 
 	// Parse their Exchange packet.
 	exchangeIn := new(pb.Exchange)