bgpd: check flags before attempting keepalive ops

If a peer already has keepalives turned on when asking to turn them on, return immediately. Same thing for turning them off. Signed-off-by: Quentin Young <[email protected]>
FRRouting · Jan 24, 2018 · 096476d · 096476d
1 parent cadc5f3
commit 096476d
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/bgpd/bgp_keepalives.c b/bgpd/bgp_keepalives.c
@@ -224,6 +224,9 @@ void *bgp_keepalives_start(void *arg)
 
 void bgp_keepalives_on(struct peer *peer)
 {
+	if (CHECK_FLAG(peer->thread_flags, PEER_THREAD_KEEPALIVES_ON))
+		return;
+
 	struct frr_pthread *fpt = frr_pthread_get(PTHREAD_KEEPALIVES);
 	assert(fpt->running);
 
@@ -251,6 +254,9 @@ void bgp_keepalives_on(struct peer *peer)
 
 void bgp_keepalives_off(struct peer *peer)
 {
+	if (!CHECK_FLAG(peer->thread_flags, PEER_THREAD_KEEPALIVES_ON))
+		return;
+
 	struct frr_pthread *fpt = frr_pthread_get(PTHREAD_KEEPALIVES);
 	assert(fpt->running);