cyonjan/frp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 07eb0dc32a into 580e75f633

Browse Source
This commit is contained in:
Pan Hao 2016-03-24 06:26:29 +00:00
commit 1a21603c8d
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf/frpc.ini
View File

@ -11,4 +11,4 @@ log_level = debug
[test1] [test1]
passwd = 123 passwd = 123
local_ip = 127.0.0.1 local_ip = 127.0.0.1
local_port = 8000 local_port = 22

16
src/frp/utils/conn/conn.go
View File

@ -175,20 +175,18 @@ func PipeDecryptoReader(r net.Conn, w net.Conn, key string) {
return return
} }
log.Debug("PipeDecryptoReader") nreader := bufio.NewReader(r)
buf := make([]byte, 10*1024)
for { for {
n, err := r.Read(buf) buf, err := nreader.ReadBytes('\n')
if err != nil { if err != nil {
log.Error("Conn ReadLine error, [%v]", err) log.Error("Conn ReadBytes error, [%v]", err)
return return
} }
res, err := laes.Decrypto(buf[:n]) res, err := laes.Decrypto(buf)
if err != nil { if err != nil {
log.Error("Decrypto error, [%s] [%s]", err, string(buf[:n])) log.Error("Decrypto error, [%s] [%s]", err, string(buf))
return return
} }
@ -213,10 +211,11 @@ func PipeEncryptoWriter(r net.Conn, w net.Conn, key string) {
log.Debug("PipeEncryptoWriter") log.Debug("PipeEncryptoWriter")
nreader := bufio.NewReader(r)
buf := make([]byte, 10*1024) buf := make([]byte, 10*1024)
for { for {
n, err := r.Read(buf) n, err := nreader.Read(buf)
if err != nil { if err != nil {
log.Error("Conn ReadLine error, [%v]", err) log.Error("Conn ReadLine error, [%v]", err)
return return
@ -227,6 +226,7 @@ func PipeEncryptoWriter(r net.Conn, w net.Conn, key string) {
return return
} }
res = append(res, '\n')
_, err = w.Write(res) _, err = w.Write(res)
if err != nil { if err != nil {
log.Error("net.Conn Write error, [%v]", err) log.Error("net.Conn Write error, [%v]", err)