From 61922ce9dacb7f4088d66d38ba1644170cc46105 Mon Sep 17 00:00:00 2001 From: "W.C.A. Wijngaards" Date: Mon, 19 Oct 2020 13:39:02 +0200 Subject: [PATCH] - Clean the fix for out of order TCP processing limits on number of queries. It was tested to work. --- doc/Changelog | 2 ++ services/listen_dnsport.c | 6 +----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/doc/Changelog b/doc/Changelog index 3f1c70a8d..89c26958f 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -14,6 +14,8 @@ - Log ip address when http session recv fails, eg. due to tls fail. - Fix to set the tcp handler event toggle flag back to default when the handler structure is reused. + - Clean the fix for out of order TCP processing limits on number + of queries. It was tested to work. 16 October 2020: Wouter - Fix that the out of order TCP processing does not limit the diff --git a/services/listen_dnsport.c b/services/listen_dnsport.c index d4f912db5..e506eeb31 100644 --- a/services/listen_dnsport.c +++ b/services/listen_dnsport.c @@ -81,9 +81,6 @@ /** number of queued TCP connections for listen() */ #define TCP_BACKLOG 256 -/** number of simultaneous requests a client can have */ -/* #define TCP_MAX_REQ_SIMULTANEOUS 32 */ - #ifndef THREADS_DISABLED /** lock on the counter of stream buffer memory */ static lock_basic_type stream_wait_count_lock; @@ -1809,8 +1806,7 @@ tcp_req_info_setup_listen(struct tcp_req_info* req) if(!req->cp->tcp_is_reading) wr = 1; - if(/*req->num_open_req + req->num_done_req < TCP_MAX_REQ_SIMULTANEOUS &&*/ - !req->read_is_closed) + if(!req->read_is_closed) rd = 1; if(wr) {