Add log message when hard quota is reached in TCP accept

When isc_quota_attach_cb() API returns ISC_R_QUOTA (meaning hard quota
was reached) the accept_connection() would return without logging a
message about quota reached.

Change the connection callback to log the quota reached message.

diff --git a/lib/isc/netmgr/tcp.c b/lib/isc/netmgr/tcp.c
index d97c2b486c66d5594edbb48769780c3d9fb74a4c..b0034b9cbf2113839dc712d0fd25c2bc4c3c0ce0 100644 (file)
--- a/lib/isc/netmgr/tcp.c
+++ b/lib/isc/netmgr/tcp.c
@@ -628,7 +628,7 @@ tcp_connection_cb(uv_stream_t *server, int status) {
                                             &ssock->quotacb);
                if (result == ISC_R_QUOTA) {
                        isc__nm_incstats(ssock, STATID_ACCEPTFAIL);
-                       return;
+                       goto done;
                }
        }
 

diff --git a/lib/isc/netmgr/tcpdns.c b/lib/isc/netmgr/tcpdns.c
index 8999207e0a50fd3cafb29323c634ec8825427427..21d1ab5bc6b225cfca1c26fbdf5d0746248eac56 100644 (file)
--- a/lib/isc/netmgr/tcpdns.c
+++ b/lib/isc/netmgr/tcpdns.c
@@ -597,7 +597,7 @@ tcpdns_connection_cb(uv_stream_t *server, int status) {
                                             &ssock->quotacb);
                if (result == ISC_R_QUOTA) {
                        isc__nm_incstats(ssock, STATID_ACCEPTFAIL);
-                       return;
+                       goto done;
                }
        }
 

diff --git a/lib/isc/netmgr/tlsdns.c b/lib/isc/netmgr/tlsdns.c
index 135a854662c0a03beea0c237df046e79ff6942f9..d56c82857ada259f1dfdbda787d8f48bc2d286cd 100644 (file)
--- a/lib/isc/netmgr/tlsdns.c
+++ b/lib/isc/netmgr/tlsdns.c
@@ -670,7 +670,7 @@ tlsdns_connection_cb(uv_stream_t *server, int status) {
                                             &ssock->quotacb);
                if (result == ISC_R_QUOTA) {
                        isc__nm_incstats(ssock, STATID_ACCEPTFAIL);
-                       return;
+                       goto done;
                }
        }