From b447f60a7224721777707776698c5891e5f33c36 Mon Sep 17 00:00:00 2001 From: Alexey <247128645+axkurcom@users.noreply.github.com> Date: Fri, 17 Apr 2026 19:08:57 +0300 Subject: [PATCH] Rustfmt + Bump --- Cargo.lock | 2 +- Cargo.toml | 2 +- src/api/mod.rs | 4 ++-- src/config/load.rs | 12 ++++++++++-- src/conntrack_control.rs | 35 ++++++++++++++++++++++++++++++----- src/healthcheck.rs | 5 ++++- 6 files changed, 48 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 164fccd..9f14499 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2780,7 +2780,7 @@ checksum = "7b2093cf4c8eb1e67749a6762251bc9cd836b6fc171623bd0a9d324d37af2417" [[package]] name = "telemt" -version = "3.4.2" +version = "3.4.3" dependencies = [ "aes", "anyhow", diff --git a/Cargo.toml b/Cargo.toml index beac5d5..be2df6f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "telemt" -version = "3.4.2" +version = "3.4.3" edition = "2024" [features] diff --git a/src/api/mod.rs b/src/api/mod.rs index 8ee46f7..46bdc10 100644 --- a/src/api/mod.rs +++ b/src/api/mod.rs @@ -41,8 +41,8 @@ use config_store::{current_revision, load_config_from_disk, parse_if_match}; use events::ApiEventStore; use http_utils::{error_response, read_json, read_optional_json, success_response}; use model::{ - ApiFailure, CreateUserRequest, DeleteUserResponse, HealthData, HealthReadyData, PatchUserRequest, - RotateSecretRequest, SummaryData, UserActiveIps, + ApiFailure, CreateUserRequest, DeleteUserResponse, HealthData, HealthReadyData, + PatchUserRequest, RotateSecretRequest, SummaryData, UserActiveIps, }; use runtime_edge::{ EdgeConnectionsCacheEntry, build_runtime_connections_summary_data, diff --git a/src/config/load.rs b/src/config/load.rs index c2b5e78..f80982f 100644 --- a/src/config/load.rs +++ b/src/config/load.rs @@ -1903,7 +1903,11 @@ mod tests { [access] "#, ); - assert!(!cfg.server.conntrack_control.inline_conntrack_control_explicit); + assert!( + !cfg.server + .conntrack_control + .inline_conntrack_control_explicit + ); } #[test] @@ -1918,7 +1922,11 @@ mod tests { [access] "#, ); - assert!(cfg.server.conntrack_control.inline_conntrack_control_explicit); + assert!( + cfg.server + .conntrack_control + .inline_conntrack_control_explicit + ); } #[test] diff --git a/src/conntrack_control.rs b/src/conntrack_control.rs index 6f83fa6..33a9174 100644 --- a/src/conntrack_control.rs +++ b/src/conntrack_control.rs @@ -72,7 +72,12 @@ pub(crate) fn spawn_conntrack_controller( stats.set_conntrack_rule_apply_ok(false); shared.disable_conntrack_close_sender(); shared.set_conntrack_pressure_active(false); - if enabled && cfg.server.conntrack_control.inline_conntrack_control_explicit { + if enabled + && cfg + .server + .conntrack_control + .inline_conntrack_control_explicit + { warn!( "conntrack control explicitly enabled but unsupported on this OS; disabling runtime worker" ); @@ -187,7 +192,13 @@ fn apply_runtime_state( ) { let enabled = cfg.server.conntrack_control.inline_conntrack_control; let available = effective_conntrack_enabled(cfg, runtime_support); - if enabled && !available && cfg.server.conntrack_control.inline_conntrack_control_explicit { + if enabled + && !available + && cfg + .server + .conntrack_control + .inline_conntrack_control_explicit + { warn!( has_cap_net_admin = runtime_support.has_cap_net_admin, backend_available = runtime_support.netfilter_backend.is_some(), @@ -297,7 +308,11 @@ fn update_pressure_state( state.low_streak = 0; } -async fn reconcile_rules(cfg: &ProxyConfig, runtime_support: ConntrackRuntimeSupport, stats: &Stats) { +async fn reconcile_rules( + cfg: &ProxyConfig, + runtime_support: ConntrackRuntimeSupport, + stats: &Stats, +) { if !cfg.server.conntrack_control.inline_conntrack_control { clear_notrack_rules_all_backends().await; stats.set_conntrack_rule_apply_ok(true); @@ -335,7 +350,10 @@ fn probe_runtime_support(configured_backend: ConntrackBackend) -> ConntrackRunti } } -fn effective_conntrack_enabled(cfg: &ProxyConfig, runtime_support: ConntrackRuntimeSupport) -> bool { +fn effective_conntrack_enabled( + cfg: &ProxyConfig, + runtime_support: ConntrackRuntimeSupport, +) -> bool { cfg.server.conntrack_control.inline_conntrack_control && runtime_support.has_cap_net_admin && runtime_support.netfilter_backend.is_some() @@ -758,7 +776,14 @@ mod tests { accept_timeout_delta: 0, me_queue_pressure_delta: 0, }; - update_pressure_state(&stats, shared.as_ref(), &cfg, true, &high_sample, &mut state); + update_pressure_state( + &stats, + shared.as_ref(), + &cfg, + true, + &high_sample, + &mut state, + ); assert!(state.active); let low_sample = PressureSample { diff --git a/src/healthcheck.rs b/src/healthcheck.rs index be9a381..c9fa610 100644 --- a/src/healthcheck.rs +++ b/src/healthcheck.rs @@ -111,7 +111,10 @@ fn probe_target(listen: SocketAddr) -> SocketAddr { } fn build_request(target: SocketAddr, path: &str, auth_header: &str) -> String { - let mut request = format!("GET {path} HTTP/1.1\r\nHost: {}\r\nConnection: close\r\n", target); + let mut request = format!( + "GET {path} HTTP/1.1\r\nHost: {}\r\nConnection: close\r\n", + target + ); if !auth_header.is_empty() { request.push_str("Authorization: "); request.push_str(auth_header);