gr1ffon/quic-go
1
0
Fork 0
forked from quic-go/quic-go
Code Pull Requests Activity

Merge pull request #1010 from lucas-clemente/simplify-frame-handling

Browse Source 
simplify frame handling
This commit is contained in:
Marten Seemann
2017-12-12 16:44:35 +07:00
committed by GitHub
parent 632040bd2b 51c5cc46d8
commit 5f5ba2c02f
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
session.go
View File

@@ -31,11 +31,6 @@ type receivedPacket struct {
rcvTime time.Time rcvTime time.Time
} }
var (
errRstStreamOnInvalidStream = errors.New("RST_STREAM received for unknown stream")
errWindowUpdateOnClosedStream = errors.New("WINDOW_UPDATE received for an already closed stream")
)
var ( var (
newCryptoSetup = handshake.NewCryptoSetup newCryptoSetup = handshake.NewCryptoSetup
newCryptoSetupClient = handshake.NewCryptoSetupClient newCryptoSetupClient = handshake.NewCryptoSetupClient
@@ -548,11 +543,6 @@ func (s *session) handleFrames(fs []wire.Frame, encLevel protocol.EncryptionLeve
switch err { switch err {
case ackhandler.ErrDuplicateOrOutOfOrderAck: case ackhandler.ErrDuplicateOrOutOfOrderAck:
// Can happen e.g. when packets thought missing arrive late // Can happen e.g. when packets thought missing arrive late
case errRstStreamOnInvalidStream:
// Can happen when RST_STREAMs arrive early or late (?)
utils.Errorf("Ignoring error in session: %s", err.Error())
case errWindowUpdateOnClosedStream:
// Can happen when we already sent the last StreamFrame with the FinBit, but the client already sent a WindowUpdate for this Stream
default: default:
return err return err
} }
@@ -597,7 +587,8 @@ func (s *session) handleMaxStreamDataFrame(frame *wire.MaxStreamDataFrame) error
return err return err
} }
if str == nil { if str == nil {
return errWindowUpdateOnClosedStream // stream is closed and already garbage collected
return nil
} }
str.UpdateSendWindow(frame.ByteOffset) str.UpdateSendWindow(frame.ByteOffset)
return nil return nil
@@ -609,7 +600,8 @@ func (s *session) handleRstStreamFrame(frame *wire.RstStreamFrame) error {
return err return err
} }
if str == nil { if str == nil {
return errRstStreamOnInvalidStream // stream is closed and already garbage collected
return nil
} }
return str.RegisterRemoteError(fmt.Errorf("RST_STREAM received with code %d", frame.ErrorCode), frame.ByteOffset) return str.RegisterRemoteError(fmt.Errorf("RST_STREAM received with code %d", frame.ErrorCode), frame.ByteOffset)
} }