Index | Thread | Search

From:
Claudio Jeker <cjeker@diehard.n-r-g.com>
Subject:
bgpd: adjust some types around imsgbuf functions
To:
tech@openbsd.org
Date:
Thu, 30 Jul 2026 15:29:47 +0200

Download raw body.

Thread
Neither imsgbuf_read nor imsgbuf_get return ssize_t. So switch 'n' to int.

-- 
:wq Claudio

Index: bgpd.c
===================================================================
RCS file: /cvs/src/usr.sbin/bgpd/bgpd.c,v
diff -u -p -r1.292 bgpd.c
--- bgpd.c	24 Jul 2026 05:01:01 -0000	1.292
+++ bgpd.c	30 Jul 2026 13:24:25 -0000
@@ -847,7 +847,7 @@ dispatch_imsg(struct imsgbuf *imsgbuf, i
 	struct pftable_msg	 pfmsg;
 	struct demote_msg	 demote;
 	char			 reason[REASON_LEN], ifname[IFNAMSIZ];
-	ssize_t			 n;
+	int			 n;
 	u_int			 rtableid;
 	int			 rv, verbose;
 
@@ -1256,7 +1256,7 @@ set_pollfd(struct pollfd *pfd, struct im
 int
 handle_pollfd(struct pollfd *pfd, struct imsgbuf *i)
 {
-	ssize_t n;
+	int n;
 
 	if (i == NULL)
 		return (0);
Index: control.c
===================================================================
RCS file: /cvs/src/usr.sbin/bgpd/control.c,v
diff -u -p -r1.142 control.c
--- control.c	24 Jul 2026 05:01:01 -0000	1.142
+++ control.c	30 Jul 2026 12:05:36 -0000
@@ -246,7 +246,7 @@ control_dispatch_msg(struct pollfd *pfd,
 	struct ctl_show_rib_request	ribreq;
 	struct ctl_conn		*c;
 	struct peer		*p;
-	ssize_t			 n;
+	int			 n;
 	uint32_t		 type;
 	pid_t			 pid;
 	int			 verbose, matched;
Index: rde.c
===================================================================
RCS file: /cvs/src/usr.sbin/bgpd/rde.c,v
diff -u -p -r1.711 rde.c
--- rde.c	24 Jul 2026 05:01:01 -0000	1.711
+++ rde.c	30 Jul 2026 13:24:59 -0000
@@ -464,7 +464,7 @@ rde_dispatch_imsg_session(struct imsgbuf
 	struct rde_aspath	*asp;
 	struct as_set		*aset;
 	struct rde_prefixset	*pset;
-	ssize_t			 n;
+	int			 n;
 	uint32_t		 peerid;
 	pid_t			 pid;
 	int			 verbose;