Handles distinction of no-route vs invalid-route in mld alternatives

The viaroute plugin always expects a route to be there potentially
with invalid edge weight to represent no-route-found. By switching
to the many-route-result for the mld alternatives algorithm we might
return an empty many-route-result invalidating the post-condition.
This commit is contained in:
Daniel J. Hofmann
2017-07-22 12:36:53 +02:00
parent 253c2dc570
commit 8af54ffe83
2 changed files with 12 additions and 2 deletions
@@ -792,8 +792,15 @@ InternalManyRoutesResult alternativePathSearch(SearchEngineData<Algorithm> &sear
shortest_path_via_it->node != SPECIAL_NODEID &&
shortest_path_via_it->weight != INVALID_EDGE_WEIGHT;
// Care needs to be taken to meet the call sites post condition.
// We must return at least one route, even if it's an invalid one.
if (!has_shortest_path)
return InternalManyRoutesResult{};
{
InternalRouteResult invalid;
invalid.shortest_path_weight = INVALID_EDGE_WEIGHT;
invalid.segment_end_coordinates = {phantom_node_pair};
return invalid;
}
NodeID shortest_path_via = shortest_path_via_it->node;
EdgeWeight shortest_path_weight = shortest_path_via_it->weight;