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

liudf0716 · Jun 19, 2017 · 0340c45 · 0340c45
2 parents fcca5cb + cb7610e
commit 0340c45
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/client/control.go b/client/control.go
@@ -293,14 +293,15 @@ func (ctl *Control) reader() {
 func (ctl *Control) writer() {
 	var xfrpWriter io.Writer
 	if config.ClientCommonCfg.UseEncryption	 {
-		xfrpWriter, err := crypto.NewWriter(ctl.conn, []byte(config.ClientCommonCfg.PrivilegeToken))
+		var err error
+		xfrpWriter, err = crypto.NewWriter(ctl.conn, []byte(config.ClientCommonCfg.PrivilegeToken))
 		if err != nil {
 			ctl.conn.Error("crypto new writer error: %v", err)
 			ctl.conn.Close()
 			return
 		}
 	} else {
-		xfrpWriter := ctl.conn;
+		xfrpWriter = ctl.conn;
 	}
 	for {
 		if m, ok := <-ctl.sendCh; !ok {

diff --git a/server/control.go b/server/control.go
@@ -199,14 +199,15 @@ func (ctl *Control) writer() {
 
 	var xfrpWriter io.Writer
 	if config.ServerCommonCfg.UseEncryption	 {
-		xfrpWriter, err := crypto.NewWriter(ctl.conn, []byte(config.ServerCommonCfg.PrivilegeToken))
+		var err error
+		xfrpWriter, err = crypto.NewWriter(ctl.conn, []byte(config.ServerCommonCfg.PrivilegeToken))
 		if err != nil {
 			ctl.conn.Error("crypto new writer error: %v", err)
 			ctl.allShutdown.Start()
 			return
 		}
 	} else {
-		xfrpWriter := ctl.conn;
+		xfrpWriter = ctl.conn;
 	}
 
 	for {