4535. [bug] Address race condition in setting / testing of

                        DNS_REQUEST_F_SENDING. [RT #43889]

(cherry picked from commit 37a8db0ba480605665f59a8f29a1513913a20dbd)

diff --git a/CHANGES b/CHANGES
index 4183027c9eeca4649e54fd877589d7348607bd1d..024349ea50909faa286d4875c3447944384dd3d2 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4535.  [bug]           Address race condition in setting / testing of
+                       DNS_REQUEST_F_SENDING. [RT #43889]
+
 4534.  [bug]           Only set RD, RA and CD in QUERY responses. [RT #43879]
 
 4533.  [bug]           dns_client_update should terminate on prerequisite

diff --git a/lib/dns/request.c b/lib/dns/request.c
index c2a053a4a074caf6557a29d824a094d6732f1599..5bc1245f96c3cb257af71e8d25ceec3ab04d954a 100644 (file)
--- a/lib/dns/request.c
+++ b/lib/dns/request.c
@@ -454,10 +454,11 @@ req_send(dns_request_t *request, isc_task_t *task, isc_sockaddr_t *address) {
                sendevent->dscp = request->dscp;
        }
 
+       request->flags |= DNS_REQUEST_F_SENDING;
        result = isc_socket_sendto2(sock, &r, task, address, NULL,
                                    sendevent, 0);
-       if (result == ISC_R_SUCCESS)
-               request->flags |= DNS_REQUEST_F_SENDING;
+       if (result != ISC_R_SUCCESS)
+               request->flags &= ~DNS_REQUEST_F_SENDING;
        return (result);
 }