mirrors/hysteria
1
0
Fork 0
mirror of https://github.com/apernet/hysteria.git synced 2025-04-04 13:07:39 +03:00
Code Issues Projects Releases Packages Wiki Activity

feat: quic close error code

Browse source
This commit is contained in:
tobyxdd 2023-06-27 22:39:16 -07:00
parent 1317c599b8
commit cc8a889503
2 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
core/client/client.go
View file

@ -24,6 +24,9 @@ import (
const ( const (
udpMessageChanSize = 1024 udpMessageChanSize = 1024
closeErrCodeOK = 0x100 // HTTP3 ErrCodeNoError
closeErrCodeProtocolError = 0x101 // HTTP3 ErrCodeGeneralProtocolError
) )
type Client interface { type Client interface {
@ -179,13 +182,13 @@ func (c *clientImpl) connect() (quic.Connection, func(), error) {
resp, err := rt.RoundTrip(req) resp, err := rt.RoundTrip(req)
if err != nil { if err != nil {
if conn != nil { if conn != nil {
_ = conn.CloseWithError(0, "") _ = conn.CloseWithError(closeErrCodeProtocolError, "")
} }
_ = pktConn.Close() _ = pktConn.Close()
return nil, nil, &coreErrs.ConnectError{Err: err} return nil, nil, &coreErrs.ConnectError{Err: err}
} }
if resp.StatusCode != protocol.StatusAuthOK { if resp.StatusCode != protocol.StatusAuthOK {
_ = conn.CloseWithError(0, "") _ = conn.CloseWithError(closeErrCodeProtocolError, "")
_ = pktConn.Close() _ = pktConn.Close()
return nil, nil, &coreErrs.AuthError{StatusCode: resp.StatusCode} return nil, nil, &coreErrs.AuthError{StatusCode: resp.StatusCode}
} }
@ -206,7 +209,7 @@ func (c *clientImpl) connect() (quic.Connection, func(), error) {
go c.udpLoop(conn) go c.udpLoop(conn)
return conn, func() { return conn, func() {
_ = conn.CloseWithError(0, "") _ = conn.CloseWithError(closeErrCodeOK, "")
_ = pktConn.Close() _ = pktConn.Close()
}, nil }, nil
} }

13
core/server/server.go
View file

@ -18,6 +18,11 @@ import (
"github.com/quic-go/quic-go/http3" "github.com/quic-go/quic-go/http3"
) )
const (
closeErrCodeOK = 0x100 // HTTP3 ErrCodeNoError
closeErrCodeTrafficLimitReached = 0x107 // HTTP3 ErrCodeExcessiveLoad
)
type Server interface { type Server interface {
Serve() error Serve() error
Close() error Close() error
@ -85,7 +90,7 @@ func (s *serverImpl) handleClient(conn quic.Connection) {
if handler.authenticated && s.config.EventLogger != nil { if handler.authenticated && s.config.EventLogger != nil {
s.config.EventLogger.Disconnect(conn.RemoteAddr(), handler.authID, err) s.config.EventLogger.Disconnect(conn.RemoteAddr(), handler.authID, err)
} }
_ = conn.CloseWithError(0, "") _ = conn.CloseWithError(closeErrCodeOK, "")
} }
type h3sHandler struct { type h3sHandler struct {
@ -281,7 +286,7 @@ func (h *h3sHandler) handleTCPRequest(stream quic.Stream) {
_ = stream.Close() _ = stream.Close()
// Disconnect the client if TrafficLogger requested // Disconnect the client if TrafficLogger requested
if err == errDisconnect { if err == errDisconnect {
_ = h.conn.CloseWithError(0, "") _ = h.conn.CloseWithError(closeErrCodeTrafficLimitReached, "")
} }
} }
@ -323,7 +328,7 @@ func (h *h3sHandler) handleUDPRequest(stream quic.Stream) {
ok := h.config.TrafficLogger.Log(h.authID, 0, uint64(udpN)) ok := h.config.TrafficLogger.Log(h.authID, 0, uint64(udpN))
if !ok { if !ok {
// TrafficLogger requested to disconnect the client // TrafficLogger requested to disconnect the client
_ = h.conn.CloseWithError(0, "") _ = h.conn.CloseWithError(closeErrCodeTrafficLimitReached, "")
return return
} }
} }
@ -383,7 +388,7 @@ func (h *h3sHandler) udpLoop() {
ok := h.handleUDPMessage(msg) ok := h.handleUDPMessage(msg)
if !ok { if !ok {
// TrafficLogger requested to disconnect the client // TrafficLogger requested to disconnect the client
_ = h.conn.CloseWithError(0, "") _ = h.conn.CloseWithError(closeErrCodeTrafficLimitReached, "")
return return
} }
} }