ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bfd: On a point to point link use the all zeros address for the peer.

Browse Source 
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
This commit is contained in:
Neale Ranns
2022-02-15 08:24:48 +00:00
parent bf9918a7e0
commit 558a354c8f
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/vnet/bfd/bfd_udp.c
View File

@@ -545,14 +545,18 @@ bfd_udp_add_session_internal (vlib_main_t * vm, bfd_udp_main_t * bum,
&key->peer_addr, IP46_TYPE_ANY); &key->peer_addr, IP46_TYPE_ANY);
vlib_log_info (bum->log_class, "create BFD session: %U", vlib_log_info (bum->log_class, "create BFD session: %U",
format_bfd_session, bs); 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) if (BFD_TRANSPORT_UDP4 == t)
{ {
bus->adj_index = adj_nbr_add_or_lock (FIB_PROTOCOL_IP4, VNET_LINK_IP4, bus->adj_index = adj_nbr_add_or_lock (FIB_PROTOCOL_IP4, VNET_LINK_IP4,
&key->peer_addr, peer, key->sw_if_index);
key->sw_if_index);
BFD_DBG ("adj_nbr_add_or_lock(FIB_PROTOCOL_IP4, VNET_LINK_IP4, %U, %d) " BFD_DBG ("adj_nbr_add_or_lock(FIB_PROTOCOL_IP4, VNET_LINK_IP4, %U, %d) "
"returns %d", format_ip46_address, &key->peer_addr, "returns %d",
IP46_TYPE_ANY, key->sw_if_index, bus->adj_index); format_ip46_address, peer, IP46_TYPE_ANY, key->sw_if_index,
bus->adj_index);
++bum->udp4_sessions_count; ++bum->udp4_sessions_count;
bfd_udp_update_stat_segment_entry ( bfd_udp_update_stat_segment_entry (
bum->udp4_sessions_count_stat_seg_entry, bum->udp4_sessions_count); 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 else
{ {
bus->adj_index = adj_nbr_add_or_lock (FIB_PROTOCOL_IP6, VNET_LINK_IP6, bus->adj_index = adj_nbr_add_or_lock (FIB_PROTOCOL_IP6, VNET_LINK_IP6,
&key->peer_addr, peer, key->sw_if_index);
key->sw_if_index);
BFD_DBG ("adj_nbr_add_or_lock(FIB_PROTOCOL_IP6, VNET_LINK_IP6, %U, %d) " BFD_DBG ("adj_nbr_add_or_lock(FIB_PROTOCOL_IP6, VNET_LINK_IP6, %U, %d) "
"returns %d", format_ip46_address, &key->peer_addr, "returns %d",
IP46_TYPE_ANY, key->sw_if_index, bus->adj_index); format_ip46_address, peer, IP46_TYPE_ANY, key->sw_if_index,
bus->adj_index);
++bum->udp6_sessions_count; ++bum->udp6_sessions_count;
bfd_udp_update_stat_segment_entry ( bfd_udp_update_stat_segment_entry (
bum->udp6_sessions_count_stat_seg_entry, bum->udp6_sessions_count); bum->udp6_sessions_count_stat_seg_entry, bum->udp6_sessions_count);