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

http_private: stored procedure: use VARBINARY(20) for peer_id

Browse source
This commit is contained in:
Joakim Frostegård 2022-04-04 10:15:27 +02:00
parent 9fd1306b2e
commit 1cdd5bde5b
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
aquatic_http_private/README.md
View file

@ -38,8 +38,8 @@ CREATE OR REPLACE PROCEDURE aquatic_announce_v1 (
IN p_user_token VARCHAR(255), IN p_user_token VARCHAR(255),
-- Hex-encoded info hash -- Hex-encoded info hash
IN p_info_hash CHAR(40), IN p_info_hash CHAR(40),
-- Peer ID -- Peer ID. VARBINARY since it can be any bytes according to spec.
IN p_peer_id CHAR(40), IN p_peer_id VARBINARY(20),
-- Event (started/stopped/completed) (can be NULL) -- Event (started/stopped/completed) (can be NULL)
IN p_event VARCHAR(9), IN p_event VARCHAR(9),
-- Bytes uploaded. Passed directly from request. -- Bytes uploaded. Passed directly from request.

8
aquatic_http_private/src/workers/socket/db.rs
View file

@ -2,7 +2,7 @@ use std::net::IpAddr;
use aquatic_common::CanonicalSocketAddr; use aquatic_common::CanonicalSocketAddr;
use aquatic_http_protocol::{ use aquatic_http_protocol::{
common::AnnounceEvent, request::AnnounceRequest, response::FailureResponse, common::{AnnounceEvent, PeerId}, request::AnnounceRequest, response::FailureResponse,
}; };
use sqlx::{Executor, MySql, Pool}; use sqlx::{Executor, MySql, Pool};
@ -22,7 +22,7 @@ struct AnnounceProcedureParameters {
user_agent: Option<String>, user_agent: Option<String>,
user_token: String, user_token: String,
info_hash: String, info_hash: String,
peer_id: String, peer_id: PeerId,
event: AnnounceEvent, event: AnnounceEvent,
uploaded: u64, uploaded: u64,
downloaded: u64, downloaded: u64,
@ -42,7 +42,7 @@ impl AnnounceProcedureParameters {
user_agent, user_agent,
user_token, user_token,
info_hash: hex::encode(request.info_hash.0), info_hash: hex::encode(request.info_hash.0),
peer_id: hex::encode(request.peer_id.0), peer_id: request.peer_id,
event: request.event, event: request.event,
uploaded: request.bytes_uploaded as u64, uploaded: request.bytes_uploaded as u64,
downloaded: request.bytes_downloaded as u64, downloaded: request.bytes_downloaded as u64,
@ -127,7 +127,7 @@ async fn call_announce_procedure(
.bind(parameters.user_agent) .bind(parameters.user_agent)
.bind(parameters.user_token) .bind(parameters.user_token)
.bind(parameters.info_hash) .bind(parameters.info_hash)
.bind(parameters.peer_id) .bind(&parameters.peer_id.0[..])
.bind(parameters.event.as_str()) .bind(parameters.event.as_str())
.bind(parameters.uploaded) .bind(parameters.uploaded)
.bind(parameters.downloaded) .bind(parameters.downloaded)