diff options
| author | Ondrej Zajicek <santiago@crfreenet.org> | 2014-04-23 13:54:28 +0200 |
|---|---|---|
| committer | Ondrej Zajicek <santiago@crfreenet.org> | 2014-04-23 13:54:28 +0200 |
| commit | 145368f5474436ad7c48fa26f5bde8108ae5ef4a (patch) | |
| tree | 3f4485fd44404d76135037913606151f2ca4937c /proto/ospf/config.Y | |
| parent | 4dd24f05f384ac14546d4bebbfcb0ecf9a976ec6 (diff) | |
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.
Diffstat (limited to 'proto/ospf/config.Y')
| -rw-r--r-- | proto/ospf/config.Y | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/proto/ospf/config.Y b/proto/ospf/config.Y index 90f289d0..478529bc 100644 --- a/proto/ospf/config.Y +++ b/proto/ospf/config.Y @@ -132,7 +132,7 @@ CF_KEYWORDS(ELIGIBLE, POLL, NETWORKS, HIDDEN, VIRTUAL, CHECK, LINK, ONLY, BFD) CF_KEYWORDS(RX, BUFFER, LARGE, NORMAL, STUBNET, HIDDEN, SUMMARY, TAG, EXTERNAL) CF_KEYWORDS(WAIT, DELAY, LSADB, ECMP, LIMIT, WEIGHT, NSSA, TRANSLATOR, STABILITY) CF_KEYWORDS(GLOBAL, LSID, ROUTER, SELF, INSTANCE, REAL, NETMASK, TX, PRIORITY, LENGTH) -CF_KEYWORDS(SECONDARY) +CF_KEYWORDS(SECONDARY, MERGE) %type <t> opttext %type <ld> lsadb_args @@ -162,6 +162,7 @@ ospf_proto_item: | STUB ROUTER bool { OSPF_CFG->stub_router = $3; } | ECMP bool { OSPF_CFG->ecmp = $2 ? DEFAULT_ECMP_LIMIT : 0; } | ECMP bool LIMIT expr { OSPF_CFG->ecmp = $2 ? $4 : 0; if ($4 < 0) cf_error("ECMP limit cannot be negative"); } + | MERGE EXTERNAL bool { OSPF_CFG->merge_external = $3; } | TICK expr { OSPF_CFG->tick = $2; if($2<=0) cf_error("Tick must be greater than zero"); } | ospf_area ; |