mirrors/uquic
1
0
Fork 0
mirror of https://github.com/refraction-networking/uquic.git synced 2025-04-04 12:47:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

rename the SERVER_BUSY error to CONNECTION_REFUSED

Browse source
This commit is contained in:
Marten Seemann 2020-06-10 12:13:40 +07:00
parent 05514ab375
commit 2e9b92ab69
5 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
integrationtests/self/handshake_test.go
View file

@ -311,7 +311,7 @@ var _ = Describe("Handshake tests", func() {
_, err := dial() _, err := dial()
Expect(err).To(HaveOccurred()) Expect(err).To(HaveOccurred())
Expect(err.(*qerr.QuicError).ErrorCode).To(Equal(qerr.ServerBusy)) Expect(err.(*qerr.QuicError).ErrorCode).To(Equal(qerr.ConnectionRefused))
// now accept one session, freeing one spot in the queue // now accept one session, freeing one spot in the queue
_, err = server.Accept(context.Background()) _, err = server.Accept(context.Background())
@ -324,7 +324,7 @@ var _ = Describe("Handshake tests", func() {
_, err = dial() _, err = dial()
Expect(err).To(HaveOccurred()) Expect(err).To(HaveOccurred())
Expect(err.(*qerr.QuicError).ErrorCode).To(Equal(qerr.ServerBusy)) Expect(err.(*qerr.QuicError).ErrorCode).To(Equal(qerr.ConnectionRefused))
}) })
It("removes closed connections from the accept queue", func() { It("removes closed connections from the accept queue", func() {
@ -340,7 +340,7 @@ var _ = Describe("Handshake tests", func() {
_, err = dial() _, err = dial()
Expect(err).To(HaveOccurred()) Expect(err).To(HaveOccurred())
Expect(err.(*qerr.QuicError).ErrorCode).To(Equal(qerr.ServerBusy)) Expect(err.(*qerr.QuicError).ErrorCode).To(Equal(qerr.ConnectionRefused))
// Now close the one of the session that are waiting to be accepted. // Now close the one of the session that are waiting to be accepted.
// This should free one spot in the queue. // This should free one spot in the queue.
@ -354,7 +354,7 @@ var _ = Describe("Handshake tests", func() {
_, err = dial() _, err = dial()
Expect(err).To(HaveOccurred()) Expect(err).To(HaveOccurred())
Expect(err.(*qerr.QuicError).ErrorCode).To(Equal(qerr.ServerBusy)) Expect(err.(*qerr.QuicError).ErrorCode).To(Equal(qerr.ConnectionRefused))
}) })
}) })

6
internal/qerr/error_codes.go
View file

@ -13,7 +13,7 @@ type ErrorCode uint64
const ( const (
NoError ErrorCode = 0x0 NoError ErrorCode = 0x0
InternalError ErrorCode = 0x1 InternalError ErrorCode = 0x1
ServerBusy ErrorCode = 0x2 ConnectionRefused ErrorCode = 0x2
FlowControlError ErrorCode = 0x3 FlowControlError ErrorCode = 0x3
StreamLimitError ErrorCode = 0x4 StreamLimitError ErrorCode = 0x4
StreamStateError ErrorCode = 0x5 StreamStateError ErrorCode = 0x5
@ -53,8 +53,8 @@ func (e ErrorCode) String() string {
return "NO_ERROR" return "NO_ERROR"
case InternalError: case InternalError:
return "INTERNAL_ERROR" return "INTERNAL_ERROR"
case ServerBusy: case ConnectionRefused:
return "SERVER_BUSY" return "CONNECTION_REFUSED"
case FlowControlError: case FlowControlError:
return "FLOW_CONTROL_ERROR" return "FLOW_CONTROL_ERROR"
case StreamLimitError: case StreamLimitError:

4
qlog/types.go
View file

@ -303,8 +303,8 @@ func (e transportError) String() string {
return "no_error" return "no_error"
case qerr.InternalError: case qerr.InternalError:
return "internal_error" return "internal_error"
case qerr.ServerBusy: case qerr.ConnectionRefused:
return "server_busy" return "connection_refused"
case qerr.FlowControlError: case qerr.FlowControlError:
return "flow_control_error" return "flow_control_error"
case qerr.StreamLimitError: case qerr.StreamLimitError:

2
qlog/types_test.go
View file

@ -100,7 +100,7 @@ var _ = Describe("Types", func() {
It("has a string representation for transport errors", func() { It("has a string representation for transport errors", func() {
Expect(transportError(qerr.NoError).String()).To(Equal("no_error")) Expect(transportError(qerr.NoError).String()).To(Equal("no_error"))
Expect(transportError(qerr.InternalError).String()).To(Equal("internal_error")) Expect(transportError(qerr.InternalError).String()).To(Equal("internal_error"))
Expect(transportError(qerr.ServerBusy).String()).To(Equal("server_busy")) Expect(transportError(qerr.ConnectionRefused).String()).To(Equal("connection_refused"))
Expect(transportError(qerr.FlowControlError).String()).To(Equal("flow_control_error")) Expect(transportError(qerr.FlowControlError).String()).To(Equal("flow_control_error"))
Expect(transportError(qerr.StreamLimitError).String()).To(Equal("stream_limit_error")) Expect(transportError(qerr.StreamLimitError).String()).To(Equal("stream_limit_error"))
Expect(transportError(qerr.StreamStateError).String()).To(Equal("stream_state_error")) Expect(transportError(qerr.StreamStateError).String()).To(Equal("stream_state_error"))

6
server.go
View file

@ -400,7 +400,7 @@ func (s *baseServer) handleInitialImpl(p *receivedPacket, hdr *wire.Header) erro
if queueLen := atomic.LoadInt32(&s.sessionQueueLen); queueLen >= protocol.MaxAcceptQueueSize { if queueLen := atomic.LoadInt32(&s.sessionQueueLen); queueLen >= protocol.MaxAcceptQueueSize {
s.logger.Debugf("Rejecting new connection. Server currently busy. Accept queue length: %d (max %d)", queueLen, protocol.MaxAcceptQueueSize) s.logger.Debugf("Rejecting new connection. Server currently busy. Accept queue length: %d (max %d)", queueLen, protocol.MaxAcceptQueueSize)
go func() { go func() {
if err := s.sendServerBusy(p.remoteAddr, hdr); err != nil { if err := s.sendConnectionRefused(p.remoteAddr, hdr); err != nil {
s.logger.Debugf("Error rejecting connection: %s", err) s.logger.Debugf("Error rejecting connection: %s", err)
} }
}() }()
@ -566,9 +566,9 @@ func (s *baseServer) maybeSendInvalidToken(p *receivedPacket, hdr *wire.Header)
return s.sendError(p.remoteAddr, hdr, sealer, qerr.InvalidToken) return s.sendError(p.remoteAddr, hdr, sealer, qerr.InvalidToken)
} }
func (s *baseServer) sendServerBusy(remoteAddr net.Addr, hdr *wire.Header) error { func (s *baseServer) sendConnectionRefused(remoteAddr net.Addr, hdr *wire.Header) error {
sealer, _ := handshake.NewInitialAEAD(hdr.DestConnectionID, protocol.PerspectiveServer) sealer, _ := handshake.NewInitialAEAD(hdr.DestConnectionID, protocol.PerspectiveServer)
return s.sendError(remoteAddr, hdr, sealer, qerr.ServerBusy) return s.sendError(remoteAddr, hdr, sealer, qerr.ConnectionRefused)
} }
// sendError sends the error as a response to the packet received with header hdr // sendError sends the error as a response to the packet received with header hdr