mirror of
https://github.com/refraction-networking/uquic.git
synced 2025-04-04 20:57:36 +03:00
use non-cryptographic random to generate skipped packet numbers
This commit is contained in:
parent
325bc1694d
commit
e8e6c7b47e
2 changed files with 38 additions and 64 deletions
|
@ -1,8 +1,6 @@
|
|||
package ackhandler
|
||||
|
||||
import (
|
||||
"math"
|
||||
|
||||
"github.com/lucas-clemente/quic-go/internal/protocol"
|
||||
. "github.com/onsi/ginkgo"
|
||||
. "github.com/onsi/gomega"
|
||||
|
@ -10,9 +8,10 @@ import (
|
|||
|
||||
var _ = Describe("Packet Number Generator", func() {
|
||||
var png *packetNumberGenerator
|
||||
const initialPN protocol.PacketNumber = 8
|
||||
|
||||
BeforeEach(func() {
|
||||
png = newPacketNumberGenerator(1, 100)
|
||||
png = newPacketNumberGenerator(initialPN, 100)
|
||||
})
|
||||
|
||||
It("can be initialized to return any first packet number", func() {
|
||||
|
@ -20,19 +19,18 @@ var _ = Describe("Packet Number Generator", func() {
|
|||
Expect(png.Pop()).To(Equal(protocol.PacketNumber(12345)))
|
||||
})
|
||||
|
||||
It("gets 1 as the first packet number", func() {
|
||||
It("gets the first packet number", func() {
|
||||
num := png.Pop()
|
||||
Expect(num).To(Equal(protocol.PacketNumber(1)))
|
||||
Expect(num).To(Equal(initialPN))
|
||||
})
|
||||
|
||||
It("allows peeking", func() {
|
||||
png.nextToSkip = 1000
|
||||
Expect(png.Peek()).To(Equal(protocol.PacketNumber(1)))
|
||||
Expect(png.Peek()).To(Equal(protocol.PacketNumber(1)))
|
||||
num := png.Pop()
|
||||
Expect(num).To(Equal(protocol.PacketNumber(1)))
|
||||
Expect(png.Peek()).To(Equal(protocol.PacketNumber(2)))
|
||||
Expect(png.Peek()).To(Equal(protocol.PacketNumber(2)))
|
||||
Expect(png.Peek()).To(Equal(initialPN))
|
||||
Expect(png.Peek()).To(Equal(initialPN))
|
||||
Expect(png.Pop()).To(Equal(initialPN))
|
||||
Expect(png.Peek()).To(Equal(initialPN + 1))
|
||||
Expect(png.Peek()).To(Equal(initialPN + 1))
|
||||
})
|
||||
|
||||
It("skips a packet number", func() {
|
||||
|
@ -50,51 +48,34 @@ var _ = Describe("Packet Number Generator", func() {
|
|||
})
|
||||
|
||||
It("skips a specific packet number", func() {
|
||||
png.nextToSkip = 2
|
||||
num := png.Pop()
|
||||
Expect(num).To(Equal(protocol.PacketNumber(1)))
|
||||
Expect(png.Peek()).To(Equal(protocol.PacketNumber(3)))
|
||||
num = png.Pop()
|
||||
Expect(num).To(Equal(protocol.PacketNumber(3)))
|
||||
png.nextToSkip = initialPN + 1
|
||||
Expect(png.Pop()).To(Equal(initialPN))
|
||||
Expect(png.Peek()).To(Equal(initialPN + 2))
|
||||
Expect(png.Pop()).To(Equal(initialPN + 2))
|
||||
})
|
||||
|
||||
It("generates a new packet number to skip", func() {
|
||||
png.next = 100
|
||||
png.averagePeriod = 100
|
||||
const averagePeriod = 25
|
||||
png.averagePeriod = averagePeriod
|
||||
|
||||
rep := 5000
|
||||
var sum protocol.PacketNumber
|
||||
|
||||
for i := 0; i < rep; i++ {
|
||||
png.generateNewSkip()
|
||||
Expect(png.nextToSkip).ToNot(Equal(protocol.PacketNumber(101)))
|
||||
sum += png.nextToSkip
|
||||
periods := make([]protocol.PacketNumber, 0, 500)
|
||||
last := initialPN
|
||||
var lastSkip protocol.PacketNumber
|
||||
for len(periods) < cap(periods) {
|
||||
next := png.Pop()
|
||||
if next > last+1 {
|
||||
skipped := next - 1
|
||||
Expect(skipped).To(BeNumerically(">", lastSkip+1))
|
||||
periods = append(periods, skipped-lastSkip-1)
|
||||
lastSkip = skipped
|
||||
}
|
||||
last = next
|
||||
}
|
||||
|
||||
average := sum / protocol.PacketNumber(rep)
|
||||
Expect(average).To(BeNumerically("==", protocol.PacketNumber(200), 4))
|
||||
})
|
||||
|
||||
It("uses random numbers", func() {
|
||||
var smallest uint16 = math.MaxUint16
|
||||
var largest uint16
|
||||
var sum uint64
|
||||
|
||||
rep := 10000
|
||||
|
||||
for i := 0; i < rep; i++ {
|
||||
num := png.getRandomNumber()
|
||||
sum += uint64(num)
|
||||
if num > largest {
|
||||
largest = num
|
||||
}
|
||||
if num < smallest {
|
||||
smallest = num
|
||||
}
|
||||
var average float64
|
||||
for _, p := range periods {
|
||||
average += float64(p) / float64(len(periods))
|
||||
}
|
||||
|
||||
Expect(smallest).To(BeNumerically("<", 300))
|
||||
Expect(largest).To(BeNumerically(">", math.MaxUint16-300))
|
||||
Expect(sum / uint64(rep)).To(BeNumerically("==", uint64(math.MaxUint16/2), 1000))
|
||||
Expect(average).To(BeNumerically("~", averagePeriod+1 /* we never skip two packet numbers at the same time */, 5))
|
||||
})
|
||||
})
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue