diff options
Diffstat (limited to 'usr.sbin/bgpd/session.c')
| -rw-r--r-- | usr.sbin/bgpd/session.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/usr.sbin/bgpd/session.c b/usr.sbin/bgpd/session.c index f3a4d9b8e55..ee91f094b8e 100644 --- a/usr.sbin/bgpd/session.c +++ b/usr.sbin/bgpd/session.c @@ -1,4 +1,4 @@ -/* $OpenBSD: session.c,v 1.285 2009/03/13 04:40:55 claudio Exp $ */ +/* $OpenBSD: session.c,v 1.286 2009/03/13 05:43:51 claudio Exp $ */ /* * Copyright (c) 2003, 2004, 2005 Henning Brauer <henning@openbsd.org> @@ -341,7 +341,7 @@ session_main(struct bgpd_config *config, struct peer *cpeers, mrt_cnt = 0; LIST_FOREACH(m, &mrthead, entry) - if (m->queued) + if (m->wbuf.queued) mrt_cnt++; if (mrt_cnt > mrt_l_elms) { @@ -469,8 +469,8 @@ session_main(struct bgpd_config *config, struct peer *cpeers, idx_peers = i; LIST_FOREACH(m, &mrthead, entry) - if (m->queued) { - pfd[i].fd = m->fd; + if (m->wbuf.queued) { + pfd[i].fd = m->wbuf.fd; pfd[i].events = POLLOUT; mrt_l[i - idx_peers] = m; i++; @@ -2423,7 +2423,7 @@ session_dispatch_imsg(struct imsgbuf *ibuf, int idx, u_int *listener_cnt) } memcpy(&xmrt, imsg.data, sizeof(struct mrt)); - if ((xmrt.fd = imsg_get_fd(ibuf)) == -1) + if ((xmrt.wbuf.fd = imsg_get_fd(ibuf)) == -1) log_warnx("expected to receive fd for mrt dump " "but didn't receive any"); @@ -2434,12 +2434,12 @@ session_dispatch_imsg(struct imsgbuf *ibuf, int idx, u_int *listener_cnt) if (mrt == NULL) fatal("session_dispatch_imsg"); memcpy(mrt, &xmrt, sizeof(struct mrt)); - TAILQ_INIT(&mrt->bufs); + TAILQ_INIT(&mrt->wbuf.bufs); LIST_INSERT_HEAD(&mrthead, mrt, entry); } else { /* old dump reopened */ - close(mrt->fd); - mrt->fd = xmrt.fd; + close(mrt->wbuf.fd); + mrt->wbuf.fd = xmrt.wbuf.fd; } break; case IMSG_MRT_CLOSE: |