Index | Thread | Search

From:
Claudio Jeker <cjeker@diehard.n-r-g.com>
Subject:
bgpd: more forgotten cleanup
To:
tech@openbsd.org
Date:
Wed, 24 Sep 2025 15:58:01 +0200

Download raw body.

Thread
Remove more ibuf queue leftovers that are not superseded by ibufq_new(3)
API family.

-- 
:wq Claudio

Index: rde.h
===================================================================
RCS file: /cvs/src/usr.sbin/bgpd/rde.h,v
diff -u -p -r1.316 rde.h
--- rde.h	4 Jun 2025 09:12:34 -0000	1.316
+++ rde.h	24 Sep 2025 13:54:46 -0000
@@ -73,11 +73,9 @@ struct rib {
 RB_HEAD(peer_tree, rde_peer);
 RB_HEAD(prefix_tree, prefix);
 RB_HEAD(prefix_index, prefix);
-struct iq;
 
 struct rde_peer {
 	RB_ENTRY(rde_peer)		 entry;
-	SIMPLEQ_HEAD(, iq)		 imsg_queue;
 	struct peer_config		 conf;
 	struct rde_peer_stats		 stats;
 	struct bgpd_addr		 remote_addr;
Index: rde_peer.c
===================================================================
RCS file: /cvs/src/usr.sbin/bgpd/rde_peer.c,v
diff -u -p -r1.50 rde_peer.c
--- rde_peer.c	22 Aug 2025 11:41:56 -0000	1.50
+++ rde_peer.c	24 Sep 2025 13:55:22 -0000
@@ -33,11 +33,6 @@ struct rde_peer		*peerself;
 CTASSERT(sizeof(peerself->recv_eor) * 8 >= AID_MAX);
 CTASSERT(sizeof(peerself->sent_eor) * 8 >= AID_MAX);
 
-struct iq {
-	SIMPLEQ_ENTRY(iq)	entry;
-	struct imsg		imsg;
-};
-
 int
 peer_has_as4byte(struct rde_peer *peer)
 {
@@ -177,7 +172,6 @@ peer_add(uint32_t id, struct peer_config
 	peer->role = peer->conf.role;
 	peer->export_type = peer->conf.export_type;
 	peer->flags = peer->conf.flags;
-	SIMPLEQ_INIT(&peer->imsg_queue);
 	if ((peer->ibufq = ibufq_new()) == NULL)
 		fatal(NULL);