manawenuz/btest-rs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 7 Wiki Activity

Revert: always report rx_bytes in UDP status, not tx_bytes
All checks were successful
CI / test (push) Successful in 1m27s
Details

Browse Source 
Reporting tx_bytes in TX-only mode caused MikroTik to show speed on
the wrong side (Tx instead of Rx). MikroTik tracks its own Rx by
counting UDP arrivals — the status bytes_received is for the OTHER
direction (how much we received from the client).

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Siavash Sameni
2026-03-31 19:52:14 +04:00
parent 0c14e6cf5b
commit 29643e7589
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/server.rs
View File

@@ -198,7 +198,7 @@ async fn handle_client(
); );
// Build auth OK response - include session token for TCP multi-connection // Build auth OK response - include session token for TCP multi-connection
let is_tcp_multi = !cmd.is_udp() && cmd.tcp_conn_count > 0; let is_tcp_multi = !cmd.is_udp() && cmd.tcp_conn_count > 1;
let session_token: u16 = if is_tcp_multi { let session_token: u16 = if is_tcp_multi {
rand::random::<u16>() | 0x0101 // ensure both bytes non-zero rand::random::<u16>() | 0x0101 // ensure both bytes non-zero
} else { } else {
@@ -669,7 +669,7 @@ async fn run_udp_test_server(
// On IPv6, send a probe packet to trigger NDP neighbor resolution before blasting. // On IPv6, send a probe packet to trigger NDP neighbor resolution before blasting.
// macOS returns ENOBUFS on send_to() until the neighbor cache is populated. // macOS returns ENOBUFS on send_to() until the neighbor cache is populated.
if peer.is_ipv6() { if peer.is_ipv6() {
let _ = udp.send_to(&[0u8; 1], client_udp_addr).await; let _ = udp.send_to(&[], client_udp_addr).await;
tokio::time::sleep(Duration::from_millis(200)).await; tokio::time::sleep(Duration::from_millis(200)).await;
tracing::debug!("IPv6 NDP probe sent to {}", client_udp_addr); tracing::debug!("IPv6 NDP probe sent to {}", client_udp_addr);
} }
@@ -682,7 +682,7 @@ async fn run_udp_test_server(
// from multiple source ports). For single-connection, always connect() — // from multiple source ports). For single-connection, always connect() —
// this is critical for IPv6 where send_to() hits ENOBUFS but send() works. // this is critical for IPv6 where send_to() hits ENOBUFS but send() works.
// recv_from() works fine on connected sockets for single source. // recv_from() works fine on connected sockets for single source.
let use_unconnected = cmd.tcp_conn_count > 0; let use_unconnected = cmd.tcp_conn_count > 1;
if !use_unconnected { if !use_unconnected {
udp.connect(client_udp_addr).await?; udp.connect(client_udp_addr).await?;
} }
@@ -949,17 +949,11 @@ async fn udp_status_loop(
let tx_bytes = state.tx_bytes.swap(0, Ordering::Relaxed); let tx_bytes = state.tx_bytes.swap(0, Ordering::Relaxed);
let lost = state.rx_lost_packets.swap(0, Ordering::Relaxed); let lost = state.rx_lost_packets.swap(0, Ordering::Relaxed);
// Report bytes relevant to the active direction. // Always report rx_bytes — how much we received from the client.
// When TX-only: report tx_bytes so client knows data is flowing. // MikroTik client tracks its own Rx independently by counting UDP arrivals.
// When RX or BOTH: report rx_bytes (how much we received from client).
let report_bytes = if cmd.server_tx() && !cmd.server_rx() {
tx_bytes
} else {
rx_bytes
};
let status = StatusMessage { let status = StatusMessage {
seq, seq,
bytes_received: report_bytes as u32, bytes_received: rx_bytes as u32,
}; };
let serialized = status.serialize(); let serialized = status.serialize();
tracing::debug!( tracing::debug!(