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

simplify version negotiation code in the client

Browse Source
This commit is contained in:
Marten Seemann
2017-03-22 18:31:23 +07:00
parent 906f80e804
commit 0ef6527165
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
client.go
View File

@@ -186,24 +186,16 @@ func (c *client) handlePacket(remoteAddr net.Addr, packet []byte) error {
} }
func (c *client) handlePacketWithVersionFlag(hdr *PublicHeader) error { func (c *client) handlePacketWithVersionFlag(hdr *PublicHeader) error {
var hasCommonVersion bool // check if we're supporting any of the offered versions
for _, v := range hdr.SupportedVersions { for _, v := range hdr.SupportedVersions {
// check if the server sent the offered version in supported versions // check if the server sent the offered version in supported versions
if v == c.version { if v == c.version {
return qerr.Error(qerr.InvalidVersionNegotiationPacket, "Server already supports client's version and should have accepted the connection.") return qerr.Error(qerr.InvalidVersionNegotiationPacket, "Server already supports client's version and should have accepted the connection.")
} }
if v != protocol.VersionUnsupported {
hasCommonVersion = true
}
}
if !hasCommonVersion {
utils.Infof("No common version found.")
return qerr.InvalidVersion
} }
ok, highestSupportedVersion := protocol.HighestSupportedVersion(hdr.SupportedVersions) ok, highestSupportedVersion := protocol.HighestSupportedVersion(hdr.SupportedVersions)
if !ok { if !ok {
return qerr.VersionNegotiationMismatch return qerr.InvalidVersion
} }
// switch to negotiated version // switch to negotiated version
@@ -224,9 +216,6 @@ func (c *client) handlePacketWithVersionFlag(hdr *PublicHeader) error {
if c.config.ConnState != nil { if c.config.ConnState != nil {
go c.config.ConnState(c.session, ConnStateVersionNegotiated) go c.config.ConnState(c.session, ConnStateVersionNegotiated)
} }
if err != nil {
return err
}
return nil // version negotiation packets have no payload return nil // version negotiation packets have no payload
} }