diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-05 09:56:24 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-05 09:56:24 +0000 |
| commit | 54de8bbe36d7d968c6367939277942518bd4e11f (patch) | |
| tree | 924f8c16d9c8831679f355b88c620b9b356c9d5a /bfdd | |
| parent | Adding debian version 10.0.1-0.1. (diff) | |
| download | frr-54de8bbe36d7d968c6367939277942518bd4e11f.tar.xz frr-54de8bbe36d7d968c6367939277942518bd4e11f.zip | |
Merging upstream version 10.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'bfdd')
| -rw-r--r-- | bfdd/bfd.h | 4 | ||||
| -rw-r--r-- | bfdd/bfd_packet.c | 6 |
2 files changed, 9 insertions, 1 deletions
@@ -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)) \ @@ -133,7 +135,7 @@ struct bfd_echo_pkt { if ((val)) \ flags |= val; \ } -#define BFD_GETCBIT(flags) (flags & BFD_FBIT) +#define BFD_GETCBIT(flags) (flags & BFD_CBIT) #define BFD_ECHO_VERSION 1 #define BFD_ECHO_PKT_LEN sizeof(struct bfd_echo_pkt) diff --git a/bfdd/bfd_packet.c b/bfdd/bfd_packet.c index fec195c..8110f43 100644 --- 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"); |