YGGverse/aquatic
1
0
Fork 0
mirror of https://github.com/YGGverse/aquatic.git synced 2026-04-01 18:25:30 +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

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

@ -1,8 +1,6 @@
use std::net::IpAddr;
use serde::Serializer;
use super::response::ResponsePeer;
use super::response::{ResponsePeerV4, ResponsePeerV6};
/// Not for serde
@ -42,22 +40,30 @@ pub fn serialize_20_bytes<S>(
}
pub fn serialize_response_peers_compact<S>(
response_peers: &[ResponsePeer],
pub fn serialize_response_peers_ipv4<S>(
response_peers: &[ResponsePeerV4],
serializer: S
) -> Result<S::Ok, S::Error> where S: Serializer {
let mut bytes = Vec::with_capacity(response_peers.len() * 6);
for peer in response_peers {
match peer.ip_address {
IpAddr::V4(ip) => {
bytes.extend_from_slice(&u32::from(ip).to_be_bytes());
bytes.extend_from_slice(&peer.port.to_be_bytes())
},
IpAddr::V6(_) => {
continue;
}
}
bytes.extend_from_slice(&u32::from(peer.ip_address).to_be_bytes());
bytes.extend_from_slice(&peer.port.to_be_bytes())
}
serializer.serialize_bytes(&bytes)
}
pub fn serialize_response_peers_ipv6<S>(
response_peers: &[ResponsePeerV6],
serializer: S
) -> Result<S::Ok, S::Error> where S: Serializer {
let mut bytes = Vec::with_capacity(response_peers.len() * 6);
for peer in response_peers {
bytes.extend_from_slice(&u128::from(peer.ip_address).to_be_bytes());
bytes.extend_from_slice(&peer.port.to_be_bytes())
}
serializer.serialize_bytes(&bytes)