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

aquatic http protocol: add deserialize impl for responses

Browse source
This commit is contained in:
Joakim Frostegård 2020-08-02 09:27:44 +02:00
parent d487bf3ebb
commit fe887e1de5
4 changed files with 203 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

33
aquatic_http_protocol/src/response.rs
View file

@ -2,36 +2,42 @@ use std::net::{Ipv4Addr, Ipv6Addr};
use std::io::Write;
use std::collections::BTreeMap;
use serde::Serialize;
use serde::{Serialize, Deserialize};
use super::common::*;
use super::utils::*;
#[derive(Debug, Clone, Serialize)]
pub struct ResponsePeer<I>{
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
pub struct ResponsePeer<I: Eq>{
pub ip_address: I,
pub port: u16
}
#[derive(Debug, Clone, Serialize)]
#[derive(Debug, Clone, Serialize, Deserialize)]
#[serde(transparent)]
pub struct ResponsePeerListV4(
#[serde(serialize_with = "serialize_response_peers_ipv4")]
#[serde(
serialize_with = "serialize_response_peers_ipv4",
deserialize_with = "deserialize_response_peers_ipv4",
)]
pub Vec<ResponsePeer<Ipv4Addr>>
);
#[derive(Debug, Clone, Serialize)]
#[derive(Debug, Clone, Serialize, Deserialize)]
#[serde(transparent)]
pub struct ResponsePeerListV6(
#[serde(serialize_with = "serialize_response_peers_ipv6")]
#[serde(
serialize_with = "serialize_response_peers_ipv6",
deserialize_with = "deserialize_response_peers_ipv6",
)]
pub Vec<ResponsePeer<Ipv6Addr>>
);
#[derive(Debug, Clone, Serialize)]
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct ScrapeStatistics {
pub complete: usize,
pub incomplete: usize,
@ -39,7 +45,7 @@ pub struct ScrapeStatistics {
}
#[derive(Debug, Clone, Serialize)]
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct AnnounceResponse {
#[serde(rename = "interval")]
pub announce_interval: usize,
@ -99,7 +105,7 @@ impl AnnounceResponse {
}
#[derive(Debug, Clone, Serialize)]
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct ScrapeResponse {
/// BTreeMap instead of HashMap since keys need to be serialized in order
pub files: BTreeMap<InfoHash, ScrapeStatistics>,
@ -133,7 +139,7 @@ impl ScrapeResponse {
}
#[derive(Debug, Clone, Serialize)]
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct FailureResponse {
pub failure_reason: String,
}
@ -158,7 +164,7 @@ impl FailureResponse {
}
#[derive(Debug, Clone, Serialize)]
#[derive(Debug, Clone, Serialize, Deserialize)]
#[serde(untagged)]
pub enum Response {
Announce(AnnounceResponse),
@ -175,6 +181,9 @@ impl Response {
Response::Scrape(r) => r.write(output),
}
}
pub fn from_bytes(bytes: &[u8]) -> Result<Self, ::bendy::serde::Error> {
::bendy::serde::de::from_bytes(bytes)
}
}