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

replace closed sessions in the packet handler map

Browse source
This commit is contained in:
Marten Seemann 2019-11-02 20:32:59 +07:00
parent 46c46689c5
commit c7334e3e66
9 changed files with 179 additions and 160 deletions
Download patch file Download diff file Expand all files Collapse all files

27
session.go
View file

@ -87,7 +87,7 @@ func (r *handshakeRunner) OnHandshakeComplete() { r.onHandshakeC
type closeError struct {
err error
remote bool
immediate bool
sendClose bool
}
var errCloseForRecreating = errors.New("closing session in order to recreate it")
@ -131,9 +131,7 @@ type session struct {
receivedPackets chan *receivedPacket
sendingScheduled chan struct{}
closeOnce sync.Once
closedSessionMutex sync.Mutex
closedSession closedSession
closeOnce sync.Once
// closeChan is used to notify the run loop that it should terminate
closeChan chan closeError
@ -901,17 +899,12 @@ func (s *session) closeLocal(e error) {
} else {
s.logger.Errorf("Closing session with error: %s", e)
}
s.closeChan <- closeError{err: e, remote: false}
s.closeChan <- closeError{err: e, sendClose: true, remote: false}
})
}
// destroy closes the session without sending the error on the wire
func (s *session) destroy(e error) {
s.closedSessionMutex.Lock()
if s.closedSession != nil {
s.closedSession.destroy()
}
s.closedSessionMutex.Unlock()
s.destroyImpl(e)
<-s.ctx.Done()
}
@ -924,7 +917,7 @@ func (s *session) destroyImpl(e error) {
s.logger.Errorf("Destroying session %s with error: %s", s.destConnID, e)
}
s.sessionRunner.Remove(s.srcConnID)
s.closeChan <- closeError{err: e, immediate: true, remote: false}
s.closeChan <- closeError{err: e, sendClose: false, remote: false}
})
}
@ -939,6 +932,7 @@ func (s *session) closeForRecreating() protocol.PacketNumber {
func (s *session) closeRemote(e error) {
s.closeOnce.Do(func() {
s.logger.Errorf("Peer closed session with error: %s", e)
s.sessionRunner.ReplaceWithClosed(s.srcConnID, newClosedRemoteSession(s.perspective))
s.closeChan <- closeError{err: e, remote: true}
})
}
@ -970,24 +964,19 @@ func (s *session) handleCloseError(closeErr closeError) {
s.streamsMap.CloseWithError(quicErr)
if closeErr.immediate {
if !closeErr.sendClose {
return
}
s.sessionRunner.Retire(s.srcConnID)
// If this is a remote close we're done here
if closeErr.remote {
s.closedSessionMutex.Lock()
s.closedSession = newClosedRemoteSession(s.receivedPackets)
s.closedSessionMutex.Unlock()
return
}
connClosePacket, err := s.sendConnectionClose(quicErr)
if err != nil {
s.logger.Debugf("Error sending CONNECTION_CLOSE: %s", err)
}
s.closedSessionMutex.Lock()
s.closedSession = newClosedLocalSession(s.conn, s.receivedPackets, connClosePacket, s.logger)
s.closedSessionMutex.Unlock()
cs := newClosedLocalSession(s.conn, connClosePacket, s.perspective, s.logger)
s.sessionRunner.ReplaceWithClosed(s.srcConnID, cs)
}
func (s *session) dropEncryptionLevel(encLevel protocol.EncryptionLevel) {