summaryrefslogtreecommitdiff
path: root/usr.sbin/bgpd/printconf.c
diff options
context:
space:
mode:
authorClaudio Jeker <claudio@cvs.openbsd.org>2019-08-07 10:26:42 +0000
committerClaudio Jeker <claudio@cvs.openbsd.org>2019-08-07 10:26:42 +0000
commit1be7007aa60e1993672d1e6d9a12f7cd0852e7e5 (patch)
tree36f31a0b7d9fd107dbea1700dc0f5a124657aaba /usr.sbin/bgpd/printconf.c
parent05323951d3dda969f05520ad18b863a65bae59dc (diff)
Improve RIB reload behaviour. Especially when the rtable changes or the
route evaluation is modified. In both cases the softreconfig code will now walk the RIB and ensure that everything is in proper sync. Additionally remove 'route-collector yes|no' from the bgpd config, instead use 'rde rib Loc-RIB no evaluate' with the benefit that you can alter the setting now during runtime. Tested and OK benno@
Diffstat (limited to 'usr.sbin/bgpd/printconf.c')
-rw-r--r--usr.sbin/bgpd/printconf.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/usr.sbin/bgpd/printconf.c b/usr.sbin/bgpd/printconf.c
index 0b5c7ec8e4b..429706a4bbb 100644
--- a/usr.sbin/bgpd/printconf.c
+++ b/usr.sbin/bgpd/printconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: printconf.c,v 1.139 2019/08/05 08:46:55 claudio Exp $ */
+/* $OpenBSD: printconf.c,v 1.140 2019/08/07 10:26:41 claudio Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -386,9 +386,6 @@ print_mainconf(struct bgpd_config *conf)
if (conf->connectretry != INTERVAL_CONNECTRETRY)
printf("connect-retry %u\n", conf->connectretry);
- if (conf->flags & BGPD_FLAG_NO_EVALUATE)
- printf("route-collector yes\n");
-
if (conf->flags & BGPD_FLAG_DECISION_ROUTEAGE)
printf("rde route-age evaluate\n");