daemon: restart client's tcp session timeout timer right after answer

diff --git a/daemon/io.c b/daemon/io.c
index 64de774c2d495cf6f315188b6af8f76010ebf257..6a59a5ac0b276127823fb750560e4ef536ceacbc 100644 (file)
--- a/daemon/io.c
+++ b/daemon/io.c
@@ -213,7 +213,7 @@ static void tcp_timeout_trigger(uv_timer_t *timer)
        assert(session->outgoing == false);
        if (session->tasks.len > 0) {
                uv_timer_again(timer);
-       } else {
+       } else if (!session->closing) {
                uv_timer_stop(timer);
                worker_session_close(session);
        }

diff --git a/daemon/worker.c b/daemon/worker.c
index 29e335df733901286cde750fcd24c4af2a31a7b8..7f099741fc8f8809a11271b03c3d254c954f2dc7 100644 (file)
--- a/daemon/worker.c
+++ b/daemon/worker.c
@@ -1412,6 +1412,11 @@ static int qr_task_finalize(struct qr_task *task, int state)
                (void) qr_task_send(task, handle,
                                    (struct sockaddr *)&ctx->source.addr,
                                    ctx->req.answer);
+               if (handle->type == UV_TCP) {
+                       /* Don't try to close source session at least
+                        * retry_interval_for_timeout_timer milliseconds */
+                       uv_timer_again(&ctx->source.session->timeout);
+               }
        } else {
                (void) qr_task_on_send(task, NULL, kr_error(EIO));
        }