Merge branch 'master' into staging-server

Psiphon-Labs · May 15, 2023 · 2d8440f · 2d8440f
2 parents 461b94c + 2d27cdc
commit 2d8440f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/psiphon/common/obfuscator/passthrough_test.go b/psiphon/common/obfuscator/passthrough_test.go
@@ -123,7 +123,7 @@ func TestTLSPassthrough(t *testing.T) {
 				timeDiff = -timeDiff
 			}
 
-			if timeDiff.Microseconds() > 100 {
+			if timeDiff.Microseconds() > 500 {
 				t.Fatalf("unexpected elapsed time difference")
 			}
 		})

diff --git a/psiphon/server/meek.go b/psiphon/server/meek.go
@@ -1650,7 +1650,7 @@ func (conn *meekConn) SetReplay(PRNG *prng.PRNG) {
 
 	if conn.meekServer.normalizer != nil {
 		// The underlying conn is wrapped with a normalizer.
-		normalizer, ok := conn.meekSession.underlyingConn.(*transforms.HTTPNormalizer)
+		normalizer, ok := underlyingConn.(*transforms.HTTPNormalizer)
 		if ok {
 			underlyingConn = normalizer.Conn
 		}
@@ -1674,7 +1674,7 @@ func (conn *meekConn) GetReplay() (*prng.Seed, bool) {
 
 	if conn.meekServer.normalizer != nil {
 		// The underlying conn is wrapped with a normalizer.
-		normalizer, ok := conn.meekSession.underlyingConn.(*transforms.HTTPNormalizer)
+		normalizer, ok := underlyingConn.(*transforms.HTTPNormalizer)
 		if ok {
 			underlyingConn = normalizer.Conn
 		}