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

fix(iroh-net): fix extra delay #2330

Merged
merged 7 commits into from
May 29, 2024
Merged

fix(iroh-net): fix extra delay #2330

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
caa210d
Fix additional delay in relay mode
zh522130 May 28, 2024
e053349
Bump netdev to v0.27.0(fix windows timeout when interface down)
zh522130 May 28, 2024
eb41a6f
Fix code formatting issues
zh522130 May 28, 2024
62de4ca
wrap LocalAddresses::new() into spawn_blocking(),add comment
zh522130 May 29, 2024
406c1ee
Merge remote-tracking branch 'upstream/main' into fix-extra-delay
zh522130 May 29, 2024
05b450c
Update comments
zh522130 May 29, 2024
f3b27cc
fix clippy
zh522130 May 29, 2024
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
4 changes: 2 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion iroh-net/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ anyhow = { version = "1" }
base64 = "0.22.1"
backoff = "0.4.0"
bytes = "1"
netdev = "0.25"
netdev = "0.27.0"
der = { version = "0.7", features = ["alloc", "derive"] }
derive_more = { version = "1.0.0-beta.6", features = ["debug", "display", "from", "try_into", "deref"] }
flume = "0.11"
Expand Down
173 changes: 90 additions & 83 deletions iroh-net/src/magicsock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2000,102 +2000,109 @@ impl Actor {
.map(|a| a.ip().is_unspecified())
.unwrap_or(false);

let LocalAddresses {
regular: mut ips,
loopback,
} = LocalAddresses::new();

if is_unspecified_v4 || is_unspecified_v6 {
if ips.is_empty() && eps.is_empty() {
// Only include loopback addresses if we have no
// interfaces at all to use as endpoints and don't
// have a public IPv4 or IPv6 address. This allows
// for localhost testing when you're on a plane and
// offline, for example.
ips = loopback;
}
let v4_port = local_addr_v4.and_then(|addr| {
if addr.ip().is_unspecified() {
Some(addr.port())
} else {
None
let msock = self.msock.clone();

tokio::spawn(async move {
// Spawn the blocking call in a separate thread to prevent blocking the executor,
// and causing additional delay.
zh522130 marked this conversation as resolved.
Show resolved Hide resolved
let LocalAddresses {
regular: mut ips,
loopback,
} = tokio::task::spawn_blocking(|| LocalAddresses::new())
.await
.unwrap();

if is_unspecified_v4 || is_unspecified_v6 {
if ips.is_empty() && eps.is_empty() {
// Only include loopback addresses if we have no
// interfaces at all to use as endpoints and don't
// have a public IPv4 or IPv6 address. This allows
// for localhost testing when you're on a plane and
// offline, for example.
ips = loopback;
}
});
let v4_port = local_addr_v4.and_then(|addr| {
if addr.ip().is_unspecified() {
Some(addr.port())
} else {
None
}
});

let v6_port = local_addr_v6.and_then(|addr| {
if addr.ip().is_unspecified() {
Some(addr.port())
} else {
None
}
});
let v6_port = local_addr_v6.and_then(|addr| {
if addr.ip().is_unspecified() {
Some(addr.port())
} else {
None
}
});

for ip in ips {
match ip {
IpAddr::V4(_) => {
if let Some(port) = v4_port {
add_addr!(
already,
eps,
SocketAddr::new(ip, port),
config::EndpointType::Local
);
for ip in ips {
match ip {
IpAddr::V4(_) => {
if let Some(port) = v4_port {
add_addr!(
already,
eps,
SocketAddr::new(ip, port),
config::EndpointType::Local
);
}
}
}
IpAddr::V6(_) => {
if let Some(port) = v6_port {
add_addr!(
already,
eps,
SocketAddr::new(ip, port),
config::EndpointType::Local
);
IpAddr::V6(_) => {
if let Some(port) = v6_port {
add_addr!(
already,
eps,
SocketAddr::new(ip, port),
config::EndpointType::Local
);
}
}
}
}
}
}

if !is_unspecified_v4 {
if let Some(addr) = local_addr_v4 {
// Our local endpoint is bound to a particular address.
// Do not offer addresses on other local interfaces.
add_addr!(already, eps, addr, config::EndpointType::Local);
if !is_unspecified_v4 {
if let Some(addr) = local_addr_v4 {
// Our local endpoint is bound to a particular address.
// Do not offer addresses on other local interfaces.
add_addr!(already, eps, addr, config::EndpointType::Local);
}
}
}

if !is_unspecified_v6 {
if let Some(addr) = local_addr_v6 {
// Our local endpoint is bound to a particular address.
// Do not offer addresses on other local interfaces.
add_addr!(already, eps, addr, config::EndpointType::Local);
if !is_unspecified_v6 {
if let Some(addr) = local_addr_v6 {
// Our local endpoint is bound to a particular address.
// Do not offer addresses on other local interfaces.
add_addr!(already, eps, addr, config::EndpointType::Local);
}
}
}

// Note: the endpoints are intentionally returned in priority order,
// from "farthest but most reliable" to "closest but least
// reliable." Addresses returned from STUN should be globally
// addressable, but might go farther on the network than necessary.
// Local interface addresses might have lower latency, but not be
// globally addressable.
//
// The STUN address(es) are always first.
// Despite this sorting, clients are not relying on this sorting for decisions;

let updated = self
.msock
.endpoints
.update(DiscoveredEndpoints::new(eps))
.is_ok();
if updated {
let eps = self.msock.endpoints.read();
eps.log_endpoint_change();
self.msock.publish_my_addr();
}

// Regardless of whether our local endpoints changed, we now want to send any queued
// call-me-maybe messages.
self.msock.send_queued_call_me_maybes();
// Note: the endpoints are intentionally returned in priority order,
// from "farthest but most reliable" to "closest but least
// reliable." Addresses returned from STUN should be globally
// addressable, but might go farther on the network than necessary.
// Local interface addresses might have lower latency, but not be
// globally addressable.
//
// The STUN address(es) are always first.
// Despite this sorting, clients are not relying on this sorting for decisions;

let updated = msock
.endpoints
.update(DiscoveredEndpoints::new(eps))
.is_ok();
if updated {
let eps = msock.endpoints.read();
eps.log_endpoint_change();
msock.publish_my_addr();
}

// Regardless of whether our local endpoints changed, we now want to send any queued
// call-me-maybe messages.
msock.send_queued_call_me_maybes();
});
}

/// Called when an endpoints update is done, no matter if it was successful or not.
Expand Down
Loading