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?
-- 
:wq Claudio

Index: bgpd.8
===================================================================
RCS file: /cvs/src/usr.sbin/bgpd/bgpd.8,v
retrieving revision 1.59
diff -u -p -r1.59 bgpd.8
--- bgpd.8      4 Nov 2018 14:34:00 -0000       1.59
+++ bgpd.8      22 Nov 2018 14:50:47 -0000
@@ -112,10 +112,6 @@ If it is not present then a length of 0 
 .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
Index: rde_decide.c
===================================================================
RCS file: /cvs/src/usr.sbin/bgpd/rde_decide.c,v
retrieving revision 1.72
diff -u -p -r1.72 rde_decide.c
--- rde_decide.c        27 Sep 2018 15:53:14 -0000      1.72
+++ rde_decide.c        22 Nov 2018 14:46:42 -0000
@@ -229,16 +229,7 @@ prefix_cmp(struct prefix *p1, struct pre
                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 */
 }
 
 /*

Reply via email to