Extends multipath support for OSPF.

Fixes cases where the same network or external route are propagated by
several OSPF routes and some other corner cases in next hop construction
and ECMP. Allows to specify whether external routes should be merged.

Thanks to Peter Christensen for the original patch.

1 files changed, 9 insertions, 0 deletions

diff --git a/doc/bird.sgml b/doc/bird.sgml
index 07e75588..fa4c777f 100644
--- a/doc/bird.sgml
+++ b/doc/bird.sgml
@@ -2291,6 +2291,7 @@ protocol ospf <name> {
 	stub router <switch>;
 	tick <num>;
 	ecmp <switch> [limit <num>];
+	merge external <switch>;
 	area <id> {
 		stub;
 		nssa;
@@ -2396,6 +2397,14 @@ protocol ospf <name> {
 	nexthops in one route. By default, ECMP is disabled. If enabled,
 	default	value of the limit is 16.
 
+	<tag>merge external <M>switch</M></tag>
+	This option specifies whether OSPF should merge external routes from
+	different routers/LSAs for the same destination. When enabled together
+	with <cf/ecmp/, equal-cost external routes will be combined to multipath
+	routes in the same way as regular routes. When disabled, external routes
+	from different LSAs are treated as separate even if they represents the
+	same destination. Default value is no.
+
 	<tag>area <M>id</M></tag>
 	This defines an OSPF area with given area ID (an integer or an IPv4
 	address, similarly to a router ID). The most important area is the