From b07859f6ecd0a90d7becc2cda211036cdab82b94 Mon Sep 17 00:00:00 2001 From: Prabhpreet Dua <615318+prabhpreet@users.noreply.github.com> Date: Tue, 16 Apr 2024 12:16:30 +0530 Subject: [PATCH] Change under load params, change localhost to IP --- rosenpass/src/app_server.rs | 4 +--- rosenpass/src/protocol.rs | 1 - rosenpass/tests/integration_test.rs | 14 ++++---------- 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/rosenpass/src/app_server.rs b/rosenpass/src/app_server.rs index 4eee622..671a6e6 100644 --- a/rosenpass/src/app_server.rs +++ b/rosenpass/src/app_server.rs @@ -1,7 +1,6 @@ use anyhow::bail; use anyhow::Result; -use clap::builder; use derive_builder::Builder; use log::{debug, error, info, warn}; use mio::Interest; @@ -18,7 +17,6 @@ use std::net::SocketAddr; use std::net::SocketAddrV4; use std::net::SocketAddrV6; use std::net::ToSocketAddrs; -use std::path::Display; use std::path::PathBuf; use std::process::Command; use std::process::Stdio; @@ -39,7 +37,7 @@ const IPV4_ANY_ADDR: Ipv4Addr = Ipv4Addr::new(0, 0, 0, 0); const IPV6_ANY_ADDR: Ipv6Addr = Ipv6Addr::new(0, 0, 0, 0, 0, 0, 0, 0); const UNDER_LOAD_RATIO: f64 = 0.5; -const DURATION_UPDATE_UNDER_LOAD_STATUS: Duration = Duration::from_millis(100); +const DURATION_UPDATE_UNDER_LOAD_STATUS: Duration = Duration::from_millis(500); fn ipv4_any_binding() -> SocketAddr { // addr, port diff --git a/rosenpass/src/protocol.rs b/rosenpass/src/protocol.rs index 98d4ada..c2c13c5 100644 --- a/rosenpass/src/protocol.rs +++ b/rosenpass/src/protocol.rs @@ -76,7 +76,6 @@ use std::{ }; use anyhow::{bail, ensure, Context, Result}; -use mio::net::SocketAddr; use rand::Fill as Randomize; use memoffset::span_of; diff --git a/rosenpass/tests/integration_test.rs b/rosenpass/tests/integration_test.rs index 01aac73..f39a1b1 100644 --- a/rosenpass/tests/integration_test.rs +++ b/rosenpass/tests/integration_test.rs @@ -1,10 +1,4 @@ -use std::{ - fs::{self, write}, - net::UdpSocket, - path::PathBuf, - process::Stdio, - time::Duration, -}; +use std::{fs, net::UdpSocket, path::PathBuf, time::Duration}; use clap::Parser; use rosenpass::{app_server::AppServerTestBuilder, cli::CliArgs}; @@ -58,7 +52,7 @@ fn setup_logging() { buf, "\x1b[1m{:?}\x1b[0m {}: {}", std::thread::current().id(), - &ts_format[18..], + &ts_format[14..], record.args() ) }); @@ -156,7 +150,7 @@ fn check_exchange_under_normal() { } }; - let listen_addr = format!("localhost:{port}"); + let listen_addr = format!("127.0.0.1:{port}"); let mut server_cmd = std::process::Command::new(BIN); server_cmd @@ -229,7 +223,7 @@ fn check_exchange_under_dos() { } }; - let listen_addr = format!("localhost:{port}"); + let listen_addr = format!("127.0.0.1:{port}"); let mut server_cmd = std::process::Command::new(BIN);