Lolia-FRP/lolia-frp
4
0
Fork 0
forked from Mxmilu666/frp
Code Pull Requests Activity

all: some optimization

Browse Source
This commit is contained in:
fatedier
2016-03-31 18:03:44 +08:00
parent 45c21b2705
commit 52f99bbc00
9 changed files with 253 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -153,7 +153,7 @@ func Join(c1 *Conn, c2 *Conn) {
var err error
_, err = io.Copy(to.TcpConn, from.TcpConn)
if err != nil {
log.Warn("join conns error, %v", err)
log.Warn("join connections error, %v", err)
}
}
@@ -171,10 +171,8 @@ func JoinMore(local *Conn, remote *Conn, cryptoKey string) {
defer to.Close()
defer wait.Done()
err := PipeEncryptoWriter(from.TcpConn, to.TcpConn, key)
if err != nil {
log.Warn("join conns error, %v", err)
}
// we don't care about errors here
PipeEncryptoWriter(from.TcpConn, to.TcpConn, key)
}
decryptoPipe := func(to *Conn, from *Conn, key string) {
@@ -182,16 +180,15 @@ func JoinMore(local *Conn, remote *Conn, cryptoKey string) {
defer to.Close()
defer wait.Done()
err := PipeDecryptoReader(to.TcpConn, from.TcpConn, key)
if err != nil {
log.Warn("join conns error, %v", err)
}
// we don't care about errors here
PipeDecryptoReader(to.TcpConn, from.TcpConn, key)
}
wait.Add(2)
go encrypPipe(local, remote, cryptoKey)
go decryptoPipe(remote, local, cryptoKey)
wait.Wait()
log.Debug("One tunnel stopped")
return
}