From 37075da75df0451fec4109d440c1a52705222fc6 Mon Sep 17 00:00:00 2001 From: Alexandre Chappuis Date: Tue, 13 Sep 2011 16:33:45 +0400 Subject: doc: add missing word * ospfd.texi: Adjust meaning of the rfc1583compatibility option in order to match the RFC specification and the actual source code. --- doc/ospfd.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/ospfd.texi b/doc/ospfd.texi index f879a986..0a085db4 100644 --- a/doc/ospfd.texi +++ b/doc/ospfd.texi @@ -99,7 +99,7 @@ behaviors implemented in Cisco and IBM routers." to section G.2 (changes) in section 16.4 a change to the path preference algorithm that prevents possible routing loops that were possible in the old version of OSPFv2. More specifically it demands -that inter-area paths and intra-area path are now of equal preference +that inter-area paths and intra-area backbone path are now of equal preference but still both preferred to external paths. This command should NOT be set normally. -- cgit v1.2.1 From c31e5726bece392e1d20081c712482e9954fec66 Mon Sep 17 00:00:00 2001 From: Alexandre Chappuis Date: Sun, 11 Sep 2011 16:54:11 +0400 Subject: doc: BGP route-flap dampening --- doc/bgpd.texi | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'doc') diff --git a/doc/bgpd.texi b/doc/bgpd.texi index e7463300..63834600 100644 --- a/doc/bgpd.texi +++ b/doc/bgpd.texi @@ -85,6 +85,7 @@ so @code{router-id} is set to 0.0.0.0. So please set router-id by hand. @menu * BGP distance:: * BGP decision process:: +* BGP route flap dampening:: @end menu @node BGP distance @@ -123,6 +124,27 @@ sequences should should be taken into account during the BGP best path decision process. @end deffn +@node BGP route flap dampening +@subsection BGP route flap dampening + +@deffn {BGP} {bgp dampening @var{<1-45>} @var{<1-20000>} @var{<1-20000>} @var{<1-255>}} {} +This command enables BGP route-flap dampening and specifies dampening parameters. + +@table @asis +@item @asis{half-life} +Half-life time for the penalty +@item @asis{reuse-threshold} +Value to start reusing a route +@item @asis{suppress-threshold} +Value to start suppressing a route +@item @asis{max-suppress} +Maximum duration to suppress a stable route +@end table + +The route-flap damping algorithm is compatible with @cite{RFC2439}. The use of this command +is not recommended nowadays, see @uref{http://www.ripe.net/ripe/docs/ripe-378,,RIPE-378}. +@end deffn + @node BGP network @section BGP network @@ -930,6 +952,14 @@ Clear peers which have addresses of X.X.X.X Clear peer using soft reconfiguration. @end deffn +@deffn {Command} {show ip bgp dampened-paths} {} +Display paths suppressed due to dampening +@end deffn + +@deffn {Command} {show ip bgp flap-statistics} {} +Display flap statistics of routes +@end deffn + @deffn {Command} {show debug} {} @end deffn -- cgit v1.2.1 From 1ffe5e794c3cd4a2ef84cac937d377de89b721f8 Mon Sep 17 00:00:00 2001 From: Roderick Schertler Date: Wed, 16 Nov 2011 15:03:14 +0400 Subject: doc: rectify "match ip next-hop" in ripd (BZ#537) --- doc/ripd.texi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'doc') diff --git a/doc/ripd.texi b/doc/ripd.texi index 197bc5af..c6f804af 100644 --- a/doc/ripd.texi +++ b/doc/ripd.texi @@ -424,10 +424,10 @@ must be different. Maybe it'd be better to made new matches - say Match if route destination is permitted by access-list. @end deffn -@deffn {Route Map} {match ip next-hop A.B.C.D} {} -Cisco uses here , @command{ripd} IPv4 address. Match if -route has this next-hop (meaning next-hop listed in the rip route -table - "show ip rip") +@deffn {Route Map} {match ip next-hop @var{word}} {} +@deffnx {Route Map} {match ip next-hop prefix-list @var{word}} {} +Match if route next-hop (meaning next-hop listed in the rip route-table +as displayed by "show ip rip") is permitted by access-list. @end deffn @deffn {Route Map} {match metric <0-4294967295>} {} -- cgit v1.2.1 From 05e54ee3df973194f2a00e3ea0b1da7bebc71fd6 Mon Sep 17 00:00:00 2001 From: Denis Ovsienko Date: Sat, 3 Dec 2011 17:45:17 +0400 Subject: build: delete .cvsignore files --- doc/.cvsignore | 31 ------------------------------- doc/mpls/.cvsignore | 2 -- 2 files changed, 33 deletions(-) delete mode 100644 doc/.cvsignore delete mode 100644 doc/mpls/.cvsignore (limited to 'doc') diff --git a/doc/.cvsignore b/doc/.cvsignore deleted file mode 100644 index 43987b24..00000000 --- a/doc/.cvsignore +++ /dev/null @@ -1,31 +0,0 @@ -Makefile -Makefile.in -mdate-sh -draft-zebra-00.txt -zebra.info-* -zebra.html -defines.texi -version.texi -quagga.html -quagga.info -*.pdf -*.eps -quagga.ps -quagga.dvi -stamp-vti -.nfs* -*.aux -*.cp -*.cps -*.fn -*.fns -*.ky -*.kys -*.log -*.op -*.pg -*.toc -*.tp -*.vr -.arch-inventory -.arch-ids diff --git a/doc/mpls/.cvsignore b/doc/mpls/.cvsignore deleted file mode 100644 index 1218df92..00000000 --- a/doc/mpls/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -.arch-ids -.arch-inventory -- cgit v1.2.1 From 651e70d7f419ee7af75113f80e688c0100e9cff5 Mon Sep 17 00:00:00 2001 From: Denis Ovsienko Date: Tue, 27 Dec 2011 18:06:45 +0400 Subject: doc: update BGP RFC references --- doc/BGP-TypeCode | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) (limited to 'doc') diff --git a/doc/BGP-TypeCode b/doc/BGP-TypeCode index 5663c4d7..b3218079 100644 --- a/doc/BGP-TypeCode +++ b/doc/BGP-TypeCode @@ -3,24 +3,22 @@ Value Attribute References ========================================================================= - 1 ORIGIN [RFC 1771] - 2 AS_PATH [RFC 1771] - 3 NEXT_HOP [RFC 1771] - 4 MULTI_EXIT_DISC [RFC 1771] - 5 LOCAL_PREF [RFC 1771] - 6 ATOMIC_AGGREGATE [RFC 1771] - 7 AGGREGATOR [RFC 1771] + 1 ORIGIN [RFC 4271] + 2 AS_PATH [RFC 4271] + 3 NEXT_HOP [RFC 4271] + 4 MULTI_EXIT_DISC [RFC 4271] + 5 LOCAL_PREF [RFC 4271] + 6 ATOMIC_AGGREGATE [RFC 4271] + 7 AGGREGATOR [RFC 4271] 8 COMMUNITIES [RFC 1997] - 9 ORIGINATOR_ID [RFC 1966] - 10 CLUSTER_LIST [RFC 1966] + 9 ORIGINATOR_ID [RFC 4456] + 10 CLUSTER_LIST [RFC 4456] 11 DPA [draft-ietf-idr-bgp-dpa-05.txt(expired)] - 12 ADVERTISER [Changed from RFC 1863 bgp@ans.net ML?] - 13 RCID_PATH [Changed from RFC 1863 bgp@ans.net ML?] - 14 MP_REACH_NLRI [RFC 2283] - 15 MP_UNREACH_NLRI [RFC 2283] - 16 EXT_COMMUNITIES [draft-ramachandra-bgp-ext-communities-09.txt] + 12 ADVERTISER [RFC 1863] + 13 RCID_PATH [RFC 1863] + 14 MP_REACH_NLRI [RFC 4760] + 15 MP_UNREACH_NLRI [RFC 4760] + 16 EXT_COMMUNITIES [RFC 4360] 17 AS4_PATH [RFC 4893] 18 AS4_AGGREGATOR [RFC 4893] - 254 RCID_PATH [RFC 1863] - 255 ADVERTISER [RFC 1863] ========================================================================= -- cgit v1.2.1 From d8bcd9e9c6a1801b52b166fa3873eb468ac3c5cb Mon Sep 17 00:00:00 2001 From: Denis Ovsienko Date: Fri, 7 Oct 2011 20:43:59 +0400 Subject: doc: "[no] router zebra" does not belong to ospfd --- doc/ospfd.texi | 4 ---- 1 file changed, 4 deletions(-) (limited to 'doc') diff --git a/doc/ospfd.texi b/doc/ospfd.texi index 0a085db4..856a2ba0 100644 --- a/doc/ospfd.texi +++ b/doc/ospfd.texi @@ -568,10 +568,6 @@ redistributed into OSPF (@pxref{OSPF redistribute}). @deffnx {OSPF Command} {no distance ospf} {} @end deffn -@deffn {Command} {router zebra} {} -@deffnx {Command} {no router zebra} {} -@end deffn - @node Showing OSPF information @section Showing OSPF information -- cgit v1.2.1 From 6ae93c058725991df5a9ae35cefec368919b5fea Mon Sep 17 00:00:00 2001 From: Denis Ovsienko Date: Tue, 27 Dec 2011 10:45:36 +0400 Subject: zebra: include MTU option in RA on request (BZ#665) This implements a new "ipv6 nd mtu <1-65535>" interface-level command. * doc/ipv6.texi: add description * zebra/rtadv.c * rtadv_send_packet(): send option type 5, when configured * ipv6_nd_mtu(): new VTY helper * no_ipv6_nd_mtu(): ditto * rtadv_config_write(): add new option * rtadv_init(): list new helpers --- doc/ipv6.texi | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'doc') diff --git a/doc/ipv6.texi b/doc/ipv6.texi index a78a92fe..ff07dfb3 100644 --- a/doc/ipv6.texi +++ b/doc/ipv6.texi @@ -157,6 +157,15 @@ Set default router preference in IPv6 router advertisements per RFC4191. Default: medium @end deffn +@deffn {Interface Command} {ipv6 nd mtu <1-65535>} {} +@deffnx {Interface Command} {no ipv6 nd mtu [<1-65535>]} {} +Include an MTU (type 5) option in each RA packet to assist the attached hosts +in proper interface configuration. The announced value is not verified to be +consistent with router interface MTU. + +Default: don't advertise any MTU option +@end deffn + @example @group interface eth0 -- cgit v1.2.1 From 6eb0c5ab1d43bcf9edd4fefd19031f2b96ded728 Mon Sep 17 00:00:00 2001 From: Denis Ovsienko Date: Tue, 24 Jan 2012 11:02:03 +0400 Subject: zebra: freshen RFC references in rtadv RFC2461 was replaced by RFC4861 RFC3775 was replaced by RFC6275 draft-ietf-mip6-mipext-advapi-03 was replaced by RFC4584 --- doc/ipv6.texi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/ipv6.texi b/doc/ipv6.texi index ff07dfb3..de067e04 100644 --- a/doc/ipv6.texi +++ b/doc/ipv6.texi @@ -175,6 +175,6 @@ interface eth0 @end example For more information see @cite{RFC2462 (IPv6 Stateless Address Autoconfiguration)} -, @cite{RFC2461 (Neighbor Discovery for IP Version 6 (IPv6))} -, @cite{RFC3775 (Mobility Support in IPv6 (Mobile IPv6))} +, @cite{RFC4861 (Neighbor Discovery for IP Version 6 (IPv6))} +, @cite{RFC6275 (Mobility Support in IPv6)} and @cite{RFC4191 (Default Router Preferences and More-Specific Routes)}. -- cgit v1.2.1 From 4afa50b393ff1fb34dd577888a05b81dfdced5af Mon Sep 17 00:00:00 2001 From: Denis Ovsienko Date: Tue, 24 Jan 2012 12:39:58 +0400 Subject: zebra: justify rtadv VTY commands with arguments ipv6 nd ra-interval ipv6 nd ra-lifetime ipv6 nd reachable-time ipv6 nd home-agent-preference ipv6 nd home-agent-lifetime ipv6 nd router-preference Calls to atoi() and atol() are replaced with VTY_GET_INTEGER_RANGE() macro, command patterns are clarified and aliases of some commands are added for consistency. Other changes are listed below. * zebra/rtadv.c * ipv6_nd_ra_interval_msec(): resolve -Wsign-compare * ipv6_nd_ra_interval(): idem * rtadv_init(): update to list new aliases * doc/ipv6.texi: update to match current implementation --- doc/ipv6.texi | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) (limited to 'doc') diff --git a/doc/ipv6.texi b/doc/ipv6.texi index de067e04..d4ef45a3 100644 --- a/doc/ipv6.texi +++ b/doc/ipv6.texi @@ -62,23 +62,24 @@ Default: not set, i.e. hosts do not assume a complete IP address is placed. @end itemize @end deffn -@deffn {Interface Command} {ipv6 nd ra-interval SECONDS} {} -@deffnx {Interface Command} {no ipv6 nd ra-interval} {} +@deffn {Interface Command} {ipv6 nd ra-interval <1-1800>} {} +@deffnx {Interface Command} {no ipv6 nd ra-interval [<1-1800>]} {} The maximum time allowed between sending unsolicited multicast router -advertisements from the interface, in seconds. Must be no less than 3 seconds. +advertisements from the interface, in seconds. Default: @code{600} @end deffn -@deffn {Interface Command} {ipv6 nd ra-interval msec MILLISECONDS} {} -@deffnx {Interface Command} {no ipv6 nd ra-interval msec} {} +@deffn {Interface Command} {ipv6 nd ra-interval msec <70-1800000>} {} +@deffnx {Interface Command} {no ipv6 nd ra-interval [msec <70-1800000>]} {} The maximum time allowed between sending unsolicited multicast router -advertisements from the interface, in milliseconds. Must be no less than 30 milliseconds. +advertisements from the interface, in milliseconds. Default: @code{600000} @end deffn -@deffn {Interface Command} {ipv6 nd ra-lifetime SECONDS} {} -@deffnx {Interface Command} {no ipv6 nd ra-lifetime} {} + +@deffn {Interface Command} {ipv6 nd ra-lifetime <0-9000>} {} +@deffnx {Interface Command} {no ipv6 nd ra-lifetime [<0-9000>]} {} The value to be placed in the Router Lifetime field of router advertisements sent from the interface, in seconds. Indicates the usefulness of the router as a default router on this interface. Setting the value to zero indicates @@ -89,12 +90,12 @@ Must be either zero or between value specified with @var{ipv6 nd ra-interval} Default: @code{1800} @end deffn -@deffn {Interface Command} {ipv6 nd reachable-time MILLISECONDS} {} -@deffnx {Interface Command} {no ipv6 nd reachable-time} {} +@deffn {Interface Command} {ipv6 nd reachable-time <1-3600000>} {} +@deffnx {Interface Command} {no ipv6 nd reachable-time [<1-3600000>]} {} The value to be placed in the Reachable Time field in the Router Advertisement messages sent by the router, in milliseconds. The configured time enables the router to detect unavailable neighbors. The value zero means unspecified (by -this router). Must be no greater than @code{3,600,000} milliseconds (1 hour). +this router). Default: @code{0} @end deffn @@ -126,18 +127,20 @@ the router acts as a Home Agent and includes a Home Agent Option. Default: not set @end deffn -@deffn {Interface Command} {ipv6 nd home-agent-preference} {} -@deffnx {Interface Command} {no ipv6 nd home-agent-preference} {} +@deffn {Interface Command} {ipv6 nd home-agent-preference <0-65535>} {} +@deffnx {Interface Command} {no ipv6 nd home-agent-preference [<0-65535>]} {} The value to be placed in Home Agent Option, when Home Agent config flag is set, -which indicates to hosts Home Agent preference. +which indicates to hosts Home Agent preference. The default value of 0 stands +for the lowest preference possible. Default: 0 @end deffn -@deffn {Interface Command} {ipv6 nd home-agent-lifetime} {} -@deffnx {Interface Command} {no ipv6 nd home-agent-lifetime} {} ++@deffn {Interface Command} {ipv6 nd home-agent-lifetime <0-65520>} {} ++@deffnx {Interface Command} {no ipv6 nd home-agent-lifetime [<0-65520>]} {} The value to be placed in Home Agent Option, when Home Agent config flag is set, -which indicates to hosts Home Agent Lifetime. A value of 0 means to place Router Lifetime value. +which indicates to hosts Home Agent Lifetime. The default value of 0 means to +place the current Router Lifetime value. Default: 0 @end deffn @@ -151,7 +154,7 @@ Default: not set @end deffn @deffn {Interface Command} {ipv6 nd router-preference (high|medium|low)} {} -@deffnx {Interface Command} {no ipv6 nd router-preference} {} +@deffnx {Interface Command} {no ipv6 nd router-preference [(high|medium|low)]} {} Set default router preference in IPv6 router advertisements per RFC4191. Default: medium -- cgit v1.2.1 From a20a4060c8b90e3d88ce97d439eee1a38260d7c5 Mon Sep 17 00:00:00 2001 From: Paul Jakma Date: Thu, 8 Mar 2012 16:42:31 +0000 Subject: doc: Fix an apparently no longer legal @itemize @asis * basic.texi: @asis isn't legal with @itemize apparently, should be @w according to docs, but @w{} seems to be needed. Fixes doc build error. --- doc/basic.texi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/basic.texi b/doc/basic.texi index 77fceee1..b3b23ca9 100644 --- a/doc/basic.texi +++ b/doc/basic.texi @@ -46,14 +46,14 @@ starting. Config files are generally found in: -@itemize @asis +@itemize @w{} @item @file{@value{INSTALL_PREFIX_ETC}/*.conf} @end itemize Each of the daemons has its own config file. For example, zebra's default config file name is: -@itemize @asis +@itemize @w{} @item @file{@value{INSTALL_PREFIX_ETC}/zebra.conf} @end itemize -- cgit v1.2.1 From f92a55ff0ef8e1186ad52369ace299bc91fdb791 Mon Sep 17 00:00:00 2001 From: Juliusz Chroboczek Date: Tue, 7 Feb 2012 16:33:17 +0100 Subject: doc: Document babeld. --- doc/babeld.texi | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ doc/ipv6.texi | 2 +- doc/quagga.texi | 2 + 3 files changed, 119 insertions(+), 1 deletion(-) create mode 100644 doc/babeld.texi (limited to 'doc') diff --git a/doc/babeld.texi b/doc/babeld.texi new file mode 100644 index 00000000..aa19c9aa --- /dev/null +++ b/doc/babeld.texi @@ -0,0 +1,116 @@ +@c -*-texinfo-*- +@c This is part of the Quagga Manual. +@c @value{COPYRIGHT_STR} +@c See file quagga.texi for copying conditions. +@node Babel +@chapter Babel + +Babel is an interior gateway protocol that is suitable both for wired +networks and for wireless mesh networks. Babel has been described as +``RIP on speed'' --- it is based on the same principles as RIP, but +includes a number of refinements that make it react much faster to +topology changes without ever counting to infinity, and allow it to +perform reliable link quality estimation on wireless links. Babel is +a double-stack routing protocol, meaning that a single Babel instance +is able to perform routing for both IPv4 and IPv6. + +Quagga implements Babel as described in RFC6126, as well as the +``Babel-Z'' extensions that optimise routes for radio frequency +diversity. + +@menu +* Configuring babeld:: +* Babel configuration:: +* Babel redistribution:: +* Show Babel information:: +* Babel debugging commands:: +@end menu + +@node Configuring babeld, Babel configuration, Babel, Babel +@section Configuring babeld + +The @command{babeld} daemon can be invoked with any of the common +options (@pxref{Common Invocation Options}). + +The @command{zebra} daemon must be running before @command{babeld} is +inovked. Also, if @command{zebra} is restarted then @command{babeld} +must be too. + +Configuration of @command{babeld} is done in its configuration file +@file{babeld.conf}. + +@node Babel configuration, Babel redistribution, Configuring babeld, Babel +@section Babel configuration + +@deffn Command {router babel} {} +@deffnx Command {no router babel} {} +Enable or disable Babel routing. +@end deffn + +@deffn {Babel Command} {network @var{ifname}} {} +@deffnx {Babel Command} {no network @var{ifname}} {} +Enable or disable Babel on the given interface. +@end deffn + +@deffn {Babel Command} {protocol group @var{group}} {} +@deffnx {Babel Command} {protocol port @var{port}} {} +Specify the multicast group and UDP port used for Babel traffic. The +default is to use group @code{ff02::1:6} and port 6696, as allocated +by IANA. (Note that RFC6126 specifies a port number that has been +obsoleted after publication.) +@end deffn + +@deffn {Interface Command} {wireless} {} +@deffnx {Interface Command} {no wireless} {} +Specifies whether this interface is wireless, which disables a number +of optimisations that are only correct on wired interfaces. +Specifying @code{no wireless} is always correct, but may cause extra +routing overhead. The default is autodetected if possible, +@code{wireless} otherwise. +@end deffn + +@deffn {Interface Command} {babel split-horizon} +@deffnx {Interface Command} {no babel split-horizon} +Specifies whether to perform split-horizon on the interface. Default +is @code{babel split-horizon} on wired interfaces, and @code{no babel +split-horizon} on wireless interfaces. Please note that performing split +horizon on wireless interfaces is not correct in general, and may lead +to communication failures. +@end deffn + +@deffn {Interface Command} {passive-interface} +@deffnx {Interface Command} {passive-interface} +Specifies whether this interface is passive. Note that this is +a little weaker than RIP's notion of passive interface, since Babel +always sends Hello packets, even on passive interfaces. +@end deffn + +@node Babel redistribution, Show Babel information, Babel configuration, Babel +@section Babel redistribution + +@deffn {Babel command} {redistribute @var{kind}} +@deffnx {Babel command} {no redistribute @var{kind}} +Specify which kind of routes should be redistributed into Babel. +@end deffn + +@node Show Babel information, Babel debugging commands, Babel redistribution, Babel +@section Show Babel information + +@deffn {Command} {show babel database} {} +@deffnx {Command} {show babel interface} {} +@deffnx {Command} {show babel neighbour} {} +@deffnx {Command} {show babel running-config} {} +These commands dump various parts of @command{babeld}'s internal +state. They are mostly useful for troubleshooting. +@end deffn + +@node Babel debugging commands, , Show Babel information, Babel +@section Babel debugging commands + +@deffn {Babel Command} {debug @var{kind}} {} +@deffnx {Babel Command} {no debug @var{kind}} {} +Enable or disable debugging messages of a given kind. @var{kind} can +be one of @samp{common}, @samp{kernel}, @samp{filter}, @samp{timeout}, +@samp{interface}, @samp{route} or @samp{all}. +@end deffn + diff --git a/doc/ipv6.texi b/doc/ipv6.texi index d4ef45a3..b6cc4376 100644 --- a/doc/ipv6.texi +++ b/doc/ipv6.texi @@ -2,7 +2,7 @@ @chapter IPv6 Support Quagga fully supports IPv6 routing. As described so far, Quagga supports -RIPng, OSPFv3 and BGP-4+. You can give IPv6 addresses to an interface +RIPng, OSPFv3, Babel and BGP-4+. You can give IPv6 addresses to an interface and configure static IPv6 routing information. Quagga IPv6 also provides automatic address configuration via a feature called @code{address auto configuration}. To do it, the router must send router advertisement diff --git a/doc/quagga.texi b/doc/quagga.texi index ff8002c8..ff913aa5 100644 --- a/doc/quagga.texi +++ b/doc/quagga.texi @@ -86,6 +86,7 @@ for @value{PACKAGE_STRING}. @uref{http://www.quagga.net,,Quagga} is a fork of * RIPng:: * OSPFv2:: * OSPFv3:: +* Babel:: * BGP:: * Configuring Quagga as a Route Server:: * VTY shell:: @@ -110,6 +111,7 @@ for @value{PACKAGE_STRING}. @uref{http://www.quagga.net,,Quagga} is a fork of @include ripngd.texi @include ospfd.texi @include ospf6d.texi +@include babeld.texi @include bgpd.texi @include routeserver.texi @include vtysh.texi -- cgit v1.2.1 From 73c74d4ee8bd0bc3fae899679e852df9c61f0ed3 Mon Sep 17 00:00:00 2001 From: Matthieu Boutier Date: Wed, 8 Feb 2012 00:32:59 +0100 Subject: doc: fix typo in babeld. --- doc/babeld.texi | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'doc') diff --git a/doc/babeld.texi b/doc/babeld.texi index aa19c9aa..b7f3d07f 100644 --- a/doc/babeld.texi +++ b/doc/babeld.texi @@ -14,9 +14,7 @@ perform reliable link quality estimation on wireless links. Babel is a double-stack routing protocol, meaning that a single Babel instance is able to perform routing for both IPv4 and IPv6. -Quagga implements Babel as described in RFC6126, as well as the -``Babel-Z'' extensions that optimise routes for radio frequency -diversity. +Quagga implements Babel as described in RFC6126. @menu * Configuring babeld:: @@ -33,7 +31,7 @@ The @command{babeld} daemon can be invoked with any of the common options (@pxref{Common Invocation Options}). The @command{zebra} daemon must be running before @command{babeld} is -inovked. Also, if @command{zebra} is restarted then @command{babeld} +invoked. Also, if @command{zebra} is restarted then @command{babeld} must be too. Configuration of @command{babeld} is done in its configuration file @@ -79,7 +77,7 @@ to communication failures. @end deffn @deffn {Interface Command} {passive-interface} -@deffnx {Interface Command} {passive-interface} +@deffnx {Interface Command} {no passive-interface} Specifies whether this interface is passive. Note that this is a little weaker than RIP's notion of passive interface, since Babel always sends Hello packets, even on passive interfaces. @@ -111,6 +109,7 @@ state. They are mostly useful for troubleshooting. @deffnx {Babel Command} {no debug @var{kind}} {} Enable or disable debugging messages of a given kind. @var{kind} can be one of @samp{common}, @samp{kernel}, @samp{filter}, @samp{timeout}, -@samp{interface}, @samp{route} or @samp{all}. +@samp{interface}, @samp{route} or @samp{all}. Note that if you have +compiled with the NO_DEBUG flag, then these commands aren't available. @end deffn -- cgit v1.2.1 From 3c442e8802c260a0ce9787b5f432a7a2a093be25 Mon Sep 17 00:00:00 2001 From: Matthieu Boutier Date: Wed, 8 Feb 2012 23:30:46 +0100 Subject: babeld: fix wire{d,less} commands name. --- doc/babeld.texi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'doc') diff --git a/doc/babeld.texi b/doc/babeld.texi index b7f3d07f..69cec52d 100644 --- a/doc/babeld.texi +++ b/doc/babeld.texi @@ -58,11 +58,11 @@ by IANA. (Note that RFC6126 specifies a port number that has been obsoleted after publication.) @end deffn -@deffn {Interface Command} {wireless} {} -@deffnx {Interface Command} {no wireless} {} +@deffn {Interface Command} {babel wired} {} +@deffnx {Interface Command} {babel wireless} {} Specifies whether this interface is wireless, which disables a number of optimisations that are only correct on wired interfaces. -Specifying @code{no wireless} is always correct, but may cause extra +Specifying @code{wireless} is always correct, but may cause extra routing overhead. The default is autodetected if possible, @code{wireless} otherwise. @end deffn -- cgit v1.2.1 From 173982334c978fdf2e7030d32a2cdc99587fb434 Mon Sep 17 00:00:00 2001 From: Juliusz Chroboczek Date: Sat, 11 Feb 2012 14:27:16 +0100 Subject: doc: fix Makefile dependencies for babeld. --- doc/Makefile.am | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'doc') diff --git a/doc/Makefile.am b/doc/Makefile.am index cd4d71bd..dde95ab3 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -46,11 +46,11 @@ info_TEXINFOS = quagga.texi quagga.pdf: $(info_TEXINFOS) $(figures_pdf) $(quagga_TEXINFOS) $(TEXI2PDF) -o "$@" $< -quagga_TEXINFOS = appendix.texi basic.texi bgpd.texi filter.texi install.texi \ - ipv6.texi kernel.texi main.texi ospf6d.texi ospfd.texi overview.texi \ - protocol.texi ripd.texi ripngd.texi routemap.texi snmp.texi \ - vtysh.texi routeserver.texi defines.texi $(figures_png) snmptrap.texi \ - $(figures_txt) +quagga_TEXINFOS = appendix.texi babeld.texi basic.texi bgpd.texi filter.texi \ + install.texi ipv6.texi kernel.texi main.texi ospf6d.texi ospfd.texi \ + overview.texi protocol.texi ripd.texi ripngd.texi routemap.texi \ + snmp.texi vtysh.texi routeserver.texi defines.texi $(figures_png) \ + snmptrap.texi $(figures_txt) .png.eps: $(PNGTOEPS) $< "$@" -- cgit v1.2.1 From 68c65a5d3a6a8cb8133b5e9311fc5dc21de88e9c Mon Sep 17 00:00:00 2001 From: Juliusz Chroboczek Date: Sat, 11 Feb 2012 14:28:17 +0100 Subject: doc: update babeld documentation. --- doc/babeld.texi | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) (limited to 'doc') diff --git a/doc/babeld.texi b/doc/babeld.texi index 69cec52d..98fc28d0 100644 --- a/doc/babeld.texi +++ b/doc/babeld.texi @@ -50,14 +50,6 @@ Enable or disable Babel routing. Enable or disable Babel on the given interface. @end deffn -@deffn {Babel Command} {protocol group @var{group}} {} -@deffnx {Babel Command} {protocol port @var{port}} {} -Specify the multicast group and UDP port used for Babel traffic. The -default is to use group @code{ff02::1:6} and port 6696, as allocated -by IANA. (Note that RFC6126 specifies a port number that has been -obsoleted after publication.) -@end deffn - @deffn {Interface Command} {babel wired} {} @deffnx {Interface Command} {babel wireless} {} Specifies whether this interface is wireless, which disables a number @@ -76,11 +68,31 @@ horizon on wireless interfaces is not correct in general, and may lead to communication failures. @end deffn -@deffn {Interface Command} {passive-interface} -@deffnx {Interface Command} {no passive-interface} +@deffn {Interface Command} {babel passive-interface} +@deffnx {Interface Command} {no babel passive-interface} Specifies whether this interface is passive. Note that this is a little weaker than RIP's notion of passive interface, since Babel -always sends Hello packets, even on passive interfaces. +always sends Hello packets and announces redistributed routes, even on +passive interfaces. +@end deffn + +@deffn {Interface Command} {babel hello-interval <20-655340>} +Specifies the time in milliseconds between two scheduled hellos. +Babel notices a link failure within two hello intervals on wired +links; on wireless links, the link quality value is reestimated at +every hello interval. +@end deffn + +@deffn {Interface Command} {babel hello-interval <20-655340>} +Specifies the time in milliseconds between two scheduled updates. +Since Babel makes extensive use of triggered updates, this can be +set to fairly high values on links with little packet loss. +@end deffn + +@deffn {Babel Command} {babel resend-delay <20-655340>} +Specifies the time in milliseconds after which an ``important'' +request or update will be resent. This is a global, not per-interface +value. @end deffn @node Babel redistribution, Show Babel information, Babel configuration, Babel -- cgit v1.2.1 From 8a46e12f5f0b02d58b1d7bc6c0d140aeec6c80c2 Mon Sep 17 00:00:00 2001 From: Matthieu Boutier Date: Sat, 11 Feb 2012 15:09:33 +0100 Subject: doc: fix typo. --- doc/babeld.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/babeld.texi b/doc/babeld.texi index 98fc28d0..b6eeced8 100644 --- a/doc/babeld.texi +++ b/doc/babeld.texi @@ -83,7 +83,7 @@ links; on wireless links, the link quality value is reestimated at every hello interval. @end deffn -@deffn {Interface Command} {babel hello-interval <20-655340>} +@deffn {Interface Command} {babel update-interval <20-655340>} Specifies the time in milliseconds between two scheduled updates. Since Babel makes extensive use of triggered updates, this can be set to fairly high values on links with little packet loss. -- cgit v1.2.1 From a14ef5eeccc8c76c41830475bbe3c31c9e14faa5 Mon Sep 17 00:00:00 2001 From: Denis Ovsienko Date: Sat, 11 Feb 2012 21:06:16 +0400 Subject: babeld: justify "running-config" meaning in CLI The primary focus of this commit is to make "show running-config" command display more current configuration, including some of the bits previously seen in the output of "show babel running-config". Besides that, the following commands were renamed for consistency with the syntax of other components: "debug *" to "debug babel *" (and moved to top level) "show babel running-config" to "show babel parameters" * babel_interface.c * show_babel_running_config(): rename to show_babel_parameters(), update syntax pattern, don't call show_babeld_configuration() * babel_if_init(): update respectively * babel_enable_if_config_write(): new VTY helper for static babel_enable_if * babel_interface.h: add extern declaration * babel_main.c: unset all debug options by default * show_babel_main_configuration(): remove debug options decoder * babel_zebra.c * babel_debug(): rename to debug_babel(), update syntax pattern * no_babel_debug(): rename to no_debug_babel(), update syntax pattern * babelz_zebra_init(): update respectively * debug_babel_config_write() new VTY helper for static debug_type * babel_zebra.h: add extern declaration * babeld.c * babel_config_write(): add the code to output "debug babel *", "router babel", "redistribute *" and "network *" statements * show_babeld_configuration(): dismiss * babeld.h: remove extern declaration * babeld.texi: update for renamed commands * babeld.conf.sample: idem, add debug statements block --- doc/babeld.texi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'doc') diff --git a/doc/babeld.texi b/doc/babeld.texi index b6eeced8..8f671974 100644 --- a/doc/babeld.texi +++ b/doc/babeld.texi @@ -109,7 +109,7 @@ Specify which kind of routes should be redistributed into Babel. @deffn {Command} {show babel database} {} @deffnx {Command} {show babel interface} {} @deffnx {Command} {show babel neighbour} {} -@deffnx {Command} {show babel running-config} {} +@deffnx {Command} {show babel parameters} {} These commands dump various parts of @command{babeld}'s internal state. They are mostly useful for troubleshooting. @end deffn @@ -117,8 +117,8 @@ state. They are mostly useful for troubleshooting. @node Babel debugging commands, , Show Babel information, Babel @section Babel debugging commands -@deffn {Babel Command} {debug @var{kind}} {} -@deffnx {Babel Command} {no debug @var{kind}} {} +@deffn {Babel Command} {debug babel @var{kind}} {} +@deffnx {Babel Command} {no debug babel @var{kind}} {} Enable or disable debugging messages of a given kind. @var{kind} can be one of @samp{common}, @samp{kernel}, @samp{filter}, @samp{timeout}, @samp{interface}, @samp{route} or @samp{all}. Note that if you have -- cgit v1.2.1 From 4d176dc07ccdcdefcd0e40043233a8c4f136f5c1 Mon Sep 17 00:00:00 2001 From: Juliusz Chroboczek Date: Tue, 14 Feb 2012 08:52:19 +0100 Subject: babeld: fix documentation. --- doc/babeld.texi | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) (limited to 'doc') diff --git a/doc/babeld.texi b/doc/babeld.texi index 8f671974..65587a71 100644 --- a/doc/babeld.texi +++ b/doc/babeld.texi @@ -54,18 +54,16 @@ Enable or disable Babel on the given interface. @deffnx {Interface Command} {babel wireless} {} Specifies whether this interface is wireless, which disables a number of optimisations that are only correct on wired interfaces. -Specifying @code{wireless} is always correct, but may cause extra -routing overhead. The default is autodetected if possible, -@code{wireless} otherwise. +Specifying @code{wireless} (the default) is always correct, but may +cause slower convergence and extra routing traffic. @end deffn @deffn {Interface Command} {babel split-horizon} @deffnx {Interface Command} {no babel split-horizon} -Specifies whether to perform split-horizon on the interface. Default -is @code{babel split-horizon} on wired interfaces, and @code{no babel -split-horizon} on wireless interfaces. Please note that performing split -horizon on wireless interfaces is not correct in general, and may lead -to communication failures. +Specifies whether to perform split-horizon on the interface. +Specifying @code{no babel split-horizon} (the default) is always +correct, while @code{babel split-horizon} is an optimisation that +should only be used on symmetric and transitive (wired) networks. @end deffn @deffn {Interface Command} {babel passive-interface} @@ -77,22 +75,23 @@ passive interfaces. @end deffn @deffn {Interface Command} {babel hello-interval <20-655340>} -Specifies the time in milliseconds between two scheduled hellos. -Babel notices a link failure within two hello intervals on wired -links; on wireless links, the link quality value is reestimated at -every hello interval. +Specifies the time in milliseconds between two scheduled hellos. On +wired links, Babel notices a link failure within two hello intervals; +on wireless links, the link quality value is reestimated at every +hello interval. The default is 4000@dmn{ms}. @end deffn @deffn {Interface Command} {babel update-interval <20-655340>} Specifies the time in milliseconds between two scheduled updates. -Since Babel makes extensive use of triggered updates, this can be -set to fairly high values on links with little packet loss. +Since Babel makes extensive use of triggered updates, this can be set +to fairly high values on links with little packet loss. The default +is 20000@dmn{ms}. @end deffn @deffn {Babel Command} {babel resend-delay <20-655340>} Specifies the time in milliseconds after which an ``important'' -request or update will be resent. This is a global, not per-interface -value. +request or update will be resent. The default is 2000@dmn{ms}. You +probably don't want to tweak this value. @end deffn @node Babel redistribution, Show Babel information, Babel configuration, Babel -- cgit v1.2.1 From 6881f2698279f3c47a55e8969860eeac59e8c3d7 Mon Sep 17 00:00:00 2001 From: Juliusz Chroboczek Date: Tue, 14 Feb 2012 15:43:34 +0100 Subject: babeld: remove "parasitic" mode. This is the functionality described in Appendix C of RFC 6126. Its main purpose is to avoid keeping a full source table, which makes it possible to implement a subset of Babel in just a few hundred lines of code. However, in Quagga the code for maintaining the source table is already there, and a parasitic implementation can be simulated using filtering -- so it makes little sense to keep the functionality. --- doc/babeld.texi | 8 -------- 1 file changed, 8 deletions(-) (limited to 'doc') diff --git a/doc/babeld.texi b/doc/babeld.texi index 65587a71..1f24edd0 100644 --- a/doc/babeld.texi +++ b/doc/babeld.texi @@ -66,14 +66,6 @@ correct, while @code{babel split-horizon} is an optimisation that should only be used on symmetric and transitive (wired) networks. @end deffn -@deffn {Interface Command} {babel passive-interface} -@deffnx {Interface Command} {no babel passive-interface} -Specifies whether this interface is passive. Note that this is -a little weaker than RIP's notion of passive interface, since Babel -always sends Hello packets and announces redistributed routes, even on -passive interfaces. -@end deffn - @deffn {Interface Command} {babel hello-interval <20-655340>} Specifies the time in milliseconds between two scheduled hellos. On wired links, Babel notices a link failure within two hello intervals; -- cgit v1.2.1