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

chore: rename wrappedQUICStream -> qStream

Browse Source
This commit is contained in:
Toby 2022-10-23 16:31:30 -07:00
parent b247919a03
commit 919fbb7152
3 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/core/client.go
View File

@ -185,7 +185,7 @@ func (c *Client) openStreamWithReconnect() (quic.Connection, quic.Stream, error)
stream, err := c.quicConn.OpenStream() stream, err := c.quicConn.OpenStream()
if err == nil { if err == nil {
// All good // All good
return c.quicConn, &wrappedQUICStream{stream}, nil return c.quicConn, &qStream{stream}, nil
} }
// Something is wrong // Something is wrong
if nErr, ok := err.(net.Error); ok && nErr.Temporary() { if nErr, ok := err.(net.Error); ok && nErr.Temporary() {
@ -200,7 +200,7 @@ func (c *Client) openStreamWithReconnect() (quic.Connection, quic.Stream, error)
} }
// We are not going to try again even if it still fails the second time // We are not going to try again even if it still fails the second time
stream, err = c.quicConn.OpenStream() stream, err = c.quicConn.OpenStream()
return c.quicConn, &wrappedQUICStream{stream}, err return c.quicConn, &qStream{stream}, err
} }
func (c *Client) DialTCP(addr string) (net.Conn, error) { func (c *Client) DialTCP(addr string) (net.Conn, error) {

2
pkg/core/server_client.go
View File

@ -89,7 +89,7 @@ func (c *serverClient) Run() error {
c.ConnGauge.Inc() c.ConnGauge.Inc()
} }
go func() { go func() {
stream := &wrappedQUICStream{stream} stream := &qStream{stream}
c.handleStream(stream) c.handleStream(stream)
_ = stream.Close() _ = stream.Close()
if c.ConnGauge != nil { if c.ConnGauge != nil {

29
pkg/core/stream.go
View File

@ -7,49 +7,52 @@ import (
"github.com/lucas-clemente/quic-go" "github.com/lucas-clemente/quic-go"
) )
// Handle stream close properly // qStream is a wrapper of quic.Stream that handles Close() correctly.
// Ref: https://github.com/libp2p/go-libp2p-quic-transport/blob/master/stream.go // quic-go's quic.Stream.Close() only closes the write side of the stream,
type wrappedQUICStream struct { // NOT the read side. This would cause the pipe(s) to hang at Read() even
// after the stream is supposedly "closed".
// Ref: https://github.com/libp2p/go-libp2p/blob/master/p2p/transport/quic/stream.go
type qStream struct {
Stream quic.Stream Stream quic.Stream
} }
func (s *wrappedQUICStream) StreamID() quic.StreamID { func (s *qStream) StreamID() quic.StreamID {
return s.Stream.StreamID() return s.Stream.StreamID()
} }
func (s *wrappedQUICStream) Read(p []byte) (n int, err error) { func (s *qStream) Read(p []byte) (n int, err error) {
return s.Stream.Read(p) return s.Stream.Read(p)
} }
func (s *wrappedQUICStream) CancelRead(code quic.StreamErrorCode) { func (s *qStream) CancelRead(code quic.StreamErrorCode) {
s.Stream.CancelRead(code) s.Stream.CancelRead(code)
} }
func (s *wrappedQUICStream) SetReadDeadline(t time.Time) error { func (s *qStream) SetReadDeadline(t time.Time) error {
return s.Stream.SetReadDeadline(t) return s.Stream.SetReadDeadline(t)
} }
func (s *wrappedQUICStream) Write(p []byte) (n int, err error) { func (s *qStream) Write(p []byte) (n int, err error) {
return s.Stream.Write(p) return s.Stream.Write(p)
} }
func (s *wrappedQUICStream) Close() error { func (s *qStream) Close() error {
s.Stream.CancelRead(0) s.Stream.CancelRead(0)
return s.Stream.Close() return s.Stream.Close()
} }
func (s *wrappedQUICStream) CancelWrite(code quic.StreamErrorCode) { func (s *qStream) CancelWrite(code quic.StreamErrorCode) {
s.Stream.CancelWrite(code) s.Stream.CancelWrite(code)
} }
func (s *wrappedQUICStream) Context() context.Context { func (s *qStream) Context() context.Context {
return s.Stream.Context() return s.Stream.Context()
} }
func (s *wrappedQUICStream) SetWriteDeadline(t time.Time) error { func (s *qStream) SetWriteDeadline(t time.Time) error {
return s.Stream.SetWriteDeadline(t) return s.Stream.SetWriteDeadline(t)
} }
func (s *wrappedQUICStream) SetDeadline(t time.Time) error { func (s *qStream) SetDeadline(t time.Time) error {
return s.Stream.SetDeadline(t) return s.Stream.SetDeadline(t)
} }