Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions Cargo.lock

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

13 changes: 10 additions & 3 deletions iroh/src/socket/remote_map/remote_state.rs
Original file line number Diff line number Diff line change
Expand Up @@ -589,7 +589,7 @@ impl RemoteStateActor {
};
trace!("path event");
match event {
NoqPathEvent::Established { id: path_id } => {
NoqPathEvent::Established { id: path_id, .. } => {
let Some(path) = conn.path(path_id) else {
trace!("path open event for unknown path");
return;
Expand All @@ -599,7 +599,7 @@ impl RemoteStateActor {
.register_and_configure_path(conn_id, conn_state, &path);
self.select_path();
}
NoqPathEvent::Abandoned { id, reason } => {
NoqPathEvent::Abandoned { id, reason, .. } => {
// Remove abandoned path from the conn state.
let Some(path_remote) = conn_state.remove_path(&id, &conn) else {
debug!(%id, "path not in path_id_map");
Expand Down Expand Up @@ -645,12 +645,19 @@ impl RemoteStateActor {
// If the remote closed our selected path, select a new one.
self.select_path();
}
NoqPathEvent::Discarded { id, path_stats } => {
NoqPathEvent::Discarded { id, path_stats, .. } => {
trace!(%id, ?path_stats, "path discarded");
}
NoqPathEvent::RemoteStatus { .. } | NoqPathEvent::ObservedAddr { .. } => {
// Nothing to do for these events.
}
_ => {
Comment thread
matheus23 marked this conversation as resolved.
// We expect to keep noq and iroh in sync in all test setups, but in production it's totally possible
// that iroh itself is linked against a newer version of noq with additional events we don't yet
// know how to handle.
#[cfg(test)]
panic!("Unhandled path event: {event:?}");
}
}
}

Expand Down
Loading