diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2005-11-29 20:45:22 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2005-11-29 20:45:22 +0000 |
| commit | a8c978aecf46439ea23fbb52fb87b12fd546b68a (patch) | |
| tree | ffb490a20f333a1ed253946f7bae5a3b88b255d9 /usr.sbin/bgpd | |
| parent | 7ef703cfb022cb9b91820677c90bde9b54300006 (diff) | |
even more spaces and tabs.
Diffstat (limited to 'usr.sbin/bgpd')
| -rw-r--r-- | usr.sbin/bgpd/rde.c | 8 | ||||
| -rw-r--r-- | usr.sbin/bgpd/rde_filter.c | 8 | ||||
| -rw-r--r-- | usr.sbin/bgpd/rde_update.c | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/usr.sbin/bgpd/rde.c b/usr.sbin/bgpd/rde.c index 82e118fbddf..8fec1bf1304 100644 --- a/usr.sbin/bgpd/rde.c +++ b/usr.sbin/bgpd/rde.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rde.c,v 1.178 2005/11/02 13:21:06 claudio Exp $ */ +/* $OpenBSD: rde.c,v 1.179 2005/11/29 20:45:21 claudio Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -521,7 +521,7 @@ rde_dispatch_imsg_parent(struct imsgbuf *ibuf) nconf = NULL; parent_set = NULL; prefix_network_clean(&peerself, reloadtime); - + if (!rde_filter_equal(rules_l, newrules, DIR_OUT)) pt_dump(rde_softreconfig_out, NULL, AF_UNSPEC); while ((r = TAILQ_FIRST(rules_l)) != NULL) { @@ -1787,7 +1787,7 @@ rde_softreconfig_out(struct pt_entry *pt, void *ptr) struct rde_aspath *oasp, *nasp; enum filter_actions oa, na; struct bgpd_addr addr; - + if (p == NULL) return; @@ -1819,7 +1819,7 @@ rde_softreconfig_out(struct pt_entry *pt, void *ptr) goto done; } if (oa == ACTION_ALLOW && na == ACTION_ALLOW) { - if (path_compare(nasp, oasp) == 0) + if (path_compare(nasp, oasp) == 0) goto done; /* send update */ up_generate(peer, nasp, &addr, pt->prefixlen); diff --git a/usr.sbin/bgpd/rde_filter.c b/usr.sbin/bgpd/rde_filter.c index 6c48c0dc0cd..822ffe0e4b5 100644 --- a/usr.sbin/bgpd/rde_filter.c +++ b/usr.sbin/bgpd/rde_filter.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rde_filter.c,v 1.37 2005/11/02 13:19:30 claudio Exp $ */ +/* $OpenBSD: rde_filter.c,v 1.38 2005/11/29 20:45:21 claudio Exp $ */ /* * Copyright (c) 2004 Claudio Jeker <claudio@openbsd.org> @@ -306,7 +306,7 @@ rde_filter_equal(struct filter_head *a, struct filter_head *b, if ((fa == NULL && fb != NULL) || (fa != NULL && fb == NULL)) /* new rule added or removed */ return (0); - + if (fa->action != fb->action || fa->quick != fb->quick) return (0); if (memcmp(&fa->peer, &fb->peer, sizeof(fa->peer))) @@ -429,7 +429,7 @@ filterset_equal(struct filter_set_head *ah, struct filter_set_head *bh) bs = pftable_id2name(b->action.id); else break; - + if (a->type == ACTION_PFTABLE) as = a->action.pftable; else @@ -446,7 +446,7 @@ filterset_equal(struct filter_set_head *ah, struct filter_set_head *bh) bs = rtlabel_id2name(b->action.id); else break; - + if (a->type == ACTION_RTLABEL) as = a->action.rtlabel; else diff --git a/usr.sbin/bgpd/rde_update.c b/usr.sbin/bgpd/rde_update.c index 5703cdee03e..b602da14c4b 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.43 2005/11/01 15:21:54 claudio Exp $ */ +/* $OpenBSD: rde_update.c,v 1.44 2005/11/29 20:45:21 claudio Exp $ */ /* * Copyright (c) 2004 Claudio Jeker <claudio@openbsd.org> @@ -283,7 +283,7 @@ up_test_update(struct rde_peer *peer, struct prefix *p) break; } - if (peer->conf.ebgp && !aspath_loopfree(p->aspath->aspath, + if (peer->conf.ebgp && !aspath_loopfree(p->aspath->aspath, peer->conf.remote_as)) { /* * Do not send routes back to sender which would |