From 0bb1c77456a04498b5a337f0aeb123a6e612e663 Mon Sep 17 00:00:00 2001 From: Igor Katson Date: Thu, 29 Aug 2024 12:48:14 +0100 Subject: [PATCH] Decode more peer ids --- crates/librqbit/src/peer_connection.rs | 2 +- crates/librqbit_core/src/peer_id.rs | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/crates/librqbit/src/peer_connection.rs b/crates/librqbit/src/peer_connection.rs index 04a1be4..58db889 100644 --- a/crates/librqbit/src/peer_connection.rs +++ b/crates/librqbit/src/peer_connection.rs @@ -200,7 +200,7 @@ impl PeerConnection { .context("error reading handshake")?; let h_supports_extended = h.supports_extended(); trace!( - peer_id=?h.peer_id, + peer_id=?Id20::new(h.peer_id), decoded_id=?try_decode_peer_id(Id20::new(h.peer_id)), "connected", ); diff --git a/crates/librqbit_core/src/peer_id.rs b/crates/librqbit_core/src/peer_id.rs index 3bf96ae..6f2ce60 100644 --- a/crates/librqbit_core/src/peer_id.rs +++ b/crates/librqbit_core/src/peer_id.rs @@ -5,6 +5,9 @@ pub enum AzureusStyleKind { Deluge, LibTorrent, Transmission, + QBittorrent, + UTorrent, + RQBit, Other([char; 2]), } @@ -20,6 +23,9 @@ impl AzureusStyleKind { b"DE" => AzureusStyleKind::Deluge, b"lt" | b"LT" => AzureusStyleKind::LibTorrent, b"TR" => AzureusStyleKind::Transmission, + b"qB" => AzureusStyleKind::QBittorrent, + b"UT" => AzureusStyleKind::UTorrent, + b"rQ" => AzureusStyleKind::RQBit, _ => AzureusStyleKind::Other([b1 as char, b2 as char]), } } @@ -53,7 +59,7 @@ pub fn generate_peer_id() -> Id20 { let u = uuid::Uuid::new_v4(); peer_id[4..20].copy_from_slice(&u.as_bytes()[..]); - peer_id[..8].copy_from_slice(b"-rQ0001-"); + peer_id[..8].copy_from_slice(b"-rQ7000-"); Id20::new(peer_id) }