diff options
| -rw-r--r-- | nest/rt-show.c | 3 | ||||
| -rw-r--r-- | nest/rt-table.c | 23 |
2 files changed, 20 insertions, 6 deletions
diff --git a/nest/rt-show.c b/nest/rt-show.c index 7691878d..a730881b 100644 --- a/nest/rt-show.c +++ b/nest/rt-show.c @@ -54,7 +54,8 @@ rt_show_rte(struct cli *c, byte *ia, rte *e, struct rt_show_data *d, int primary /* Need to normalize the extended attributes */ if (d->verbose && !rta_is_cached(a) && a->eattrs) - ea_normalize(a->eattrs); + if (a->eattrs) + ea_normalize(a->eattrs); get_route_info = a->src->proto->proto->get_route_info; if (get_route_info) diff --git a/nest/rt-table.c b/nest/rt-table.c index ae5a8444..a045c91b 100644 --- a/nest/rt-table.c +++ b/nest/rt-table.c @@ -2895,12 +2895,25 @@ rt_update_hostentry(rtable *tab, struct hostentry *he) rta *a = e->attrs; pxlen = n->n.addr->pxlen; - if (a->hostentry) + int MAX_REC = 10; + u32 prev_igp_metric = 0; + int i = 0; + for (struct hostentry *he = a->hostentry; + he && he->src; + i++, he = he->src->hostentry) { - /* Recursive route should not depend on another recursive route */ - log(L_WARN "Next hop address %I resolvable through recursive route for %N", - he->addr, n->n.addr); - goto done; + log(L_WARN "Next hop address %I resolvable through recursive route for %N igp_metric %u %u", + he->addr, n->n.addr, prev_igp_metric, he->igp_metric); + + if (prev_igp_metric >= he->igp_metric || i >= MAX_REC) + { + /* Recursive route should not depend on another recursive route */ + log(L_WARN "Next hop address %I resolvable through deep recursive route for %N", + he->addr, n->n.addr); + goto done; + } + + prev_igp_metric = he->igp_metric; } if (a->dest == RTD_UNICAST) |