diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2012-09-23 09:39:19 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2012-09-23 09:39:19 +0000 |
| commit | 2c725639fbf3fbc5db690be9a0af259c52b534b5 (patch) | |
| tree | 6d329db559e3c61f16f46ff86c7e9ae66f4df98b | |
| parent | 0c536b86bbb7f9bedc14c71f4ffea5942638de3d (diff) | |
Enable graceful restart by default. The only way to find out if it works for
real. After discussion with sthen@, henning@ and deraadt@.
It can be disabled per neighbor with "announce restart no".
| -rw-r--r-- | usr.sbin/bgpd/parse.y | 4 | ||||
| -rw-r--r-- | usr.sbin/bgpd/printconf.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/bgpd/parse.y b/usr.sbin/bgpd/parse.y index 108e1ff8c18..1099ef26833 100644 --- a/usr.sbin/bgpd/parse.y +++ b/usr.sbin/bgpd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.263 2012/09/12 05:56:22 claudio Exp $ */ +/* $OpenBSD: parse.y,v 1.264 2012/09/23 09:39:17 claudio Exp $ */ /* * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -3019,7 +3019,7 @@ alloc_peer(void) for (i = 0; i < AID_MAX; i++) p->conf.capabilities.mp[i] = -1; p->conf.capabilities.refresh = 1; - p->conf.capabilities.grestart.restart = 0; + p->conf.capabilities.grestart.restart = 1; p->conf.capabilities.as4byte = 1; p->conf.local_as = conf->as; p->conf.local_short_as = conf->short_as; diff --git a/usr.sbin/bgpd/printconf.c b/usr.sbin/bgpd/printconf.c index 88ffb052197..803f83d9d34 100644 --- a/usr.sbin/bgpd/printconf.c +++ b/usr.sbin/bgpd/printconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: printconf.c,v 1.87 2012/09/12 05:56:22 claudio Exp $ */ +/* $OpenBSD: printconf.c,v 1.88 2012/09/23 09:39:18 claudio Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -377,8 +377,8 @@ print_peer(struct peer_config *p, struct bgpd_config *conf, const char *c) printf("%s\tannounce capabilities no\n", c); if (p->capabilities.refresh == 0) printf("%s\tannounce refresh no\n", c); - if (p->capabilities.grestart.restart == 1) - printf("%s\tannounce restart yes\n", c); + if (p->capabilities.grestart.restart == 0) + printf("%s\tannounce restart no\n", c); if (p->capabilities.as4byte == 0) printf("%s\tannounce as4byte no\n", c); if (p->announce_type == ANNOUNCE_SELF) |