Merge branch 'master' of https://github.com/KunTengRom/frp

liudf0716 · Jun 19, 2017 · 0f120e3 · 0f120e3
2 parents 0340c45 + 3801e91
commit 0f120e3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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 {

diff --git 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 {