summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--usr.sbin/bgpd/bgpd.87
-rw-r--r--usr.sbin/bgpd/bgpd.conf.532
2 files changed, 20 insertions, 19 deletions
diff --git a/usr.sbin/bgpd/bgpd.8 b/usr.sbin/bgpd/bgpd.8
index c3bdfb55150..222249321a6 100644
--- a/usr.sbin/bgpd/bgpd.8
+++ b/usr.sbin/bgpd/bgpd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: bgpd.8,v 1.10 2004/06/23 00:11:27 claudio Exp $
+.\" $OpenBSD: bgpd.8,v 1.11 2004/07/09 11:01:22 henning Exp $
.\"
.\" Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
.\"
@@ -28,10 +28,9 @@
.Op Fl f Ar file
.Ek
.Sh DESCRIPTION
-The
.Nm
-daemon implements the Border Gateway Protocol version 4 as described
-in RFC 1771.
+is a daemon usually invoked at boot time to manage the network routing tables.
+It uses the Border Gateway Protocol, Version 4, as described in RFC 1771.
The options are as follows:
.Bl -tag -width Ds
.It Fl D Ar macro=value
diff --git a/usr.sbin/bgpd/bgpd.conf.5 b/usr.sbin/bgpd/bgpd.conf.5
index a6782767a24..6231fccb150 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.29 2004/07/05 17:04:44 henning Exp $
+.\" $OpenBSD: bgpd.conf.5,v 1.30 2004/07/09 11:01:22 henning Exp $
.\"
.\" Copyright (c) 2004 Claudio Jeker <claudio@openbsd.org>
.\" Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -36,7 +36,8 @@ config file is divided into four main sections.
User-defined variables may be defined and used later, simplifying the
configuration file.
.It Cm Global configuration
-Global settings for the bgpd daemon.
+Global settings for
+.Ar bgpd .
.It Cm Neighbors and Groups
.Ar bgpd
establishes sessions with
@@ -69,8 +70,8 @@ Macros are not expanded inside quotes.
.Pp
For example,
.Bd -literal -offset indent
-c7206="1.2.3.4"
-neighbor $c7206 {
+peer1="1.2.3.4"
+neighbor $peer1 {
remote-as 65001
}
.Ed
@@ -113,34 +114,35 @@ Dumping the
.Em RIB
is normally an expensive operation, but it should not influence the session
handling.
-Dumping too often may result in a slow update speed.
+Excessive dumping may result in delayed update processing.
.Pp
-This will dump all 300 seconds of the
+For example,
+.Bd -literal -offset indent
+dump table "/tmp/rib-dump-%H%M" 300
+.Ed
+.Pp
+will dump all 300 seconds of the
.Em RIB
table to the
.Xr strftime 3
expanded filename.
The timeout is optional.
.Bd -literal -offset indent
-dump table "/tmp/rib-dump-%H%M" 300
+dump all in "/tmp/all-in-%H%M" 300
.Ed
.Pp
-Similar to the table dump but this time all
+Similar to the table dump, but this time all
.Em bgp
messages and
.Em state
-transitions are dumped to the specified file:
+transitions are dumped to the specified file.
.Bd -literal -offset indent
-dump all in "/tmp/all-in-%H%M" 300
+dump updates in "/tmp/updates-in-%H%M" 300
.Ed
.Pp
As before, but only the
.Em UPDATE
-messages are dumped to the file:
-.Bd -literal -offset indent
-dump updates in "/tmp/updates-in-%H%M" 300
-.Ed
-.Pp
+messages are dumped to the file.
It is also possible to dump outgoing messages:
.Bd -literal -offset indent
dump all out "/tmp/all-out-%H%M" 300