Merge branch 'master' into wip-udp-relay

This commit is contained in:
Toby
2021-04-21 21:54:28 -07:00
2 changed files with 10 additions and 7 deletions

View File

@@ -45,7 +45,7 @@ func (r *TCPRelay) ListenAndServe() error {
if err != nil {
return err
}
go func(c *net.TCPConn) {
go func() {
defer c.Close()
r.ConnFunc(c.RemoteAddr())
rc, err := r.HyClient.DialTCP(r.Remote)
@@ -56,6 +56,6 @@ func (r *TCPRelay) ListenAndServe() error {
defer rc.Close()
err = utils.PipePairWithTimeout(c, rc, r.Timeout)
r.ErrorFunc(c.RemoteAddr(), err)
}(c)
}()
}
}