diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2018-12-04 14:13:41 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2018-12-04 14:13:41 +0000 |
| commit | b99512da84f47ec98538c08d22c0b39971261bca (patch) | |
| tree | bb069cb038037ec1cfbef7f0d770b1d66c9639a6 /usr.sbin/bgpd | |
| parent | b0f00d54f8f03d1651b027a0e50a892cb4a5ee23 (diff) | |
Since a while announcements added by bgpctl will overwrite the ones from
the config and no longer live next to each other. Because of this step 13
in the decision process is no longer needed.
OK benno@
Diffstat (limited to 'usr.sbin/bgpd')
| -rw-r--r-- | usr.sbin/bgpd/bgpd.8 | 8 | ||||
| -rw-r--r-- | usr.sbin/bgpd/rde_decide.c | 11 |
2 files changed, 3 insertions, 16 deletions
diff --git a/usr.sbin/bgpd/bgpd.8 b/usr.sbin/bgpd/bgpd.8 index c00836da9a4..de82d1f6b32 100644 --- a/usr.sbin/bgpd/bgpd.8 +++ b/usr.sbin/bgpd/bgpd.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: bgpd.8,v 1.59 2018/11/04 14:34:00 claudio Exp $ +.\" $OpenBSD: bgpd.8,v 1.60 2018/12/04 14:13:40 claudio Exp $ .\" .\" Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> .\" @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: November 4 2018 $ +.Dd $Mdocdate: December 4 2018 $ .Dt BGPD 8 .Os .Sh NAME @@ -112,10 +112,6 @@ If it is not present then a length of 0 is used in the comparison. .It The path coming from the peer with the lowest IP address is selected. IPv4 sessions will be preferred over IPv6 ones. -.It -In case of locally announced prefixes -.Nm -will prefer statically set prefixes over dynamically inserted ones. .El .Pp Attributes set by filters can be used to tip the decision process to prefer diff --git a/usr.sbin/bgpd/rde_decide.c b/usr.sbin/bgpd/rde_decide.c index 23814f632c3..f7287ad8af5 100644 --- a/usr.sbin/bgpd/rde_decide.c +++ b/usr.sbin/bgpd/rde_decide.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rde_decide.c,v 1.72 2018/09/27 15:53:14 claudio Exp $ */ +/* $OpenBSD: rde_decide.c,v 1.73 2018/12/04 14:13:40 claudio Exp $ */ /* * Copyright (c) 2003, 2004 Claudio Jeker <claudio@openbsd.org> @@ -229,16 +229,7 @@ prefix_cmp(struct prefix *p1, struct prefix *p2) return (-memcmp(&peer1->remote_addr, &peer2->remote_addr, sizeof(peer1->remote_addr))); - /* 13. for announced prefixes prefer dynamic routes */ - if ((asp1->flags & F_ANN_DYNAMIC) != (asp2->flags & F_ANN_DYNAMIC)) { - if (asp1->flags & F_ANN_DYNAMIC) - return (1); - else - return (-1); - } - fatalx("Uh, oh a politician in the decision process"); - /* NOTREACHED */ } /* |