Git-Mirrors/veilid
1
0
Fork 0
mirror of https://gitlab.com/veilid/veilid.git synced 2024-10-01 01:26:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

correctly handle local interface address changes

Browse Source 
closes #350
This commit is contained in:
Christien Rioux 2024-05-19 12:28:06 -04:00
parent 046c15c668
commit 6590b76263
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
veilid-core/src/network_manager/native/mod.rs
View File

@ -109,6 +109,8 @@ struct NetworkInner {
listener_states: BTreeMap<SocketAddr, Arc<RwLock<ListenerState>>>, listener_states: BTreeMap<SocketAddr, Arc<RwLock<ListenerState>>>,
/// Preferred local addresses for protocols/address combinations for outgoing connections /// Preferred local addresses for protocols/address combinations for outgoing connections
preferred_local_addresses: BTreeMap<(ProtocolType, AddressType), SocketAddr>, preferred_local_addresses: BTreeMap<(ProtocolType, AddressType), SocketAddr>,
/// The list of stable interface addresses we have last seen
stable_interface_addresses_at_startup: Vec<IpAddr>,
} }
struct NetworkUnlockedInner { struct NetworkUnlockedInner {
@ -155,6 +157,7 @@ impl Network {
tls_acceptor: None, tls_acceptor: None,
listener_states: BTreeMap::new(), listener_states: BTreeMap::new(),
preferred_local_addresses: BTreeMap::new(), preferred_local_addresses: BTreeMap::new(),
stable_interface_addresses_at_startup: Vec::new(),
} }
} }
@ -170,7 +173,7 @@ impl Network {
connection_manager, connection_manager,
interfaces: NetworkInterfaces::new(), interfaces: NetworkInterfaces::new(),
update_network_class_task: TickTask::new(1), update_network_class_task: TickTask::new(1),
network_interfaces_task: TickTask::new(5), network_interfaces_task: TickTask::new(1),
upnp_task: TickTask::new(1), upnp_task: TickTask::new(1),
igd_manager: igd_manager::IGDManager::new(config.clone()), igd_manager: igd_manager::IGDManager::new(config.clone()),
} }
@ -339,13 +342,14 @@ impl Network {
pub fn get_stable_interface_addresses(&self) -> Vec<IpAddr> { pub fn get_stable_interface_addresses(&self) -> Vec<IpAddr> {
let addrs = self.unlocked_inner.interfaces.stable_addresses(); let addrs = self.unlocked_inner.interfaces.stable_addresses();
let addrs: Vec<IpAddr> = addrs let mut addrs: Vec<IpAddr> = addrs
.into_iter() .into_iter()
.filter(|addr| { .filter(|addr| {
let address = Address::from_ip_addr(*addr); let address = Address::from_ip_addr(*addr);
address.is_local() || address.is_global() address.is_local() || address.is_global()
}) })
.collect(); .collect();
addrs.sort();
addrs addrs
} }
@ -361,7 +365,11 @@ impl Network {
return Ok(false); return Ok(false);
} }
self.inner.lock().needs_public_dial_info_check = true; let mut inner = self.inner.lock();
let new_stable_interface_addresses = self.get_stable_interface_addresses();
if new_stable_interface_addresses != inner.stable_interface_addresses_at_startup {
inner.network_needs_restart = true;
}
Ok(true) Ok(true)
} }
@ -708,8 +716,11 @@ impl Network {
// determine if we have ipv4/ipv6 addresses // determine if we have ipv4/ipv6 addresses
{ {
let mut inner = self.inner.lock(); let mut inner = self.inner.lock();
let stable_interface_addresses = self.get_stable_interface_addresses();
inner.enable_ipv4 = false; inner.enable_ipv4 = false;
for addr in self.get_stable_interface_addresses() { for addr in stable_interface_addresses.iter().copied() {
if addr.is_ipv4() { if addr.is_ipv4() {
log_net!(debug "enable address {:?} as ipv4", addr); log_net!(debug "enable address {:?} as ipv4", addr);
inner.enable_ipv4 = true; inner.enable_ipv4 = true;
@ -724,6 +735,7 @@ impl Network {
} }
} }
} }
inner.stable_interface_addresses_at_startup = stable_interface_addresses;
} }
// Build our protocol config to share it with other nodes // Build our protocol config to share it with other nodes

6
veilid-core/src/routing_table/tasks/bootstrap.rs
View File

@ -287,9 +287,9 @@ impl RoutingTable {
Ok(NodeContactMethod::Direct(v)) => v, Ok(NodeContactMethod::Direct(v)) => v,
Ok(v) => { Ok(v) => {
log_rtab!(warn "invalid contact method for bootstrap, ignoring peer: {:?}", v); log_rtab!(warn "invalid contact method for bootstrap, ignoring peer: {:?}", v);
let _ = routing_table // let _ = routing_table
.network_manager() // .network_manager()
.get_node_contact_method(nr.clone()); // .get_node_contact_method(nr.clone());
return; return;
} }
Err(e) => { Err(e) => {