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

forwarder: better pipe error handling

Browse Source
This commit is contained in:
Toby 2020-04-11 15:47:53 -07:00
parent 246c2ce89c
commit f0c647004f
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
internal/forwarder/client.go
View File

@ -187,14 +187,21 @@ func (c *QUICClient) handleConn(conn net.Conn) {
return
}
defer stream.Close()
// From TCP to QUIC
// Pipes
errChan := make(chan error, 2)
go func() {
_ = utils.Pipe(conn, stream, &c.outboundBytes)
// TCP to QUIC
errChan <- utils.Pipe(conn, stream, &c.outboundBytes)
_ = conn.Close()
_ = stream.Close()
}()
// From QUIC to TCP
err = utils.Pipe(stream, conn, &c.inboundBytes)
// Closed
go func() {
// QUIC to TCP
errChan <- utils.Pipe(stream, conn, &c.inboundBytes)
_ = conn.Close()
_ = stream.Close()
}()
// We only need the first error
err = <-errChan
c.onTCPConnectionClosed(conn.RemoteAddr(), err)
}

17
internal/forwarder/server.go
View File

@ -160,14 +160,21 @@ func (s *QUICServer) handleStream(addr net.Addr, name string, stream quic.Stream
return
}
defer tcpConn.Close()
// From TCP to QUIC
// Pipes
errChan := make(chan error, 2)
go func() {
_ = utils.Pipe(tcpConn, stream, &s.outboundBytes)
// TCP to QUIC
errChan <- utils.Pipe(tcpConn, stream, &s.outboundBytes)
_ = tcpConn.Close()
_ = stream.Close()
}()
// From QUIC to TCP
err = utils.Pipe(stream, tcpConn, &s.inboundBytes)
// Closed
go func() {
// QUIC to TCP
errChan <- utils.Pipe(stream, tcpConn, &s.inboundBytes)
_ = tcpConn.Close()
_ = stream.Close()
}()
// We only need the first error
err = <-errChan
s.onClientStreamClosed(addr, name, int(stream.StreamID()), err)
}