This commit is contained in:
Jason
2019-08-11 21:11:08 +08:00
parent 6d50f90315
commit c22db614ff
2 changed files with 12 additions and 10 deletions

View File

@@ -51,16 +51,22 @@ func (h *tcpHandler) relay(localConn, remoteConn net.Conn) {
// Up Link // Up Link
go func() { go func() {
io.Copy(remoteConn, localConn) if _, err := io.Copy(remoteConn, localConn); err != nil {
tcpCloseRead(localConn) closeOnce()
tcpCloseWrite(remoteConn) } else {
tcpCloseRead(localConn)
tcpCloseWrite(remoteConn)
}
wg.Done() wg.Done()
}() }()
// Down Link // Down Link
io.Copy(localConn, remoteConn) if _, err := io.Copy(localConn, remoteConn); err != nil {
tcpCloseRead(remoteConn) closeOnce()
tcpCloseWrite(localConn) } else {
tcpCloseRead(remoteConn)
tcpCloseWrite(localConn)
}
wg.Wait() // Wait for Up Link done wg.Wait() // Wait for Up Link done

View File

@@ -3,8 +3,6 @@ package socks
import ( import (
"net" "net"
"time" "time"
"github.com/xjasonlyu/tun2socks/common/log"
) )
type duplexConn interface { type duplexConn interface {
@@ -15,14 +13,12 @@ type duplexConn interface {
func tcpCloseRead(conn net.Conn) { func tcpCloseRead(conn net.Conn) {
if c, ok := conn.(duplexConn); ok { if c, ok := conn.(duplexConn); ok {
log.Warnf("ok!----")
c.CloseRead() c.CloseRead()
} }
} }
func tcpCloseWrite(conn net.Conn) { func tcpCloseWrite(conn net.Conn) {
if c, ok := conn.(duplexConn); ok { if c, ok := conn.(duplexConn); ok {
log.Warnf("ok!++++")
c.CloseWrite() c.CloseWrite()
} }
} }