coder
diff --git a/‎vpn/speaker_internal_test.go
Lines changed: 2 additions & 2 deletions b/‎vpn/speaker_internal_test.go
Lines changed: 2 additions & 2 deletions
diff --git a/‎vpn/version.go
Lines changed: 7 additions & 4 deletions b/‎vpn/version.go
Lines changed: 7 additions & 4 deletions
@@ -54,7 +54,7 @@ func TestSpeaker_RawPeer(t *testing.T) {
 	require.NoError(t, err)
 	require.Equal(t, expectedHandshake, string(b[:n]))
 
-	_, err = mp.Write([]byte("codervpn manager 1.0\n"))
+	_, err = mp.Write([]byte("codervpn manager 1.3,2.1\n"))
 	require.NoError(t, err)
 
 	err = testutil.RequireRecvCtx(ctx, t, errCh)
@@ -179,7 +179,7 @@ func TestSpeaker_HandshakeInvalid(t *testing.T) {
 	}{
 		{name: "preamble", handshake: "ssh manager 1.0\n"},
 		{name: "2components", handshake: "ssh manager\n"},
-		{name: "newmajor", handshake: "codervpn manager 2.0\n"},
+		{name: "newmajors", handshake: "codervpn manager 2.0,3.0\n"},
 		{name: "0version", handshake: "codervpn 0.1 manager\n"},
 		{name: "unknown_role", handshake: "codervpn 1.0 supervisor\n"},
 		{name: "unexpected_role", handshake: "codervpn 1.0 tunnel\n"},
 
@@ -79,7 +79,7 @@ func ParseRPCVersionList(str string) (RPCVersionList, error) {
 	for i, v := range split {
 		version, err := ParseRPCVersion(v)
 		if err != nil {
-			return RPCVersionList{}, xerrors.Errorf("invalid version string: %s", v)
+			return RPCVersionList{}, xerrors.Errorf("invalid version list: %s", str)
 		}
 		versions[i] = version
 	}
@@ -105,11 +105,14 @@ func (vl RPCVersionList) Validate() error {
 	if len(vl.Versions) == 0 {
 		return xerrors.New("no versions")
 	}
-	for i := 1; i < len(vl.Versions); i++ {
-		if vl.Versions[i-1].Major == vl.Versions[i].Major {
+	for i := 0; i < len(vl.Versions); i++ {
+		if vl.Versions[i].Major == 0 {
+			return xerrors.Errorf("invalid version: %s", vl.Versions[i].String())
+		}
+		if i > 0 && vl.Versions[i-1].Major == vl.Versions[i].Major {
 			return xerrors.Errorf("duplicate major version: %d", vl.Versions[i].Major)
 		}
-		if vl.Versions[i-1].Major > vl.Versions[i].Major {
+		if i > 0 && vl.Versions[i-1].Major > vl.Versions[i].Major {
 			return xerrors.Errorf("versions are not sorted")
 		}
 	}
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ func ParseRPCVersionList(str string) (RPCVersionList, error) {`
`79`	`79`	`for i, v := range split {`
`80`	`80`	`version, err := ParseRPCVersion(v)`
`81`	`81`	`if err != nil {`
`82`		`- return RPCVersionList{}, xerrors.Errorf("invalid version string: %s", v)`
	`82`	`+ return RPCVersionList{}, xerrors.Errorf("invalid version list: %s", str)`
`83`	`83`	`}`
`84`	`84`	`versions[i] = version`
`85`	`85`	`}`
`@@ -105,11 +105,14 @@ func (vl RPCVersionList) Validate() error {`
`105`	`105`	`if len(vl.Versions) == 0 {`
`106`	`106`	`return xerrors.New("no versions")`
`107`	`107`	`}`
`108`		`- for i := 1; i < len(vl.Versions); i++ {`
`109`		`- if vl.Versions[i-1].Major == vl.Versions[i].Major {`
	`108`	`+ for i := 0; i < len(vl.Versions); i++ {`
	`109`	`+ if vl.Versions[i].Major == 0 {`
	`110`	`+ return xerrors.Errorf("invalid version: %s", vl.Versions[i].String())`
	`111`	`+ }`
	`112`	`+ if i > 0 && vl.Versions[i-1].Major == vl.Versions[i].Major {`
`110`	`113`	`return xerrors.Errorf("duplicate major version: %d", vl.Versions[i].Major)`
`111`	`114`	`}`
`112`		`- if vl.Versions[i-1].Major > vl.Versions[i].Major {`
	`115`	`+ if i > 0 && vl.Versions[i-1].Major > vl.Versions[i].Major {`
`113`	`116`	`return xerrors.Errorf("versions are not sorted")`
`114`	`117`	`}`
`115`	`118`	`}`