From fc159aa0a046ea63c5a415afe6db5547f9baddac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20Frosteg=C3=A5rd?= Date: Mon, 4 Apr 2022 10:55:24 +0200 Subject: [PATCH] http_private: make call_announce_procedure cleaner --- aquatic_http_private/src/workers/socket/db.rs | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/aquatic_http_private/src/workers/socket/db.rs b/aquatic_http_private/src/workers/socket/db.rs index c66ba72..89b7396 100644 --- a/aquatic_http_private/src/workers/socket/db.rs +++ b/aquatic_http_private/src/workers/socket/db.rs @@ -54,12 +54,6 @@ async fn call_announce_procedure( user_token: String, // FIXME: length request: &AnnounceRequest, ) -> anyhow::Result { - let source_addr = source_addr.get(); - let source_ip_bytes: Vec = match source_addr.ip() { - IpAddr::V4(ip) => ip.octets().into(), - IpAddr::V6(ip) => ip.octets().into(), - }; - let mut t = pool.begin().await?; t.execute( @@ -91,8 +85,11 @@ async fn call_announce_procedure( ); ", ) - .bind(source_ip_bytes) - .bind(source_addr.port()) + .bind(match source_addr.get().ip() { + IpAddr::V4(ip) => Vec::from(ip.octets()), + IpAddr::V6(ip) => Vec::from(ip.octets()), + }) + .bind(source_addr.get().port()) .bind(user_agent) .bind(user_token) .bind(hex::encode(request.info_hash.0))