diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2009-10-13 09:51:54 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2009-10-13 09:51:54 +0000 |
| commit | b9da93e67f458f1c6f81399e611ad5ac07fb9d0b (patch) | |
| tree | 3419aa8d91b05995489febd7de59179f78c83b66 | |
| parent | 7cf5dc5f369569796741923a3f0f6b4085e5e26c (diff) | |
Disable graceful restart for now. The EOR marker is sent in the wrong place
and fixing this is not a two liner. Will be enabled again when I found out
how to fix this.
| -rw-r--r-- | usr.sbin/bgpd/bgpd.conf.5 | 10 | ||||
| -rw-r--r-- | usr.sbin/bgpd/parse.y | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/usr.sbin/bgpd/bgpd.conf.5 b/usr.sbin/bgpd/bgpd.conf.5 index 476171ea7aa..0eaba42d033 100644 --- a/usr.sbin/bgpd/bgpd.conf.5 +++ b/usr.sbin/bgpd/bgpd.conf.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: bgpd.conf.5,v 1.97 2009/10/06 09:44:13 claudio Exp $ +.\" $OpenBSD: bgpd.conf.5,v 1.98 2009/10/13 09:51:53 claudio Exp $ .\" .\" Copyright (c) 2004 Claudio Jeker <claudio@openbsd.org> .\" Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -16,7 +16,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: October 6 2009 $ +.Dd $Mdocdate: October 13 2009 $ .Dt BGPD.CONF 5 .Os .Sh NAME @@ -519,13 +519,13 @@ The default is .Pq Ic yes Ns \&| Ns Ic no .Xc If set to -.Ic no , -the graceful restart capability is not announced. +.Ic yes , +the graceful restart capability is announced. Currently only the End-of-RIB marker is supported and announced by the .Ic restart capability. The default is -.Ic yes . +.Ic no . .Pp .It Ic demote Ar group Increase the diff --git a/usr.sbin/bgpd/parse.y b/usr.sbin/bgpd/parse.y index c065b7d183e..af99af689f6 100644 --- a/usr.sbin/bgpd/parse.y +++ b/usr.sbin/bgpd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.237 2009/10/06 09:44:13 claudio Exp $ */ +/* $OpenBSD: parse.y,v 1.238 2009/10/13 09:51:53 claudio Exp $ */ /* * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -2600,7 +2600,7 @@ alloc_peer(void) p->conf.capabilities.mp_v4 = SAFI_ALL; p->conf.capabilities.mp_v6 = SAFI_ALL; p->conf.capabilities.refresh = 1; - p->conf.capabilities.restart = 1; + p->conf.capabilities.restart = 0; p->conf.capabilities.as4byte = 1; p->conf.local_as = conf->as; p->conf.local_short_as = conf->short_as; |