feat(p2p): implement connect and lookup
#372
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rklaehn
reviewed
Oct 20, 2022
faassen
suggested changes
Oct 20, 2022
rklaehn
previously approved these changes
Oct 20, 2022
There was a problem hiding this comment.
Did some basic tests with this. Works on my machine 👍
iroh on ramfox/connect [$?] via 🦀 v1.63.0
❯ cargo run -p iroh -- p2p connect /ip4/192.168.100.126/tcp/4001/p2p/12D3KooWBK6nRXqdZBZW6UKQgV4M1nhJAewjkS3iqZqPkza9R8UN
Finished dev [unoptimized + debuginfo] target(s) in 0.18s
Running `target/debug/iroh p2p connect /ip4/192.168.100.126/tcp/4001/p2p/12D3KooWBK6nRXqdZBZW6UKQgV4M1nhJAewjkS3iqZqPkza9R8UN`
Connected!
iroh on ramfox/connect [$?] via 🦀 v1.63.0
❯ cargo run -p iroh -- p2p lookup
Finished dev [unoptimized + debuginfo] target(s) in 0.19s
Running `target/debug/iroh p2p lookup`
peer id: 12D3KooWCLb7tdXfUWSxNhqdFW2RunQTnXPyWaZN6uUguRenMfM2
listening addresses: ["/ip4/127.0.0.1/tcp/4444", "/ip4/192.168.100.17/tcp/4444", "/ip4/109.97.120.25/tcp/4444", "/ip6/64:ff9b::6d61:7819/tcp/4444", "/ip4/10.142.15.221/tcp/57264", "/ip4/109.97.120.25/tcp/57900/ws", "/ip4/100.121.168.64/tcp/4444"]
protocols: []
protocol version:
observed addresses: ["/ip4/109.97.120.25/tcp/4444", "/ip6/64:ff9b::6d61:7819/tcp/4444", "/ip4/10.142.15.221/tcp/57264", "/ip4/109.97.120.25/tcp/57900/ws", "/ip4/100.121.168.64/tcp/4444"]
iroh on ramfox/connect [$?] via 🦀 v1.63.0
❯ cargo run -p iroh -- p2p lookup 12D3KooWBK6nRXqdZBZW6UKQgV4M1nhJAewjkS3iqZqPkza9R8UN
Finished dev [unoptimized + debuginfo] target(s) in 0.17s
Running `target/debug/iroh p2p lookup 12D3KooWBK6nRXqdZBZW6UKQgV4M1nhJAewjkS3iqZqPkza9R8UN`
peer id: 12D3KooWBK6nRXqdZBZW6UKQgV4M1nhJAewjkS3iqZqPkza9R8UN
listening addresses: ["/ip4/192.168.100.126/udp/4001/quic", "/ip4/192.168.100.126/tcp/4001", "/ip4/109.97.120.25/tcp/4001", "/ip4/109.97.120.25/udp/20325/quic", "/ip4/109.97.120.25/tcp/20323"]
protocols: ["/p2p/id/delta/1.0.0", "/ipfs/id/1.0.0", "/ipfs/id/push/1.0.0", "/ipfs/ping/1.0.0", "/libp2p/circuit/relay/0.1.0", "/libp2p/circuit/relay/0.2.0/stop", "/ipfs/lan/kad/1.0.0", "/libp2p/autonat/1.0.0", "/ipfs/bitswap/1.2.0", "/ipfs/bitswap/1.1.0", "/ipfs/bitswap/1.0.0", "/ipfs/bitswap", "/x/", "/libp2p/circuit/relay/0.2.0/hop", "/ipfs/kad/1.0.0", "/libp2p/dcutr"]
protocol version: ipfs/0.1.0
observed addresses: ["/ip4/192.168.100.17/tcp/4444"]It is a bit hard to figure out if it worked without ipfs p2p peers or something like htat, but I guess that would be the next thing...
Great point. I'll make an issue that can go into 0.1.1 |
ramfox
force-pushed
the
ramfox/connect
branch
from
43a4639 to
7aa8c02
Compare
ramfox
force-pushed
the
ramfox/connect
branch
5 times, most recently
from
a560260 to
d286ab7
Compare
b5
approved these changes
Oct 21, 2022
b5
previously approved these changes
Oct 21, 2022
iroh/src/p2p.rs
Outdated
| } | ||
| P2pCommands::Connect { addr } => match p2p.connect(&addr.0).await { | ||
| Ok(_) => { | ||
| println!("Connected!"); |
There was a problem hiding this comment.
nit: maybe print to what we connected? seems like it would be a bit clearer
ramfox
force-pushed
the
ramfox/connect
branch
2 times, most recently
from
8bebc5c to
f68ceda
Compare
b5
previously approved these changes
Oct 21, 2022
ramfox
force-pushed
the
ramfox/connect
branch
from
f68ceda to
5d558fe
Compare
b5
approved these changes
Oct 21, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR cleans up a bunch of messy
connectbehaviourPeerIdkubo swarm connectcan connect toiroh-p2p, butiroh-ctl p2p connectdoes not connect to kubo beetle#214Adds
lookupbehaviourconnectfirst attempting to find the peer on the dhtThis needs a follow-up PR to clean up:
iroh p2p lookupsuccess outputiroh p2p lookup&iroh p2p connecterror output