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

udp: statistics: properly handle ipv4-mapped ipv6 addresses

Browse source
This commit is contained in:
Joakim Frostegård 2021-11-21 20:16:17 +01:00
parent f001c69dc7
commit 3a4056058b
1 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

27
aquatic_udp/src/lib/workers/socket.rs
View file

@ -240,20 +240,8 @@ fn read_requests(
Request::from_bytes(&buffer[..amt], config.protocol.max_scrape_torrents); Request::from_bytes(&buffer[..amt], config.protocol.max_scrape_torrents);
let src = match src { let src = match src {
src @ SocketAddr::V4(_) => { src @ SocketAddr::V4(_) => src,
if res_request.is_ok() {
requests_received_ipv4 += 1;
}
bytes_received_ipv4 += amt;
src
}
SocketAddr::V6(src) => { SocketAddr::V6(src) => {
if res_request.is_ok() {
requests_received_ipv6 += 1;
}
bytes_received_ipv6 += amt;
match src.ip().octets() { match src.ip().octets() {
// Convert IPv4-mapped address (available in std but nightly-only) // Convert IPv4-mapped address (available in std but nightly-only)
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff, a, b, c, d] => { [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff, a, b, c, d] => {
@ -267,6 +255,19 @@ fn read_requests(
} }
}; };
// Update statistics for converted address
if src.is_ipv4() {
if res_request.is_ok() {
requests_received_ipv4 += 1;
}
bytes_received_ipv4 += amt;
} else {
if res_request.is_ok() {
requests_received_ipv6 += 1;
}
bytes_received_ipv6 += amt;
}
handle_request( handle_request(
config, config,
connections, connections,