All checks were successful
CI / test (push) Successful in 1m20s
MITM capture showed MikroTik sends all-zero TCP data streams. Our server was setting packet[0]=0x07 (STATUS_MSG_TYPE), which MikroTik rejected. TCP mode has no status headers — just raw zero-filled data streams in both directions. Fixed in both server and client TCP TX loops. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
456 lines
14 KiB
Rust
456 lines
14 KiB
Rust
use std::net::SocketAddr;
|
|
use std::sync::atomic::Ordering;
|
|
use std::sync::Arc;
|
|
use std::time::{Duration, Instant};
|
|
|
|
use tokio::io::{AsyncReadExt, AsyncWriteExt};
|
|
use tokio::net::{TcpStream, UdpSocket};
|
|
|
|
use crate::auth;
|
|
use crate::bandwidth::{self, BandwidthState};
|
|
use crate::protocol::*;
|
|
|
|
pub async fn run_client(
|
|
host: &str,
|
|
port: u16,
|
|
direction: u8,
|
|
use_udp: bool,
|
|
tx_speed: u32,
|
|
rx_speed: u32,
|
|
auth_user: Option<String>,
|
|
auth_pass: Option<String>,
|
|
nat_mode: bool,
|
|
) -> Result<()> {
|
|
let addr = format!("{}:{}", host, port);
|
|
tracing::info!("Connecting to {}...", addr);
|
|
let mut stream = TcpStream::connect(&addr).await?;
|
|
stream.set_nodelay(true)?;
|
|
|
|
recv_hello(&mut stream).await?;
|
|
tracing::info!("Connected to server");
|
|
|
|
let proto = if use_udp { CMD_PROTO_UDP } else { CMD_PROTO_TCP };
|
|
let mut cmd = Command::new(proto, direction);
|
|
cmd.local_tx_speed = tx_speed;
|
|
cmd.remote_tx_speed = rx_speed;
|
|
|
|
send_command(&mut stream, &cmd).await?;
|
|
|
|
let resp = recv_response(&mut stream).await?;
|
|
if resp == AUTH_OK {
|
|
// No auth required
|
|
} else if resp == AUTH_REQUIRED {
|
|
// MD5 auth
|
|
match (auth_user.as_deref(), auth_pass.as_deref()) {
|
|
(Some(user), Some(pass)) => {
|
|
auth::client_authenticate(&mut stream, resp, user, pass).await?;
|
|
}
|
|
_ => {
|
|
return Err(BtestError::Protocol(
|
|
"Server requires authentication but no credentials provided (-a/-p)".into(),
|
|
));
|
|
}
|
|
}
|
|
} else if resp == [0x03, 0x00, 0x00, 0x00] {
|
|
// EC-SRP5 auth (RouterOS >= 6.43)
|
|
match (auth_user.as_deref(), auth_pass.as_deref()) {
|
|
(Some(user), Some(pass)) => {
|
|
crate::ecsrp5::client_authenticate(&mut stream, user, pass).await?;
|
|
// After EC-SRP5, server sends AUTH_OK
|
|
let post_auth = recv_response(&mut stream).await?;
|
|
if post_auth != AUTH_OK {
|
|
return Err(BtestError::Protocol(format!(
|
|
"Unexpected post-EC-SRP5 response: {:02x?}",
|
|
post_auth
|
|
)));
|
|
}
|
|
}
|
|
_ => {
|
|
return Err(BtestError::Protocol(
|
|
"Server requires EC-SRP5 authentication. Provide credentials with -a/-p".into(),
|
|
));
|
|
}
|
|
}
|
|
} else {
|
|
return Err(BtestError::Protocol(format!(
|
|
"Unexpected server response: {:02x?}",
|
|
resp
|
|
)));
|
|
}
|
|
|
|
tracing::info!(
|
|
"Starting {} {} test",
|
|
if use_udp { "UDP" } else { "TCP" },
|
|
match direction {
|
|
CMD_DIR_RX => "upload (client TX)",
|
|
CMD_DIR_TX => "download (client RX)",
|
|
CMD_DIR_BOTH => "bidirectional",
|
|
_ => "unknown",
|
|
},
|
|
);
|
|
|
|
if use_udp {
|
|
run_udp_test_client(&mut stream, host, &cmd, nat_mode).await
|
|
} else {
|
|
run_tcp_test_client(stream, cmd).await
|
|
}
|
|
}
|
|
|
|
// --- TCP Test Client ---
|
|
|
|
async fn run_tcp_test_client(stream: TcpStream, cmd: Command) -> Result<()> {
|
|
let state = BandwidthState::new();
|
|
let tx_size = cmd.tx_size as usize;
|
|
let client_should_tx = cmd.client_tx();
|
|
let client_should_rx = cmd.client_rx();
|
|
let tx_speed = cmd.local_tx_speed;
|
|
|
|
let (reader, writer) = stream.into_split();
|
|
|
|
// IMPORTANT: Do NOT drop unused halves - dropping OwnedWriteHalf sends TCP FIN,
|
|
// causing the peer to think we disconnected. Use Option to conditionally move.
|
|
let mut _writer_keepalive = None;
|
|
let mut _reader_keepalive = None;
|
|
|
|
let state_tx = state.clone();
|
|
let tx_handle = if client_should_tx {
|
|
Some(tokio::spawn(async move {
|
|
tcp_client_tx_loop(writer, tx_size, tx_speed, state_tx).await
|
|
}))
|
|
} else {
|
|
_writer_keepalive = Some(writer);
|
|
None
|
|
};
|
|
|
|
let state_rx = state.clone();
|
|
let rx_handle = if client_should_rx {
|
|
Some(tokio::spawn(async move {
|
|
tcp_client_rx_loop(reader, state_rx).await
|
|
}))
|
|
} else {
|
|
_reader_keepalive = Some(reader);
|
|
None
|
|
};
|
|
|
|
client_status_loop(&cmd, &state).await;
|
|
|
|
state.running.store(false, Ordering::SeqCst);
|
|
if let Some(h) = tx_handle { let _ = h.await; }
|
|
if let Some(h) = rx_handle { let _ = h.await; }
|
|
Ok(())
|
|
}
|
|
|
|
async fn tcp_client_tx_loop(
|
|
mut writer: tokio::net::tcp::OwnedWriteHalf,
|
|
tx_size: usize,
|
|
tx_speed: u32,
|
|
state: Arc<BandwidthState>,
|
|
) {
|
|
tokio::time::sleep(Duration::from_millis(100)).await;
|
|
|
|
let packet = vec![0u8; tx_size]; // TCP data is all zeros
|
|
let mut interval = bandwidth::calc_send_interval(tx_speed, tx_size as u16);
|
|
let mut next_send = Instant::now();
|
|
|
|
while state.running.load(Ordering::Relaxed) {
|
|
if writer.write_all(&packet).await.is_err() {
|
|
break;
|
|
}
|
|
state.tx_bytes.fetch_add(tx_size as u64, Ordering::Relaxed);
|
|
|
|
if state.tx_speed_changed.load(Ordering::Relaxed) {
|
|
state.tx_speed_changed.store(false, Ordering::Relaxed);
|
|
let new_speed = state.tx_speed.load(Ordering::Relaxed);
|
|
interval = bandwidth::calc_send_interval(new_speed, tx_size as u16);
|
|
next_send = Instant::now();
|
|
}
|
|
|
|
match interval {
|
|
Some(iv) => {
|
|
next_send += iv;
|
|
let now = Instant::now();
|
|
if next_send > now {
|
|
tokio::time::sleep(next_send - now).await;
|
|
}
|
|
}
|
|
None => {
|
|
tokio::task::yield_now().await;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
async fn tcp_client_rx_loop(
|
|
mut reader: tokio::net::tcp::OwnedReadHalf,
|
|
state: Arc<BandwidthState>,
|
|
) {
|
|
let mut buf = vec![0u8; 65536];
|
|
while state.running.load(Ordering::Relaxed) {
|
|
match reader.read(&mut buf).await {
|
|
Ok(0) | Err(_) => break,
|
|
Ok(n) => {
|
|
state.rx_bytes.fetch_add(n as u64, Ordering::Relaxed);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
// --- UDP Test Client ---
|
|
|
|
async fn run_udp_test_client(
|
|
stream: &mut TcpStream,
|
|
host: &str,
|
|
cmd: &Command,
|
|
nat_mode: bool,
|
|
) -> Result<()> {
|
|
let mut port_buf = [0u8; 2];
|
|
stream.read_exact(&mut port_buf).await?;
|
|
let server_udp_port = u16::from_be_bytes(port_buf);
|
|
let client_udp_port = server_udp_port + BTEST_PORT_CLIENT_OFFSET;
|
|
|
|
tracing::info!(
|
|
"UDP ports: server={}, client={}",
|
|
server_udp_port, client_udp_port,
|
|
);
|
|
|
|
let udp = UdpSocket::bind(format!("0.0.0.0:{}", client_udp_port)).await?;
|
|
let server_udp_addr: SocketAddr =
|
|
format!("{}:{}", host, server_udp_port).parse().unwrap();
|
|
udp.connect(server_udp_addr).await?;
|
|
|
|
if nat_mode {
|
|
tracing::info!("NAT mode: sending probe packet");
|
|
udp.send(&[]).await?;
|
|
}
|
|
|
|
let state = BandwidthState::new();
|
|
let tx_size = cmd.tx_size as usize;
|
|
let client_should_tx = cmd.client_tx();
|
|
let client_should_rx = cmd.client_rx();
|
|
let tx_speed = cmd.local_tx_speed;
|
|
let udp = Arc::new(udp);
|
|
|
|
let state_tx = state.clone();
|
|
let udp_tx = udp.clone();
|
|
let tx_handle = if client_should_tx {
|
|
Some(tokio::spawn(async move {
|
|
udp_client_tx_loop(&udp_tx, tx_size, tx_speed, state_tx).await
|
|
}))
|
|
} else {
|
|
None
|
|
};
|
|
|
|
let state_rx = state.clone();
|
|
let udp_rx = udp.clone();
|
|
let rx_handle = if client_should_rx {
|
|
Some(tokio::spawn(async move {
|
|
udp_client_rx_loop(&udp_rx, state_rx).await
|
|
}))
|
|
} else {
|
|
None
|
|
};
|
|
|
|
udp_client_status_loop(stream, cmd, &state).await;
|
|
|
|
state.running.store(false, Ordering::SeqCst);
|
|
if let Some(h) = tx_handle { let _ = h.await; }
|
|
if let Some(h) = rx_handle { let _ = h.await; }
|
|
Ok(())
|
|
}
|
|
|
|
async fn udp_client_tx_loop(
|
|
socket: &UdpSocket,
|
|
tx_size: usize,
|
|
initial_tx_speed: u32,
|
|
state: Arc<BandwidthState>,
|
|
) {
|
|
let mut seq: u32 = 0;
|
|
let mut packet = vec![0u8; tx_size];
|
|
let mut interval = bandwidth::calc_send_interval(initial_tx_speed, tx_size as u16);
|
|
let mut next_send = Instant::now();
|
|
let mut consecutive_errors: u32 = 0;
|
|
|
|
while state.running.load(Ordering::Relaxed) {
|
|
packet[0..4].copy_from_slice(&seq.to_be_bytes());
|
|
|
|
match socket.send(&packet).await {
|
|
Ok(n) => {
|
|
seq = seq.wrapping_add(1);
|
|
state.tx_bytes.fetch_add(n as u64, Ordering::Relaxed);
|
|
consecutive_errors = 0;
|
|
}
|
|
Err(_) => {
|
|
consecutive_errors += 1;
|
|
if consecutive_errors > 1000 {
|
|
tracing::warn!("UDP TX: too many consecutive send errors, stopping");
|
|
break;
|
|
}
|
|
tokio::time::sleep(Duration::from_micros(200)).await;
|
|
continue;
|
|
}
|
|
}
|
|
|
|
if state.tx_speed_changed.load(Ordering::Relaxed) {
|
|
state.tx_speed_changed.store(false, Ordering::Relaxed);
|
|
let new_speed = state.tx_speed.load(Ordering::Relaxed);
|
|
interval = bandwidth::calc_send_interval(new_speed, tx_size as u16);
|
|
next_send = Instant::now();
|
|
tracing::debug!("TX speed adjusted to {} bps ({:.2} Mbps)",
|
|
new_speed, new_speed as f64 / 1_000_000.0);
|
|
}
|
|
|
|
match interval {
|
|
Some(iv) => {
|
|
next_send += iv;
|
|
let now = Instant::now();
|
|
if next_send > now {
|
|
tokio::time::sleep(next_send - now).await;
|
|
}
|
|
}
|
|
None => {
|
|
if seq % 64 == 0 {
|
|
tokio::task::yield_now().await;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
async fn udp_client_rx_loop(socket: &UdpSocket, state: Arc<BandwidthState>) {
|
|
let mut buf = vec![0u8; 65536];
|
|
let mut last_seq: Option<u32> = None;
|
|
|
|
while state.running.load(Ordering::Relaxed) {
|
|
match tokio::time::timeout(Duration::from_secs(5), socket.recv(&mut buf)).await {
|
|
Ok(Ok(n)) if n >= 4 => {
|
|
state.rx_bytes.fetch_add(n as u64, Ordering::Relaxed);
|
|
state.rx_packets.fetch_add(1, Ordering::Relaxed);
|
|
|
|
let seq = u32::from_be_bytes([buf[0], buf[1], buf[2], buf[3]]);
|
|
if let Some(last) = last_seq {
|
|
let expected = last.wrapping_add(1);
|
|
if seq > expected {
|
|
let lost = seq - expected;
|
|
state.rx_lost_packets.fetch_add(lost as u64, Ordering::Relaxed);
|
|
}
|
|
}
|
|
last_seq = Some(seq);
|
|
}
|
|
Ok(Ok(_)) => {}
|
|
Ok(Err(e)) => {
|
|
tracing::debug!("UDP recv error: {}", e);
|
|
tokio::time::sleep(Duration::from_millis(10)).await;
|
|
}
|
|
Err(_) => {
|
|
tracing::debug!("UDP RX timeout");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
// --- Status Loops ---
|
|
|
|
async fn client_status_loop(cmd: &Command, state: &BandwidthState) {
|
|
let mut seq: u32 = 0;
|
|
let mut interval = tokio::time::interval(Duration::from_secs(1));
|
|
|
|
loop {
|
|
interval.tick().await;
|
|
if !state.running.load(Ordering::Relaxed) {
|
|
break;
|
|
}
|
|
|
|
seq += 1;
|
|
|
|
if cmd.client_tx() {
|
|
let tx = state.tx_bytes.swap(0, Ordering::Relaxed);
|
|
bandwidth::print_status(seq, "TX", tx, Duration::from_secs(1), None);
|
|
}
|
|
|
|
if cmd.client_rx() {
|
|
let rx = state.rx_bytes.swap(0, Ordering::Relaxed);
|
|
bandwidth::print_status(seq, "RX", rx, Duration::from_secs(1), None);
|
|
}
|
|
}
|
|
}
|
|
|
|
/// UDP status exchange - sequential like C pselect():
|
|
/// 1. Wait up to 1 second for server status
|
|
/// 2. Read and process if available
|
|
/// 3. ALWAYS send our status
|
|
async fn udp_client_status_loop(
|
|
stream: &mut TcpStream,
|
|
cmd: &Command,
|
|
state: &BandwidthState,
|
|
) {
|
|
let mut seq: u32 = 0;
|
|
let (mut reader, mut writer) = tokio::io::split(stream);
|
|
let mut status_buf = [0u8; STATUS_MSG_SIZE];
|
|
let mut next_status = Instant::now() + Duration::from_secs(1);
|
|
|
|
loop {
|
|
if !state.running.load(Ordering::Relaxed) {
|
|
break;
|
|
}
|
|
|
|
let now = Instant::now();
|
|
let wait_time = if next_status > now {
|
|
next_status - now
|
|
} else {
|
|
Duration::ZERO
|
|
};
|
|
|
|
match tokio::time::timeout(wait_time, reader.read_exact(&mut status_buf)).await {
|
|
Ok(Ok(_)) => {
|
|
let server_status = StatusMessage::deserialize(&status_buf);
|
|
|
|
if server_status.bytes_received > 0 && cmd.client_tx() {
|
|
let new_speed =
|
|
((server_status.bytes_received as u64 * 8 * 3) / 2) as u32;
|
|
state.tx_speed.store(new_speed, Ordering::Relaxed);
|
|
state.tx_speed_changed.store(true, Ordering::Relaxed);
|
|
tracing::debug!(
|
|
"Server received {} bytes → TX {:.2} Mbps",
|
|
server_status.bytes_received,
|
|
new_speed as f64 / 1_000_000.0,
|
|
);
|
|
}
|
|
|
|
if Instant::now() < next_status {
|
|
continue;
|
|
}
|
|
}
|
|
Ok(Err(_)) => {
|
|
state.running.store(false, Ordering::SeqCst);
|
|
break;
|
|
}
|
|
Err(_) => {}
|
|
}
|
|
|
|
// ALWAYS send our status every 1 second
|
|
seq += 1;
|
|
next_status = Instant::now() + Duration::from_secs(1);
|
|
|
|
let rx_bytes = state.rx_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 status = StatusMessage {
|
|
seq,
|
|
bytes_received: rx_bytes as u32,
|
|
};
|
|
if writer.write_all(&status.serialize()).await.is_err() {
|
|
state.running.store(false, Ordering::SeqCst);
|
|
break;
|
|
}
|
|
let _ = writer.flush().await;
|
|
|
|
if cmd.client_tx() {
|
|
bandwidth::print_status(seq, "TX", tx_bytes, Duration::from_secs(1), None);
|
|
}
|
|
if cmd.client_rx() {
|
|
bandwidth::print_status(seq, "RX", rx_bytes, Duration::from_secs(1), Some(lost));
|
|
}
|
|
}
|
|
}
|