move maxbuffers test to allocate_udp_buffer

diff --git a/lib/dns/dispatch.c b/lib/dns/dispatch.c
index 2e534d26c3bf819093784651a733292170f43b23..c70ee9fa2515155603293c506e086dba59f020ca 100644 (file)
--- a/lib/dns/dispatch.c
+++ b/lib/dns/dispatch.c
@@ -915,6 +915,10 @@ allocate_udp_buffer(dns_dispatch_t *disp) {
        void *temp;
 
        LOCK(&disp->mgr->buffer_lock);
+       if (disp->mgr->buffers >= disp->mgr->maxbuffers) {
+               UNLOCK(&disp->mgr->buffer_lock);
+               return (NULL);
+       }
        bpool = disp->mgr->bpool;
        disp->mgr->buffers++;
        UNLOCK(&disp->mgr->buffer_lock);
@@ -1500,15 +1504,6 @@ startrecv(dns_dispatch_t *disp, dispsocket_t *dispsock) {
        if (disp->recv_pending != 0 && dispsock == NULL)
                return (ISC_R_SUCCESS);
 
-       if (disp->socktype == isc_sockettype_udp) {
-               LOCK(&disp->mgr->buffer_lock);
-               if (disp->mgr->buffers >= disp->mgr->maxbuffers) {
-                       UNLOCK(&disp->mgr->buffer_lock);
-                       return (ISC_R_NOMEMORY);
-               }
-               UNLOCK(&disp->mgr->buffer_lock);
-       }
-
        if ((disp->attributes & DNS_DISPATCHATTR_EXCLUSIVE) != 0 &&
            dispsock == NULL)
                return (ISC_R_SUCCESS);