Merge pull request #15697 from zmw12306/bfd_check_Mflag

bfdd: Add check for flag Multipoint (M)
FRRouting · Apr 12, 2024 · b6e6656 · b6e6656
2 parents 692f916 + 665ec41
commit b6e6656
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/bfdd/bfd.h b/bfdd/bfd.h
@@ -105,6 +105,8 @@ struct bfd_echo_pkt {
 #define BFD_CBIT 0x08
 #define BFD_ABIT 0x04
 #define BFD_DEMANDBIT 0x02
+#define BFD_MBIT	      0x01
+#define BFD_GETMBIT(flags)    (flags & BFD_MBIT)
 #define BFD_SETDEMANDBIT(flags, val)                                           \
 	{                                                                      \
 		if ((val))                                                     \

diff --git a/bfdd/bfd_packet.c b/bfdd/bfd_packet.c
@@ -898,6 +898,12 @@ void bfd_recv_cb(struct event *t)
 		return;
 	}
 
+	if (BFD_GETMBIT(cp->flags)) {
+		cp_debug(is_mhop, &peer, &local, ifindex, vrfid,
+			 "detect non-zero Multipoint (M) flag");
+		return;
+	}
+
 	if (cp->discrs.my_discr == 0) {
 		cp_debug(is_mhop, &peer, &local, ifindex, vrfid,
 			 "'my discriminator' is zero");