summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--usr.sbin/bgpd/bgpd.c4
-rw-r--r--usr.sbin/bgpd/buffer.c4
-rw-r--r--usr.sbin/bgpd/mrt.c4
-rw-r--r--usr.sbin/bgpd/rde.c6
-rw-r--r--usr.sbin/bgpd/session.c4
5 files changed, 11 insertions, 11 deletions
diff --git a/usr.sbin/bgpd/bgpd.c b/usr.sbin/bgpd/bgpd.c
index 7fe3f8fa382..346f94cc78a 100644
--- a/usr.sbin/bgpd/bgpd.c
+++ b/usr.sbin/bgpd/bgpd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bgpd.c,v 1.20 2003/12/23 18:28:05 henning Exp $ */
+/* $OpenBSD: bgpd.c,v 1.21 2003/12/23 19:14:49 deraadt Exp $ */
/*
* Copyright (c) 2003 Henning Brauer <henning@openbsd.org>
@@ -238,7 +238,7 @@ main(int argc, char *argv[])
dispatch_imsg(&ibuf_rde, PFD_PIPE_ROUTE, &mrtconf);
}
- for (j = PFD_MRT_START; j < i && nfds > 0 ; j++) {
+ for (j = PFD_MRT_START; j < i && nfds > 0 ; j++) {
if (pfd[j].revents & POLLOUT) {
if ((n = msgbuf_write(&mrt[i]->msgbuf)) == -1)
fatal("pipe write error", errno);
diff --git a/usr.sbin/bgpd/buffer.c b/usr.sbin/bgpd/buffer.c
index e3164c07924..71db8737494 100644
--- a/usr.sbin/bgpd/buffer.c
+++ b/usr.sbin/bgpd/buffer.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: buffer.c,v 1.7 2003/12/21 23:48:46 henning Exp $ */
+/* $OpenBSD: buffer.c,v 1.8 2003/12/23 19:14:49 deraadt Exp $ */
/*
* Copyright (c) 2003 Henning Brauer <henning@openbsd.org>
@@ -76,7 +76,7 @@ buf_close(struct msgbuf *msgbuf, struct buf *buf)
{
int n;
- /* first try to write out directly */
+ /* first try to write out directly */
if (msgbuf->queued == 0) {
if ((n = buf_write(msgbuf->sock, buf)) == -1)
return (-1);
diff --git a/usr.sbin/bgpd/mrt.c b/usr.sbin/bgpd/mrt.c
index ba88e08186f..414dc9016a1 100644
--- a/usr.sbin/bgpd/mrt.c
+++ b/usr.sbin/bgpd/mrt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mrt.c,v 1.8 2003/12/21 23:26:37 henning Exp $ */
+/* $OpenBSD: mrt.c,v 1.9 2003/12/23 19:14:49 deraadt Exp $ */
/*
* Copyright (c) 2003 Claudio Jeker <claudio@openbsd.org>
@@ -151,7 +151,7 @@ mrt_dump_entry(struct mrt *mrt, struct prefix *p, u_int16_t snum,
DUMP_LONG(buf, p->lastchange); /* originated */
DUMP_NLONG(buf, peer->remote_addr.sin_addr.s_addr);
DUMP_SHORT(buf, peer->remote_as);
- DUMP_SHORT(buf, attr_len);
+ DUMP_SHORT(buf, attr_len);
if ((bptr = buf_reserve(buf, attr_len)) == NULL)
fatal("buf_reserve error", 0);
diff --git a/usr.sbin/bgpd/rde.c b/usr.sbin/bgpd/rde.c
index 47f43379174..e7f8352b879 100644
--- a/usr.sbin/bgpd/rde.c
+++ b/usr.sbin/bgpd/rde.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rde.c,v 1.22 2003/12/23 19:13:27 henning Exp $ */
+/* $OpenBSD: rde.c,v 1.23 2003/12/23 19:14:49 deraadt Exp $ */
/*
* Copyright (c) 2003 Henning Brauer <henning@openbsd.org>
@@ -132,7 +132,7 @@ rde_main(struct bgpd_config *config, int pipe_m2r[2], int pipe_s2r[2])
pfd[PFD_PIPE_SESSION].fd = ibuf_se.sock;
pfd[PFD_PIPE_SESSION].events = POLLIN;
- if (ibuf_se.w.queued > 0)
+ if (ibuf_se.w.queued > 0)
pfd[PFD_PIPE_SESSION].events |= POLLOUT;
if ((nfds = poll(pfd, 2, INFTIM)) == -1)
@@ -530,7 +530,7 @@ rde_send_kroute(struct prefix *new, struct prefix *old)
type = IMSG_KROUTE_CHANGE;
p = new;
}
-
+
kr.prefix = p->prefix->prefix.s_addr;
kr.prefixlen = p->prefix->prefixlen;
kr.nexthop = p->aspath->flags.nexthop.s_addr;
diff --git a/usr.sbin/bgpd/session.c b/usr.sbin/bgpd/session.c
index eabb57d0af2..167b0fdc150 100644
--- a/usr.sbin/bgpd/session.c
+++ b/usr.sbin/bgpd/session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: session.c,v 1.31 2003/12/23 18:41:32 henning Exp $ */
+/* $OpenBSD: session.c,v 1.32 2003/12/23 19:14:49 deraadt Exp $ */
/*
* Copyright (c) 2003 Henning Brauer <henning@openbsd.org>
@@ -119,7 +119,7 @@ setup_listener(void)
close(fd);
return (-1);
}
-
+
return (fd);
}