From d3cb149cc45517b4dbdba23419865f231ad6a273 Mon Sep 17 00:00:00 2001 From: Gogs Date: Wed, 23 Mar 2016 11:14:13 +0800 Subject: [PATCH 1/3] fix crypto --- src/frp/utils/conn/conn.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/frp/utils/conn/conn.go b/src/frp/utils/conn/conn.go index 68cf6536..50501d4e 100644 --- a/src/frp/utils/conn/conn.go +++ b/src/frp/utils/conn/conn.go @@ -175,23 +175,22 @@ func PipeDecryptoReader(r net.Conn, w net.Conn, key string) { return } - log.Debug("PipeDecryptoReader") - - buf := make([]byte, 10*1024) + nreader := bufio.NewReader(r) for { - n, err := r.Read(buf) + buf, err := nreader.ReadBytes('\n') if err != nil { - log.Error("Conn ReadLine error, [%v]", err) + log.Error("Conn ReadBytes error, [%v]", err) return } - res, err := laes.Decrypto(buf[:n]) + res, err := laes.Decrypto(buf) if err != nil { - log.Error("Decrypto error, [%s] [%s]", err, string(buf[:n])) + log.Error("Decrypto error, [%s] [%s]", err, string(buf)) return } + // res = append(res, '\n') _, err = w.Write(res) if err != nil { log.Error("net.Conn Write error, [%v]", err) @@ -213,20 +212,21 @@ func PipeEncryptoWriter(r net.Conn, w net.Conn, key string) { log.Debug("PipeEncryptoWriter") - buf := make([]byte, 10*1024) + nreader := bufio.NewReader(r) for { - n, err := r.Read(buf) + buf, err := nreader.ReadBytes('\n') if err != nil { log.Error("Conn ReadLine error, [%v]", err) return } - res, err := laes.Encrypto(buf[:n]) + res, err := laes.Encrypto(buf) if err != nil { log.Error("Encrypto error, [%v]", err) return } + res = append(res, '\n') _, err = w.Write(res) if err != nil { log.Error("net.Conn Write error, [%v]", err) From 3993d9546652bdfee8bb843eb7c6ed274e7dabc6 Mon Sep 17 00:00:00 2001 From: Gogs Date: Wed, 23 Mar 2016 11:56:06 +0800 Subject: [PATCH 2/3] fix conn.go --- src/frp/utils/conn/conn.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/frp/utils/conn/conn.go b/src/frp/utils/conn/conn.go index 50501d4e..133b7080 100644 --- a/src/frp/utils/conn/conn.go +++ b/src/frp/utils/conn/conn.go @@ -190,7 +190,6 @@ func PipeDecryptoReader(r net.Conn, w net.Conn, key string) { return } - // res = append(res, '\n') _, err = w.Write(res) if err != nil { log.Error("net.Conn Write error, [%v]", err) @@ -213,14 +212,15 @@ func PipeEncryptoWriter(r net.Conn, w net.Conn, key string) { log.Debug("PipeEncryptoWriter") nreader := bufio.NewReader(r) + buf := make([]byte, 10*1024) for { - buf, err := nreader.ReadBytes('\n') + n, err := nreader.Read(buf) if err != nil { log.Error("Conn ReadLine error, [%v]", err) return } - res, err := laes.Encrypto(buf) + res, err := laes.Encrypto(buf[:n]) if err != nil { log.Error("Encrypto error, [%v]", err) return From 07eb0dc32abde172b7ebc642f80815312412fd10 Mon Sep 17 00:00:00 2001 From: Gogs Date: Thu, 24 Mar 2016 14:09:17 +0800 Subject: [PATCH 3/3] change local port to 22 --- conf/frpc.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/frpc.ini b/conf/frpc.ini index c5dbb49c..09dfeb75 100644 --- a/conf/frpc.ini +++ b/conf/frpc.ini @@ -11,4 +11,4 @@ log_level = debug [test1] passwd = 123 local_ip = 127.0.0.1 -local_port = 8000 +local_port = 22