From: Christian Franke <chris@opensourcerouting.org>
Date: Mon, 2 Oct 2017 14:01:58 +0000 (+0200)
Subject: isisd: fix vertex queue comparator
X-Git-Tag: frr-4.0-dev~258^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F1276%2Fhead;p=mirror%2Ffrr.git

isisd: fix vertex queue comparator

While vertizes should be strictly ordered on insertion, deletion
will of course encouter equality.

Signed-off-by: Christian Franke <chris@opensourcerouting.org>
---

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);