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

fix conn.go

Browse Source
This commit is contained in:
Gogs 2016-03-23 11:56:06 +08:00
parent d3cb149cc4
commit 3993d95466
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -190,7 +190,6 @@ func PipeDecryptoReader(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)
@ -213,14 +212,15 @@ func PipeEncryptoWriter(r net.Conn, w net.Conn, key string) {
log.Debug("PipeEncryptoWriter") log.Debug("PipeEncryptoWriter")
nreader := bufio.NewReader(r) nreader := bufio.NewReader(r)
buf := make([]byte, 10*1024)
for { for {
buf, err := nreader.ReadBytes('\n') 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
} }
res, err := laes.Encrypto(buf) res, err := laes.Encrypto(buf[:n])
if err != nil { if err != nil {
log.Error("Encrypto error, [%v]", err) log.Error("Encrypto error, [%v]", err)
return return