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

aquatic_http: add ipv6 compact responses; fix ipv4/ipv6 issue

Browse source
This commit is contained in:
Joakim Frostegård 2020-07-08 12:26:41 +02:00
parent 5ff00e866d
commit 43a33d80c4
6 changed files with 127 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

39
aquatic_http/src/lib/protocol/response.rs
View file

@ -1,4 +1,4 @@
use std::net::IpAddr;
use std::net::{IpAddr, Ipv4Addr, Ipv6Addr};
use hashbrown::HashMap;
use serde::Serialize;
@ -9,7 +9,6 @@ use super::common::*;
use super::utils::*;
#[derive(Clone, Copy, Debug, Serialize)]
pub struct ResponsePeer {
pub ip_address: IpAddr,
pub port: u16
@ -28,6 +27,36 @@ impl ResponsePeer {
}
#[derive(Clone, Copy, Debug, Serialize)]
pub struct ResponsePeerV4 {
pub ip_address: Ipv4Addr,
pub port: u16
}
#[derive(Clone, Copy, Debug, Serialize)]
pub struct ResponsePeerV6 {
pub ip_address: Ipv6Addr,
pub port: u16
}
#[derive(Debug, Clone, Serialize)]
#[serde(transparent)]
pub struct ResponsePeerListV4(
#[serde(serialize_with = "serialize_response_peers_ipv4")]
pub Vec<ResponsePeerV4>
);
#[derive(Debug, Clone, Serialize)]
#[serde(transparent)]
pub struct ResponsePeerListV6(
#[serde(serialize_with = "serialize_response_peers_ipv6")]
pub Vec<ResponsePeerV6>
);
#[derive(Debug, Clone, Serialize)]
pub struct ScrapeStatistics {
pub complete: usize,
@ -42,10 +71,8 @@ pub struct AnnounceResponse {
pub announce_interval: usize,
pub complete: usize,
pub incomplete: usize,
#[serde(
serialize_with = "serialize_response_peers_compact"
)]
pub peers: Vec<ResponsePeer>,
pub peers: ResponsePeerListV4,
pub peers6: ResponsePeerListV6,
}