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

Merge pull request #2069 from lucas-clemente/grease-transport-parameters

Browse Source 
grease transport parameters
This commit is contained in:
Marten Seemann
2019-08-19 15:35:23 +07:00
committed by GitHub
parent 07a7c0ac62 481cf25910
commit 2133d01956
2 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
internal/handshake/transport_parameter_test.go
View File

@@ -139,10 +139,16 @@ var _ = Describe("Transport Parameters", func() {
})
It("doesn't send the max_ack_delay, if it has the default value", func() {
dataDefault := (&TransportParameters{MaxAckDelay: protocol.DefaultMaxAckDelay}).Marshal()
defaultLen := len(dataDefault)
data := (&TransportParameters{MaxAckDelay: protocol.DefaultMaxAckDelay + time.Millisecond}).Marshal()
Expect(len(data)).To(Equal(defaultLen + 2 /* parameter ID */ + 2 /* length field */ + 1 /* value */))
const num = 1000
var defaultLen, dataLen int
// marshal 1000 times to average out the greasing transport parameter
for i := 0; i < num; i++ {
dataDefault := (&TransportParameters{MaxAckDelay: protocol.DefaultMaxAckDelay}).Marshal()
defaultLen += len(dataDefault)
data := (&TransportParameters{MaxAckDelay: protocol.DefaultMaxAckDelay + time.Millisecond}).Marshal()
dataLen += len(data)
}
Expect(float32(dataLen) / num).To(BeNumerically("~", float32(defaultLen)/num+2 /* parameter ID */ +2 /* length field */ +1 /* value */, 1))
})
It("errors when the ack_delay_exponenent is too large", func() {
@@ -152,10 +158,16 @@ var _ = Describe("Transport Parameters", func() {
})
It("doesn't send the ack_delay_exponent, if it has the default value", func() {
dataDefault := (&TransportParameters{AckDelayExponent: protocol.DefaultAckDelayExponent}).Marshal()
defaultLen := len(dataDefault)
data := (&TransportParameters{AckDelayExponent: protocol.DefaultAckDelayExponent + 1}).Marshal()
Expect(len(data)).To(Equal(defaultLen + 2 /* parameter ID */ + 2 /* length field */ + 1 /* value */))
const num = 1000
var defaultLen, dataLen int
// marshal 1000 times to average out the greasing transport parameter
for i := 0; i < num; i++ {
dataDefault := (&TransportParameters{AckDelayExponent: protocol.DefaultAckDelayExponent}).Marshal()
defaultLen += len(dataDefault)
data := (&TransportParameters{AckDelayExponent: protocol.DefaultAckDelayExponent + 1}).Marshal()
dataLen += len(data)
}
Expect(float32(dataLen) / num).To(BeNumerically("~", float32(defaultLen)/num+2 /* parameter ID */ +2 /* length field */ +1 /* value */, 1))
})
It("sets the default value for the ack_delay_exponent, when no value was sent", func() {

13
internal/handshake/transport_parameters.go
View File

@@ -6,6 +6,7 @@ import (
"errors"
"fmt"
"io"
"math/rand"
"sort"
"time"
@@ -13,6 +14,10 @@ import (
"github.com/lucas-clemente/quic-go/internal/utils"
)
func init() {
rand.Seed(time.Now().UTC().UnixNano())
}
type transportParameterID uint16
const (
@@ -204,6 +209,14 @@ func (p *TransportParameters) Marshal() []byte {
b := &bytes.Buffer{}
b.Write([]byte{0, 0}) // length. Will be replaced later
// add a greased value
utils.BigEndian.WriteUint16(b, uint16(27+31*rand.Intn(100)))
len := rand.Intn(16)
randomData := make([]byte, len)
rand.Read(randomData)
utils.BigEndian.WriteUint16(b, uint16(len))
b.Write(randomData)
// initial_max_stream_data_bidi_local
p.marshalVarintParam(b, initialMaxStreamDataBidiLocalParameterID, uint64(p.InitialMaxStreamDataBidiLocal))
// initial_max_stream_data_bidi_remote