psiphon: fix bug with early proxy shutdown

Signed-off-by: Mark Pashmfouroush <[email protected]>
bepass-org · Mar 15, 2024 · 4ab1358 · 4ab1358
1 parent db5b413
commit 4ab1358
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/psiphon/p.go b/psiphon/p.go
@@ -357,15 +357,16 @@ func RunPsiphon(ctx context.Context, l *slog.Logger, wgBind, localSocksPort, cou
 
 	l.Info("Handshaking, Please Wait...")
 
-	ctx, _ = context.WithTimeout(ctx, 2*time.Minute)
+	childCtx, cancel := context.WithTimeout(ctx, 2*time.Minute)
+	defer cancel()
 	t0 := time.Now()
 	t := time.NewTicker(1 * time.Second)
 	defer t.Stop()
 
 	for {
 		select {
-		case <-ctx.Done():
-			if errors.Is(ctx.Err(), context.Canceled) {
+		case <-childCtx.Done():
+			if errors.Is(childCtx.Err(), context.Canceled) {
 				return errors.New("psiphon handshake operation canceled")
 			}
 			return errors.New("psiphon handshake maximum time exceeded")