Git-Mirrors/veilid
1
0
Fork 0
mirror of https://gitlab.com/veilid/veilid.git synced 2025-08-24 22:30:25 -04:00
Code Issues Projects Releases Packages Wiki Activity

fix crash in last flow check

Browse source
This commit is contained in:
Christien Rioux 2024-07-18 18:44:33 -04:00
parent 65509efc08
commit 43518bafb9
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
veilid-core/src/routing_table/bucket_entry.rs
View file

@ -398,12 +398,12 @@ impl BucketEntryInner {
} }
// Check connections // Check connections
let last_connections = self.last_flows( let last_flows = self.last_flows(
rti, rti,
true, true,
NodeRefFilter::from(routing_domain), NodeRefFilter::from(routing_domain),
); );
!last_connections.is_empty() !last_flows.is_empty()
} }
pub fn node_info(&self, routing_domain: RoutingDomain) -> Option<&NodeInfo> { pub fn node_info(&self, routing_domain: RoutingDomain) -> Option<&NodeInfo> {
@ -539,8 +539,8 @@ impl BucketEntryInner {
only_live: bool, only_live: bool,
filter: NodeRefFilter, filter: NodeRefFilter,
) -> Vec<(Flow, Timestamp)> { ) -> Vec<(Flow, Timestamp)> {
let connection_manager = let opt_connection_manager =
rti.unlocked_inner.network_manager.connection_manager(); rti.unlocked_inner.network_manager.opt_connection_manager();
let mut out: Vec<(Flow, Timestamp)> = self let mut out: Vec<(Flow, Timestamp)> = self
.last_flows .last_flows
@ -568,7 +568,11 @@ impl BucketEntryInner {
// Should we check the connection table? // Should we check the connection table?
if v.0.protocol_type().is_ordered() { if v.0.protocol_type().is_ordered() {
// Look the connection up in the connection manager and see if it's still there // Look the connection up in the connection manager and see if it's still there
connection_manager.get_connection(v.0).is_some() if let Some(connection_manager) = &opt_connection_manager {
connection_manager.get_connection(v.0).is_some()
} else {
false
}
} else { } else {
// If this is not connection oriented, then we check our last seen time // If this is not connection oriented, then we check our last seen time
// to see if this mapping has expired (beyond our timeout) // to see if this mapping has expired (beyond our timeout)