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

Jump to bottom

transports/tcp: simplify IfWatcher integration #2813

Merged
merged 28 commits into from
Sep 10, 2022
Merged

transports/tcp: simplify IfWatcher integration #2813

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
cf5bda2
transports/tcp: Update to `if-watch` v2.0.0
elenaf9 Aug 11, 2022
f832d08
transports/tcp: use `if-watcher` in all runtimes
elenaf9 Aug 11, 2022
e72b2fe
transports/tcp: fix docs for not feature async-io
elenaf9 Aug 11, 2022
9b1dc6b
tcp/transports: remove addr(s) from `InAddr`
elenaf9 Aug 11, 2022
1a8c64f
Merge branch 'master' of github.com:libp2p/rust-libp2p into tcp/refac…
elenaf9 Aug 18, 2022
2198640
transports/tcp: fix clippy
elenaf9 Aug 18, 2022
a39c192
Merge branch 'master' of github.com:libp2p/rust-libp2p into tcp/refac…
elenaf9 Aug 19, 2022
a139f76
transports/tcp: adapt to latest `if-watch` master
elenaf9 Aug 19, 2022
e59d665
transports/tcp: Use `if-watch` from crates.io
elenaf9 Aug 20, 2022
9cc1678
Merge branch 'master' of github.com:libp2p/rust-libp2p into tcp/refac…
elenaf9 Aug 20, 2022
64a3165
transports/tcp: remove `InAddr`
elenaf9 Aug 11, 2022
8d16ad7
transports/tcp: consistent poll style
elenaf9 Aug 20, 2022
603b39c
transports/tcp: poll `pause` before `IfWatcher`
elenaf9 Aug 20, 2022
9f3b14e
transports/tcp/tests: fix clippy
elenaf9 Aug 20, 2022
e2ca55d
transports/tcp: use `poll_unpin` to poll `pause`
elenaf9 Aug 20, 2022
2e5b11d
transports/tcp: add changelog entry
elenaf9 Aug 20, 2022
582582a
transports/tcp: docs
elenaf9 Aug 20, 2022
856065b
transports/tcp: fmt
elenaf9 Aug 20, 2022
e2d001f
transports/tcp: minor style change
elenaf9 Aug 23, 2022
607ba62
Merge branch 'master' of github.com:libp2p/rust-libp2p into tcp/refac…
elenaf9 Aug 23, 2022
4a63d84
transports/tcp: return early if ip is unspecified
elenaf9 Aug 30, 2022
972a34e
Merge branch 'master' of github.com:libp2p/rust-libp2p into tcp/refac…
elenaf9 Aug 30, 2022
036f56f
transports/tcp: don't log error before returning
elenaf9 Aug 30, 2022
864237f
Merge branch 'master' into tcp/refactor-inaddr
elenaf9 Sep 7, 2022
773cd1b
Merge branch 'master' into tcp/refactor-inaddr
mxinden Sep 9, 2022
99fa0cb
transports/tcp: Move changelog entry and bump version
mxinden Sep 9, 2022
9f802b2
transports/tcp/CHANGELOG: Mark entry as unreleased
mxinden Sep 9, 2022
d5af2ca
Cargo.toml: Bump version
mxinden Sep 9, 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
10 changes: 4 additions & 6 deletions transports/tcp/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@ categories = ["network-programming", "asynchronous"]
async-io-crate = { package = "async-io", version = "1.2.0", optional = true }
futures = "0.3.8"
futures-timer = "3.0"
if-watch = { version = "1.1.1", optional = true }
if-addrs = { version = "0.7.0", optional = true }
ipnet = "2.0.0"
if-watch = "2.0.0"
libc = "0.2.80"
libp2p-core = { version = "0.35.0", path = "../../core", default-features = false }
log = "0.4.11"
Expand All @@ -25,10 +23,10 @@ tokio-crate = { package = "tokio", version = "1.19.0", default-features = false,

[features]
default = ["async-io"]
tokio = ["tokio-crate", "if-addrs"]
async-io = ["async-io-crate", "if-watch"]
tokio = ["tokio-crate"]
async-io = ["async-io-crate"]

[dev-dependencies]
async-std = { version = "1.6.5", features = ["attributes"] }
tokio-crate = { package = "tokio", version = "1.0.1", default-features = false, features = ["net", "rt"] }
tokio-crate = { package = "tokio", version = "1.0.1", default-features = false, features = ["net", "rt", "macros"] }
env_logger = "0.9.0"
Loading