YGGverse/aquatic
1
0
Fork 0
mirror of https://github.com/YGGverse/aquatic.git synced 2026-03-31 17:55:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

udp: in bandwidth statistics, take headers etc into account

Browse source
This commit is contained in:
Joakim Frostegård 2022-11-01 17:33:26 +01:00
parent 21e5050dd1
commit 82122da762
2 changed files with 36 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -36,6 +36,7 @@
* Forbid unrecognized keys when parsing config files * Forbid unrecognized keys when parsing config files
* Fix warnings from invalid avx512 key included in `./scripts/env-native-cpu-without-avx-512` * Fix warnings from invalid avx512 key included in `./scripts/env-native-cpu-without-avx-512`
* _aquatic_udp_: when calculating bandwidth statistics, take packet headers etc. into account
* _aquatic_http_protocol_: explicity check for /scrape path * _aquatic_http_protocol_: explicity check for /scrape path
* _aquatic_http_protocol_: return NeedMoreData until headers are fully parsed * _aquatic_http_protocol_: return NeedMoreData until headers are fully parsed
* _aquatic_http_protocol_: fix issues with ScrapeRequest::write and AnnounceRequest::write * _aquatic_http_protocol_: fix issues with ScrapeRequest::write and AnnounceRequest::write

42
aquatic_udp/src/workers/socket/mod.rs
View file

@ -25,6 +25,24 @@ use crate::config::Config;
use storage::PendingScrapeResponseSlab; use storage::PendingScrapeResponseSlab;
use validator::ConnectionValidator; use validator::ConnectionValidator;
/// Bytes of data transmitted when sending an IPv4 UDP packet, in addition to payload size
///
/// Consists of:
/// - 8 bit ethernet frame
/// - 14 + 4 bit MAC header and checksum
/// - 20 bit IPv4 header
/// - 8 bit udp header
const EXTRA_PACKET_SIZE_IPV4: usize = 8 + 18 + 20 + 8;
/// Bytes of data transmitted when sending an IPv4 UDP packet, in addition to payload size
///
/// Consists of:
/// - 8 bit ethernet frame
/// - 14 + 4 bit MAC header and checksum
/// - 40 bit IPv6 header
/// - 8 bit udp header
const EXTRA_PACKET_SIZE_IPV6: usize = 8 + 18 + 40 + 8;
pub struct SocketWorker { pub struct SocketWorker {
config: Config, config: Config,
shared_state: State, shared_state: State,
@ -241,12 +259,12 @@ impl SocketWorker {
if request_parsable { if request_parsable {
requests_received_ipv4 += 1; requests_received_ipv4 += 1;
} }
bytes_received_ipv4 += bytes_read; bytes_received_ipv4 += bytes_read + EXTRA_PACKET_SIZE_IPV4;
} else { } else {
if request_parsable { if request_parsable {
requests_received_ipv6 += 1; requests_received_ipv6 += 1;
} }
bytes_received_ipv6 += bytes_read; bytes_received_ipv6 += bytes_read + EXTRA_PACKET_SIZE_IPV6;
} }
} }
Err(err) if err.kind() == ErrorKind::WouldBlock => { Err(err) if err.kind() == ErrorKind::WouldBlock => {
@ -379,12 +397,22 @@ impl SocketWorker {
match socket.send_to(&cursor.get_ref()[..bytes_written], addr) { match socket.send_to(&cursor.get_ref()[..bytes_written], addr) {
Ok(amt) if config.statistics.active() => { Ok(amt) if config.statistics.active() => {
let stats = if canonical_addr.is_ipv4() { let stats = if canonical_addr.is_ipv4() {
&shared_state.statistics_ipv4 let stats = &shared_state.statistics_ipv4;
} else {
&shared_state.statistics_ipv6
};
stats.bytes_sent.fetch_add(amt, Ordering::Relaxed); stats
.bytes_sent
.fetch_add(amt + EXTRA_PACKET_SIZE_IPV4, Ordering::Relaxed);
stats
} else {
let stats = &shared_state.statistics_ipv6;
stats
.bytes_sent
.fetch_add(amt + EXTRA_PACKET_SIZE_IPV6, Ordering::Relaxed);
stats
};
match response { match response {
Response::Connect(_) => { Response::Connect(_) => {