From 137776bcb296a88ae53cea03e5b6bab2d22903df Mon Sep 17 00:00:00 2001
From: Matthias Radestock <matthias.radestock@gmail.com>
Date: Tue, 28 Apr 2015 11:33:51 +0100
Subject: [PATCH] remove decryptor shutdown we only needed it because of the
 nonce channels

---
 router/connection.go | 1 -
 router/crypto.go     | 7 -------
 2 files changed, 8 deletions(-)

diff --git a/router/connection.go b/router/connection.go
index 5ba2e033..ed0651a4 100644
--- a/router/connection.go
+++ b/router/connection.go
@@ -442,7 +442,6 @@ func (conn *LocalConnection) sendProtocolMsg(m ProtocolMsg) error {
 }
 
 func (conn *LocalConnection) receiveTCP(decoder *gob.Decoder) {
-	defer conn.Decryptor.Shutdown()
 	usingPassword := conn.SessionKey != nil
 	var receiver TCPReceiver
 	if usingPassword {
diff --git a/router/crypto.go b/router/crypto.go
index 0d893469..9987ce58 100644
--- a/router/crypto.go
+++ b/router/crypto.go
@@ -152,7 +152,6 @@ type FrameConsumer func(src []byte, dst []byte, frame []byte)
 
 type Decryptor interface {
 	IterateFrames([]byte, FrameConsumer) error
-	Shutdown()
 }
 
 type NonDecryptor struct {
@@ -209,9 +208,6 @@ func (nd *NonDecryptor) IterateFrames(packet []byte, consumer FrameConsumer) err
 	return nil
 }
 
-func (nd *NonDecryptor) Shutdown() {
-}
-
 func NewNaClDecryptor(sessionKey *[32]byte, outbound bool) *NaClDecryptor {
 	return &NaClDecryptor{
 		NonDecryptor: *NewNonDecryptor(),
@@ -220,9 +216,6 @@ func NewNaClDecryptor(sessionKey *[32]byte, outbound bool) *NaClDecryptor {
 		instanceDF:   NewNaClDecryptorInstance(outbound)}
 }
 
-func (nd *NaClDecryptor) Shutdown() {
-}
-
 func (nd *NaClDecryptor) IterateFrames(packet []byte, consumer FrameConsumer) error {
 	if len(packet) < 8 {
 		return PacketDecodingError{Desc: fmt.Sprintf("encrypted UDP packet too short; expected length >= 8, got %d", len(packet))}