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

don’t pass version negotiation packets to the session

Browse Source 
Version negotiation packets don’t have any payload. They must not be
passed to the session, because they’ll end up there as undecryptable
packets.
This commit is contained in:
Marten Seemann
2017-04-27 20:08:18 +07:00
parent 40cdea8deb
commit 194c56fcbc
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client.go
View File

@@ -168,10 +168,8 @@ func (c *client) handlePacket(remoteAddr net.Addr, packet []byte) error {
}
if hdr.VersionFlag {
err = c.handlePacketWithVersionFlag(hdr)
if err != nil {
return err
}
// version negotiation packets have no payload
return c.handlePacketWithVersionFlag(hdr)
}
c.session.handlePacket(&receivedPacket{
@@ -215,7 +213,7 @@ func (c *client) handlePacketWithVersionFlag(hdr *PublicHeader) error {
go c.config.ConnState(c.session, ConnStateVersionNegotiated)
}
return nil // version negotiation packets have no payload
return nil
}
func (c *client) cryptoChangeCallback(_ Session, isForwardSecure bool) {

4
client_test.go
View File

@@ -242,8 +242,10 @@ var _ = Describe("Client", func() {
Expect(cl.session).ToNot(Equal(sess))
Expect(cl.connectionID).ToNot(Equal(0x1337)) // it generated a new connection ID
Expect(err).ToNot(HaveOccurred())
// it didn't pass the version negoation packet to the session (since it has no payload)
// it didn't pass the version negoation packet to the old session (since it has no payload)
Expect(sess.packetCount).To(BeZero())
// if the version negotiation packet was passed to the new session, it would end up as an undecryptable packet there
Expect(cl.session.(*session).undecryptablePackets).To(BeEmpty())
Expect(*(*[]protocol.VersionNumber)(unsafe.Pointer(reflect.ValueOf(cl.session.(*session).cryptoSetup).Elem().FieldByName("negotiatedVersions").UnsafeAddr()))).To(Equal([]protocol.VersionNumber{35}))
})