From 30afc53046be8e4465b6e14c607f9dd16db55375 Mon Sep 17 00:00:00 2001 From: deraadt Date: Mon, 23 May 2022 13:40:11 +0000 Subject: [PATCH] whitespaces found when I went checking for something else --- usr.sbin/bgpd/bgpd.h | 4 ++-- usr.sbin/bgpd/kroute.c | 6 +++--- usr.sbin/bgpd/parse.y | 4 ++-- usr.sbin/bgpd/rde_peer.c | 6 +++--- usr.sbin/bgpd/rde_rib.c | 4 ++-- usr.sbin/bgpd/rde_trie.c | 10 +++++----- usr.sbin/bgpd/rde_update.c | 6 +++--- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/usr.sbin/bgpd/bgpd.h b/usr.sbin/bgpd/bgpd.h index 8e77df00802..42ff7e021cb 100644 --- a/usr.sbin/bgpd/bgpd.h +++ b/usr.sbin/bgpd/bgpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bgpd.h,v 1.422 2022/03/21 10:15:34 claudio Exp $ */ +/* $OpenBSD: bgpd.h,v 1.423 2022/05/23 13:40:11 deraadt Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer @@ -1286,7 +1286,7 @@ int ktable_update(u_int, char *, int, uint8_t); void ktable_preload(void); void ktable_postload(uint8_t); int ktable_exists(u_int, u_int *); -int kr_change(u_int, struct kroute_full *, uint8_t); +int kr_change(u_int, struct kroute_full *, uint8_t); int kr_delete(u_int, struct kroute_full *, uint8_t); int kr_flush(u_int); void kr_shutdown(uint8_t, u_int); diff --git a/usr.sbin/bgpd/kroute.c b/usr.sbin/bgpd/kroute.c index c4a45e1ec7a..6295aa0b757 100644 --- a/usr.sbin/bgpd/kroute.c +++ b/usr.sbin/bgpd/kroute.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kroute.c,v 1.245 2022/05/06 15:51:09 claudio Exp $ */ +/* $OpenBSD: kroute.c,v 1.246 2022/05/23 13:40:12 deraadt Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer @@ -3384,14 +3384,14 @@ fetchtable(struct ktable *kt, uint8_t fib_prio) } if (sa->sa_family == AF_INET) { - if (rtm->rtm_priority == fib_prio) { + if (rtm->rtm_priority == fib_prio) { send_rtmsg(kr_state.fd, RTM_DELETE, kt, &kr->r, fib_prio); free(kr); } else kroute_insert(kt, kr); } else if (sa->sa_family == AF_INET6) { - if (rtm->rtm_priority == fib_prio) { + if (rtm->rtm_priority == fib_prio) { send_rt6msg(kr_state.fd, RTM_DELETE, kt, &kr6->r, fib_prio); free(kr6); diff --git a/usr.sbin/bgpd/parse.y b/usr.sbin/bgpd/parse.y index e6d8351acd2..5dd4eb55795 100644 --- a/usr.sbin/bgpd/parse.y +++ b/usr.sbin/bgpd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.423 2022/03/15 11:13:48 claudio Exp $ */ +/* $OpenBSD: parse.y,v 1.424 2022/05/23 13:40:12 deraadt Exp $ */ /* * Copyright (c) 2002, 2003, 2004 Henning Brauer @@ -4746,7 +4746,7 @@ new_prefix_set(char *name, int is_roa) sets = &conf->originsets; } - if (find_prefixset(name, sets) != NULL) { + if (find_prefixset(name, sets) != NULL) { yyerror("%s \"%s\" already exists", type, name); return NULL; } diff --git a/usr.sbin/bgpd/rde_peer.c b/usr.sbin/bgpd/rde_peer.c index 4ed02e27f88..2b5741905fd 100644 --- a/usr.sbin/bgpd/rde_peer.c +++ b/usr.sbin/bgpd/rde_peer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rde_peer.c,v 1.15 2022/03/22 10:53:08 claudio Exp $ */ +/* $OpenBSD: rde_peer.c,v 1.16 2022/05/23 13:40:12 deraadt Exp $ */ /* * Copyright (c) 2019 Claudio Jeker @@ -45,7 +45,7 @@ struct iq { struct imsg imsg; }; -extern struct filter_head *out_rules; +extern struct filter_head *out_rules; int peer_has_as4byte(struct rde_peer *peer) @@ -116,7 +116,7 @@ peer_foreach(void (*callback)(struct rde_peer *, void *), void *arg) { struct rde_peer *peer, *np; - LIST_FOREACH_SAFE(peer, &peerlist, peer_l, np) + LIST_FOREACH_SAFE(peer, &peerlist, peer_l, np) callback(peer, arg); } diff --git a/usr.sbin/bgpd/rde_rib.c b/usr.sbin/bgpd/rde_rib.c index e09a66d4cdf..6977578d59b 100644 --- a/usr.sbin/bgpd/rde_rib.c +++ b/usr.sbin/bgpd/rde_rib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rde_rib.c,v 1.237 2022/03/22 10:53:08 claudio Exp $ */ +/* $OpenBSD: rde_rib.c,v 1.238 2022/05/23 13:40:12 deraadt Exp $ */ /* * Copyright (c) 2003, 2004 Claudio Jeker @@ -1446,7 +1446,7 @@ prefix_write(u_char *buf, int len, struct bgpd_addr *prefix, uint8_t plen, *buf++ = 0x80; *buf++ = 0x0; *buf++ = 0x0; - } else { + } else { memcpy(buf, &prefix->labelstack, prefix->labellen); buf += prefix->labellen; diff --git a/usr.sbin/bgpd/rde_trie.c b/usr.sbin/bgpd/rde_trie.c index 2ddf0b1da41..8cec20fe706 100644 --- a/usr.sbin/bgpd/rde_trie.c +++ b/usr.sbin/bgpd/rde_trie.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rde_trie.c,v 1.14 2022/02/06 09:51:19 claudio Exp $ */ +/* $OpenBSD: rde_trie.c,v 1.15 2022/05/23 13:40:12 deraadt Exp $ */ /* * Copyright (c) 2018 Claudio Jeker @@ -158,7 +158,7 @@ trie_add_v4(struct trie_head *th, struct in_addr *prefix, uint8_t plen) minlen = n->plen > plen ? plen : n->plen; inet4applymask(&mp, &p, minlen); - if (n->addr.s_addr != mp.s_addr) { + if (n->addr.s_addr != mp.s_addr) { /* * out of path, insert intermediary node between * np and n, then insert n and new node there @@ -425,7 +425,7 @@ trie_roa_add(struct trie_head *th, struct roa *roa) if ((rsp = set_match(*stp, roa->asnum)) != NULL) { if (rsp->maxlen < roa->maxlen) rsp->maxlen = roa->maxlen; - } else { + } else { rs.as = roa->asnum; rs.maxlen = roa->maxlen; if (set_add(*stp, &rs, 1) != 0) @@ -489,7 +489,7 @@ trie_match_v4(struct trie_head *th, struct in_addr *prefix, uint8_t plen, break; /* too specific, no match possible */ inet4applymask(&mp, prefix, n->plen); - if (n->addr.s_addr != mp.s_addr) + if (n->addr.s_addr != mp.s_addr) break; /* off path, no match possible */ /* the match covers all larger prefixlens */ @@ -585,7 +585,7 @@ trie_roa_check_v4(struct trie_head *th, struct in_addr *prefix, uint8_t plen, break; /* too specific, no match possible */ inet4applymask(&mp, prefix, n->plen); - if (n->addr.s_addr != mp.s_addr) + if (n->addr.s_addr != mp.s_addr) break; /* off path, no other match possible */ if (n->node) { diff --git a/usr.sbin/bgpd/rde_update.c b/usr.sbin/bgpd/rde_update.c index a0c849ed824..9982fadb7df 100644 --- a/usr.sbin/bgpd/rde_update.c +++ b/usr.sbin/bgpd/rde_update.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rde_update.c,v 1.139 2022/03/30 16:06:32 tb Exp $ */ +/* $OpenBSD: rde_update.c,v 1.140 2022/05/23 13:40:12 deraadt Exp $ */ /* * Copyright (c) 2004 Claudio Jeker @@ -170,7 +170,7 @@ up_generate_updates(struct filter_head *rules, struct rde_peer *peer, peer->prefix_out_cnt > peer->conf.max_out_prefix) { log_peer_warnx(&peer->conf, "outbound prefix limit reached (>%u/%u)", - peer->prefix_out_cnt, peer->conf.max_out_prefix); + peer->prefix_out_cnt, peer->conf.max_out_prefix); rde_update_err(peer, ERR_CEASE, ERR_CEASE_MAX_SENT_PREFIX, NULL, 0); } @@ -230,7 +230,7 @@ up_generate_default(struct filter_head *rules, struct rde_peer *peer, peer->prefix_out_cnt > peer->conf.max_out_prefix) { log_peer_warnx(&peer->conf, "outbound prefix limit reached (>%u/%u)", - peer->prefix_out_cnt, peer->conf.max_out_prefix); + peer->prefix_out_cnt, peer->conf.max_out_prefix); rde_update_err(peer, ERR_CEASE, ERR_CEASE_MAX_SENT_PREFIX, NULL, 0); } -- 2.20.1