From 22d5e599726d44fa06b0f9970906076f0f33bde1 Mon Sep 17 00:00:00 2001 From: Max Lv Date: Wed, 30 Oct 2019 09:44:58 +0800 Subject: [PATCH] Remove request timeout --- src/jconf.h | 1 - src/server.c | 9 ++------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/jconf.h b/src/jconf.h index 59408c54..4c88a823 100644 --- a/src/jconf.h +++ b/src/jconf.h @@ -27,7 +27,6 @@ #define MAX_DSCP_NUM 64 #define MAX_CONF_SIZE (128 * 1024) #define MAX_CONNECT_TIMEOUT 10 -#define MAX_REQUEST_TIMEOUT 30 #define MIN_TCP_IDLE_TIMEOUT (24 * 3600) #define MIN_UDP_TIMEOUT 10 diff --git a/src/server.c b/src/server.c index 43acc69c..a6867434 100644 --- a/src/server.c +++ b/src/server.c @@ -706,8 +706,6 @@ server_recv_cb(EV_P_ ev_io *w, int revents) buf = remote->buf; // Only timer the watcher if a valid connection is established - int timeout = max(MIN_TCP_IDLE_TIMEOUT, server->listen_ctx->timeout); - ev_timer_set(&server->recv_ctx->watcher, timeout, timeout); ev_timer_again(EV_A_ & server->recv_ctx->watcher); } @@ -1114,8 +1112,6 @@ remote_recv_cb(EV_P_ ev_io *w, int revents) return; } - int timeout = max(MIN_TCP_IDLE_TIMEOUT, server->listen_ctx->timeout); - ev_timer_set(&server->recv_ctx->watcher, timeout, timeout); ev_timer_again(EV_A_ & server->recv_ctx->watcher); ssize_t r = recv(remote->fd, server->buf->data, SOCKET_BUF_SIZE, 0); @@ -1396,12 +1392,11 @@ new_server(int fd, listen_ctx_t *listener) crypto->ctx_init(crypto->cipher, server->e_ctx, 1); crypto->ctx_init(crypto->cipher, server->d_ctx, 0); - int request_timeout = min(MAX_REQUEST_TIMEOUT, listener->timeout); - + int timeout = max(MIN_TCP_IDLE_TIMEOUT, server->listen_ctx->timeout); ev_io_init(&server->recv_ctx->io, server_recv_cb, fd, EV_READ); ev_io_init(&server->send_ctx->io, server_send_cb, fd, EV_WRITE); ev_timer_init(&server->recv_ctx->watcher, server_timeout_cb, - request_timeout, request_timeout); + timeout, timeout); cork_dllist_add(&connections, &server->entries);