From 5383308b6af100a25e625c93841e2b0d68823c86 Mon Sep 17 00:00:00 2001 From: Mingye Chen Date: Tue, 14 Nov 2023 14:19:20 -0500 Subject: [PATCH] Increase proxy stall timeout (#263) Increase proxy stall timeout while ensuring that sessions transferring 0 bytes still timeout at 30s. --- pkg/station/lib/proxies.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkg/station/lib/proxies.go b/pkg/station/lib/proxies.go index fba7171a..76ec5424 100644 --- a/pkg/station/lib/proxies.go +++ b/pkg/station/lib/proxies.go @@ -17,7 +17,8 @@ import ( "github.com/refraction-networking/conjure/pkg/station/log" ) -const proxyStallTimeout = 30 * time.Second +const proxyStallTimeout = 2 * time.Minute +const proxyInitTimeout = 30 * time.Second const resetIfNotClosedAfter = 10 // seconds var ( @@ -119,12 +120,12 @@ func halfPipe(src net.Conn, dst net.Conn, }() // Set deadlines in case either side disappears. - err := src.SetDeadline(time.Now().Add(proxyStallTimeout)) + err := src.SetDeadline(time.Now().Add(proxyInitTimeout)) if err != nil { logger.Errorln("error setting deadline for src conn: ", tag) return } - err = dst.SetDeadline(time.Now().Add(proxyStallTimeout)) + err = dst.SetDeadline(time.Now().Add(proxyInitTimeout)) if err != nil { logger.Errorln("error setting deadline for dst conn: ", tag) return