From 3a27ff823921397af6cc1be2692055e78c3ca8e3 Mon Sep 17 00:00:00 2001 From: Darien Raymond Date: Wed, 27 Sep 2017 21:09:13 +0200 Subject: [PATCH] increase default timeout to 5 minutes --- proxy/dokodemo/dokodemo.go | 2 +- proxy/http/server.go | 2 +- proxy/shadowsocks/client.go | 2 +- proxy/socks/client.go | 2 +- proxy/socks/server.go | 2 +- proxy/vmess/outbound/outbound.go | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/proxy/dokodemo/dokodemo.go b/proxy/dokodemo/dokodemo.go index 33bcb120f..23819e2b5 100644 --- a/proxy/dokodemo/dokodemo.go +++ b/proxy/dokodemo/dokodemo.go @@ -62,7 +62,7 @@ func (d *DokodemoDoor) Process(ctx context.Context, network net.Network, conn in timeout := time.Second * time.Duration(d.config.Timeout) if timeout == 0 { - timeout = time.Minute * 2 + timeout = time.Minute * 5 } ctx, timer := signal.CancelAfterInactivity(ctx, timeout) diff --git a/proxy/http/server.go b/proxy/http/server.go index a515e7072..b13b75d46 100644 --- a/proxy/http/server.go +++ b/proxy/http/server.go @@ -125,7 +125,7 @@ func (s *Server) handleConnect(ctx context.Context, request *http.Request, reade timeout := time.Second * time.Duration(s.config.Timeout) if timeout == 0 { - timeout = time.Minute * 2 + timeout = time.Minute * 5 } ctx, timer := signal.CancelAfterInactivity(ctx, timeout) ray, err := dispatcher.Dispatch(ctx, dest) diff --git a/proxy/shadowsocks/client.go b/proxy/shadowsocks/client.go index dd1a5177c..8177fa08d 100644 --- a/proxy/shadowsocks/client.go +++ b/proxy/shadowsocks/client.go @@ -91,7 +91,7 @@ func (v *Client) Process(ctx context.Context, outboundRay ray.OutboundRay, diale request.Option |= RequestOptionOneTimeAuth } - ctx, timer := signal.CancelAfterInactivity(ctx, time.Minute*2) + ctx, timer := signal.CancelAfterInactivity(ctx, time.Minute*5) if request.Command == protocol.RequestCommandTCP { bufferedWriter := buf.NewBufferedWriter(conn) diff --git a/proxy/socks/client.go b/proxy/socks/client.go index 5e57044c6..e227e3b28 100644 --- a/proxy/socks/client.go +++ b/proxy/socks/client.go @@ -84,7 +84,7 @@ func (c *Client) Process(ctx context.Context, ray ray.OutboundRay, dialer proxy. return newError("failed to establish connection to server").AtWarning().Base(err) } - ctx, timer := signal.CancelAfterInactivity(ctx, time.Minute*2) + ctx, timer := signal.CancelAfterInactivity(ctx, time.Minute*5) var requestFunc func() error var responseFunc func() error diff --git a/proxy/socks/server.go b/proxy/socks/server.go index a7e3a0ca4..3bef8f5c9 100644 --- a/proxy/socks/server.go +++ b/proxy/socks/server.go @@ -108,7 +108,7 @@ func (*Server) handleUDP() error { func (v *Server) transport(ctx context.Context, reader io.Reader, writer io.Writer, dest net.Destination, dispatcher dispatcher.Interface) error { timeout := time.Second * time.Duration(v.config.Timeout) if timeout == 0 { - timeout = time.Minute * 2 + timeout = time.Minute * 5 } ctx, timer := signal.CancelAfterInactivity(ctx, timeout) diff --git a/proxy/vmess/outbound/outbound.go b/proxy/vmess/outbound/outbound.go index 9fb6d9425..27c417769 100644 --- a/proxy/vmess/outbound/outbound.go +++ b/proxy/vmess/outbound/outbound.go @@ -104,7 +104,7 @@ func (v *Handler) Process(ctx context.Context, outboundRay ray.OutboundRay, dial session := encoding.NewClientSession(protocol.DefaultIDHash) - ctx, timer := signal.CancelAfterInactivity(ctx, time.Minute*2) + ctx, timer := signal.CancelAfterInactivity(ctx, time.Minute*5) requestDone := signal.ExecuteAsync(func() error { writer := buf.NewBufferedWriter(conn)