diff options
| author |   Neale Ranns <neale@graphiant.com> | 2022-02-15 08:24:48 +0000 |
|---|---|---|
| committer | Neale Ranns <neale@graphiant.com> | 2022-02-16 14:21:08 +0000 |
| commit | 558a354c8fdf3ec2f7189b36d9f55437615b3681 (patch) | |
| tree | ecfc86b6b86bb7744d99aa627fa041227af3c52b | |
| parent | bf9918a7e0c6bf116b90780cbc2c111ca7995399 (diff) | |
bfd: On a point to point link use the all zeros address for the peer.
Type: fix
The adjacency used is then the same one as that used by routes in the FIB and so the BFD protection/fast-failover works for thise route, since they are children of the BFD protected adjacency.
Signed-off-by: Neale Ranns <neale@graphiant.com>
Change-Id: I72e10b3074697cba8a002a4c1acf690983985157
| -rw-r--r-- | src/vnet/bfd/bfd_udp.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/vnet/bfd/bfd_udp.c b/src/vnet/bfd/bfd_udp.c index 97b1a737528..3a25830cfb5 100644 --- a/src/vnet/bfd/bfd_udp.c +++ b/src/vnet/bfd/bfd_udp.c @@ -545,14 +545,18 @@ bfd_udp_add_session_internal (vlib_main_t * vm, bfd_udp_main_t * bum, &key->peer_addr, IP46_TYPE_ANY); vlib_log_info (bum->log_class, "create BFD session: %U", format_bfd_session, bs); + const ip46_address_t *peer = + (vnet_sw_interface_is_p2p (vnet_get_main (), key->sw_if_index) ? + &zero_addr : + &key->peer_addr); if (BFD_TRANSPORT_UDP4 == t) { bus->adj_index = adj_nbr_add_or_lock (FIB_PROTOCOL_IP4, VNET_LINK_IP4, - &key->peer_addr, - key->sw_if_index); + peer, key->sw_if_index); BFD_DBG ("adj_nbr_add_or_lock(FIB_PROTOCOL_IP4, VNET_LINK_IP4, %U, %d) " - "returns %d", format_ip46_address, &key->peer_addr, - IP46_TYPE_ANY, key->sw_if_index, bus->adj_index); + "returns %d", + format_ip46_address, peer, IP46_TYPE_ANY, key->sw_if_index, + bus->adj_index); ++bum->udp4_sessions_count; bfd_udp_update_stat_segment_entry ( bum->udp4_sessions_count_stat_seg_entry, bum->udp4_sessions_count); @@ -567,11 +571,11 @@ bfd_udp_add_session_internal (vlib_main_t * vm, bfd_udp_main_t * bum, else { bus->adj_index = adj_nbr_add_or_lock (FIB_PROTOCOL_IP6, VNET_LINK_IP6, - &key->peer_addr, - key->sw_if_index); + peer, key->sw_if_index); BFD_DBG ("adj_nbr_add_or_lock(FIB_PROTOCOL_IP6, VNET_LINK_IP6, %U, %d) " - "returns %d", format_ip46_address, &key->peer_addr, - IP46_TYPE_ANY, key->sw_if_index, bus->adj_index); + "returns %d", + format_ip46_address, peer, IP46_TYPE_ANY, key->sw_if_index, + bus->adj_index); ++bum->udp6_sessions_count; bfd_udp_update_stat_segment_entry ( bum->udp6_sessions_count_stat_seg_entry, bum->udp6_sessions_count); |