Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Minor fixes.

Browse source
This commit is contained in:
Ondrej Zajicek 2011-04-05 11:41:18 +02:00
parent bf27abd6d4
commit 489c308a75
4 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
configure.in
View file

@ -211,7 +211,9 @@ if test "$enable_client" = yes ; then
AC_CHECK_LIB(history, add_history, CLIENT_LIBS="-lhistory") AC_CHECK_LIB(history, add_history, CLIENT_LIBS="-lhistory")
AC_CHECK_LIB(ncurses, tgetent, USE_TERMCAP_LIB=-lncurses, AC_CHECK_LIB(ncurses, tgetent, USE_TERMCAP_LIB=-lncurses,
AC_CHECK_LIB(curses, tgetent, USE_TERMCAP_LIB=-lcurses, 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_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_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) AC_CHECK_LIB(readline, rl_crlf, AC_DEFINE(HAVE_RL_CRLF),,$USE_TERMCAP_LIB)

2
doc/bird.conf.example
View file

@ -167,7 +167,7 @@ protocol static {
# description "My BGP uplink"; # description "My BGP uplink";
# local as 65000; # local as 65000;
# neighbor 62.168.0.130 as 5588; # neighbor 62.168.0.130 as 5588;
# multihop 20 via 62.168.0.13; # multihop;
# hold time 240; # hold time 240;
# startup hold time 240; # startup hold time 240;
# connect retry time 120; # connect retry time 120;

13
doc/bird.sgml
View file

@ -1024,7 +1024,7 @@ This allows to set routing policy and all the other parameters differently
for each neighbor using the following configuration parameters: for each neighbor using the following configuration parameters:
<descrip> <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 are part of. (Note that contrary to other IP routers, BIRD is
able to act as a router located in multiple AS'es able to act as a router located in multiple AS'es
simultaneously, but in such cases you need to tweak the BGP 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 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. 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. session to a neighbor that isn't directly connected.
Accurately, this option should be used if the configured Accurately, this option should be used if the configured
neighbor IP address does not match with any local network 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. notification messages, so the default time is set to a large value.
<tag>primary [ "<m/mask/" ] <m/prefix/</tag> <tag>primary [ "<m/mask/" ] <m/prefix/</tag>
If a network interface has more than one network address, If a network interface has more than one network address, BIRD
BIRD has to choose one of them as a primary one, because some has to choose one of them as a primary one. By default, BIRD
routing protocols (for example OSPFv2) suppose there is only chooses the lexicographically smallest address as the primary
one network address per interface. By default, BIRD chooses one.
the lexicographically smallest address as the primary one.
This option allows to specify which network address should be This option allows to specify which network address should be
chosen as a primary one. Network addresses that match chosen as a primary one. Network addresses that match

4
nest/iface.h
View file

@ -63,8 +63,8 @@ struct iface {
* - Host addresses, with ifa.prefix/pxlen == ifa.ip/32 (or /128). * - Host addresses, with ifa.prefix/pxlen == ifa.ip/32 (or /128).
* May be considered a special case of standard addresses. * May be considered a special case of standard addresses.
* *
* Peer addresses (AFAIK) do not exist in IPv6. Linux alos supports generalized peer * Peer addresses (AFAIK) do not exist in IPv6. Linux also supports generalized peer
* address (with pxlen < 32 and ifa.ip outside prefix), we do not support that. * addresses (with pxlen < 32 and ifa.ip outside prefix), we do not support that.
*/ */