From 873c95a6028c72a405d51cef059a629c1d670739 Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Wed, 14 Jan 2015 18:37:50 +0000 Subject: [PATCH] tiny refactor --- router/connection.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/router/connection.go b/router/connection.go index ce0610c8..3b367fae 100644 --- a/router/connection.go +++ b/router/connection.go @@ -172,7 +172,7 @@ func (conn *LocalConnection) run(queryChan <-chan *ConnectionInteraction, accept } log.Printf("->[%s] completed handshake with %s\n", conn.remoteTCPAddr, conn.remote.Name) - go conn.receiveTCP(dec, conn.Router.UsingPassword()) + go conn.receiveTCP(dec) conn.Router.Ourself.AddConnection(conn) if conn.remoteUDPAddr != nil { @@ -435,8 +435,9 @@ func checkHandshakeStringField(fieldName string, expectedValue string, handshake return val, nil } -func (conn *LocalConnection) receiveTCP(decoder *gob.Decoder, usingPassword bool) { +func (conn *LocalConnection) receiveTCP(decoder *gob.Decoder) { defer conn.Decryptor.Shutdown() + usingPassword := conn.SessionKey != nil var receiver TCPReceiver if usingPassword { receiver = NewEncryptedTCPReceiver(conn)