From: Claudio Jeker <cjeker@diehard.n-r-g.com>
Subject: rpki-client: use msgbuf_queuelen()
To: tech@openbsd.org
Date: Tue, 20 Aug 2024 14:36:01 +0200

Similar diff to what was done in bgpd.

-- 
:wq Claudio

diff --git usr.sbin/rpki-client/filemode.c usr.sbin/rpki-client/filemode.c
index c8dd391cc3e..920c470e7e9 100644
--- usr.sbin/rpki-client/filemode.c
+++ usr.sbin/rpki-client/filemode.c
@@ -731,7 +731,7 @@ proc_filemode(int fd)
 
 	for (;;) {
 		pfd.events = POLLIN;
-		if (msgq.queued)
+		if (msgbuf_queuelen(&msgq) > 0)
 			pfd.events |= POLLOUT;
 
 		if (poll(&pfd, 1, INFTIM) == -1) {
diff --git usr.sbin/rpki-client/http.c usr.sbin/rpki-client/http.c
index 66db3b6d849..52bece1bbbe 100644
--- usr.sbin/rpki-client/http.c
+++ usr.sbin/rpki-client/http.c
@@ -2077,7 +2077,7 @@ proc_http(char *bind_addr, int fd)
 		memset(&pfds, 0, sizeof(pfds));
 		pfds[0].fd = fd;
 		pfds[0].events = POLLIN;
-		if (msgq.queued)
+		if (msgbuf_queuelen(&msgq) > 0)
 			pfds[0].events |= POLLOUT;
 
 		i = 1;
diff --git usr.sbin/rpki-client/main.c usr.sbin/rpki-client/main.c
index b2205a92020..35dcf190c55 100644
--- usr.sbin/rpki-client/main.c
+++ usr.sbin/rpki-client/main.c
@@ -1289,7 +1289,7 @@ main(int argc, char *argv[])
 
 		for (i = 0; i < NPFD; i++) {
 			pfd[i].events = POLLIN;
-			if (queues[i]->queued)
+			if (msgbuf_queuelen(queues[i]) > 0)
 				pfd[i].events |= POLLOUT;
 		}
 
diff --git usr.sbin/rpki-client/parser.c usr.sbin/rpki-client/parser.c
index 5e6f60ab7cf..50eeb44c5db 100644
--- usr.sbin/rpki-client/parser.c
+++ usr.sbin/rpki-client/parser.c
@@ -1056,7 +1056,7 @@ proc_parser(int fd)
 
 	for (;;) {
 		pfd.events = POLLIN;
-		if (msgq.queued)
+		if (msgbuf_queuelen(&msgq) > 0)
 			pfd.events |= POLLOUT;
 
 		if (poll(&pfd, 1, INFTIM) == -1) {
diff --git usr.sbin/rpki-client/rrdp.c usr.sbin/rpki-client/rrdp.c
index 9439c7964f4..42a63999bb0 100644
--- usr.sbin/rpki-client/rrdp.c
+++ usr.sbin/rpki-client/rrdp.c
@@ -585,7 +585,7 @@ proc_rrdp(int fd)
 		 */
 		pfds[0].fd = fd;
 		pfds[0].events = POLLIN;
-		if (msgq.queued)
+		if (msgbuf_queuelen(&msgq) > 0)
 			pfds[0].events |= POLLOUT;
 
 		if (poll(pfds, i, INFTIM) == -1) {
diff --git usr.sbin/rpki-client/rsync.c usr.sbin/rpki-client/rsync.c
index f035dffd26c..21dfba8b0b9 100644
--- usr.sbin/rpki-client/rsync.c
+++ usr.sbin/rpki-client/rsync.c
@@ -294,7 +294,7 @@ proc_rsync(char *prog, char *bind_addr, int fd)
 
 		pfd.events = 0;
 		pfd.events |= POLLIN;
-		if (msgq.queued)
+		if (msgbuf_queuelen(&msgq) > 0)
 			pfd.events |= POLLOUT;
 
 		if (npending > 0 && nprocs < MAX_RSYNC_REQUESTS) {