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

don't spawn a new Go routine to send a CONNECTION_REFUSED packet (#4091)

Browse source
This commit is contained in:
Marten Seemann 2023-09-25 09:31:27 +00:00 • committed by GitHub
parent 348042ee4c
commit ae2ef95fa3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

39
server.go
View file

@ -110,6 +110,7 @@ type baseServer struct {
running chan struct{} // closed as soon as run() returns running chan struct{} // closed as soon as run() returns
versionNegotiationQueue chan receivedPacket versionNegotiationQueue chan receivedPacket
invalidTokenQueue chan rejectedPacket invalidTokenQueue chan rejectedPacket
connectionRefusedQueue chan rejectedPacket
connQueue chan quicConn connQueue chan quicConn
connQueueLen int32 // to be used as an atomic connQueueLen int32 // to be used as an atomic
@ -251,6 +252,7 @@ func newServer(
receivedPackets: make(chan receivedPacket, protocol.MaxServerUnprocessedPackets), receivedPackets: make(chan receivedPacket, protocol.MaxServerUnprocessedPackets),
versionNegotiationQueue: make(chan receivedPacket, 4), versionNegotiationQueue: make(chan receivedPacket, 4),
invalidTokenQueue: make(chan rejectedPacket, 4), invalidTokenQueue: make(chan rejectedPacket, 4),
connectionRefusedQueue: make(chan rejectedPacket, 4),
newConn: newConnection, newConn: newConnection,
tracer: tracer, tracer: tracer,
logger: utils.DefaultLogger.WithPrefix("server"), logger: utils.DefaultLogger.WithPrefix("server"),
@ -295,6 +297,8 @@ func (s *baseServer) runSendQueue() {
s.maybeSendVersionNegotiationPacket(p) s.maybeSendVersionNegotiationPacket(p)
case p := <-s.invalidTokenQueue: case p := <-s.invalidTokenQueue:
s.maybeSendInvalidToken(p) s.maybeSendInvalidToken(p)
case p := <-s.connectionRefusedQueue:
s.sendConnectionRefused(p)
} }
} }
} }
@ -588,7 +592,7 @@ func (s *baseServer) handleInitialImpl(p receivedPacket, hdr *wire.Header) error
select { select {
case s.invalidTokenQueue <- rejectedPacket{receivedPacket: p, hdr: hdr}: case s.invalidTokenQueue <- rejectedPacket{receivedPacket: p, hdr: hdr}:
default: default:
// it's fine to drop INVALID_TOKEN packets when we are busy // drop packet if we can't send out the INVALID_TOKEN packets fast enough
p.buffer.Release() p.buffer.Release()
} }
return nil return nil
@ -608,12 +612,12 @@ func (s *baseServer) handleInitialImpl(p receivedPacket, hdr *wire.Header) error
if queueLen := atomic.LoadInt32(&s.connQueueLen); queueLen >= protocol.MaxAcceptQueueSize { if queueLen := atomic.LoadInt32(&s.connQueueLen); 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() { select {
defer p.buffer.Release() case s.connectionRefusedQueue <- rejectedPacket{receivedPacket: p, hdr: hdr}:
if err := s.sendConnectionRefused(p.remoteAddr, hdr, p.info); err != nil { default:
s.logger.Debugf("Error rejecting connection: %s", err) // drop packet if we can't send out the CONNECTION_REFUSED fast enough
} p.buffer.Release()
}() }
return nil return nil
} }
@ -673,12 +677,12 @@ func (s *baseServer) handleInitialImpl(p receivedPacket, hdr *wire.Header) error
return conn, true return conn, true
}); !added { }); !added {
go func() { select {
defer p.buffer.Release() case s.connectionRefusedQueue <- rejectedPacket{receivedPacket: p, hdr: hdr}:
if err := s.sendConnectionRefused(p.remoteAddr, hdr, p.info); err != nil { default:
s.logger.Debugf("Error rejecting connection: %s", err) // drop packet if we can't send out the CONNECTION_REFUSED fast enough
} p.buffer.Release()
}() }
return nil return nil
} }
go conn.run() go conn.run()
@ -790,9 +794,12 @@ func (s *baseServer) maybeSendInvalidToken(p rejectedPacket) {
} }
} }
func (s *baseServer) sendConnectionRefused(remoteAddr net.Addr, hdr *wire.Header, info packetInfo) error { func (s *baseServer) sendConnectionRefused(p rejectedPacket) {
sealer, _ := handshake.NewInitialAEAD(hdr.DestConnectionID, protocol.PerspectiveServer, hdr.Version) defer p.buffer.Release()
return s.sendError(remoteAddr, hdr, sealer, qerr.ConnectionRefused, info) sealer, _ := handshake.NewInitialAEAD(p.hdr.DestConnectionID, protocol.PerspectiveServer, p.hdr.Version)
if err := s.sendError(p.remoteAddr, p.hdr, sealer, qerr.ConnectionRefused, p.info); err != nil {
s.logger.Debugf("Error sending CONNECTION_REFUSED error: %s", err)
}
} }
// 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