YGGverse/aquatic
1
0
Fork 0
mirror of https://github.com/YGGverse/aquatic.git synced 2026-04-01 02:05:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

improve ws protocol struct naming and documentation

Browse source
This commit is contained in:
Joakim Frostegård 2023-10-30 19:03:28 +01:00
parent b473bb6fba
commit 0789f7ec3b
17 changed files with 193 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/ws/src/workers/socket.rs
View file

@ -906,8 +906,8 @@ impl<S: futures::AsyncRead + futures::AsyncWrite + Unpin> ConnectionWriter<S> {
#[cfg(feature = "metrics")]
{
let out_message_type = match &out_message {
OutMessage::Offer(_) => "offer",
OutMessage::Answer(_) => "offer_answer",
OutMessage::OfferOutMessage(_) => "offer",
OutMessage::AnswerOutMessage(_) => "offer_answer",
OutMessage::AnnounceResponse(_) => "announce",
OutMessage::ScrapeResponse(_) => "scrape",
OutMessage::ErrorResponse(_) => "error",

16
crates/ws/src/workers/swarm.rs
View file

@ -443,7 +443,7 @@ fn handle_announce_request(
);
for (offer, offer_receiver) in offers.into_iter().zip(offer_receivers) {
let middleman_offer = MiddlemanOfferToPeer {
let offer_out_message = OfferOutMessage {
action: AnnounceAction,
info_hash: request.info_hash,
peer_id: request.peer_id,
@ -457,17 +457,19 @@ fn handle_announce_request(
pending_scrape_id: None,
};
out_messages.push((meta, OutMessage::Offer(middleman_offer)));
out_messages.push((meta, OutMessage::OfferOutMessage(offer_out_message)));
::log::trace!("sending middleman offer to {:?}", meta);
}
}
// If peer sent answer, send it on to relevant peer
if let (Some(answer), Some(answer_receiver_id), Some(offer_id)) =
(request.answer, request.to_peer_id, request.offer_id)
{
if let (Some(answer), Some(answer_receiver_id), Some(offer_id)) = (
request.answer,
request.answer_to_peer_id,
request.answer_offer_id,
) {
if let Some(answer_receiver) = torrent_data.peers.get(&answer_receiver_id) {
let middleman_answer = MiddlemanAnswerToPeer {
let answer_out_message = AnswerOutMessage {
action: AnnounceAction,
peer_id: request.peer_id,
info_hash: request.info_hash,
@ -481,7 +483,7 @@ fn handle_announce_request(
pending_scrape_id: None,
};
out_messages.push((meta, OutMessage::Answer(middleman_answer)));
out_messages.push((meta, OutMessage::AnswerOutMessage(answer_out_message)));
::log::trace!("sending middleman answer to {:?}", meta);
}
}