diff options
| -rw-r--r-- | usr.sbin/bgpd/bgpd.conf.5 | 12 | ||||
| -rw-r--r-- | usr.sbin/bgpd/parse.y | 10 |
2 files changed, 11 insertions, 11 deletions
diff --git a/usr.sbin/bgpd/bgpd.conf.5 b/usr.sbin/bgpd/bgpd.conf.5 index d54f82ce884..2d40eff8473 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.9 2003/12/27 18:43:36 henning Exp $ +.\" $OpenBSD: bgpd.conf.5,v 1.10 2003/12/27 21:40:43 henning Exp $ .\" .\" Copyright (c) 2003 Henning Brauer <henning@openbsd.org> .\" Copyright (c) 2002 Daniel Hartmeier <dhartmei@openbsd.org> @@ -95,11 +95,11 @@ AS 65001 sets the local .Ar AS to 65001. -.It Ar bgpid -Set the bgp id to the given IP address which must be local to the +.It Ar router-id +Set the router id to the given IP address which must be local to the machine. .Bd -literal -offset indent -bgpid 10.0.0.1 +router-id 10.0.0.1 .Ed .Pp If not given the bgp id is determined as the biggest IP address assigned @@ -175,12 +175,12 @@ Add a description. The description is used when logging neighbor events and in status reports etc and has no further meaning to .Ar bgpd . -.It Ar local-addr +.It Ar local-address When .Ar bgpd initiates the TCP connection to the neighbor system, it normally does not bind to a specific IP address. -If a local-addr is given it binds +If a local-address is given it binds to this address before. .It Ar multihop Normally neighbors that are not in the same AS as the local diff --git a/usr.sbin/bgpd/parse.y b/usr.sbin/bgpd/parse.y index 6d89ab8bbd2..7b8463ab614 100644 --- a/usr.sbin/bgpd/parse.y +++ b/usr.sbin/bgpd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.23 2003/12/27 17:34:10 henning Exp $ */ +/* $OpenBSD: parse.y,v 1.24 2003/12/27 21:40:43 henning Exp $ */ /* * Copyright (c) 2002, 2003 Henning Brauer <henning@openbsd.org> @@ -82,7 +82,7 @@ typedef struct { %} %token SET -%token AS BGPID HOLDTIME YMIN LISTEN ON NO FIBUPDATE +%token AS ROUTERID HOLDTIME YMIN LISTEN ON NO FIBUPDATE %token GROUP NEIGHBOR %token REMOTEAS DESCR LOCALADDR MULTIHOP PASSIVE %token ERROR @@ -144,7 +144,7 @@ varset : STRING '=' string { conf_main : AS number { conf->as = $2; } - | BGPID address { + | ROUTERID address { conf->bgpid = $2.s_addr; } | HOLDTIME number { @@ -323,13 +323,12 @@ lookup(char *s) /* this has to be sorted always */ static const struct keywords keywords[] = { { "AS", AS}, - { "bgpid", BGPID}, { "descr", DESCR}, { "fib-update", FIBUPDATE}, { "group", GROUP}, { "holdtime", HOLDTIME}, { "listen", LISTEN}, - { "local-addr", LOCALADDR}, + { "local-address", LOCALADDR}, { "log", LOG}, { "min", YMIN}, { "mrtdump", MRTDUMP}, @@ -338,6 +337,7 @@ lookup(char *s) { "on", ON}, { "passive", PASSIVE}, { "remote-as", REMOTEAS}, + { "router-id", ROUTERID}, { "set", SET}, { "updates", UPDATES}, }; |