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

implement handling of RST_STREAM frames

Browse Source 
fixes #15
This commit is contained in:
Lucas Clemente
2016-04-26 14:57:34 +02:00
parent 5db81d8874
commit 6f38ae3da2
2 changed files with 50 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
session.go
View File

@@ -22,6 +22,10 @@ type receivedPacket struct {
r *bytes.Reader
}
var (
errRstStreamOnInvalidStream = errors.New("RST_STREAM received for unknown stream")
)
// StreamCallback gets a stream frame and returns a reply frame
type StreamCallback func(*Session, utils.Stream)
@@ -81,9 +85,13 @@ func (s *Session) Run() {
}
if err != nil {
if err == ackhandler.ErrDuplicateOrOutOfOrderAck {
switch err {
// Can happen e.g. when packets thought missing arrive late
case ackhandler.ErrDuplicateOrOutOfOrderAck:
// Can happen when RST_STREAMs arrive early or late (?)
case errRstStreamOnInvalidStream:
fmt.Printf("Ignoring error in session: %s\n", err.Error())
} else {
default:
s.Close(err)
}
}
@@ -128,7 +136,7 @@ func (s *Session) handlePacket(addr *net.UDPAddr, publicHeader *PublicHeader, r
case *frames.StopWaitingFrame:
err = s.receivedPacketHandler.ReceivedStopWaiting(frame)
case *frames.RstStreamFrame:
fmt.Printf("%#v\n", frame)
err = s.handleRstStreamFrame(frame)
case *frames.WindowUpdateFrame:
fmt.Printf("%#v\n", frame)
default:
@@ -146,6 +154,7 @@ func (s *Session) HandlePacket(addr *net.UDPAddr, publicHeader *PublicHeader, r
s.receivedPackets <- receivedPacket{addr: addr, publicHeader: publicHeader, r: r}
}
// TODO: Ignore data for closed streams
func (s *Session) handleStreamFrame(frame *frames.StreamFrame) error {
fmt.Printf("Got %d bytes for stream %d\n", len(frame.Data), frame.StreamID)
if frame.StreamID == 0 {
@@ -172,6 +181,18 @@ func (s *Session) handleStreamFrame(frame *frames.StreamFrame) error {
return nil
}
// TODO: Handle frame.byteOffset
func (s *Session) handleRstStreamFrame(frame *frames.RstStreamFrame) error {
s.streamsMutex.RLock()
str, streamExists := s.streams[frame.StreamID]
s.streamsMutex.RUnlock()
if !streamExists || str == nil {
return errRstStreamOnInvalidStream
}
str.RegisterError(fmt.Errorf("RST_STREAM received with code %d", frame.ErrorCode))
return nil
}
// Close the connection by sending a ConnectionClose frame
func (s *Session) Close(e error) error {
if e == nil {