Optimise bfd_get_random_discr

Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
acassen · Dec 29, 2017 · bf53510 · bf53510
1 parent 04a123c
commit bf53510
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/keepalived/bfd/bfd_data.c b/keepalived/bfd/bfd_data.c
@@ -276,22 +276,26 @@ rand_intv(uint32_t min, uint32_t max)
 
 /* Returns random disciminator number */
 uint32_t
-bfd_get_random_discr(bfd_data_t * data)
+bfd_get_random_discr(bfd_data_t *data)
 {
 	bfd_t *bfd;
 	uint32_t discr;
 	element e;
 
 	assert(data);
 
-	discr = rand_intv(1, UINT32_MAX);
-
-	/* Check for collisions */
-	for (e = LIST_HEAD(data->bfd); e; ELEMENT_NEXT(e)) {
-		bfd = ELEMENT_DATA(e);
-		if (bfd->local_discr == discr)
-			return bfd_get_random_discr(data);
-	}
+	do {
+		discr = rand_intv(1, UINT32_MAX);
+
+		/* Check for collisions */
+		for (e = LIST_HEAD(data->bfd); e; ELEMENT_NEXT(e)) {
+			bfd = ELEMENT_DATA(e);
+			if (bfd->local_discr == discr) {
+				discr = 0;
+				break;
+			}
+		}
+	} while (!discr);
 
 	return discr;
 }