diff options
| author |   claudio <claudio@openbsd.org> | 2004-08-10 14:06:53 +0000 |
|---|---|---|
| committer | claudio <claudio@openbsd.org> | 2004-08-10 14:06:53 +0000 |
| commit | 6030dde6375b0795cce19c8ce2aa9c6e52735446 (patch) | |
| tree | f5ca42e9ae2d5742fa3061e90186735148706744 | |
| parent | Always free message buffer on error. (diff) | |
| download | wireguard-openbsd-6030dde6375b0795cce19c8ce2aa9c6e52735446.tar.xz wireguard-openbsd-6030dde6375b0795cce19c8ce2aa9c6e52735446.zip | |
Gahhh, why is this still around? It was never necessary to inform the parent
after fd passing. I thought I removed that some time ago... anyway now it
is gone.
| -rw-r--r-- | usr.sbin/bgpd/rde.c | 7 | ||||
| -rw-r--r-- | usr.sbin/bgpd/session.c | 7 |
2 files changed, 2 insertions, 12 deletions
diff --git a/usr.sbin/bgpd/rde.c b/usr.sbin/bgpd/rde.c index 220b5666ac2..5f60302e60e 100644 --- a/usr.sbin/bgpd/rde.c +++ b/usr.sbin/bgpd/rde.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rde.c,v 1.140 2004/08/10 13:02:08 claudio Exp $ */ +/* $OpenBSD: rde.c,v 1.141 2004/08/10 14:06:53 claudio Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -474,11 +474,6 @@ rde_dispatch_imsg_parent(struct imsgbuf *ibuf) log_warnx("expected to receive fd for mrt dump " "but didn't receive any"); - /* tell parent to close fd */ - if (imsg_compose(&ibuf_main, IMSG_MRT_CLOSE, 0, - xmrt, sizeof(struct mrt)) == -1) - log_warn("rde_dispatch_imsg_parent: mrt close"); - if (xmrt->type == MRT_TABLE_DUMP) { /* do not dump if a other is still running */ if (mrt == NULL || mrt->queued == 0) { diff --git a/usr.sbin/bgpd/session.c b/usr.sbin/bgpd/session.c index a4c212a320e..1f2f34984f9 100644 --- a/usr.sbin/bgpd/session.c +++ b/usr.sbin/bgpd/session.c @@ -1,4 +1,4 @@ -/* $OpenBSD: session.c,v 1.185 2004/08/06 11:51:19 claudio Exp $ */ +/* $OpenBSD: session.c,v 1.186 2004/08/10 14:06:53 claudio Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -2185,11 +2185,6 @@ session_dispatch_imsg(struct imsgbuf *ibuf, int idx, u_int *listener_cnt) close(mrt->fd); mrt->fd = xmrt.fd; } - - /* tell parent to close fd */ - if (imsg_compose(&ibuf_main, IMSG_MRT_CLOSE, 0, - &xmrt, sizeof(struct mrt)) == -1) - log_warn("session_dispatch_imsg: mrt close"); break; case IMSG_MRT_CLOSE: if (imsg.hdr.len > IMSG_HEADER_SIZE + |