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
2 changes: 1 addition & 1 deletion contrib/bencode/src/reference/decode_opt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ impl BDecodeOpt {
///
/// It may be useful to disable this if for example, the input bencode is prepended to
/// some payload and you would like to disassociate it. In this case, to find where the
/// rest of the payload starts that wasn't decoded, get the bencode buffer, and call len().
/// rest of the payload starts that wasn't decoded, get the bencode buffer, and call `len()`.
#[must_use]
pub fn enforce_full_decode(&self) -> bool {
self.enforce_full_decode
Expand Down
6 changes: 5 additions & 1 deletion src/servers/udp/handlers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use aquatic_udp_protocol::{
AnnounceInterval, AnnounceRequest, AnnounceResponse, ConnectRequest, ConnectResponse, ErrorResponse, NumberOfDownloads,
NumberOfPeers, Port, Request, Response, ResponsePeer, ScrapeRequest, ScrapeResponse, TorrentScrapeStatistics, TransactionId,
};
use log::debug;
use log::{debug, info};

use super::connection_cookie::{check, from_connection_id, into_connection_id, make};
use crate::core::{statistics, Tracker};
Expand Down Expand Up @@ -73,6 +73,7 @@ pub async fn handle_request(request: Request, remote_addr: SocketAddr, tracker:
///
/// This function does not ever return an error.
pub async fn handle_connect(remote_addr: SocketAddr, request: &ConnectRequest, tracker: &Tracker) -> Result<Response, Error> {
info!(target: "UDP", "\"CONNECT TxID {}\"", request.transaction_id.0);
debug!("udp connect request: {:#?}", request);

let connection_cookie = make(&remote_addr);
Expand Down Expand Up @@ -136,6 +137,8 @@ pub async fn handle_announce(

authenticate(&info_hash, tracker).await?;

info!(target: "UDP", "\"ANNOUNCE TxID {} IH {}\"", announce_request.transaction_id.0, info_hash.to_hex_string());

let mut peer = peer_builder::from_request(&wrapped_announce_request, &remote_client_ip);

let response = tracker.announce(&info_hash, &mut peer, &remote_client_ip).await;
Expand Down Expand Up @@ -210,6 +213,7 @@ pub async fn handle_announce(
///
/// This function does not ever return an error.
pub async fn handle_scrape(remote_addr: SocketAddr, request: &ScrapeRequest, tracker: &Tracker) -> Result<Response, Error> {
info!(target: "UDP", "\"SCRAPE TxID {}\"", request.transaction_id.0);
debug!("udp scrape request: {:#?}", request);

// Convert from aquatic infohashes
Expand Down
8 changes: 4 additions & 4 deletions src/servers/udp/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ impl Udp {
Ok((valid_bytes, remote_addr)) = socket.recv_from(&mut data) => {
let payload = data[..valid_bytes].to_vec();

info!("Received {} bytes", payload.len());
debug!("Received {} bytes", payload.len());
debug!("From: {}", &remote_addr);
debug!("Payload: {:?}", payload);

Expand Down Expand Up @@ -227,7 +227,7 @@ impl Udp {
Ok((valid_bytes, remote_addr)) = socket.recv_from(&mut data) => {
let payload = data[..valid_bytes].to_vec();

info!("Received {} bytes", payload.len());
debug!("Received {} bytes", payload.len());
debug!("From: {}", &remote_addr);
debug!("Payload: {:?}", payload);

Expand All @@ -249,13 +249,13 @@ impl Udp {
let position = cursor.position() as usize;
let inner = cursor.get_ref();

info!("Sending {} bytes ...", &inner[..position].len());
debug!("Sending {} bytes ...", &inner[..position].len());
debug!("To: {:?}", &remote_addr);
debug!("Payload: {:?}", &inner[..position]);

Udp::send_packet(socket, &remote_addr, &inner[..position]).await;

info!("{} bytes sent", &inner[..position].len());
debug!("{} bytes sent", &inner[..position].len());
}
Err(_) => {
error!("could not write response to bytes.");
Expand Down