mirrors/uquic
1
0
Fork 0
mirror of https://github.com/refraction-networking/uquic.git synced 2025-04-04 20:57:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix flaky drop tests by working around the div-nonce type byte issue

Browse source 
hopefully fixes #243
This commit is contained in:
Lucas Clemente 2016-08-05 11:27:41 +02:00
parent 62b06a003c
commit 095f32ec53
2 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
integrationtests/drop_test.go
View file

@ -43,7 +43,7 @@ var _ = Describe("Drop Proxy", func() {
"https://quic.clemente.io/data", "https://quic.clemente.io/data",
) )
session, err := Start(command, nil, GinkgoWriter) session, err := Start(command, GinkgoWriter, GinkgoWriter)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
defer session.Kill() defer session.Kill()
Eventually(session, 4).Should(Exit(0)) Eventually(session, 4).Should(Exit(0))
@ -61,7 +61,7 @@ var _ = Describe("Drop Proxy", func() {
Context(fmt.Sprintf("with quic version %d", version), func() { Context(fmt.Sprintf("with quic version %d", version), func() {
Context("dropping every 4th packet after the crypto handshake", func() { Context("dropping every 4th packet after the crypto handshake", func() {
dropper := func(p protocol.PacketNumber) bool { dropper := func(p protocol.PacketNumber) bool {
if p <= 5 { // don't interfere with the crypto handshake if p <= 10 { // don't interfere with the crypto handshake
return false return false
} }
return p%4 == 0 return p%4 == 0

16
integrationtests/proxy/udp_proxy.go
View file

@ -151,15 +151,17 @@ func (p *UDPProxy) runConnection(conn *connection) error {
} }
raw := buffer[0:n] raw := buffer[0:n]
r := bytes.NewReader(raw)
hdr, err := quic.ParsePublicHeader(r)
if err != nil {
return err
}
atomic.AddUint64(&conn.outgoingPacketCounter, 1) // TODO: Switch back to using the public header once Chrome properly sets the type byte.
// r := bytes.NewReader(raw)
// , err := quic.ParsePublicHeader(r)
// if err != nil {
// return err
// }
if !p.dropOutgoingPacket(hdr.PacketNumber) { v := atomic.AddUint64(&conn.outgoingPacketCounter, 1)
if !p.dropOutgoingPacket(protocol.PacketNumber(v)) {
// Relay it to client // Relay it to client
go func() { go func() {
time.Sleep(p.rttGen.getRTT() / 2) time.Sleep(p.rttGen.getRTT() / 2)