1 files changed, 40 insertions, 14 deletions

diff --git a/lib/bfd.c b/lib/bfd.c
index d1a0ec671e..cdf7008601 100644
--- a/lib/bfd.c
+++ b/lib/bfd.c
@@ -104,7 +104,10 @@ void bfd_set_param(struct bfd_info **bfd_info, uint32_t min_rx, uint32_t min_tx,
 		if (((*bfd_info)->required_min_rx != min_rx)
 		    || ((*bfd_info)->desired_min_tx != min_tx)
 		    || ((*bfd_info)->detect_mult != detect_mult)
-		    || (profile && strcmp((*bfd_info)->profile, profile)))
+		    || ((*bfd_info)->profile[0] == 0 && profile)
+		    || ((*bfd_info)->profile[0] && profile == NULL)
+		    || (profile && (*bfd_info)->profile[0]
+			&& strcmp((*bfd_info)->profile, profile)))
 			*command = ZEBRA_BFD_DEST_UPDATE;
 	}
 
@@ -402,7 +405,7 @@ void bfd_client_sendmsg(struct zclient *zclient, int command,
 			vrf_id_t vrf_id)
 {
 	struct stream *s;
-	int ret;
+	enum zclient_send_status ret;
 
 	/* Check socket. */
 	if (!zclient || zclient->sock < 0) {
@@ -423,7 +426,7 @@ void bfd_client_sendmsg(struct zclient *zclient, int command,
 
 	ret = zclient_send_message(zclient);
 
-	if (ret < 0) {
+	if (ret == ZCLIENT_SEND_FAILURE) {
 		if (bfd_debug)
 			zlog_debug(
 				"bfd_client_sendmsg %ld: zclient_send_message() failed",
@@ -468,6 +471,39 @@ int zclient_bfd_command(struct zclient *zc, struct bfd_session_arg *args)
 					    : sizeof(struct in6_addr);
 	stream_put(s, &args->dst, addrlen);
 
+	/*
+	 * For more BFD integration protocol details, see function
+	 * `_ptm_msg_read` in `bfdd/ptm_adapter.c`.
+	 */
+#if HAVE_BFDD > 0
+	/* Session timers. */
+	stream_putl(s, args->min_rx);
+	stream_putl(s, args->min_tx);
+	stream_putc(s, args->detection_multiplier);
+
+	/* Is multi hop? */
+	stream_putc(s, args->mhop != 0);
+
+	/* Source address. */
+	stream_putw(s, args->family);
+	stream_put(s, &args->src, addrlen);
+
+	/* Send the expected TTL. */
+	stream_putc(s, args->ttl);
+
+	/* Send interface name if any. */
+	stream_putc(s, args->ifnamelen);
+	if (args->ifnamelen)
+		stream_put(s, args->ifname, args->ifnamelen);
+
+	/* Send the C bit indicator. */
+	stream_putc(s, args->cbit);
+
+	/* Send profile name if any. */
+	stream_putc(s, args->profilelen);
+	if (args->profilelen)
+		stream_put(s, args->profile, args->profilelen);
+#else /* PTM BFD */
 	/* Encode timers if this is a registration message. */
 	if (args->command != ZEBRA_BFD_DEST_DEREGISTER) {
 		stream_putl(s, args->min_rx);
@@ -500,23 +536,13 @@ int zclient_bfd_command(struct zclient *zc, struct bfd_session_arg *args)
 		if (args->ifnamelen)
 			stream_put(s, args->ifname, args->ifnamelen);
 	}
-
-	/* Send the C bit indicator. */
-	stream_putc(s, args->cbit);
-
-	/* `ptm-bfd` doesn't support profiles yet. */
-#if HAVE_BFDD > 0
-	/* Send profile name if any. */
-	stream_putc(s, args->profilelen);
-	if (args->profilelen)
-		stream_put(s, args->profile, args->profilelen);
 #endif /* HAVE_BFDD */
 
 	/* Finish the message by writing the size. */
 	stream_putw_at(s, 0, stream_get_endp(s));
 
 	/* Send message to zebra. */
-	if (zclient_send_message(zc) == -1) {
+	if (zclient_send_message(zc) == ZCLIENT_SEND_FAILURE) {
 		if (bfd_debug)
 			zlog_debug("%s: zclient_send_message failed", __func__);
 		return -1;