Call dns_adb_endudpfetch() on error path, if required

For UDP queries, after calling dns_adb_beginudpfetch() in fctx_query(),
make sure that dns_adb_endudpfetch() is also called on error path, in
order to adjust the quota back.

(cherry picked from commit 5da79e2be0)
This commit is contained in:
Aram Sargsyan
2022-10-21 08:46:43 +00:00
parent 5e2c20a88c
commit c3660564ce
+9 -1
View File
@@ -2309,7 +2309,7 @@ fctx_query(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo,
result = resquery_send(query);
if (result != ISC_R_SUCCESS) {
goto cleanup_dispatch;
goto cleanup_udpfetch;
}
}
@@ -2335,6 +2335,14 @@ fctx_query(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo,
cleanup_socket:
isc_socket_detach(&query->tcpsocket);
cleanup_udpfetch:
if (!RESQUERY_CANCELED(query)) {
if ((query->options & DNS_FETCHOPT_TCP) == 0) {
/* Inform the ADB that we're ending a UDP fetch */
dns_adb_endudpfetch(fctx->adb, addrinfo);
}
}
cleanup_dispatch:
if (query->dispatch != NULL) {
dns_dispatch_detach(&query->dispatch);