Skip to content

Commit 2f02a4a

Browse files
authoredMay 13, 2024··
Merge pull request #25 from n0-computer/iroh-016
feat: update to iroh@0.16
2 parents e1ee159 + 9fe27a8 commit 2f02a4a

File tree

3 files changed

+259
-122
lines changed

3 files changed

+259
-122
lines changed
 

‎Cargo.lock

+251-118
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ description = "A cli tool to pipe data over the network, with NAT hole punching"
1414
anyhow = "1.0.75"
1515
clap = { version = "4.4.10", features = ["derive"] }
1616
hex = "0.4.3"
17-
iroh-net = { version = "0.15" }
18-
quinn = "0.10.2"
17+
iroh-net = { version = "0.16" }
18+
quinn = { version = "0.10", package = "iroh-quinn" }
1919
tokio = { version = "1.34.0", features = ["full"] }
2020
tokio-util = "0.7.10"
2121
tracing = "0.1.40"

‎src/main.rs

+6-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22
use anyhow::Context;
33
use clap::{Parser, Subcommand};
44
use dumbpipe::NodeTicket;
5-
use iroh_net::{key::SecretKey, magic_endpoint::get_remote_node_id, MagicEndpoint, NodeAddr};
5+
use iroh_net::{
6+
key::SecretKey,
7+
magic_endpoint::{get_remote_node_id, Connecting},
8+
MagicEndpoint, NodeAddr,
9+
};
610
use std::{
711
io,
812
net::{SocketAddr, ToSocketAddrs},
@@ -454,7 +458,7 @@ async fn listen_tcp(args: ListenTcpArgs) -> anyhow::Result<()> {
454458

455459
// handle a new incoming connection on the magic endpoint
456460
async fn handle_magic_accept(
457-
connecting: quinn::Connecting,
461+
connecting: Connecting,
458462
addrs: Vec<std::net::SocketAddr>,
459463
handshake: bool,
460464
) -> anyhow::Result<()> {

0 commit comments

Comments
 (0)
Please sign in to comment.