fluencelabs/rust-libp2p
1
0
Fork 0
mirror of https://github.com/fluencelabs/rust-libp2p synced 2025-05-03 06:32:16 +00:00
Code Issues Projects Releases Wiki Activity

protocols/mdns: Do not fire all timers at the same time. (#2212)

Browse Source 
Co-authored-by: Max Inden <mail@max-inden.de>
This commit is contained in:
David Craven 2021-09-07 19:04:57 +02:00 committed by GitHub
parent 733a0b6ce4
commit 67722c534d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
protocols/mdns/CHANGELOG.md
View File

@ -9,7 +9,10 @@
in `MdnsConfig` to `IPV6_MDNS_MULTICAST_ADDRESS`. in `MdnsConfig` to `IPV6_MDNS_MULTICAST_ADDRESS`.
See [PR 2161] for details. See [PR 2161] for details.
- Prevent timers from firing at the same time. See [PR 2212] for details.
[PR 2161]: https://github.com/libp2p/rust-libp2p/pull/2161/ [PR 2161]: https://github.com/libp2p/rust-libp2p/pull/2161/
[PR 2212]: https://github.com/libp2p/rust-libp2p/pull/2212/
# 0.31.0 [2021-07-12] # 0.31.0 [2021-07-12]

31
protocols/mdns/src/behaviour.rs
View File

@ -153,6 +153,13 @@ impl Mdns {
Async::new(socket)? Async::new(socket)?
}; };
let if_watch = if_watch::IfWatcher::new().await?; let if_watch = if_watch::IfWatcher::new().await?;
// randomize timer to prevent all converging and firing at the same time.
let query_interval = {
use rand::Rng;
let mut rng = rand::thread_rng();
let jitter = rng.gen_range(0..100);
config.query_interval + Duration::from_millis(jitter)
};
Ok(Self { Ok(Self {
recv_socket, recv_socket,
send_socket, send_socket,
@ -162,9 +169,9 @@ impl Mdns {
discovered_nodes: SmallVec::new(), discovered_nodes: SmallVec::new(),
closest_expiration: None, closest_expiration: None,
events: Default::default(), events: Default::default(),
query_interval: config.query_interval, query_interval,
ttl: config.ttl, ttl: config.ttl,
timeout: Timer::interval(config.query_interval), timeout: Timer::interval(query_interval),
multicast_addr: config.multicast_addr, multicast_addr: config.multicast_addr,
}) })
} }
@ -179,10 +186,19 @@ impl Mdns {
self.discovered_nodes.iter().map(|(p, _, _)| p) self.discovered_nodes.iter().map(|(p, _, _)| p)
} }
fn reset_timer(&mut self) {
self.timeout.set_interval(self.query_interval);
}
fn fire_timer(&mut self) {
self.timeout
.set_interval_at(Instant::now(), self.query_interval);
}
fn inject_mdns_packet(&mut self, packet: MdnsPacket, params: &impl PollParameters) { fn inject_mdns_packet(&mut self, packet: MdnsPacket, params: &impl PollParameters) {
match packet { match packet {
MdnsPacket::Query(query) => { MdnsPacket::Query(query) => {
self.timeout.set_interval(self.query_interval); self.reset_timer();
log::trace!("sending response"); log::trace!("sending response");
for packet in build_query_response( for packet in build_query_response(
query.query_id(), query.query_id(),
@ -279,8 +295,7 @@ impl NetworkBehaviour for Mdns {
} }
fn inject_new_listen_addr(&mut self, _id: ListenerId, _addr: &Multiaddr) { fn inject_new_listen_addr(&mut self, _id: ListenerId, _addr: &Multiaddr) {
self.timeout self.fire_timer();
.set_interval_at(Instant::now(), self.query_interval);
} }
fn poll( fn poll(
@ -302,8 +317,7 @@ impl NetworkBehaviour for Mdns {
if let Err(err) = socket.join_multicast_v4(&multicast, &addr) { if let Err(err) = socket.join_multicast_v4(&multicast, &addr) {
log::error!("join multicast failed: {}", err); log::error!("join multicast failed: {}", err);
} else { } else {
self.timeout self.fire_timer();
.set_interval_at(Instant::now(), self.query_interval);
} }
} }
} }
@ -313,8 +327,7 @@ impl NetworkBehaviour for Mdns {
if let Err(err) = socket.join_multicast_v6(&multicast, 0) { if let Err(err) = socket.join_multicast_v6(&multicast, 0) {
log::error!("join multicast failed: {}", err); log::error!("join multicast failed: {}", err);
} else { } else {
self.timeout self.fire_timer();
.set_interval_at(Instant::now(), self.query_interval);
} }
} }
} }