GuanM/hysteria-dev
1
0
Fork 0
mirror of https://github.com/cmz0228/hysteria-dev.git synced 2025-06-17 17:59:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: TProxy UDP error log

Browse Source
This commit is contained in:
Toby 2023-08-10 22:15:55 -07:00
parent ceb3c7f6a8
commit cbfb1998a5
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/internal/tproxy/udp_linux.go
View File

@ -76,10 +76,22 @@ func (r *UDPTProxy) newPair(srcAddr, dstAddr *net.UDPAddr, initPkt []byte) {
return return
} }
// Start forwarding // Start forwarding
go r.forwarding(conn, hyConn, dstAddr.String()) go func() {
err := r.forwarding(conn, hyConn, dstAddr.String())
_ = conn.Close()
_ = hyConn.Close()
if r.EventLogger != nil {
var netErr net.Error
if errors.As(err, &netErr) && netErr.Timeout() {
// We don't consider deadline exceeded (timeout) an error
err = nil
}
r.EventLogger.Error(srcAddr, dstAddr, err)
}
}()
} }
func (r *UDPTProxy) forwarding(conn *net.UDPConn, hyConn client.HyUDPConn, dst string) { func (r *UDPTProxy) forwarding(conn *net.UDPConn, hyConn client.HyUDPConn, dst string) error {
errChan := make(chan error, 2) errChan := make(chan error, 2)
// Local <- Remote // Local <- Remote
go func() { go func() {
@ -116,17 +128,7 @@ func (r *UDPTProxy) forwarding(conn *net.UDPConn, hyConn client.HyUDPConn, dst s
} }
} }
}() }()
err := <-errChan return <-errChan
_ = conn.Close()
_ = hyConn.Close()
if r.EventLogger != nil {
var netErr net.Error
if errors.As(err, &netErr) && netErr.Timeout() {
// We don't consider deadline exceeded (timeout) an error
err = nil
}
r.EventLogger.Error(conn.LocalAddr(), conn.RemoteAddr(), err)
}
} }
func (r *UDPTProxy) updateConnDeadline(conn *net.UDPConn) error { func (r *UDPTProxy) updateConnDeadline(conn *net.UDPConn) error {