matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

Merge pull request #2169 from piotrjurkiewicz/eigrp_feasibility

Browse source 
eigrpd: Consider only feasible successors as successors
This commit is contained in:
Donald Sharp 2018-05-03 23:02:36 -04:00 committed by GitHub
parent 87e6a84061 53765081f9
commit 1c96f2fb96
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
eigrpd/eigrp_topology.c
View file

@ -443,17 +443,24 @@ void eigrp_topology_update_node_flags(struct eigrp_prefix_entry *dest)
struct eigrp *eigrp = eigrp_lookup();
for (ALL_LIST_ELEMENTS_RO(dest->entries, node, entry)) {
if (((uint64_t)entry->distance
<= (uint64_t)dest->distance * (uint64_t)eigrp->variance)
&& entry->distance != EIGRP_MAX_METRIC) // is successor
{
entry->flags |= EIGRP_NEXTHOP_ENTRY_SUCCESSOR_FLAG;
entry->flags &= ~EIGRP_NEXTHOP_ENTRY_FSUCCESSOR_FLAG;
} else if (entry->reported_distance
< dest->fdistance) // is feasible successor
{
entry->flags |= EIGRP_NEXTHOP_ENTRY_FSUCCESSOR_FLAG;
entry->flags &= ~EIGRP_NEXTHOP_ENTRY_SUCCESSOR_FLAG;
if (entry->reported_distance < dest->fdistance) {
// is feasible successor, can be successor
if (((uint64_t)entry->distance
<= (uint64_t)dest->distance
* (uint64_t)eigrp->variance)
&& entry->distance != EIGRP_MAX_METRIC) {
// is successor
entry->flags |=
EIGRP_NEXTHOP_ENTRY_SUCCESSOR_FLAG;
entry->flags &=
~EIGRP_NEXTHOP_ENTRY_FSUCCESSOR_FLAG;
} else {
// is feasible successor only
entry->flags |=
EIGRP_NEXTHOP_ENTRY_FSUCCESSOR_FLAG;
entry->flags &=
~EIGRP_NEXTHOP_ENTRY_SUCCESSOR_FLAG;
}
} else {
entry->flags &= ~EIGRP_NEXTHOP_ENTRY_FSUCCESSOR_FLAG;
entry->flags &= ~EIGRP_NEXTHOP_ENTRY_SUCCESSOR_FLAG;