summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--isisd/isis_te.c24
-rwxr-xr-xtools/frr-reload.py1
2 files changed, 6 insertions, 19 deletions
diff --git a/isisd/isis_te.c b/isisd/isis_te.c
index c9af39ce5a..32492ae0c0 100644
--- a/isisd/isis_te.c
+++ b/isisd/isis_te.c
@@ -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;
}
}
diff --git a/tools/frr-reload.py b/tools/frr-reload.py
index f124cae713..9d3a23ae29 100755
--- a/tools/frr-reload.py
+++ b/tools/frr-reload.py
@@ -289,6 +289,7 @@ ctx_keywords = {
},
"srv6": {
"locators": {"locator ": {}},
+ "static-sids": {},
"encapsulation": {},
"formats": {"format": {}},
},