diff options
author | Igor Sobrado <sobrado@cvs.openbsd.org> | 2010-09-02 14:03:23 +0000 |
---|---|---|
committer | Igor Sobrado <sobrado@cvs.openbsd.org> | 2010-09-02 14:03:23 +0000 |
commit | 387e88c0114b6b3a436bae0e9990765cde6d044b (patch) | |
tree | e1bf9e53609f8950063eb0a42e49e5f7fb380598 /usr.sbin/bgpd | |
parent | 32fd4528adafb57b4319d0dfa6e5c18c71d70a06 (diff) |
remove trailing spaces and tabs from source code; no binary changes
(verified by both sthen@ and me).
ok sthen@; "just commit it" claudio@
Diffstat (limited to 'usr.sbin/bgpd')
-rw-r--r-- | usr.sbin/bgpd/bgpd.c | 4 | ||||
-rw-r--r-- | usr.sbin/bgpd/config.c | 4 | ||||
-rw-r--r-- | usr.sbin/bgpd/kroute.c | 6 | ||||
-rw-r--r-- | usr.sbin/bgpd/mrt.c | 4 | ||||
-rw-r--r-- | usr.sbin/bgpd/parse.y | 4 | ||||
-rw-r--r-- | usr.sbin/bgpd/rde.c | 12 | ||||
-rw-r--r-- | usr.sbin/bgpd/session.c | 6 |
7 files changed, 20 insertions, 20 deletions
diff --git a/usr.sbin/bgpd/bgpd.c b/usr.sbin/bgpd/bgpd.c index 6c0d2bc946f..15d6953e72b 100644 --- a/usr.sbin/bgpd/bgpd.c +++ b/usr.sbin/bgpd/bgpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bgpd.c,v 1.165 2010/06/28 19:52:03 sobrado Exp $ */ +/* $OpenBSD: bgpd.c,v 1.166 2010/09/02 14:03:21 sobrado Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -505,7 +505,7 @@ reconfigure(char *conffile, struct bgpd_config *conf, struct mrt_head *mrt_l, if (imsg_compose(ibuf_rde, IMSG_RECONF_RDOMAIN, 0, 0, -1, rd, sizeof(*rd)) == -1) return (-1); - + /* export targets */ if (imsg_compose(ibuf_rde, IMSG_RECONF_RDOMAIN_EXPORT, 0, 0, -1, NULL, 0) == -1) diff --git a/usr.sbin/bgpd/config.c b/usr.sbin/bgpd/config.c index 8ad8e817627..bd46f9e3a47 100644 --- a/usr.sbin/bgpd/config.c +++ b/usr.sbin/bgpd/config.c @@ -1,4 +1,4 @@ -/* $OpenBSD: config.c,v 1.54 2010/06/27 19:53:34 claudio Exp $ */ +/* $OpenBSD: config.c,v 1.55 2010/09/02 14:03:21 sobrado Exp $ */ /* * Copyright (c) 2003, 2004, 2005 Henning Brauer <henning@openbsd.org> @@ -78,7 +78,7 @@ merge_config(struct bgpd_config *xconf, struct bgpd_config *conf, nla->reconf = RECONF_REINIT; } else { - /* + /* * merge new listeners: * -flag all existing ones as to be deleted * -those that are in both new and old: flag to keep diff --git a/usr.sbin/bgpd/kroute.c b/usr.sbin/bgpd/kroute.c index 10c5bd68606..2ab93d78655 100644 --- a/usr.sbin/bgpd/kroute.c +++ b/usr.sbin/bgpd/kroute.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kroute.c,v 1.183 2010/07/12 14:35:13 bluhm Exp $ */ +/* $OpenBSD: kroute.c,v 1.184 2010/09/02 14:03:21 sobrado Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -1152,7 +1152,7 @@ kr_net_reload(u_int rtableid, struct network_head *nh) } else TAILQ_INSERT_TAIL(&kt->krn, n, entry); } - + for (n = TAILQ_FIRST(&kt->krn); n != NULL; n = xn) { xn = TAILQ_NEXT(n, entry); if (n->net.old) { @@ -1637,7 +1637,7 @@ kroute6_find(struct ktable *kt, const struct in6_addr *prefix, while (tmp) { if (kroute6_compare(&s, tmp) == 0) kn6 = tmp; - else + else break; tmp = RB_PREV(kroute6_tree, &kt->krt6, kn6); } diff --git a/usr.sbin/bgpd/mrt.c b/usr.sbin/bgpd/mrt.c index 1fff1134f6b..d2bfe6475d8 100644 --- a/usr.sbin/bgpd/mrt.c +++ b/usr.sbin/bgpd/mrt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mrt.c,v 1.69 2010/06/04 10:13:00 claudio Exp $ */ +/* $OpenBSD: mrt.c,v 1.70 2010/09/02 14:03:21 sobrado Exp $ */ /* * Copyright (c) 2003, 2004 Claudio Jeker <claudio@openbsd.org> @@ -584,7 +584,7 @@ mrt_dump_hdr_rde(struct ibuf **bp, u_int16_t type, u_int16_t subtype, default: log_warnx("mrt_dump_hdr_rde: unsupported type"); goto fail; - } + } return (0); fail: diff --git a/usr.sbin/bgpd/parse.y b/usr.sbin/bgpd/parse.y index 04ed72eb245..eecd9a7a134 100644 --- a/usr.sbin/bgpd/parse.y +++ b/usr.sbin/bgpd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.257 2010/08/03 18:42:40 henning Exp $ */ +/* $OpenBSD: parse.y,v 1.258 2010/09/02 14:03:21 sobrado Exp $ */ /* * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -2388,7 +2388,7 @@ top: if (next == '=') return (NE); lungetc(next); - break; + break; case '<': next = lgetc(0); if (next == '=') diff --git a/usr.sbin/bgpd/rde.c b/usr.sbin/bgpd/rde.c index 172a5168a4d..f47c44eeb1c 100644 --- a/usr.sbin/bgpd/rde.c +++ b/usr.sbin/bgpd/rde.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rde.c,v 1.297 2010/07/14 09:00:08 claudio Exp $ */ +/* $OpenBSD: rde.c,v 1.298 2010/09/02 14:03:21 sobrado Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -1703,7 +1703,7 @@ rde_get_mp_nexthop(u_char *data, u_int16_t len, u_int8_t aid, /* * Neither RFC4364 nor RFC3107 specify the format of the * nexthop in an explicit way. The quality of RFC went down - * the toilet the larger the the number got. + * the toilet the larger the the number got. * RFC4364 is very confusing about VPN-IPv4 address and the * VPN-IPv4 prefix that carries also a MPLS label. * So the nexthop is a 12-byte address with a 64bit RD and @@ -2150,11 +2150,11 @@ rde_dump_filter(struct prefix *p, struct ctl_show_rib_request *req) { struct rde_peer *peer; - if (req->flags & F_CTL_ADJ_IN || + if (req->flags & F_CTL_ADJ_IN || !(req->flags & (F_CTL_ADJ_IN|F_CTL_ADJ_OUT))) { if (req->peerid && req->peerid != p->aspath->peer->conf.id) return; - if (req->type == IMSG_CTL_SHOW_RIB_AS && + if (req->type == IMSG_CTL_SHOW_RIB_AS && !aspath_match(p->aspath->aspath, req->as.type, req->as.as)) return; if (req->type == IMSG_CTL_SHOW_RIB_COMMUNITY && @@ -2713,7 +2713,7 @@ rde_generate_updates(u_int16_t ribid, struct prefix *new, struct prefix *old) /* * If old is != NULL we know it was active and should be removed. - * If new is != NULL we know it is reachable and then we should + * If new is != NULL we know it is reachable and then we should * generate an update. */ if (old == NULL && new == NULL) @@ -2846,7 +2846,7 @@ rde_update6_queue_runner(u_int8_t aid) b = queue_buf + r; break; } - + /* finally send message to SE */ if (imsg_compose(ibuf_se, IMSG_UPDATE, peer->conf.id, 0, -1, b, len) == -1) diff --git a/usr.sbin/bgpd/session.c b/usr.sbin/bgpd/session.c index a2bbd6dd848..55b232fc8f3 100644 --- a/usr.sbin/bgpd/session.c +++ b/usr.sbin/bgpd/session.c @@ -1,4 +1,4 @@ -/* $OpenBSD: session.c,v 1.310 2010/06/27 19:53:34 claudio Exp $ */ +/* $OpenBSD: session.c,v 1.311 2010/09/02 14:03:21 sobrado Exp $ */ /* * Copyright (c) 2003, 2004, 2005 Henning Brauer <henning@openbsd.org> @@ -174,7 +174,7 @@ setup_listeners(u_int *la_cnt) } pid_t -session_main(int pipe_m2s[2], int pipe_s2r[2], int pipe_m2r[2], +session_main(int pipe_m2s[2], int pipe_s2r[2], int pipe_m2r[2], int pipe_s2rctl[2]) { int nfds, timeout; @@ -369,7 +369,7 @@ session_main(int pipe_m2s[2], int pipe_s2r[2], int pipe_m2r[2], if (ctl_queued < SESSION_CTL_QUEUE_MAX) /* * Do not act as unlimited buffer. Don't read in more - * messages if the ctl sockets are getting full. + * messages if the ctl sockets are getting full. */ pfd[PFD_PIPE_ROUTE_CTL].events = POLLIN; pfd[PFD_SOCK_CTL].fd = csock; |