Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ clap = { version = "4", features = ["derive", "env"] }
tokio = { version = "1", features = ["macros", "rt-multi-thread", "signal"] }
tracing = { version = "0.1.40" }
tracing-subscriber = { version = "0.3.0", features = ["env-filter"] }
hyper-util = { version = "0.1.16", default-features = false }
axum = { version = "0.8.1", features = ["http2"] }
axum-extra = { version = "0.10.0", default-features = false, features = [
"erased-json",
Expand Down
4 changes: 0 additions & 4 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,6 @@ pub struct Args {
#[clap(short, long, default_value = "1024")]
pub concurrent: usize,

/// Keep alive timeout (seconds)
#[clap(short, long, default_value = "60")]
pub keep_alive_timeout: u64,

/// TLS certificate file path
#[clap(short = 'C', long)]
pub tls_cert: Option<PathBuf>,
Expand Down
7 changes: 5 additions & 2 deletions src/server/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ use axum::{
};
use axum_extra::response::ErasedJson;
use axum_server::Handle;
use hyper_util::rt::TokioTimer;
use tower::limit::ConcurrencyLimitLayer;
use tower_http::{
cors::{AllowHeaders, AllowMethods, AllowOrigin, CorsLayer},
Expand All @@ -40,7 +41,6 @@ pub async fn run(args: Args) -> Result<()> {
tracing::info!("OS: {}", std::env::consts::OS);
tracing::info!("Arch: {}", std::env::consts::ARCH);
tracing::info!("Version: {}", env!("CARGO_PKG_VERSION"));
tracing::info!("Keep alive: {}s", args.keep_alive_timeout);
tracing::info!("Concurrent limit: {}", args.concurrent);
tracing::info!("Bind address: {}", args.bind);

Expand Down Expand Up @@ -91,7 +91,10 @@ pub async fn run(args: Args) -> Result<()> {
server
.http_builder()
.http2()
.keep_alive_timeout(Duration::from_secs(args.keep_alive_timeout));
.timer(TokioTimer::new())
.auto_date_header(true)
.keep_alive_interval(Duration::from_secs(0))
.keep_alive_timeout(Duration::from_secs(0));

server
.handle(handle)
Expand Down
2 changes: 1 addition & 1 deletion src/server/tracker/inspector/tls/enums.rs
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,8 @@ enum_builder2! {
ffdhe4096 => 258,
ffdhe6144 => 259,
ffdhe8192 => 260,
X25519MLKEM768 => 4588,
MLKEM1024 => 514,
X25519MLKEM768 => 4588,
CECPQ2 => 16696,
X25519Kyber768Draft00 => 25497,
X25519Kyber512Draft00 => 65072,
Expand Down
Loading