create a v0.20.x release

quic-go · Mar 19, 2021 · 4947840 · 4947840
1 parent 81d16a9
commit 4947840
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/internal/protocol/version.go b/internal/protocol/version.go
@@ -18,8 +18,8 @@ const (
 
 // The version numbers, making grepping easier
 const (
-	VersionTLS      VersionNumber = 0x51474fff
-	VersionWhatever VersionNumber = 1 // for when the version doesn't matter
+	VersionTLS      VersionNumber = 0xff00001d // draft-29
+	VersionWhatever VersionNumber = 1          // for when the version doesn't matter
 	VersionUnknown  VersionNumber = math.MaxUint32
 	VersionDraft29  VersionNumber = 0xff00001d
 	VersionDraft32  VersionNumber = 0xff000020
@@ -28,7 +28,7 @@ const (
 
 // SupportedVersions lists the versions that the server supports
 // must be in sorted descending order
-var SupportedVersions = []VersionNumber{VersionTLS}
+var SupportedVersions = []VersionNumber{VersionDraft29, VersionDraft34, VersionDraft32}
 
 // IsValidVersion says if the version is known to quic-go
 func IsValidVersion(v VersionNumber) bool {

diff --git a/internal/protocol/version_test.go b/internal/protocol/version_test.go
@@ -14,9 +14,9 @@ var _ = Describe("Version", func() {
 		Expect(IsValidVersion(VersionTLS)).To(BeTrue())
 		Expect(IsValidVersion(VersionWhatever)).To(BeFalse())
 		Expect(IsValidVersion(VersionUnknown)).To(BeFalse())
-		Expect(IsValidVersion(VersionDraft29)).To(BeFalse())
-		Expect(IsValidVersion(VersionDraft32)).To(BeFalse())
-		Expect(IsValidVersion(VersionDraft34)).To(BeFalse())
+		Expect(IsValidVersion(VersionDraft29)).To(BeTrue())
+		Expect(IsValidVersion(VersionDraft32)).To(BeTrue())
+		Expect(IsValidVersion(VersionDraft34)).To(BeTrue())
 		Expect(IsValidVersion(1234)).To(BeFalse())
 	})
 
@@ -25,7 +25,6 @@ var _ = Describe("Version", func() {
 	})
 
 	It("has the right string representation", func() {
-		Expect(VersionTLS.String()).To(ContainSubstring("TLS"))
 		Expect(VersionWhatever.String()).To(Equal("whatever"))
 		Expect(VersionUnknown.String()).To(Equal("unknown"))
 		Expect(VersionDraft29.String()).To(Equal("draft-29"))
@@ -45,8 +44,9 @@ var _ = Describe("Version", func() {
 		Expect(IsSupportedVersion(SupportedVersions, SupportedVersions[len(SupportedVersions)-1])).To(BeTrue())
 	})
 
-	It("has supported versions in sorted order", func() {
-		for i := 0; i < len(SupportedVersions)-1; i++ {
+	It("defaults to draft-29, and has additional supported versions in sorted order", func() {
+		Expect(SupportedVersions[0]).To(Equal(VersionDraft29))
+		for i := 1; i < len(SupportedVersions)-1; i++ {
 			Expect(SupportedVersions[i]).To(BeNumerically(">", SupportedVersions[i+1]))
 		}
 	})

diff --git a/interop/client/main.go b/interop/client/main.go
@@ -68,7 +68,10 @@ func runTestcase(testcase string) error {
 	if err != nil {
 		return err
 	}
-	quicConf := &quic.Config{Tracer: qlog.NewTracer(getLogWriter)}
+	quicConf := &quic.Config{
+		Tracer:   qlog.NewTracer(getLogWriter),
+		Versions: []quic.VersionNumber{quic.VersionDraft29},
+	}
 
 	if testcase == "http3" {
 		r := &http3.RoundTripper{