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

check for consistent ACK ranges when writing QUIC 34 ACK frames

Browse Source 
ref #182
This commit is contained in:
Marten Seemann
2016-06-22 15:35:14 +07:00
parent 9d3dd34017
commit 1d412f2af6
2 changed files with 39 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
frames/ack_frame_new.go
View File

@@ -9,7 +9,13 @@ import (
"github.com/lucas-clemente/quic-go/utils"
)
var errInvalidAckRanges = errors.New("AckFrame: ACK frame contains invalid ACK ranges")
// ErrInvalidAckRanges occurs when a client sends inconsistent ACK ranges
var ErrInvalidAckRanges = errors.New("AckFrame: ACK frame contains invalid ACK ranges")
var (
errInconsistentAckLargestObserved = errors.New("internal inconsistency: LargestObserved does not match ACK ranges")
errInconsistentAckLowestAcked = errors.New("internal inconsistency: LowestAcked does not match ACK ranges")
)
// An AckFrameNew is a ACK frame in QUIC c34
type AckFrameNew struct {
@@ -73,7 +79,7 @@ func ParseAckFrameNew(r *bytes.Reader, version protocol.VersionNumber) (*AckFram
}
if ackBlockLength > largestObserved {
return nil, errInvalidAckRanges
return nil, ErrInvalidAckRanges
}
if hasMissingRanges {
@@ -117,7 +123,7 @@ func ParseAckFrameNew(r *bytes.Reader, version protocol.VersionNumber) (*AckFram
}
if !frame.validateAckRanges() {
return nil, errInvalidAckRanges
return nil, ErrInvalidAckRanges
}
var numTimestampByte byte
@@ -207,10 +213,10 @@ func (f *AckFrameNew) Write(b *bytes.Buffer, version protocol.VersionNumber) err
utils.WriteUint48(b, uint64(f.LargestObserved-f.LowestAcked+1))
} else {
if f.LargestObserved != f.AckRanges[0].LastPacketNumber {
return errors.New("internal inconsistency: LastPacketNumber does not match ACK ranges")
return errInconsistentAckLargestObserved
}
if f.LowestAcked != f.AckRanges[len(f.AckRanges)-1].FirstPacketNumber {
return errors.New("internal inconsistency: FirstPacketNumber does not match ACK ranges")
return errInconsistentAckLowestAcked
}
length := f.LargestObserved - f.AckRanges[0].FirstPacketNumber + 1
utils.WriteUint48(b, uint64(length))