From 60d3914270ff0ad3de8c6c08cec8ca60f18cf84a Mon Sep 17 00:00:00 2001 From: Christian Franke Date: Mon, 2 Oct 2017 16:01:58 +0200 Subject: [PATCH] isisd: fix vertex queue comparator While vertizes should be strictly ordered on insertion, deletion will of course encouter equality. Signed-off-by: Christian Franke --- isisd/isis_spf.c | 2 +- tests/isisd/test_isis_vertex_queue.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/isisd/isis_spf.c b/isisd/isis_spf.c index 34fcf8f8c6..cd9a0f89bb 100644 --- a/isisd/isis_spf.c +++ b/isisd/isis_spf.c @@ -153,7 +153,7 @@ static int isis_vertex_queue_tent_cmp(void *a, void *b) if (va->insert_counter > vb->insert_counter) return 1; - assert(!"Vertizes should be strictly ordered"); + return 0; } static struct skiplist *isis_vertex_queue_skiplist(void) diff --git a/tests/isisd/test_isis_vertex_queue.c b/tests/isisd/test_isis_vertex_queue.c index 50436387b5..674482cd17 100644 --- a/tests/isisd/test_isis_vertex_queue.c +++ b/tests/isisd/test_isis_vertex_queue.c @@ -89,7 +89,7 @@ static void test_ordered(void) assert(isis_vertex_queue_pop(&q) == vertices[1]); 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_vertex_queue_count(&q) == 0); -- 2.39.5