rayhaan/bgp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change route client bails into warnings.
Some checks failed
Rust / build (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Rayhaan Jaufeerally
2024-08-08 21:19:19 +00:00
parent 9c9d6beede
commit 4a7e346153
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
crates/route_client/src/lib.rs
View File

@ -16,7 +16,6 @@ pub mod fib_state;
pub mod netlink; pub mod netlink;
pub mod southbound_interface; pub mod southbound_interface;
use log::trace;
use std::convert::TryInto; use std::convert::TryInto;
use std::net::IpAddr; use std::net::IpAddr;
use std::net::Ipv4Addr; use std::net::Ipv4Addr;
@ -32,7 +31,7 @@ use eyre::{anyhow, Result};
use ip_network_table_deps_treebitmap::IpLookupTable; use ip_network_table_deps_treebitmap::IpLookupTable;
use tonic::transport::Endpoint; use tonic::transport::Endpoint;
use tonic::transport::Uri; use tonic::transport::Uri;
use tracing::info; use tracing::{info, trace, warn};
use crate::fib_state::FibState; use crate::fib_state::FibState;
use crate::proto::route_service_client::RouteServiceClient; use crate::proto::route_service_client::RouteServiceClient;
@ -101,13 +100,13 @@ pub async fn run_connector_v4<S: SouthboundInterface>(
let nh_bytes: [u8; 4] = vec_to_array(best.nexthop.clone())?; let nh_bytes: [u8; 4] = vec_to_array(best.nexthop.clone())?;
let nh_addr: Ipv4Addr = Ipv4Addr::from(nh_bytes); let nh_addr: Ipv4Addr = Ipv4Addr::from(nh_bytes);
if let Err(e) = fib_state.route_add(&nlri, IpAddr::V4(nh_addr)).await { if let Err(e) = fib_state.route_add(&nlri, IpAddr::V4(nh_addr)).await {
return Err(anyhow!("Failed to add route {}: {}", nlri, e)); warn!("Failed to add route into kernel: {}: {}", nlri, e);
} }
} }
} else { } else {
// No more paths, delete // No more paths, delete
if let Err(e) = fib_state.route_del(nlri).await { if let Err(e) = fib_state.route_del(nlri).await {
return Err(anyhow!("Failed to delete route: {}", e)); warn!("Failed to delete route from kernel: {}", e);
} }
} }
} }
@ -169,13 +168,13 @@ pub async fn run_connector_v6<S: SouthboundInterface>(
let nh_bytes: [u8; 16] = vec_to_array(best.nexthop.clone())?; let nh_bytes: [u8; 16] = vec_to_array(best.nexthop.clone())?;
let nh_addr: Ipv6Addr = Ipv6Addr::from(nh_bytes); let nh_addr: Ipv6Addr = Ipv6Addr::from(nh_bytes);
if let Err(e) = fib_state.route_add(&nlri, IpAddr::V6(nh_addr)).await { if let Err(e) = fib_state.route_add(&nlri, IpAddr::V6(nh_addr)).await {
return Err(anyhow!("Failed to add route {}: {}", nlri, e)); warn!("Failed to add route into kernel: {}: {}", nlri, e);
} }
} }
} else { } else {
// No more paths, delete // No more paths, delete
if let Err(e) = fib_state.route_del(nlri).await { if let Err(e) = fib_state.route_del(nlri).await {
return Err(anyhow!("Failed to delete route: {}", e)); warn!("Failed to delete route from kernel: {}", e);
} }
} }
} }