Merge pull request #3351 from chiragshah6/ospfv3_dev

ospf6d: abr summary advertise best route
This commit is contained in:
Russ White 2018-11-26 08:09:12 -05:00 committed by GitHub
commit 98d8359fe7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -240,6 +240,20 @@ int ospf6_abr_originate_summary_to_area(struct ospf6_route *route,
}
}
if (route->path.origin.type ==
htons(OSPF6_LSTYPE_INTRA_PREFIX)) {
if (!CHECK_FLAG(route->flag, OSPF6_ROUTE_BEST)) {
if (is_debug) {
prefix2str(&route->prefix, buf,
sizeof(buf));
zlog_debug("%s: intra-prefix route %s with cost %u is not best, ignore."
, __PRETTY_FUNCTION__, buf,
route->path.cost);
}
return 0;
}
}
if (is_debug) {
prefix2str(&route->prefix, buf, sizeof(buf));
zlog_debug("Originating summary in area %s for %s cost %u",
@ -271,9 +285,10 @@ int ospf6_abr_originate_summary_to_area(struct ospf6_route *route,
ospf6_abr_delete_route(route, summary,
summary_table, old);
}
} else if (old)
} else if (old) {
ospf6_route_remove(summary, summary_table);
ospf6_lsa_purge(old);
}
return 0;
}