bfd: store actual timeout information in bfd

The actual BFD timeout value is not stored in the BFD session. This change adds support to track and record that information.

Signed-off-by: Sougata <sougatahitcs@gmail.com>

Author: sougata-github-nvidia

bfdd/bfd.h

@@ -357,7 +357,9 @@ struct bfd_session {
 	struct event *echo_recvtimer_ev;
 	struct event *recvtimer_ev;
 	uint64_t xmt_TO;
+	uint64_t xmt_TO_actual;  /* Actual transmit timeout with jitter applied */
 	uint64_t echo_xmt_TO;
+	uint64_t echo_xmt_TO_actual;  /* Actual echo transmit timeout with jitter applied */
 	struct event *xmttimer_ev;
 	struct event *echo_xmttimer_ev;
 	uint64_t echo_detect_TO;

bfdd/bfdd_vty.c

@@ -216,15 +216,21 @@ static void _display_peer(struct vty *vty, struct bfd_session *bs)
 		bs->timers.required_min_rx / 1000);
 	vty_out(vty, "\t\t\tTransmission interval: %ums\n",
 		bs->timers.desired_min_tx / 1000);
+	if (bs->xmt_TO_actual > 0)
+		vty_out(vty, "\t\t\tTransmission interval (actual with jitter): %" PRIu64 "ms\n",
+			bs->xmt_TO_actual / 1000);
 	if (bs->timers.required_min_echo_rx != 0)
 		vty_out(vty, "\t\t\tEcho receive interval: %ums\n",
 			bs->timers.required_min_echo_rx / 1000);
 	else
 		vty_out(vty, "\t\t\tEcho receive interval: disabled\n");
-	if (CHECK_FLAG(bs->flags, BFD_SESS_FLAG_ECHO) || bs->bfd_mode == BFD_MODE_TYPE_SBFD_ECHO)
+	if (CHECK_FLAG(bs->flags, BFD_SESS_FLAG_ECHO) || bs->bfd_mode == BFD_MODE_TYPE_SBFD_ECHO) {
 		vty_out(vty, "\t\t\tEcho transmission interval: %ums\n",
 			bs->timers.desired_min_echo_tx / 1000);
-	else
+		if (bs->echo_xmt_TO_actual > 0)
+			vty_out(vty, "\t\t\tEcho transmission interval (actual with jitter): %" PRIu64 "ms\n",
+				bs->echo_xmt_TO_actual / 1000);
+	} else
 		vty_out(vty, "\t\t\tEcho transmission interval: disabled\n");
 
 

bfdd/event.c

@@ -131,13 +131,18 @@ void bfd_xmttimer_update(struct bfd_session *bs, uint64_t jitter)
 {
 	struct timeval tv = {.tv_sec = 0, .tv_usec = jitter};
 
+	/* Store the actual transmit timeout with jitter applied */
+	bs->xmt_TO_actual = jitter;
+
 	/* Remove previous schedule if any. */
 	bfd_xmttimer_delete(bs);
 
 	/* Don't add event if peer is deactivated. */
 	if (CHECK_FLAG(bs->flags, BFD_SESS_FLAG_SHUTDOWN) ||
-	    bs->sock == -1)
+	    bs->sock == -1) {
+		bs->xmt_TO_actual = 0;  /* Timer not scheduled */
 		return;
+	}
 
 	tv_normalize(&tv);
 
@@ -149,13 +154,18 @@ void bfd_echo_xmttimer_update(struct bfd_session *bs, uint64_t jitter)
 {
 	struct timeval tv = {.tv_sec = 0, .tv_usec = jitter};
 
+	/* Store the actual echo transmit timeout with jitter applied */
+	bs->echo_xmt_TO_actual = jitter;
+
 	/* Remove previous schedule if any. */
 	bfd_echo_xmttimer_delete(bs);
 
 	/* Don't add event if peer is deactivated. */
 	if (CHECK_FLAG(bs->flags, BFD_SESS_FLAG_SHUTDOWN) ||
-	    bs->sock == -1)
+	    bs->sock == -1) {
+		bs->echo_xmt_TO_actual = 0;  /* Timer not scheduled */
 		return;
+	}
 
 	tv_normalize(&tv);