Merge pull request #18294 from Orange-OpenSource/isisd

isisd: Correct edge insertion into TED
This commit is contained in:
Donald Sharp 2025-03-03 07:37:42 -05:00 committed by GitHub
commit 21a8f5277b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -1193,32 +1193,18 @@ static int lsp_to_edge_cb(const uint8_t *id, uint32_t metric, bool old_metric,
" |- Link Edge (Unknown) to destination vertex (%s)",
print_sys_hostname(id));
/* Then search if there is a reverse Edge to link them */
dst = ls_find_edge_by_destination(args->ted, edge->attributes);
if (dst) {
/* Attach remote link if not set */
if (edge->source && dst->destination == NULL) {
vertex = edge->source;
if (vertex->incoming_edges)
listnode_add_sort_nodup(vertex->incoming_edges,
dst);
if (dst->destination == NULL) {
listnode_add_sort_nodup(vertex->incoming_edges, dst);
dst->destination = vertex;
}
/* and destination vertex to this edge if not set */
if (dst->source && edge->destination == NULL) {
vertex = dst->source;
if (vertex->incoming_edges)
listnode_add_sort_nodup(vertex->incoming_edges,
edge);
edge->destination = vertex;
}
} else {
/* Search dst. Vertex by Extended Reach. ID if not found */
if (edge->destination == NULL) {
vertex = ls_find_vertex_by_key(args->ted,
sysid_to_key(id));
if (vertex && vertex->incoming_edges)
listnode_add_sort_nodup(vertex->incoming_edges,
edge);
vertex = dst->source;
listnode_add_sort_nodup(vertex->incoming_edges, edge);
edge->destination = vertex;
}
}