diff options
Diffstat (limited to 'net/openbgpd/files/patch-bgpd_bgpd.conf.5')
| -rw-r--r-- | net/openbgpd/files/patch-bgpd_bgpd.conf.5 | 228 |
1 files changed, 129 insertions, 99 deletions
diff --git a/net/openbgpd/files/patch-bgpd_bgpd.conf.5 b/net/openbgpd/files/patch-bgpd_bgpd.conf.5 index bee730547c3b..b1ccbec4a8f2 100644 --- a/net/openbgpd/files/patch-bgpd_bgpd.conf.5 +++ b/net/openbgpd/files/patch-bgpd_bgpd.conf.5 @@ -1,14 +1,14 @@ Index: bgpd/bgpd.conf.5 =================================================================== RCS file: /home/cvs/private/hrs/openbgpd/bgpd/bgpd.conf.5,v -retrieving revision 1.1.1.1 -retrieving revision 1.5 -diff -u -p -r1.1.1.1 -r1.5 ---- bgpd/bgpd.conf.5 30 Jun 2009 05:46:15 -0000 1.1.1.1 -+++ bgpd/bgpd.conf.5 22 Oct 2009 15:10:02 -0000 1.5 +retrieving revision 1.1.1.7 +retrieving revision 1.6 +diff -u -p -r1.1.1.7 -r1.6 +--- bgpd/bgpd.conf.5 14 Feb 2010 20:19:57 -0000 1.1.1.7 ++++ bgpd/bgpd.conf.5 4 Feb 2010 16:22:23 -0000 1.6 @@ -1,4 +1,4 @@ --.\" $OpenBSD: bgpd.conf.5,v 1.88 2008/03/22 08:38:38 claudio Exp $ -+.\" $OpenBSD: bgpd.conf.5,v 1.94 2009/06/07 00:31:22 claudio Exp $ +-.\" $OpenBSD: bgpd.conf.5,v 1.94 2009/06/07 00:31:22 claudio Exp $ ++.\" $OpenBSD: bgpd.conf.5,v 1.103 2009/12/16 15:40:55 claudio Exp $ .\" .\" Copyright (c) 2004 Claudio Jeker <claudio@openbsd.org> .\" Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -16,73 +16,39 @@ diff -u -p -r1.1.1.1 -r1.5 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" --.Dd $Mdocdate: March 22 2008 $ -+.Dd $Mdocdate: October 6 2009 $ +-.Dd $Mdocdate: June 7 2009 $ ++.Dd $Mdocdate: November 26 2009 $ .Dt BGPD.CONF 5 .Os .Sh NAME -@@ -123,14 +123,26 @@ sets the local AS to 65001. - The AS numbers 64512 \(en 65534 are designated for private use. - The AS number 23456 is a specially designated Autonomous System Number and - should not be used. --4-byte AS numbers are specified as two numbers separated by a dot. --For example: -+4-byte AS numbers are specified as two numbers separated by a dot -+(ASDOT format), -+for example: - .Bd -literal -offset indent - AS 3.10 - .Ed - .Pp -+or as a large number (ASPLAIN format), for example: -+.Bd -literal -offset indent -+AS 196618 -+.Ed -+.Pp -+.It Ic connect-retry Ar seconds -+Set the number of seconds before retrying to open a connection. -+This timer should be sufficiently large in EBGP configurations. -+The default is 120 seconds. -+.Pp - .It Xo - .Ic dump -+.Op Ic rib Ar name - .Pq Ic table Ns \&| Ns Ic table-mp - .Ar file Op Ar timeout +@@ -93,7 +93,7 @@ Set the local + .Em autonomous system + number to + .Ar as-number . +-If the first AS number is a 4-byte AS it is possible to specifiy a secondary ++If the first AS number is a 4-byte AS it is possible to specify a secondary + 2-byte AS number which is used for neighbors which do not support 4-byte AS + numbers. + The default for the secondary AS is 23456. +@@ -313,7 +313,7 @@ is only compared between peers belonging + .Ic rib Ar name + .Op Ic no Ic evaluate .Xc -@@ -145,7 +157,8 @@ Dump the RIB, a.k.a. the - and all BGP messages in Multi-threaded Routing Toolkit (MRT) format. - Dumping the RIB is normally an expensive operation, - but it should not influence the session handling. --Excessive dumping may result in delayed update processing. -+It is possible to dump alternate RIB with the use of -+.Ar name . - .Pp - For example, the following will dump the entire table to the - .Xr strftime 3 Ns -expanded -@@ -297,6 +310,21 @@ is only compared between peers belonging +-Creat an additional RIB named ++Create an additional RIB named + .Ar name . + It is possible to disable the decision process per RIB with the + .Ic no Ic evaluate +@@ -321,7 +321,7 @@ flag. + .Ic Adj-RIB-In + and + .Ic Loc-RIB +-are created automaticaly and used as default. ++are created automatically and used as default. .Pp .It Xo .Ic rde -+.Ic rib Ar name -+.Op Ic no Ic evaluate -+.Xc -+Create an additional RIB named -+.Ar name . -+It is possible to disable the decision process per RIB with the -+.Ic no Ic evaluate -+flag. -+.Ic Adj-RIB-In -+and -+.Ic Loc-RIB -+are created automaticaly and used as default. -+.Pp -+.It Xo -+.Ic rde - .Ic route-age - .Pq Ic ignore Ns \&| Ns Ic evaluate - .Xc -@@ -455,6 +483,17 @@ Only routes for that address family and +@@ -483,6 +483,17 @@ Only routes for that address family and announced and processed. .Pp .It Xo @@ -100,7 +66,7 @@ diff -u -p -r1.1.1.1 -r1.5 .Ic announce capabilities .Pq Ic yes Ns \&| Ns Ic no .Xc -@@ -465,6 +504,29 @@ This can be helpful to connect to old or +@@ -493,6 +504,29 @@ This can be helpful to connect to old or The default is .Ic yes . .Pp @@ -130,7 +96,16 @@ diff -u -p -r1.1.1.1 -r1.5 .It Ic demote Ar group Increase the .Xr carp 4 -@@ -561,6 +623,12 @@ Inherited from the global configuration +@@ -504,7 +538,7 @@ The demotion counter will be increased a + .Xr bgpd 8 + starts and decreased + 60 seconds after the session went to state +-.Em ESTABLISHED. ++.Em ESTABLISHED . + For neighbors added at runtime, the demotion counter is only increased after + the session has been + .Em ESTABLISHED +@@ -589,6 +623,12 @@ Inherited from the global configuration Set the minimal acceptable holdtime. Inherited from the global configuration if not given. .Pp @@ -143,11 +118,11 @@ diff -u -p -r1.1.1.1 -r1.5 .It Xo .Ic ipsec .Pq Ic ah Ns \&| Ns Ic esp -@@ -611,11 +679,11 @@ is responsible for managing the session +@@ -639,11 +679,11 @@ is responsible for managing the session With .Xr isakmpd 8 , it is sufficient to copy the peer's public key, found in --.Pa /etc/isakmpd/private/local.pub , +-.Pa /etc/isakmpd/local.pub , +.Pa %%PREFIX%%/etc/isakmpd/private/local.pub , to the local machine. It must be stored in a file @@ -157,44 +132,99 @@ diff -u -p -r1.1.1.1 -r1.5 The local public key must be copied to the peer in the same way. As .Xr bgpd 8 -@@ -670,6 +738,9 @@ Do not attempt to actively open a TCP co +@@ -698,7 +738,7 @@ Do not attempt to actively open a TCP co .It Ic remote-as Ar as-number Set the AS number of the remote system. .Pp +-.It rib .Ar name +.It Ic rib Ar name -+Bind the neighbor to the specified RIB. -+.Pp + Bind the neighbor to the specified RIB. + .Pp .It Ic route-reflector Op Ar address - Act as an RFC 2796 - .Em route-reflector -@@ -728,6 +799,18 @@ tcp md5sig key deadbeef - .Ed +@@ -1028,6 +1068,12 @@ matches a rule which has the + option set, this rule is considered the last matching rule, and evaluation + of subsequent rules is skipped. .Pp - .It Xo -+.Ic transparent-as -+.Pq Ic yes Ns \&| Ns Ic no -+.Xc -+If set to -+.Ic yes , -+.Em AS paths -+to EBGP neighbors are not prepended with their own AS. -+The default is inherited from the global -+.Ic transparent-as -+setting. ++.It Ic rib Ar name ++Apply rule only to the specified RIB. ++This only applies for received updates, so not for rules using the ++.Ar to peer ++parameter. +.Pp + .It Ic set Ar attribute ... + All matching rules can set the + .Em AS path attributes +@@ -1079,6 +1125,48 @@ Alternately, well-known communities may + or + .Ic NO_PEER . + .Pp +.It Xo - .Ic ttl-security - .Pq Ic yes Ns \&| Ns Ic no - .Xc -@@ -1048,6 +1131,7 @@ will be adjusted by adding or subtractin - .Ar number ; - otherwise it will be set to ++.Ic ext-community Op Ar delete ++.Ar subtype Ar as-number Ns Li : Ns Ar local ++.Xc ++.It Xo ++.Ic ext-community Op Ar delete ++.Ar subtype Ar IP Ns Li : Ns Ar local ++.Xc ++.It Xo ++.Ic ext-community Op Ar delete ++.Ar subtype Ar numvalue ++.Xc ++Set or delete the ++.Em Extended Community ++AS path attribute. ++Extended Communities are specified by a ++.Ar subtype ++and normally two values, a globally unique part (e.g. the AS number) and a ++local part. ++The type is selected depending on the encoding of the global part. ++Two-octet AS Specific Extended Communities and Four-octet AS Specific Extended ++Communities are encoded as ++.Ar as-number Ns Li : Ns Ar local . ++Four-octet encoding is used if the ++.Ar as-number ++is bigger then 65535 or if the AS_DOT encoding is used. ++IPv4 Address Specific Extended Communities are encoded as ++.Ar IP Ns Li : Ns Ar local . ++Opaque Extended Communities are encoded with a single numeric value. ++Currently the following subtypes are supported: ++.Bd -literal -offset indent ++rt Route Target ++soo Source of Origin ++odi OSPF Domain Identifier ++ort OSPF Route Type ++ori OSPF Router ID ++bdc BGP Data Collection ++.Ed ++.Pp ++Not all type and subtype value pairs are allowed by IANA and the parser ++will ensure that no invalid combination is created. ++.Pp + .It Ic localpref Ar number + Set the + .Em LOCAL_PREF +@@ -1108,6 +1196,20 @@ otherwise it will be set to .Ar number . -+The default is 100. .Pp - .It Ic med Ar number - .It Ic metric Ar number -@@ -1137,8 +1221,8 @@ For prefixes with equally long paths, th + .It Xo ++.Ic origin ++.Sm off ++.Po Ic igp \*(Ba ++.Ic egp \*(Ba ++.Ic incomplete Pc ++.Sm on ++.Xc ++Set the ++.Em ORIGIN ++AS path attribute to mark the source of this ++route as being injected from an igp protocol, an egp protocol ++or being an aggregated route. ++.Pp ++.It Xo + .Ic nexthop + .Sm off + .Po Ar address \*(Ba +@@ -1181,8 +1283,8 @@ For prefixes with equally long paths, th is selected. .El .Sh FILES |