]> git.ipfire.org Git - thirdparty/unbound.git/commitdiff
stream reuse, review comments.
authorW.C.A. Wijngaards <wouter@nlnetlabs.nl>
Mon, 23 Nov 2020 08:40:15 +0000 (09:40 +0100)
committerW.C.A. Wijngaards <wouter@nlnetlabs.nl>
Mon, 23 Nov 2020 08:40:15 +0000 (09:40 +0100)
services/outside_network.c

index a6d787e6dd093647d2a3e8c8df0c96d0200f618a..d0dac9087e96dfe036c0ea5a301c18bdb4303df4 100644 (file)
@@ -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);