summaryrefslogtreecommitdiff
path: root/usr.sbin/ldpd
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin/ldpd')
-rw-r--r--usr.sbin/ldpd/control.c4
-rw-r--r--usr.sbin/ldpd/lde.c6
-rw-r--r--usr.sbin/ldpd/ldpd.c6
-rw-r--r--usr.sbin/ldpd/ldpe.c6
4 files changed, 11 insertions, 11 deletions
diff --git a/usr.sbin/ldpd/control.c b/usr.sbin/ldpd/control.c
index 4a2ce22ae52..7fcbaaf94cb 100644
--- a/usr.sbin/ldpd/control.c
+++ b/usr.sbin/ldpd/control.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: control.c,v 1.35 2024/11/21 13:17:02 claudio Exp $ */
+/* $OpenBSD: control.c,v 1.36 2024/11/21 13:17:57 claudio Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -179,7 +179,7 @@ control_close(int fd)
return;
}
- msgbuf_clear(&c->iev.ibuf.w);
+ imsgbuf_clear(&c->iev.ibuf);
TAILQ_REMOVE(&ctl_conns, c, entry);
event_del(&c->iev.ev);
diff --git a/usr.sbin/ldpd/lde.c b/usr.sbin/ldpd/lde.c
index 2b5940f3455..a7c43fa0fc1 100644
--- a/usr.sbin/ldpd/lde.c
+++ b/usr.sbin/ldpd/lde.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lde.c,v 1.81 2024/11/21 13:17:02 claudio Exp $ */
+/* $OpenBSD: lde.c,v 1.82 2024/11/21 13:17:57 claudio Exp $ */
/*
* Copyright (c) 2013, 2016 Renato Westphal <renato@openbsd.org>
@@ -151,9 +151,9 @@ static __dead void
lde_shutdown(void)
{
/* close pipes */
- msgbuf_clear(&iev_ldpe->ibuf.w);
+ imsgbuf_clear(&iev_ldpe->ibuf);
close(iev_ldpe->ibuf.fd);
- msgbuf_clear(&iev_main->ibuf.w);
+ imsgbuf_clear(&iev_main->ibuf);
close(iev_main->ibuf.fd);
lde_gc_stop_timer();
diff --git a/usr.sbin/ldpd/ldpd.c b/usr.sbin/ldpd/ldpd.c
index 64cbde25732..ee1ac31bd49 100644
--- a/usr.sbin/ldpd/ldpd.c
+++ b/usr.sbin/ldpd/ldpd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ldpd.c,v 1.72 2024/11/21 13:17:02 claudio Exp $ */
+/* $OpenBSD: ldpd.c,v 1.73 2024/11/21 13:17:57 claudio Exp $ */
/*
* Copyright (c) 2013, 2016 Renato Westphal <renato@openbsd.org>
@@ -291,9 +291,9 @@ ldpd_shutdown(void)
int status;
/* close pipes */
- msgbuf_clear(&iev_ldpe->ibuf.w);
+ imsgbuf_clear(&iev_ldpe->ibuf);
close(iev_ldpe->ibuf.fd);
- msgbuf_clear(&iev_lde->ibuf.w);
+ imsgbuf_clear(&iev_lde->ibuf);
close(iev_lde->ibuf.fd);
kr_shutdown();
diff --git a/usr.sbin/ldpd/ldpe.c b/usr.sbin/ldpd/ldpe.c
index 3705b0cef70..8c6d0721316 100644
--- a/usr.sbin/ldpd/ldpe.c
+++ b/usr.sbin/ldpd/ldpe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ldpe.c,v 1.85 2024/11/21 13:17:02 claudio Exp $ */
+/* $OpenBSD: ldpe.c,v 1.86 2024/11/21 13:17:57 claudio Exp $ */
/*
* Copyright (c) 2013, 2016 Renato Westphal <renato@openbsd.org>
@@ -160,10 +160,10 @@ ldpe_shutdown(void)
/* close pipes */
imsgbuf_write(&iev_lde->ibuf);
- msgbuf_clear(&iev_lde->ibuf.w);
+ imsgbuf_clear(&iev_lde->ibuf);
close(iev_lde->ibuf.fd);
imsgbuf_write(&iev_main->ibuf);
- msgbuf_clear(&iev_main->ibuf.w);
+ imsgbuf_clear(&iev_main->ibuf);
close(iev_main->ibuf.fd);
control_cleanup();