Deuxfleurs/garage
48
56
Fork 73
Code Issues 100 Pull requests 13 Releases 30 Wiki Activity

Fixes to garage_net peering manager #786

Merged
lx merged 3 commits from net-fixes into next-0.10 2024-03-21 10:26:37 +00:00
Conversation 0 Commits 3 Files changed 5 +13 -13
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 3844110cd0 - Show all commits

26
src/net/peering.rs
View file

@ -43,7 +43,7 @@ impl Message for PingMessage {
#[derive(Serialize, Deserialize)]
struct PeerListMessage {
pub list: Vec<(NodeID, Vec<SocketAddr>)>,
pub list: Vec<(NodeID, SocketAddr)>,
}
impl Message for PeerListMessage {
@ -185,11 +185,13 @@ impl KnownHosts {
}
self.hash = hash_state.finalize();
}
fn connected_peers_vec(&self) -> Vec<(NodeID, Vec<SocketAddr>)> {
fn connected_peers_vec(&self) -> Vec<(NodeID, SocketAddr)> {
self.list
.iter()
.filter(|(_, peer)| peer.state.is_up())
.map(|(id, peer)| (*id, peer.known_addrs.clone()))
.filter_map(|(id, peer)| match peer.state {
PeerConnState::Connected { addr } => Some((*id, addr)),
_ => None,
})
.collect::<Vec<_>>()
}
}
@ -468,20 +470,18 @@ impl PeeringManager {
}
}
fn handle_peer_list(&self, list: &[(NodeID, Vec<SocketAddr>)]) {
fn handle_peer_list(&self, list: &[(NodeID, SocketAddr)]) {
let mut known_hosts = self.known_hosts.write().unwrap();
let mut changed = false;
for (id, addrs) in list.iter() {
for addr in addrs.iter() {
if let Some(kh) = known_hosts.list.get_mut(id) {
if kh.add_addr(*addr) {
changed = true;
}
} else {
known_hosts.list.insert(*id, self.new_peer(id, *addr));
for (id, addr) in list.iter() {
if let Some(kh) = known_hosts.list.get_mut(id) {
if kh.add_addr(*addr) {
changed = true;
}
} else {
known_hosts.list.insert(*id, self.new_peer(id, *addr));
changed = true;
}
}