Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

protocols/mdns: Update to if-watch v2.0.0 #2978

Merged
merged 8 commits into from
Oct 5, 2022
Merged

protocols/mdns: Update to if-watch v2.0.0 #2978

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fca7c3b
Updated if-warch
umgefahren Oct 4, 2022
df6e5ca
Added changelog entry
umgefahren Oct 4, 2022
5f1e3c4
Merge branch 'master' into update-if-watch-mdns
umgefahren Oct 4, 2022
fcae4f5
Removed the need for async
umgefahren Oct 5, 2022
8c4b293
Merge branch 'master' into update-if-watch-mdns
umgefahren Oct 5, 2022
a97a311
Update protocols/mdns/CHANGELOG.md
umgefahren Oct 5, 2022
13aaea2
Merge branch 'master' into update-if-watch-mdns
umgefahren Oct 5, 2022
f8c45b3
Merge branch 'master' into update-if-watch-mdns
mxinden Oct 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions protocols/mdns/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,11 @@

- Fix a bug that could cause a delay of ~10s until peers would get discovered when using the tokio runtime. See [PR 2939].

- Update to `if-watch` `v2.0.0`. See [PR 2978].
umgefahren marked this conversation as resolved.
Show resolved Hide resolved

[PR 2918]: https://github.com/libp2p/rust-libp2p/pull/2918
[PR 2939]: https://github.com/libp2p/rust-libp2p/pull/2939
[PR 2978]: https://github.com/libp2p/rust-libp2p/pull/2978

# 0.40.0

Expand Down
2 changes: 1 addition & 1 deletion protocols/mdns/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ categories = ["network-programming", "asynchronous"]
data-encoding = "2.3.2"
dns-parser = "0.8.0"
futures = "0.3.13"
if-watch = "1.1.1"
if-watch = "2.0.0"
lazy_static = "1.4.0"
libp2p-core = { version = "0.37.0", path = "../../core" }
libp2p-swarm = { version = "0.40.0", path = "../../swarm" }
Expand Down
5 changes: 2 additions & 3 deletions protocols/mdns/src/behaviour.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ mod timer;
use self::iface::InterfaceState;
use crate::behaviour::{socket::AsyncSocket, timer::Builder};
use crate::MdnsConfig;
use futures::prelude::*;
use futures::Stream;
use if_watch::{IfEvent, IfWatcher};
use libp2p_core::transport::ListenerId;
Expand Down Expand Up @@ -83,7 +82,7 @@ where
{
/// Builds a new `Mdns` behaviour.
pub async fn new(config: MdnsConfig) -> io::Result<Self> {
umgefahren marked this conversation as resolved.
Show resolved Hide resolved
let if_watch = if_watch::IfWatcher::new().await?;
let if_watch = if_watch::IfWatcher::new()?;
Ok(Self {
config,
if_watch,
Expand Down Expand Up @@ -170,7 +169,7 @@ where
params: &mut impl PollParameters,
) -> Poll<NetworkBehaviourAction<Self::OutEvent, DummyConnectionHandler>> {
// Poll ifwatch.
while let Poll::Ready(event) = Pin::new(&mut self.if_watch).poll(cx) {
while let Poll::Ready(Some(event)) = Pin::new(&mut self.if_watch).poll_next(cx) {
match event {
Ok(IfEvent::Up(inet)) => {
let addr = inet.addr();
Expand Down