Skip to content

swarm/: Support generic connection management through NetworkBehaviour #2828

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

Closed
wants to merge 12 commits into from
Closed

swarm/: Support generic connection management through NetworkBehaviour #2828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3927ca2
*: Generic connection management
mxinden Aug 14, 2022
7bfdba6
protocols/connection-limit: Introduce
mxinden Aug 14, 2022
835394c
protocols/connection-limit: Test pending inbound connection limit
mxinden Aug 15, 2022
553f280
*: Test outbound established limit
mxinden Aug 15, 2022
cb42dd3
swarm-derive/: Add where clause of behaviour to generated out event
mxinden Aug 15, 2022
b4f1472
swarm-derive/: Derive Debug for generated OutEvent
mxinden Aug 16, 2022
3f58ccd
swarm-derive/: Do the changes
mxinden Aug 16, 2022
0e682ec
*: Review established connections
mxinden Aug 16, 2022
ebe1131
*: Enforce outgoing established connection limit
mxinden Aug 17, 2022
7335a94
*: Enforce outgoing established connection limit
mxinden Aug 17, 2022
486daba
Merge branch 'master' of https://github.com/libp2p/rust-libp2p into g…
mxinden Aug 17, 2022
a7eb4cb
protocols/connection-limit: Decrease count
mxinden Aug 19, 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
5 changes: 5 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ categories = ["network-programming", "asynchronous"]
[features]
default = [
"autonat",
# TODO: Should this really be a default?
"connection-limit",
Comment on lines +16 to +17
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Long term, I would say no because of #2173. For consistency with the current way of doing things, probably yes.

"deflate",
"dns-async-std",
"floodsub",
Expand All @@ -37,6 +39,7 @@ default = [
]

autonat = ["dep:libp2p-autonat"]
connection-limit = ["dep:libp2p-connection-limit"]
dcutr = ["dep:libp2p-dcutr", "libp2p-metrics?/dcutr"]
deflate = ["dep:libp2p-deflate"]
dns-async-std = ["dep:libp2p-dns", "libp2p-dns?/async-std"]
Expand Down Expand Up @@ -79,6 +82,7 @@ lazy_static = "1.2"

libp2p-autonat = { version = "0.6.0", path = "protocols/autonat", optional = true }
libp2p-core = { version = "0.35.0", path = "core", default-features = false }
libp2p-connection-limit = { version = "0.1.0", path = "protocols/connection-limit", optional = true }
libp2p-dcutr = { version = "0.5.0", path = "protocols/dcutr", optional = true }
libp2p-floodsub = { version = "0.38.0", path = "protocols/floodsub", optional = true }
libp2p-identify = { version = "0.38.0", path = "protocols/identify", optional = true }
Expand Down Expand Up @@ -130,6 +134,7 @@ members = [
"misc/prost-codec",
"muxers/mplex",
"muxers/yamux",
"protocols/connection-limit",
"protocols/dcutr",
"protocols/autonat",
"protocols/floodsub",
Expand Down
24 changes: 24 additions & 0 deletions protocols/connection-limit/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
[package]
name = "libp2p-connection-limit"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this have to be its own crate? I think this could also live in libp2p-swarm.

It can still be feature-flagged there if we want but looking at the dependencies of this crate, we don't really gain much at the moment from separating this out.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Separate crate forces us to deliver on the promise of being able to implement ones own.

That said, agreed that we don't gain much more and instead add complexity.

edition = "2021"
rust-version = "1.56.1"
description = "Basic connection limiting functionality"
version = "0.1.0"
authors = ["Max Inden <[email protected]>"]
license = "MIT"
repository = "https://github.com/libp2p/rust-libp2p"
keywords = ["peer-to-peer", "libp2p", "networking"]
categories = ["network-programming", "asynchronous"]

[dependencies]
libp2p-core = { version = "0.35.0", path = "../../core", default-features = false }
libp2p-swarm = { version = "0.38.0", path = "../../swarm" }
# TODO: Still needed?
fnv = "1.0"
futures = "0.3.0"

[dev-dependencies]
quickcheck = "0.9.0"
libp2p-plaintext = { path = "../../transports/plaintext" }
libp2p-yamux = { path = "../../muxers/yamux" }
libp2p = { version = "0.47.0", path = "../..", default-features = false }
Loading