From: Grigorii Demidov <grigorii.demidov@nic.cz>
Date: Thu, 19 Apr 2018 14:02:30 +0000 (+0200)
Subject: daemon/worker: fix misplaced timer stop
X-Git-Tag: v2.3.0^2~2^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22a1c3cbc1e14b9782e3960bf6e22a7fcf04d2d7;p=thirdparty%2Fknot-resolver.git

daemon/worker: fix misplaced timer stop

fixup! 8ea37cc3 daemon/worker: robustness against the slow-lorris attack
---

diff --git a/daemon/worker.c b/daemon/worker.c
index e7d7d9e97..8826c4b1c 100644
--- a/daemon/worker.c
+++ b/daemon/worker.c
@@ -2301,8 +2301,8 @@ int worker_process_tcp(struct worker_ctx *worker, uv_stream_t *handle,
 			if (session->outgoing) {
 				/* To prevent slow lorris attack restart watchdog only after
 				* the whole message was successfully assembled and parsed */
-				uv_timer_stop(&session->timeout);
 				if (session->tasks.len > 0 || session->waiting.len > 0) {
+					uv_timer_stop(&session->timeout);
 					timer_start(session, on_tcp_watchdog_timeout, MAX_TCP_INACTIVITY, 0);
 				}
 			} else {