Replace custom isc_boolean_t with C standard bool type

2025-08-31 14:35:26 +00:00 · 2018-04-17 08:29:14 -07:00
parent cb6a185c69
commit 994e656977
546 changed files with 10785 additions and 10367 deletions
--- a/lib/ns/client.c
+++ b/lib/ns/client.c
@@ -12,6 +12,7 @@
 #include <config.h>

 #include <inttypes.h>
+#include <stdbool.h>

 #include <isc/aes.h>
 #include <isc/formatcheck.h>
@@ -143,7 +144,7 @@ struct ns_clientmgr {

 	/* Lock covers manager state. */
 	isc_mutex_t			lock;
-	isc_boolean_t			exiting;
+	bool			exiting;

 	/* Lock covers the clients list */
 	isc_mutex_t			listlock;
@@ -238,17 +239,17 @@ struct ns_clientmgr {

 LIBNS_EXTERNAL_DATA unsigned int ns_client_requests;

-static void read_settimeout(ns_client_t *client, isc_boolean_t newconn);
-static void client_read(ns_client_t *client, isc_boolean_t newconn);
+static void read_settimeout(ns_client_t *client, bool newconn);
+static void client_read(ns_client_t *client, bool newconn);
 static void client_accept(ns_client_t *client);
 static void client_udprecv(ns_client_t *client);
 static void clientmgr_destroy(ns_clientmgr_t *manager);
-static isc_boolean_t exit_check(ns_client_t *client);
+static bool exit_check(ns_client_t *client);
 static void ns_client_endrequest(ns_client_t *client);
 static void client_start(isc_task_t *task, isc_event_t *event);
 static void ns_client_dumpmessage(ns_client_t *client, const char *reason);
 static isc_result_t get_client(ns_clientmgr_t *manager, ns_interface_t *ifp,
-			       dns_dispatch_t *disp, isc_boolean_t tcp);
+			       dns_dispatch_t *disp, bool tcp);
 static isc_result_t get_worker(ns_clientmgr_t *manager, ns_interface_t *ifp,
 			       isc_socket_t *sock);
 static void compute_cookie(ns_client_t *client, uint32_t when,
@@ -288,8 +289,8 @@ ns_client_settimeout(ns_client_t *client, unsigned int seconds) {

 	isc_interval_set(&interval, seconds, 0);
 	result = isc_timer_reset(client->timer, isc_timertype_once, NULL,
-				 &interval, ISC_FALSE);
-	client->timerset = ISC_TRUE;
+				 &interval, false);
+	client->timerset = true;
 	if (result != ISC_R_SUCCESS) {
 		ns_client_log(client, NS_LOGCATEGORY_CLIENT,
 			      NS_LOGMODULE_CLIENT, ISC_LOG_ERROR,
@@ -300,7 +301,7 @@ ns_client_settimeout(ns_client_t *client, unsigned int seconds) {
 }

 static void
-read_settimeout(ns_client_t *client, isc_boolean_t newconn) {
+read_settimeout(ns_client_t *client, bool newconn) {
 	isc_result_t result;
 	isc_interval_t interval;
 	unsigned int ds;
@@ -314,8 +315,8 @@ read_settimeout(ns_client_t *client, isc_boolean_t newconn) {

 	isc_interval_set(&interval, ds / 10, 100000000 * (ds % 10));
 	result = isc_timer_reset(client->timer, isc_timertype_once, NULL,
-				 &interval, ISC_FALSE);
-	client->timerset = ISC_TRUE;
+				 &interval, false);
+	client->timerset = true;
 	if (result != ISC_R_SUCCESS) {
 		ns_client_log(client, NS_LOGCATEGORY_CLIENT,
 			      NS_LOGMODULE_CLIENT, ISC_LOG_ERROR,
@@ -327,20 +328,20 @@ read_settimeout(ns_client_t *client, isc_boolean_t newconn) {

 /*%
 * Check for a deactivation or shutdown request and take appropriate
- * action.  Returns ISC_TRUE if either is in progress; in this case
+ * action.  Returns true if either is in progress; in this case
 * the caller must no longer use the client object as it may have been
 * freed.
 */
-static isc_boolean_t
+static bool
 exit_check(ns_client_t *client) {
-	isc_boolean_t destroy_manager = ISC_FALSE;
+	bool destroy_manager = false;
 	ns_clientmgr_t *manager = NULL;

 	REQUIRE(NS_CLIENT_VALID(client));
 	manager = client->manager;

 	if (client->state <= client->newstate)
-		return (ISC_FALSE); /* Business as usual. */
+		return (false); /* Business as usual. */

 	INSIST(client->newstate < NS_CLIENTSTATE_RECURSING);

@@ -367,7 +368,7 @@ exit_check(ns_client_t *client) {
 		 * Let the update processing complete.
 		 */
 		if (client->nupdates > 0)
-			return (ISC_TRUE);
+			return (true);

 		/*
 		 * We are trying to abort request processing.
@@ -389,7 +390,7 @@ exit_check(ns_client_t *client) {
 			 * Still waiting for I/O cancel completion.
 			 * or lingering references.
 			 */
-			return (ISC_TRUE);
+			return (true);
 		}

 		/*
@@ -415,13 +416,13 @@ exit_check(ns_client_t *client) {

 		if (NS_CLIENTSTATE_READING == client->newstate) {
 			if (!client->pipelined) {
-				client_read(client, ISC_FALSE);
+				client_read(client, false);
 				client->newstate = NS_CLIENTSTATE_MAX;
-				return (ISC_TRUE); /* We're done. */
+				return (true); /* We're done. */
 			} else if (client->mortal) {
 				client->newstate = NS_CLIENTSTATE_INACTIVE;
 			} else
-				return (ISC_FALSE);
+				return (false);
 		}
 	}

@@ -436,12 +437,12 @@ exit_check(ns_client_t *client) {
 			dns_tcpmsg_cancelread(&client->tcpmsg);
 		if (client->nreads != 0) {
 			/* Still waiting for read cancel completion. */
-			return (ISC_TRUE);
+			return (true);
 		}

 		if (client->tcpmsg_valid) {
 			dns_tcpmsg_invalidate(&client->tcpmsg);
-			client->tcpmsg_valid = ISC_FALSE;
+			client->tcpmsg_valid = false;
 		}
 		if (client->tcpsocket != NULL) {
 			CTRACE("closetcp");
@@ -454,13 +455,13 @@ exit_check(ns_client_t *client) {
 		if (client->timerset) {
 			(void)isc_timer_reset(client->timer,
 					      isc_timertype_inactive,
-					      NULL, NULL, ISC_TRUE);
-			client->timerset = ISC_FALSE;
+					      NULL, NULL, true);
+			client->timerset = false;
 		}

-		client->pipelined = ISC_FALSE;
+		client->pipelined = false;

-		client->peeraddr_valid = ISC_FALSE;
+		client->peeraddr_valid = false;

 		client->state = NS_CLIENTSTATE_READY;
 		INSIST(client->recursionquota == NULL);
@@ -481,7 +482,7 @@ exit_check(ns_client_t *client) {
 			LOCK(&client->interface->lock);
 			if (client->interface->ntcpcurrent <
 				    client->interface->ntcptarget)
-				client->mortal = ISC_FALSE;
+				client->mortal = false;
 			UNLOCK(&client->interface->lock);
 		}

@@ -500,7 +501,7 @@ exit_check(ns_client_t *client) {
 			} else
 				client_udprecv(client);
 			client->newstate = NS_CLIENTSTATE_MAX;
-			return (ISC_TRUE);
+			return (true);
 		}
 	}

@@ -516,7 +517,7 @@ exit_check(ns_client_t *client) {

 		/* Still waiting for accept cancel completion. */
 		if (! (client->naccepts == 0))
-			return (ISC_TRUE);
+			return (true);

 		/* Accept cancel is complete. */
 		if (client->nrecvs > 0)
@@ -525,11 +526,11 @@ exit_check(ns_client_t *client) {

 		/* Still waiting for recv cancel completion. */
 		if (! (client->nrecvs == 0))
-			return (ISC_TRUE);
+			return (true);

 		/* Still waiting for control event to be delivered */
 		if (client->nctls > 0)
-			return (ISC_TRUE);
+			return (true);

 		/* Deactivate the client. */
 		if (client->interface)
@@ -547,7 +548,7 @@ exit_check(ns_client_t *client) {
 			dns_dispatch_detach(&client->dispatch);

 		client->attributes = 0;
-		client->mortal = ISC_FALSE;
+		client->mortal = false;
 		client->sendcb = NULL;

 		if (client->keytag != NULL) {
@@ -577,7 +578,7 @@ exit_check(ns_client_t *client) {
 			}
 			if (client->needshutdown)
 				isc_task_shutdown(client->task);
-			return (ISC_TRUE);
+			return (true);
 		}
 	}

@@ -602,7 +603,7 @@ exit_check(ns_client_t *client) {
 			LOCK(&manager->lock);
 			if (manager->exiting &&
 			    ISC_LIST_EMPTY(manager->clients))
-				destroy_manager = ISC_TRUE;
+				destroy_manager = true;
 			UNLOCK(&manager->lock);
 			UNLOCK(&manager->listlock);
 		}
@@ -669,7 +670,7 @@ exit_check(ns_client_t *client) {
 	if (destroy_manager && manager != NULL)
 		clientmgr_destroy(manager);

-	return (ISC_TRUE);
+	return (true);
 }

 /*%
@@ -692,7 +693,7 @@ client_start(isc_task_t *task, isc_event_t *event) {

 	if (TCP_CLIENT(client)) {
 		if (client->pipelined) {
-			client_read(client, ISC_FALSE);
+			client_read(client, false);
 		} else {
 			client_accept(client);
 		}
@@ -731,7 +732,7 @@ client_shutdown(isc_task_t *task, isc_event_t *event) {
 		ISC_QUEUE_UNLINK(client->manager->inactive, client, ilink);

 	client->newstate = NS_CLIENTSTATE_FREED;
-	client->needshutdown = ISC_FALSE;
+	client->needshutdown = false;
 	(void)exit_check(client);
 }

@@ -1063,11 +1064,11 @@ client_send(ns_client_t *client) {
 	isc_buffer_t tcpbuffer;
 	isc_region_t r;
 	dns_compress_t cctx;
-	isc_boolean_t cleanup_cctx = ISC_FALSE;
+	bool cleanup_cctx = false;
 	unsigned char sendbuf[SEND_BUFFER_SIZE];
 	unsigned int render_opts;
 	unsigned int preferred_glue;
-	isc_boolean_t opt_included = ISC_FALSE;
+	bool opt_included = false;
 	size_t respsize;
 	dns_aclenv_t *env = ns_interfacemgr_getaclenv(client->interface->mgr);
 #ifdef HAVE_DNSTAP
@@ -1153,14 +1154,14 @@ client_send(ns_client_t *client) {
 		    !dns_acl_allowed(&netaddr, name,
 				     client->view->nocasecompress, env))
 		{
-			dns_compress_setsensitive(&cctx, ISC_TRUE);
+			dns_compress_setsensitive(&cctx, true);
 		}

-		if (client->view->msgcompression == ISC_FALSE) {
+		if (client->view->msgcompression == false) {
 			dns_compress_disable(&cctx);
 		}
 	}
-	cleanup_cctx = ISC_TRUE;
+	cleanup_cctx = true;

 	result = dns_message_renderbegin(client->message, &cctx, &buffer);
 	if (result != ISC_R_SUCCESS)
@@ -1168,7 +1169,7 @@ client_send(ns_client_t *client) {

 	if (client->opt != NULL) {
 		result = dns_message_setopt(client->message, client->opt);
-		opt_included = ISC_TRUE;
+		opt_included = true;
 		client->opt = NULL;
 		if (result != ISC_R_SUCCESS)
 			goto done;
@@ -1240,7 +1241,7 @@ client_send(ns_client_t *client) {

 	if (cleanup_cctx) {
 		dns_compress_invalidate(&cctx);
-		cleanup_cctx = ISC_FALSE;
+		cleanup_cctx = false;
 	}

 	if (client->sendcb != NULL) {
@@ -1253,7 +1254,7 @@ client_send(ns_client_t *client) {
 		if (client->view != NULL) {
 			dns_dt_send(client->view, dtmsgtype,
 				    &client->peeraddr, &client->destsockaddr,
-				    ISC_TRUE, &zr, &client->requesttime, NULL,
+				    true, &zr, &client->requesttime, NULL,
 				    &buffer);
 		}
 #endif /* HAVE_DNSTAP */
@@ -1283,7 +1284,7 @@ client_send(ns_client_t *client) {
 			dns_dt_send(client->view, dtmsgtype,
 				    &client->peeraddr,
 				    &client->destsockaddr,
-				    ISC_FALSE, &zr,
+				    false, &zr,
 				    &client->requesttime, NULL, &buffer);
 		}
 #endif /* HAVE_DNSTAP */
@@ -1471,7 +1472,7 @@ ns_client_error(ns_client_t *client, isc_result_t result) {
 	 * Try to rate limit error responses.
 	 */
 	if (client->view != NULL && client->view->rrl != NULL) {
-		isc_boolean_t wouldlog;
+		bool wouldlog;
 		char log_buf[DNS_RRL_LOG_BUF_LEN];
 		dns_rrl_result_t rrl_result;
 		int loglevel;
@@ -1527,14 +1528,14 @@ ns_client_error(ns_client_t *client, isc_result_t result) {
 	 * AA and AD shouldn't be set.
 	 */
 	message->flags &= ~(DNS_MESSAGEFLAG_AA | DNS_MESSAGEFLAG_AD);
-	result = dns_message_reply(message, ISC_TRUE);
+	result = dns_message_reply(message, true);
 	if (result != ISC_R_SUCCESS) {
 		/*
 		 * It could be that we've got a query with a good header,
 		 * but a bad question section, so we try again with
-		 * want_question_section set to ISC_FALSE.
+		 * want_question_section set to false.
 		 */
-		result = dns_message_reply(message, ISC_FALSE);
+		result = dns_message_reply(message, false);
 		if (result != ISC_R_SUCCESS) {
 			ns_client_next(client, result);
 			return;
@@ -1590,7 +1591,7 @@ ns_client_error(ns_client_t *client, isc_result_t result) {
 			dns_badcache_add(client->view->failcache,
 					 client->query.qname,
 					 client->query.qtype,
-					 ISC_TRUE, flags, &expire);
+					 true, flags, &expire);
 	}
 	ns_client_send(client);
 }
@@ -2257,12 +2258,12 @@ ns__client_request(isc_task_t *task, isc_event_t *event) {
 	isc_buffer_t tbuffer;
 	dns_rdataset_t *opt;
 	const dns_name_t *signame;
-	isc_boolean_t ra;	/* Recursion available. */
+	bool ra;	/* Recursion available. */
 	isc_netaddr_t netaddr;
 	int match;
 	dns_messageid_t id;
 	unsigned int flags;
-	isc_boolean_t notimp;
+	bool notimp;
 	size_t reqsize;
 	dns_aclenv_t *env;
 #ifdef HAVE_DNSTAP
@@ -2292,7 +2293,7 @@ ns__client_request(isc_task_t *task, isc_event_t *event) {
 		result = sevent->result;
 		if (result == ISC_R_SUCCESS) {
 			client->peeraddr = sevent->address;
-			client->peeraddr_valid = ISC_TRUE;
+			client->peeraddr_valid = true;
 		}
 		if ((sevent->attributes & ISC_SOCKEVENTATTR_DSCP) != 0) {
 			ns_client_log(client, NS_LOGCATEGORY_CLIENT,
@@ -2495,7 +2496,7 @@ ns__client_request(isc_task_t *task, isc_event_t *event) {
 	 * Pipeline TCP query processing.
 	 */
 	if (client->message->opcode != dns_opcode_query)
-		client->pipelined = ISC_FALSE;
+		client->pipelined = false;
 	if (TCP_CLIENT(client) && client->pipelined) {
 		result = isc_quota_reserve(&client->sctx->tcpquota);
 		if (result == ISC_R_SUCCESS)
@@ -2505,7 +2506,7 @@ ns__client_request(isc_task_t *task, isc_event_t *event) {
 				      NS_LOGMODULE_CLIENT, ISC_LOG_WARNING,
 				      "no more TCP clients(read): %s",
 				      isc_result_totext(result));
-			client->pipelined = ISC_FALSE;
+			client->pipelined = false;
 		}
 	}

@@ -2515,11 +2516,11 @@ ns__client_request(isc_task_t *task, isc_event_t *event) {
 	case dns_opcode_query:
 	case dns_opcode_update:
 	case dns_opcode_notify:
-		notimp = ISC_FALSE;
+		notimp = false;
 		break;
 	case dns_opcode_iquery:
 	default:
-		notimp = ISC_TRUE;
+		notimp = true;
 		break;
 	}

@@ -2558,7 +2559,7 @@ ns__client_request(isc_task_t *task, isc_event_t *event) {
 		    client->message->opcode == dns_opcode_query &&
 		    client->message->counts[DNS_SECTION_QUESTION] == 0U)
 		{
-			result = dns_message_reply(client->message, ISC_TRUE);
+			result = dns_message_reply(client->message, true);
 			if (result != ISC_R_SUCCESS) {
 				ns_client_error(client, result);
 				return;
@@ -2769,24 +2770,24 @@ ns__client_request(isc_task_t *task, isc_event_t *event) {
 	 * responses to ordinary queries.  Note if you can't query the
 	 * cache there is no point in setting RA.
 	 */
-	ra = ISC_FALSE;
+	ra = false;
 	if (client->view->resolver != NULL &&
-	    client->view->recursion == ISC_TRUE &&
+	    client->view->recursion == true &&
 	    ns_client_checkaclsilent(client, NULL,
 				     client->view->recursionacl,
-				     ISC_TRUE) == ISC_R_SUCCESS &&
+				     true) == ISC_R_SUCCESS &&
 	    ns_client_checkaclsilent(client, NULL,
 				     client->view->cacheacl,
-				     ISC_TRUE) == ISC_R_SUCCESS &&
+				     true) == ISC_R_SUCCESS &&
 	    ns_client_checkaclsilent(client, &client->destaddr,
 				     client->view->recursiononacl,
-				     ISC_TRUE) == ISC_R_SUCCESS &&
+				     true) == ISC_R_SUCCESS &&
 	    ns_client_checkaclsilent(client, &client->destaddr,
 				     client->view->cacheonacl,
-				     ISC_TRUE) == ISC_R_SUCCESS)
-		ra = ISC_TRUE;
+				     true) == ISC_R_SUCCESS)
+		ra = true;

-	if (ra == ISC_TRUE)
+	if (ra == true)
 		client->attributes |= NS_CLIENTATTR_RA;

 	ns_client_log(client, DNS_LOGCATEGORY_SECURITY, NS_LOGMODULE_CLIENT,
@@ -2961,7 +2962,7 @@ client_create(ns_clientmgr_t *manager, ns_client_t **clientp) {
 				  client, &client->timer);
 	if (result != ISC_R_SUCCESS)
 		goto cleanup_task;
-	client->timerset = ISC_FALSE;
+	client->timerset = false;

 	client->delaytimer = NULL;

@@ -3012,7 +3013,7 @@ client_create(ns_clientmgr_t *manager, ns_client_t **clientp) {
 	client->udpsocket = NULL;
 	client->tcplistener = NULL;
 	client->tcpsocket = NULL;
-	client->tcpmsg_valid = ISC_FALSE;
+	client->tcpmsg_valid = false;
 	client->tcpbuf = NULL;
 	client->opt = NULL;
 	client->udpsize = 512;
@@ -3024,17 +3025,16 @@ client_create(ns_clientmgr_t *manager, ns_client_t **clientp) {
 	client->shutdown_arg = NULL;
 	client->signer = NULL;
 	dns_name_init(&client->signername, NULL);
-	client->mortal = ISC_FALSE;
+	client->mortal = false;
 	client->sendcb = NULL;
-	client->pipelined = ISC_FALSE;
+	client->pipelined = false;
 	client->tcpquota = NULL;
 	client->recursionquota = NULL;
 	client->interface = NULL;
-	client->peeraddr_valid = ISC_FALSE;
+	client->peeraddr_valid = false;
 	dns_ecs_init(&client->ecs);
 	client->filter_aaaa = dns_aaaa_ok;
-	client->needshutdown = ISC_TF((client->sctx->options &
-				       NS_SERVER_CLIENTTEST) != 0);
+	client->needshutdown = (client->sctx->options & NS_SERVER_CLIENTTEST);

 	ISC_EVENT_INIT(&client->ctlevent, sizeof(client->ctlevent), 0, NULL,
 		       NS_EVENT_CLIENTCONTROL, client_start, client, client,
@@ -3103,7 +3103,7 @@ client_create(ns_clientmgr_t *manager, ns_client_t **clientp) {
 }

 static void
-client_read(ns_client_t *client, isc_boolean_t newconn) {
+client_read(ns_client_t *client, bool newconn) {
 	isc_result_t result;

 	CTRACE("read");
@@ -3164,7 +3164,7 @@ client_newconn(isc_task_t *task, isc_event_t *event) {

 		(void)isc_socket_getpeername(client->tcpsocket,
 					     &client->peeraddr);
-		client->peeraddr_valid = ISC_TRUE;
+		client->peeraddr_valid = true;
 		ns_client_log(client, NS_LOGCATEGORY_CLIENT,
 			   NS_LOGMODULE_CLIENT, ISC_LOG_DEBUG(3),
 			   "new TCP connection");
@@ -3207,10 +3207,10 @@ client_newconn(isc_task_t *task, isc_event_t *event) {
 			goto freeevent;
 		}

-		INSIST(client->tcpmsg_valid == ISC_FALSE);
+		INSIST(client->tcpmsg_valid == false);
 		dns_tcpmsg_init(client->mctx, client->tcpsocket,
 				&client->tcpmsg);
-		client->tcpmsg_valid = ISC_TRUE;
+		client->tcpmsg_valid = true;

 		/*
 		 * Let a new client take our place immediately, before
@@ -3218,7 +3218,7 @@ client_newconn(isc_task_t *task, isc_event_t *event) {
 		 * telnetting to port 53 (once per CPU) will
 		 * deny service to legitimate TCP clients.
 		 */
-		client->pipelined = ISC_FALSE;
+		client->pipelined = false;
 		result = isc_quota_attach(&client->sctx->tcpquota,
 					  &client->tcpquota);
 		if (result == ISC_R_SUCCESS)
@@ -3232,10 +3232,10 @@ client_newconn(isc_task_t *task, isc_event_t *event) {
 			   !dns_acl_allowed(&netaddr, NULL,
 					    client->sctx->keepresporder, env))
 		{
-			client->pipelined = ISC_TRUE;
+			client->pipelined = true;
 		}

-		client_read(client, ISC_TRUE);
+		client_read(client, true);
 	}

 freeevent:
@@ -3322,15 +3322,15 @@ ns_client_detach(ns_client_t **clientp) {
 	(void)exit_check(client);
 }

-isc_boolean_t
+bool
 ns_client_shuttingdown(ns_client_t *client) {
-	return (ISC_TF(client->newstate == NS_CLIENTSTATE_FREED));
+	return (client->newstate == NS_CLIENTSTATE_FREED);
 }

 isc_result_t
 ns_client_replace(ns_client_t *client) {
 	isc_result_t result;
-	isc_boolean_t tcp;
+	bool tcp;

 	CTRACE("replace");

@@ -3353,7 +3353,7 @@ ns_client_replace(ns_client_t *client) {
 	 * transferred to the new client.  Therefore, the old client
 	 * should refrain from listening for any more requests.
 	 */
-	client->mortal = ISC_TRUE;
+	client->mortal = true;

 	return (ISC_R_SUCCESS);
 }
@@ -3429,7 +3429,7 @@ ns_clientmgr_create(isc_mem_t *mctx, ns_server_t *sctx, isc_taskmgr_t *taskmgr,
 	manager->mctx = mctx;
 	manager->taskmgr = taskmgr;
 	manager->timermgr = timermgr;
-	manager->exiting = ISC_FALSE;
+	manager->exiting = false;

 	manager->sctx = NULL;
 	ns_server_attach(sctx, &manager->sctx);
@@ -3470,7 +3470,7 @@ ns_clientmgr_destroy(ns_clientmgr_t **managerp) {
 	isc_result_t result;
 	ns_clientmgr_t *manager;
 	ns_client_t *client;
-	isc_boolean_t need_destroy = ISC_FALSE, unlock = ISC_FALSE;
+	bool need_destroy = false, unlock = false;

 	REQUIRE(managerp != NULL);
 	manager = *managerp;
@@ -3485,9 +3485,9 @@ ns_clientmgr_destroy(ns_clientmgr_t **managerp) {
 	 */
 	result = isc_task_beginexclusive(manager->excl);
 	if (result == ISC_R_SUCCESS)
-		unlock = ISC_TRUE;
+		unlock = true;

-	manager->exiting = ISC_TRUE;
+	manager->exiting = true;

 	for (client = ISC_LIST_HEAD(manager->clients);
 	     client != NULL;
@@ -3495,7 +3495,7 @@ ns_clientmgr_destroy(ns_clientmgr_t **managerp) {
 		isc_task_shutdown(client->task);

 	if (ISC_LIST_EMPTY(manager->clients))
-		need_destroy = ISC_TRUE;
+		need_destroy = true;

 	if (unlock)
 		isc_task_endexclusive(manager->excl);
@@ -3508,7 +3508,7 @@ ns_clientmgr_destroy(ns_clientmgr_t **managerp) {

 static isc_result_t
 get_client(ns_clientmgr_t *manager, ns_interface_t *ifp,
-	   dns_dispatch_t *disp, isc_boolean_t tcp)
+	   dns_dispatch_t *disp, bool tcp)
 {
 	isc_result_t result = ISC_R_SUCCESS;
 	isc_event_t *ev;
@@ -3618,19 +3618,19 @@ get_worker(ns_clientmgr_t *manager, ns_interface_t *ifp, isc_socket_t *sock) {
 	client->dscp = ifp->dscp;

 	client->attributes |= NS_CLIENTATTR_TCP;
-	client->pipelined = ISC_TRUE;
-	client->mortal = ISC_TRUE;
+	client->pipelined = true;
+	client->mortal = true;
 	client->sendcb = NULL;

 	isc_socket_attach(ifp->tcpsocket, &client->tcplistener);
 	isc_socket_attach(sock, &client->tcpsocket);
 	isc_socket_setname(client->tcpsocket, "worker-tcp", NULL);
 	(void)isc_socket_getpeername(client->tcpsocket, &client->peeraddr);
-	client->peeraddr_valid = ISC_TRUE;
+	client->peeraddr_valid = true;

-	INSIST(client->tcpmsg_valid == ISC_FALSE);
+	INSIST(client->tcpmsg_valid == false);
 	dns_tcpmsg_init(client->mctx, client->tcpsocket, &client->tcpmsg);
-	client->tcpmsg_valid = ISC_TRUE;
+	client->tcpmsg_valid = true;

 	INSIST(client->nctls == 0);
 	client->nctls++;
@@ -3642,7 +3642,7 @@ get_worker(ns_clientmgr_t *manager, ns_interface_t *ifp, isc_socket_t *sock) {

 isc_result_t
 ns__clientmgr_getclient(ns_clientmgr_t *manager, ns_interface_t *ifp,
-			isc_boolean_t tcp, ns_client_t **clientp)
+			bool tcp, ns_client_t **clientp)
 {
 	isc_result_t result = ISC_R_SUCCESS;
 	ns_client_t *client;
@@ -3691,7 +3691,7 @@ ns__clientmgr_getclient(ns_clientmgr_t *manager, ns_interface_t *ifp,

 isc_result_t
 ns_clientmgr_createclients(ns_clientmgr_t *manager, unsigned int n,
-			   ns_interface_t *ifp, isc_boolean_t tcp)
+			   ns_interface_t *ifp, bool tcp)
 {
 	isc_result_t result = ISC_R_SUCCESS;
 	unsigned int disp;
@@ -3722,7 +3722,7 @@ ns_client_getdestaddr(ns_client_t *client) {

 isc_result_t
 ns_client_checkaclsilent(ns_client_t *client, isc_netaddr_t *netaddr,
-			 dns_acl_t *acl, isc_boolean_t default_allow)
+			 dns_acl_t *acl, bool default_allow)
 {
 	isc_result_t result;
 	dns_aclenv_t *env = ns_interfacemgr_getaclenv(client->interface->mgr);
@@ -3760,7 +3760,7 @@ ns_client_checkaclsilent(ns_client_t *client, isc_netaddr_t *netaddr,
 isc_result_t
 ns_client_checkacl(ns_client_t *client, isc_sockaddr_t *sockaddr,
 		   const char *opname, dns_acl_t *acl,
-		   isc_boolean_t default_allow, int log_level)
+		   bool default_allow, int log_level)
 {
 	isc_result_t result;
 	isc_netaddr_t netaddr;