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

Merge pull request #909 from lucas-clemente/handle-ietf-style-vnps

Browse source 
handle IETF draft style Version Negotiation Packets
This commit is contained in:
Marten Seemann 2017-10-30 19:44:34 +07:00 • committed by GitHub
commit 09334f432e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

29
client.go
View file

@ -286,26 +286,29 @@ func (c *client) handlePacket(remoteAddr net.Addr, packet []byte) {
return
}
// ignore delayed / duplicated version negotiation packets
if (c.receivedVersionNegotiationPacket || c.versionNegotiated) && hdr.VersionFlag {
return
}
isVersionNegotiationPacket := hdr.VersionFlag /* gQUIC Version Negotiation Packet */ || hdr.Type == protocol.PacketTypeVersionNegotiation /* IETF draft style Version Negotiation Packet */
// this is the first packet after the client sent a packet with the VersionFlag set
// if the server doesn't send a version negotiation packet, it supports the suggested version
if !hdr.VersionFlag && !c.versionNegotiated {
c.versionNegotiated = true
close(c.versionNegotiationChan)
}
// handle Version Negotiation Packets
if isVersionNegotiationPacket {
// ignore delayed / duplicated version negotiation packets
if c.receivedVersionNegotiationPacket || c.versionNegotiated {
return
}
if hdr.VersionFlag {
// version negotiation packets have no payload
if err := c.handlePacketWithVersionFlag(hdr); err != nil {
if err := c.handleVersionNegotiationPacket(hdr); err != nil {
c.session.Close(err)
}
return
}
// this is the first packet we are receiving
// since it is not a Version Negotiation Packet, this means the server supports the suggested version
if !c.versionNegotiated {
c.versionNegotiated = true
close(c.versionNegotiationChan)
}
c.session.handlePacket(&receivedPacket{
remoteAddr: remoteAddr,
header: hdr,
@ -314,7 +317,7 @@ func (c *client) handlePacket(remoteAddr net.Addr, packet []byte) {
})
}
func (c *client) handlePacketWithVersionFlag(hdr *wire.Header) error {
func (c *client) handleVersionNegotiationPacket(hdr *wire.Header) error {
for _, v := range hdr.SupportedVersions {
if v == c.version {
// the version negotiation packet contains the version that we offered

1
client_test.go
View file

@ -246,6 +246,7 @@ var _ = Describe("Client", func() {
testErr := errors.New("late handshake error")
packetConn.dataToRead = acceptClientVersionPacket(cl.connectionID)
go func() {
defer GinkgoRecover()
_, dialErr := Dial(packetConn, addr, "quic.clemente.io:1337", nil, config)
Expect(dialErr).To(MatchError(testErr))
close(done)