mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 14:07:59 +00:00
Code Issues Releases Wiki Activity

Document under what conditions client_allocsendbuf() is allowed to return

Browse Source 
ISC_R_NOSPACE.  Add an INSIST to catch changes to callers.
This commit is contained in:
Mark Andrews
2001-03-06 04:18:42 +00:00
parent 668acc6107
commit 0c13f7af64
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
bin/named/client.c
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: client.c,v 1.156 2001/03/06 01:24:38 bwelling Exp $ */ /* $Id: client.c,v 1.157 2001/03/06 04:18:42 marka Exp $ */
#include <config.h> #include <config.h>
@@ -654,6 +654,14 @@ client_senddone(isc_task_t *task, isc_event_t *event) {
ns_client_next(client, ISC_R_SUCCESS); ns_client_next(client, ISC_R_SUCCESS);
} }
/*
* We only want to fail with ISC_R_NOSPACE when called from
* ns_client_sendraw() and not when called from ns_client_send(),
* tcpbuffer is NULL when called from ns_client_sendraw() and
* length != 0. tcpbuffer != NULL when called from ns_client_send()
* and length == 0.
*/
static isc_result_t static isc_result_t
client_allocsendbuf(ns_client_t *client, isc_buffer_t *buffer, client_allocsendbuf(ns_client_t *client, isc_buffer_t *buffer,
isc_buffer_t *tcpbuffer, isc_uint32_t length, isc_buffer_t *tcpbuffer, isc_uint32_t length,
@@ -664,10 +672,12 @@ client_allocsendbuf(ns_client_t *client, isc_buffer_t *buffer,
isc_result_t result; isc_result_t result;
INSIST(datap != NULL); INSIST(datap != NULL);
INSIST((tcpbuffer == NULL && length != 0) ||
(tcpbuffer != NULL && length == 0));
if (TCP_CLIENT(client)) { if (TCP_CLIENT(client)) {
INSIST(client->tcpbuf == NULL); INSIST(client->tcpbuf == NULL);
if (tcpbuffer == NULL && length + 2 > TCP_BUFFER_SIZE) { if (length + 2 > TCP_BUFFER_SIZE) {
result = ISC_R_NOSPACE; result = ISC_R_NOSPACE;
goto done; goto done;
} }
@@ -690,7 +700,7 @@ client_allocsendbuf(ns_client_t *client, isc_buffer_t *buffer,
bufsize = client->udpsize; bufsize = client->udpsize;
else else
bufsize = SEND_BUFFER_SIZE; bufsize = SEND_BUFFER_SIZE;
if (tcpbuffer == NULL && length > bufsize) { if (length > bufsize) {
result = ISC_R_NOSPACE; result = ISC_R_NOSPACE;
goto done; goto done;
} }