From: W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Date: Mon, 23 Nov 2020 08:40:15 +0000 (+0100)
Subject: stream reuse, review comments.
X-Git-Tag: release-1.13.0rc1~5^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8143ce6967f640f3b538c180ca92b41e1b7c9b06;p=thirdparty%2Funbound.git

stream reuse, review comments.
---

diff --git a/services/outside_network.c b/services/outside_network.c
index a6d787e6d..d0dac9087 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -971,16 +971,17 @@ outnet_tcp_cb(struct comm_point* c, void* arg, int error,
 	struct waiting_tcp* w = NULL;
 	verbose(VERB_ALGO, "outnettcp cb");
 	if(error == NETEVENT_TIMEOUT) {
-		if(pend->c->tcp_write_and_read)
+		if(pend->c->tcp_write_and_read) {
 			verbose(VERB_QUERY, "outnettcp got tcp timeout "
 				"for read, ignored because write underway");
-		else verbose(VERB_QUERY, "outnettcp got tcp timeout %s",
-			(pend->reuse.tree_by_id.count?"for reading pkt":
-			"for keepalive for reuse"));
-		/* if we are writing, ignore readtimer, wait for write timer
-		 * or write is done */
-		if(pend->c->tcp_write_and_read)
+			/* if we are writing, ignore readtimer, wait for write timer
+			 * or write is done */
 			return 0;
+		} else {
+			verbose(VERB_QUERY, "outnettcp got tcp timeout %s",
+				(pend->reuse.tree_by_id.count?"for reading pkt":
+				"for keepalive for reuse"));
+		}
 		/* must be timeout for reading or keepalive reuse,
 		 * close it. */
 		reuse_tcp_remove_tree_list(outnet, &pend->reuse);