Merge pull request #1501 from lucas-clemente/vnp-tests

improve sending of VNPs, improve VNP integration test
This commit is contained in:
Marten Seemann
2018-08-27 16:48:55 +07:00
committed by GitHub
6 changed files with 18 additions and 10 deletions

View File

@@ -393,14 +393,14 @@ func (s *server) sendVersionNegotiationPacket(p *receivedPacket) error {
s.logger.Debugf("Client offered version %s, sending VersionNegotiationPacket", hdr.Version)
var data []byte
if hdr.Version.UsesIETFFrameFormat() {
if hdr.IsPublicHeader {
data = wire.ComposeGQUICVersionNegotiation(hdr.DestConnectionID, s.config.Versions)
} else {
var err error
data, err = wire.ComposeVersionNegotiation(hdr.SrcConnectionID, hdr.DestConnectionID, s.config.Versions)
if err != nil {
return err
}
} else {
data = wire.ComposeGQUICVersionNegotiation(hdr.DestConnectionID, s.config.Versions)
}
_, err := s.conn.WriteTo(data, p.remoteAddr)
return err