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

aquatic_http: parameterise many data structures over peer IP protocol

Browse source
This commit is contained in:
Joakim Frostegård 2020-07-08 14:12:01 +02:00
parent da4ba14b47
commit 2386dd0e8b
7 changed files with 230 additions and 205 deletions
Download patch file Download diff file Expand all files Collapse all files

4
aquatic_http/src/lib/protocol/common.rs
View file

@ -5,7 +5,7 @@ use serde::Serialize;
use super::utils::*;
#[derive(Debug, Clone, Hash, PartialEq, Eq, Serialize)]
#[derive(Debug, Clone, Copy, Hash, PartialEq, Eq, Serialize)]
#[serde(transparent)]
pub struct PeerId(
#[serde(
@ -15,7 +15,7 @@ pub struct PeerId(
);
#[derive(Debug, Clone, Hash, PartialEq, Eq, Serialize)]
#[derive(Debug, Clone, Copy, Hash, PartialEq, Eq, Serialize)]
#[serde(transparent)]
pub struct InfoHash(
#[serde(

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

@ -1,42 +1,15 @@
use std::net::{IpAddr, Ipv4Addr, Ipv6Addr};
use std::net::{Ipv4Addr, Ipv6Addr};
use hashbrown::HashMap;
use serde::Serialize;
use crate::common::Peer;
use super::common::*;
use super::utils::*;
pub struct ResponsePeer {
pub ip_address: IpAddr,
pub port: u16
}
impl ResponsePeer {
pub fn from_peer(peer: &Peer) -> Self {
let ip_address = peer.connection_meta.peer_addr.ip();
Self {
ip_address,
port: peer.port
}
}
}
#[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,
#[derive(Debug, Clone, Serialize)]
pub struct ResponsePeer<I>{
pub ip_address: I,
pub port: u16
}
@ -45,7 +18,7 @@ pub struct ResponsePeerV6 {
#[serde(transparent)]
pub struct ResponsePeerListV4(
#[serde(serialize_with = "serialize_response_peers_ipv4")]
pub Vec<ResponsePeerV4>
pub Vec<ResponsePeer<Ipv4Addr>>
);
@ -53,7 +26,7 @@ pub struct ResponsePeerListV4(
#[serde(transparent)]
pub struct ResponsePeerListV6(
#[serde(serialize_with = "serialize_response_peers_ipv6")]
pub Vec<ResponsePeerV6>
pub Vec<ResponsePeer<Ipv6Addr>>
);

8
aquatic_http/src/lib/protocol/utils.rs
View file

@ -1,6 +1,8 @@
use std::net::{Ipv4Addr, Ipv6Addr};
use serde::Serializer;
use super::response::{ResponsePeerV4, ResponsePeerV6};
use super::response::ResponsePeer;
/// Not for serde
@ -41,7 +43,7 @@ pub fn serialize_20_bytes<S>(
pub fn serialize_response_peers_ipv4<S>(
response_peers: &[ResponsePeerV4],
response_peers: &[ResponsePeer<Ipv4Addr>],
serializer: S
) -> Result<S::Ok, S::Error> where S: Serializer {
let mut bytes = Vec::with_capacity(response_peers.len() * 6);
@ -56,7 +58,7 @@ pub fn serialize_response_peers_ipv4<S>(
pub fn serialize_response_peers_ipv6<S>(
response_peers: &[ResponsePeerV6],
response_peers: &[ResponsePeer<Ipv6Addr>],
serializer: S
) -> Result<S::Ok, S::Error> where S: Serializer {
let mut bytes = Vec::with_capacity(response_peers.len() * 6);