From 2c2dc4e7a53dc2139c27518cc9a4836b82ca84d7 Mon Sep 17 00:00:00 2001 From: Dengfeng Liu Date: Mon, 19 Jun 2017 10:30:02 +0800 Subject: [PATCH 1/2] Update control.go --- server/control.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/control.go b/server/control.go index ef8ab6a..73b1e89 100644 --- a/server/control.go +++ b/server/control.go @@ -235,9 +235,9 @@ func (ctl *Control) reader() { var xfrpReader io.Reader if config.ServerCommonCfg.UseEncryption { - xfrpReader := crypto.NewReader(ctl.conn, []byte(config.ServerCommonCfg.PrivilegeToken)) + xfrpReader = crypto.NewReader(ctl.conn, []byte(config.ServerCommonCfg.PrivilegeToken)) } else { - xfrpReader := ctl.conn; + xfrpReader = ctl.conn; } for { if m, err := msg.ReadMsg(xfrpReader); err != nil { From 3801e917ac9c9a95a46cd1610ecf3a2ad3118e90 Mon Sep 17 00:00:00 2001 From: Dengfeng Liu Date: Mon, 19 Jun 2017 10:30:41 +0800 Subject: [PATCH 2/2] Update control.go --- client/control.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/control.go b/client/control.go index dcf9b5f..4201f44 100644 --- a/client/control.go +++ b/client/control.go @@ -271,9 +271,9 @@ func (ctl *Control) reader() { var xfrpReader io.Reader if config.ClientCommonCfg.UseEncryption { - xfrpReader := crypto.NewReader(ctl.conn, []byte(config.ClientCommonCfg.PrivilegeToken)) + xfrpReader = crypto.NewReader(ctl.conn, []byte(config.ClientCommonCfg.PrivilegeToken)) } else { - xfrpReader := ctl.conn; + xfrpReader = ctl.conn; } for { if m, err := msg.ReadMsg(xfrpReader); err != nil {