Skip to content

refactor(iroh): Spawn RemoteStateActor in JoinSet and remove guarded_channel.rs #3681

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

Draft
wants to merge 19 commits into
base: feat-multipath
Choose a base branch
from
+143 −182
Draft

refactor(iroh): Spawn RemoteStateActor in JoinSet and remove guarded_channel.rs #3681

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
db9d18a
fix
Frando Nov 18, 2025
08061e5
make nicer
Frando Nov 18, 2025
3ee7c69
fix: check if local_addrs are connected
Frando Nov 18, 2025
687d1fd
Merge remote-tracking branch 'origin/feat-multipath' into Frando/mp-f…
Frando Nov 18, 2025
9c19639
chore: add log
Frando Nov 18, 2025
ab321af
chore: trace to debug for netsime
Frando Nov 18, 2025
717ac88
fix: log failed addr in transports send
Frando Nov 18, 2025
7c11665
fix: don't break RemoteStateActor if sending datagram fails
Frando Nov 18, 2025
899df00
Simplify the idle timeout logic & don't short-circuit in `handle_msg_…
matheus23 Nov 20, 2025
e98b835
Merge remote-tracking branch 'origin/feat-multipath' into Frando/mp-f…
matheus23 Nov 20, 2025
2eeac07
fix: add error context add call site
Frando Nov 20, 2025
ff20fa3
chore: clippy
Frando Nov 20, 2025
3f8d72a
Stop the `RemoteStateActor` when the direct addr watcher disconnects
matheus23 Nov 20, 2025
52d4382
Rename `local_addrs` to `local_direct_addrs`
matheus23 Nov 20, 2025
64e9e2d
Replace `RemoteStateHandle` with storing a `JoinSet` in `RemoteMap`
matheus23 Nov 19, 2025
969754d
Remove `guarded_channel` and use `tokio::mpsc` instead. Return leftov…
matheus23 Nov 19, 2025
4c4d11d
Send back leftover messages
matheus23 Nov 20, 2025
5cd4dd1
`cargo make format`
matheus23 Nov 20, 2025
6e09bda
Move leftover msg fetching to the end of `run`
matheus23 Nov 20, 2025
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
Prev Previous commit
Next Next commit
make nicer
  • Loading branch information
@Frando
Frando committed Nov 18, 2025
commit 08061e53744ae44befa11e1a535eebb18f974a50
5 changes: 3 additions & 2 deletions iroh/src/magicsock/remote_map/remote_state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,12 +278,13 @@ impl RemoteStateActor {
}
}

if self.connections.is_empty() && inbox.is_idle() && idle_timeout.is_none() {
let is_idle = self.connections.is_empty() && inbox.is_idle();
if idle_timeout.is_none() && is_idle {
trace!("start idle timeout");
idle_timeout
.as_mut()
.set_future(time::sleep(ACTOR_MAX_IDLE_TIMEOUT));
} else if idle_timeout.is_some() && (!self.connections.is_empty() || !inbox.is_idle()) {
} else if idle_timeout.is_some() && !is_idle {
trace!("abort idle timeout");
idle_timeout.as_mut().set_none()
}
Expand Down
Loading