package/tun2socks
1
0
Fork 0
mirror of https://github.com/xjasonlyu/tun2socks.git synced 2025-10-08 02:00:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

add tcp timeout & resize bufsize

Browse Source
This commit is contained in:
Jason
2019-08-02 20:01:40 +08:00
parent 0c93157360
commit 6a4c8403de
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
proxy/socks/tcp.go
View File

@@ -42,8 +42,10 @@ const (
dirDownlink dirDownlink
) )
var tcpTimeout = 300 * time.Second
func statsCopy(dst io.Writer, src io.Reader, sess *stats.Session, dir direction) (written int64, err error) { func statsCopy(dst io.Writer, src io.Reader, sess *stats.Session, dir direction) (written int64, err error) {
buf := make([]byte, 32*1024) buf := make([]byte, 64*1024)
for { for {
nr, er := src.Read(buf) nr, er := src.Read(buf)
if nr > 0 { if nr > 0 {
@@ -142,7 +144,7 @@ func (h *tcpHandler) relay(lhs, rhs net.Conn, sess *stats.Session) {
} }
} }
func (h *tcpHandler) Handle(conn net.Conn, target *net.TCPAddr) error { func (h *tcpHandler) Handle(localConn net.Conn, target *net.TCPAddr) error {
dialer, err := proxy.SOCKS5("tcp", core.ParseTCPAddr(h.proxyHost, h.proxyPort).String(), nil, nil) dialer, err := proxy.SOCKS5("tcp", core.ParseTCPAddr(h.proxyHost, h.proxyPort).String(), nil, nil)
if err != nil { if err != nil {
return err return err
@@ -157,7 +159,7 @@ func (h *tcpHandler) Handle(conn net.Conn, target *net.TCPAddr) error {
} }
dest := net.JoinHostPort(targetHost, strconv.Itoa(target.Port)) dest := net.JoinHostPort(targetHost, strconv.Itoa(target.Port))
c, err := dialer.Dial(target.Network(), dest) remoteConn, err := dialer.Dial(target.Network(), dest)
if err != nil { if err != nil {
return err return err
} }
@@ -166,7 +168,7 @@ func (h *tcpHandler) Handle(conn net.Conn, target *net.TCPAddr) error {
var sess *stats.Session var sess *stats.Session
if h.sessionStater != nil { if h.sessionStater != nil {
// Get name of the process. // Get name of the process.
localHost, localPortStr, _ := net.SplitHostPort(conn.LocalAddr().String()) localHost, localPortStr, _ := net.SplitHostPort(localConn.LocalAddr().String())
localPortInt, _ := strconv.Atoi(localPortStr) localPortInt, _ := strconv.Atoi(localPortStr)
process, err = lsof.GetCommandNameBySocket(target.Network(), localHost, uint16(localPortInt)) process, err = lsof.GetCommandNameBySocket(target.Network(), localHost, uint16(localPortInt))
if err != nil { if err != nil {
@@ -176,18 +178,23 @@ func (h *tcpHandler) Handle(conn net.Conn, target *net.TCPAddr) error {
sess = &stats.Session{ sess = &stats.Session{
ProcessName: process, ProcessName: process,
Network: target.Network(), Network: target.Network(),
LocalAddr: conn.LocalAddr().String(), LocalAddr: localConn.LocalAddr().String(),
RemoteAddr: dest, RemoteAddr: dest,
UploadBytes: 0, UploadBytes: 0,
DownloadBytes: 0, DownloadBytes: 0,
SessionStart: time.Now(), SessionStart: time.Now(),
} }
h.sessionStater.AddSession(conn, sess) h.sessionStater.AddSession(localConn, sess)
} }
go h.relay(conn, c, sess) // set timeout
localConn.SetDeadline(time.Now().Add(tcpTimeout))
remoteConn.SetDeadline(time.Now().Add(tcpTimeout))
log.Access(process, "proxy", target.Network(), conn.LocalAddr().String(), dest) // relay connections
go h.relay(localConn, remoteConn, sess)
log.Access(process, "proxy", target.Network(), localConn.LocalAddr().String(), dest)
return nil return nil
} }