Explorar el Código

Updated QUIC server Source Connection ID Length

Amir Khan hace 2 años
padre
commit
3ab7eb7a4c
Se han modificado 4 ficheros con 6 adiciones y 9 borrados
  1. 1 1
      go.mod
  2. 2 6
      go.sum
  3. 2 1
      vendor/github.com/Psiphon-Labs/quic-go/internal/protocol/params.go
  4. 1 1
      vendor/modules.txt

+ 1 - 1
go.mod

@@ -18,7 +18,7 @@ require (
 	github.com/Psiphon-Inc/rotate-safe-writer v0.0.0-20210303140923-464a7a37606e
 	github.com/Psiphon-Inc/rotate-safe-writer v0.0.0-20210303140923-464a7a37606e
 	github.com/Psiphon-Labs/bolt v0.0.0-20200624191537-23cedaef7ad7
 	github.com/Psiphon-Labs/bolt v0.0.0-20200624191537-23cedaef7ad7
 	github.com/Psiphon-Labs/goptlib v0.0.0-20200406165125-c0e32a7a3464
 	github.com/Psiphon-Labs/goptlib v0.0.0-20200406165125-c0e32a7a3464
-	github.com/Psiphon-Labs/quic-go v0.0.0-20230614195241-44655521e44b
+	github.com/Psiphon-Labs/quic-go v0.0.0-20230626192210-73f29effc9da
 	github.com/Psiphon-Labs/tls-tris v0.0.0-20210713133851-676a693d51ad
 	github.com/Psiphon-Labs/tls-tris v0.0.0-20210713133851-676a693d51ad
 	github.com/armon/go-proxyproto v0.0.0-20180202201750-5b7edb60ff5f
 	github.com/armon/go-proxyproto v0.0.0-20180202201750-5b7edb60ff5f
 	github.com/bifurcation/mint v0.0.0-20180306135233-198357931e61
 	github.com/bifurcation/mint v0.0.0-20180306135233-198357931e61

+ 2 - 6
go.sum

@@ -14,12 +14,8 @@ github.com/Psiphon-Labs/qtls-go1-19 v0.0.0-20230608213623-d58aa73e519a h1:O8D+Gc
 github.com/Psiphon-Labs/qtls-go1-19 v0.0.0-20230608213623-d58aa73e519a/go.mod h1:81bbD3bvEvi3BSamZb30PgvPvqwSLfEPqwwmq5sx7fc=
 github.com/Psiphon-Labs/qtls-go1-19 v0.0.0-20230608213623-d58aa73e519a/go.mod h1:81bbD3bvEvi3BSamZb30PgvPvqwSLfEPqwwmq5sx7fc=
 github.com/Psiphon-Labs/qtls-go1-20 v0.0.0-20230608214729-dd57d6787acf h1:bGS+WxWdHHuf42hn3M1GFSJbzCgtKNVTuiRqwCo3zyc=
 github.com/Psiphon-Labs/qtls-go1-20 v0.0.0-20230608214729-dd57d6787acf h1:bGS+WxWdHHuf42hn3M1GFSJbzCgtKNVTuiRqwCo3zyc=
 github.com/Psiphon-Labs/qtls-go1-20 v0.0.0-20230608214729-dd57d6787acf/go.mod h1:wUiSd0qyefymNlikc99B2rRC01YPN1uUvDMytMOGmF8=
 github.com/Psiphon-Labs/qtls-go1-20 v0.0.0-20230608214729-dd57d6787acf/go.mod h1:wUiSd0qyefymNlikc99B2rRC01YPN1uUvDMytMOGmF8=
-github.com/Psiphon-Labs/quic-go v0.0.0-20230608212323-c51576c9a3d5 h1:r0/f9ztI1KygYgkyXmKCtzGXEV3J2Dfl1d6vRHzftig=
-github.com/Psiphon-Labs/quic-go v0.0.0-20230608212323-c51576c9a3d5/go.mod h1:wTIxqsKVrEQIxVIIYOEHuscY+PM3h6Wz79u5aF60fo0=
-github.com/Psiphon-Labs/quic-go v0.0.0-20230614192914-1a4b04988030 h1:MSlNdUKy1zZtkYSgm/p2v3B6+AKxWbPzFTZjRi1yiGg=
-github.com/Psiphon-Labs/quic-go v0.0.0-20230614192914-1a4b04988030/go.mod h1:wTIxqsKVrEQIxVIIYOEHuscY+PM3h6Wz79u5aF60fo0=
-github.com/Psiphon-Labs/quic-go v0.0.0-20230614195241-44655521e44b h1:CP226ehTcuzIZRLpKxVd3TZhwh9iOlKa5co7pnrobFM=
-github.com/Psiphon-Labs/quic-go v0.0.0-20230614195241-44655521e44b/go.mod h1:wTIxqsKVrEQIxVIIYOEHuscY+PM3h6Wz79u5aF60fo0=
+github.com/Psiphon-Labs/quic-go v0.0.0-20230626192210-73f29effc9da h1:TI2+ExyFR3A0kPrFHfaM6y3RybP0HGfP9N1R8hfZzfk=
+github.com/Psiphon-Labs/quic-go v0.0.0-20230626192210-73f29effc9da/go.mod h1:wTIxqsKVrEQIxVIIYOEHuscY+PM3h6Wz79u5aF60fo0=
 github.com/Psiphon-Labs/tls-tris v0.0.0-20210713133851-676a693d51ad h1:m6HS84+b5xDPLj7D/ya1CeixyaHOCZoMbBilJ48y+Ts=
 github.com/Psiphon-Labs/tls-tris v0.0.0-20210713133851-676a693d51ad h1:m6HS84+b5xDPLj7D/ya1CeixyaHOCZoMbBilJ48y+Ts=
 github.com/Psiphon-Labs/tls-tris v0.0.0-20210713133851-676a693d51ad/go.mod h1:v3y9GXFo9Sf2mO6auD2ExGG7oDgrK8TI7eb49ZnUxrE=
 github.com/Psiphon-Labs/tls-tris v0.0.0-20210713133851-676a693d51ad/go.mod h1:v3y9GXFo9Sf2mO6auD2ExGG7oDgrK8TI7eb49ZnUxrE=
 github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412 h1:w1UutsfOrms1J05zt7ISrnJIXKzwaspym5BTKGx93EI=
 github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412 h1:w1UutsfOrms1J05zt7ISrnJIXKzwaspym5BTKGx93EI=

+ 2 - 1
vendor/github.com/Psiphon-Labs/quic-go/internal/protocol/params.go

@@ -152,9 +152,10 @@ const MaxNumAckRanges = 32
 // Example: For a packet pacing delay of 200μs, we would send 5 packets at once, wait for 1ms, and so forth.
 // Example: For a packet pacing delay of 200μs, we would send 5 packets at once, wait for 1ms, and so forth.
 const MinPacingDelay = time.Millisecond
 const MinPacingDelay = time.Millisecond
 
 
+// [Psiphon]
 // DefaultConnectionIDLength is the connection ID length that is used for multiplexed connections
 // DefaultConnectionIDLength is the connection ID length that is used for multiplexed connections
 // if no other value is configured.
 // if no other value is configured.
-const DefaultConnectionIDLength = 4
+const DefaultConnectionIDLength = 8
 
 
 // MaxActiveConnectionIDs is the number of connection IDs that we're storing.
 // MaxActiveConnectionIDs is the number of connection IDs that we're storing.
 const MaxActiveConnectionIDs = 4
 const MaxActiveConnectionIDs = 4

+ 1 - 1
vendor/modules.txt

@@ -22,7 +22,7 @@ github.com/Psiphon-Labs/qtls-go1-19
 # github.com/Psiphon-Labs/qtls-go1-20 v0.0.0-20230608214729-dd57d6787acf
 # github.com/Psiphon-Labs/qtls-go1-20 v0.0.0-20230608214729-dd57d6787acf
 ## explicit; go 1.20
 ## explicit; go 1.20
 github.com/Psiphon-Labs/qtls-go1-20
 github.com/Psiphon-Labs/qtls-go1-20
-# github.com/Psiphon-Labs/quic-go v0.0.0-20230614195241-44655521e44b
+# github.com/Psiphon-Labs/quic-go v0.0.0-20230626192210-73f29effc9da
 ## explicit; go 1.19
 ## explicit; go 1.19
 github.com/Psiphon-Labs/quic-go
 github.com/Psiphon-Labs/quic-go
 github.com/Psiphon-Labs/quic-go/http3
 github.com/Psiphon-Labs/quic-go/http3