proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-06-06 22:38:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1276 from opensourcerouting/isis-fix-vertex-queue

Browse Source 
isisd: fix vertex queue comparator
This commit is contained in:
Donald Sharp 2017-10-02 10:51:07 -04:00 committed by GitHub
commit 75d07b8b83
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
isisd/isis_spf.c
View File

@ -153,7 +153,7 @@ static int isis_vertex_queue_tent_cmp(void *a, void *b)
if (va->insert_counter > vb->insert_counter) if (va->insert_counter > vb->insert_counter)
return 1; return 1;
assert(!"Vertizes should be strictly ordered"); return 0;
} }
static struct skiplist *isis_vertex_queue_skiplist(void) static struct skiplist *isis_vertex_queue_skiplist(void)

2
tests/isisd/test_isis_vertex_queue.c
View File

@ -89,7 +89,7 @@ static void test_ordered(void)
assert(isis_vertex_queue_pop(&q) == vertices[1]); assert(isis_vertex_queue_pop(&q) == vertices[1]);
assert(isis_find_vertex(&q, vertices[1]->N.id, vertices[1]->type) == NULL); assert(isis_find_vertex(&q, vertices[1]->N.id, vertices[1]->type) == NULL);
assert(isis_vertex_queue_pop(&q) == vertices[4]); isis_vertex_queue_delete(&q, vertices[4]);
assert(isis_find_vertex(&q, vertices[4]->N.id, vertices[4]->type) == NULL); assert(isis_find_vertex(&q, vertices[4]->N.id, vertices[4]->type) == NULL);
assert(isis_vertex_queue_count(&q) == 0); assert(isis_vertex_queue_count(&q) == 0);