Commit 489c308a authored by Ondřej Zajíček's avatar Ondřej Zajíček

Minor fixes.

parent bf27abd6
......@@ -211,7 +211,9 @@ if test "$enable_client" = yes ; then
AC_CHECK_LIB(history, add_history, CLIENT_LIBS="-lhistory")
AC_CHECK_LIB(ncurses, tgetent, USE_TERMCAP_LIB=-lncurses,
AC_CHECK_LIB(curses, tgetent, USE_TERMCAP_LIB=-lcurses,
AC_CHECK_LIB(termcap, tgetent, USE_TERMCAP_LIB=-ltermcap)))
AC_CHECK_LIB(tinfow, tgetent, USE_TERMCAP_LIB=-ltinfow,
AC_CHECK_LIB(tinfo, tgetent, USE_TERMCAP_LIB=-ltinfo
AC_CHECK_LIB(termcap, tgetent, USE_TERMCAP_LIB=-ltermcap)))))
AC_CHECK_LIB(readline, rl_callback_read_char, CLIENT_LIBS="-lreadline $CLIENT_LIBS $USE_TERMCAP_LIB",
AC_MSG_ERROR([[The client requires GNU readline library 2.1 or newer. Either install the library or use --disable-client to compile without the client.]]), $USE_TERMCAP_LIB)
AC_CHECK_LIB(readline, rl_crlf, AC_DEFINE(HAVE_RL_CRLF),,$USE_TERMCAP_LIB)
......
......@@ -167,7 +167,7 @@ protocol static {
# description "My BGP uplink";
# local as 65000;
# neighbor 62.168.0.130 as 5588;
# multihop 20 via 62.168.0.13;
# multihop;
# hold time 240;
# startup hold time 240;
# connect retry time 120;
......
......@@ -1024,7 +1024,7 @@ This allows to set routing policy and all the other parameters differently
for each neighbor using the following configuration parameters:
<descrip>
<tag>local <m/[ip]/] as <m/number/</tag> Define which AS we
<tag>local [<m/ip/] as <m/number/</tag> Define which AS we
are part of. (Note that contrary to other IP routers, BIRD is
able to act as a router located in multiple AS'es
simultaneously, but in such cases you need to tweak the BGP
......@@ -1039,7 +1039,7 @@ for each neighbor using the following configuration parameters:
of your router's interfaces. In case the neighbor is in the same AS
as we are, we automatically switch to iBGP. This parameter is mandatory.
<tag>multihop <m/[number]/]</tag> Configure multihop BGP
<tag>multihop [<m/number/]</tag> Configure multihop BGP
session to a neighbor that isn't directly connected.
Accurately, this option should be used if the configured
neighbor IP address does not match with any local network
......@@ -1334,11 +1334,10 @@ require network interfaces to be defined for them to work with.
notification messages, so the default time is set to a large value.
<tag>primary [ "<m/mask/" ] <m/prefix/</tag>
If a network interface has more than one network address,
BIRD has to choose one of them as a primary one, because some
routing protocols (for example OSPFv2) suppose there is only
one network address per interface. By default, BIRD chooses
the lexicographically smallest address as the primary one.
If a network interface has more than one network address, BIRD
has to choose one of them as a primary one. By default, BIRD
chooses the lexicographically smallest address as the primary
one.
This option allows to specify which network address should be
chosen as a primary one. Network addresses that match
......
......@@ -63,8 +63,8 @@ struct iface {
* - Host addresses, with ifa.prefix/pxlen == ifa.ip/32 (or /128).
* May be considered a special case of standard addresses.
*
* Peer addresses (AFAIK) do not exist in IPv6. Linux alos supports generalized peer
* address (with pxlen < 32 and ifa.ip outside prefix), we do not support that.
* Peer addresses (AFAIK) do not exist in IPv6. Linux also supports generalized peer
* addresses (with pxlen < 32 and ifa.ip outside prefix), we do not support that.
*/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment