mab122
/
radicle-heartwood-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

node: Always notify the service of a fetch result 

Even if the peer is no longer connected.
This commit is contained in:
cloudhead 2024-04-09 15:09:20 +02:00
parent 395d317954
commit 53ecc88437
No known key found for this signature in database
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
radicle-node/src/wire/protocol.rs
View File

@ -409,34 +409,34 @@ where
return; return;
}; };
let Peer::Connected { if let Peer::Connected { link, streams, .. } = peer {
nid, link, streams, .. // Nb. It's possible that the stream would already be unregistered if we received an
} = peer // early "close" from the remote. Otherwise, we unregister it here and send the "close"
else { // ourselves.
if let Some(s) = streams.unregister(&task.stream) {
log::debug!(
target: "wire", "Stream {} of {} closing with {} byte(s) sent and {} byte(s) received",
task.stream, task.remote, s.sent_bytes, s.received_bytes
);
let frame = Frame::control(
*link,
frame::Control::Close {
stream: task.stream,
},
);
self.actions.push_back(Action::Send(fd, frame.to_bytes()));
}
} else {
// If the peer disconnected, we'll get here, but we still want to let the service know
// about the fetch result, so we don't return here.
log::warn!(target: "wire", "Peer {nid} is not connected; ignoring fetch result"); log::warn!(target: "wire", "Peer {nid} is not connected; ignoring fetch result");
return; return;
}; };
// Nb. It's possible that the stream would already be unregistered if we received an early
// "close" from the remote. Otherwise, we unregister it here and send the "close" ourselves.
if let Some(s) = streams.unregister(&task.stream) {
log::debug!(
target: "wire", "Stream {} of {} closing with {} byte(s) sent and {} byte(s) received",
task.stream, task.remote, s.sent_bytes, s.received_bytes
);
let frame = Frame::control(
*link,
frame::Control::Close {
stream: task.stream,
},
);
self.actions.push_back(Action::Send(fd, frame.to_bytes()));
}
// Only call into the service if we initiated this fetch. // Only call into the service if we initiated this fetch.
match task.result { match task.result {
FetchResult::Initiator { rid, result } => { FetchResult::Initiator { rid, result } => {
self.service.fetched(rid, *nid, result); self.service.fetched(rid, nid, result);
} }
FetchResult::Responder { rid, result } => { FetchResult::Responder { rid, result } => {
if let Some(rid) = rid { if let Some(rid) = rid {