mirror of
https://github.com/telemt/telemt.git
synced 2026-09-13 22:14:08 +03:00
Rustfmt
This commit is contained in:
@@ -11,9 +11,7 @@ use crate::error::{ProxyError, Result};
|
||||
use crate::ip_tracker::UserIpTracker;
|
||||
use crate::proxy::direct_relay::handle_via_direct_with_shared_and_conntrack;
|
||||
use crate::proxy::handshake::HandshakeSuccess;
|
||||
use crate::proxy::middle_relay::{
|
||||
handle_via_middle_proxy, handle_via_middle_proxy_with_conntrack,
|
||||
};
|
||||
use crate::proxy::middle_relay::{handle_via_middle_proxy, handle_via_middle_proxy_with_conntrack};
|
||||
use crate::proxy::route_mode::{RelayRouteMode, RouteRuntimeController};
|
||||
use crate::proxy::shared_state::{ConntrackClosePolicy, ProxySharedState};
|
||||
use crate::stats::Stats;
|
||||
|
||||
+2
-4
@@ -43,9 +43,7 @@ use crate::transport::{UpstreamManager, configure_client_socket, parse_proxy_pro
|
||||
|
||||
use crate::proxy::authenticated::{ClientRuntimeDeps, run_authenticated};
|
||||
#[cfg(test)]
|
||||
use crate::proxy::authenticated::{
|
||||
UserConnectionReservation, acquire_user_connection_reservation,
|
||||
};
|
||||
use crate::proxy::authenticated::{UserConnectionReservation, acquire_user_connection_reservation};
|
||||
use crate::proxy::handshake::{
|
||||
HandshakeSuccess, TlsResponseWriteOptions, handle_mtproto_handshake_with_shared,
|
||||
handle_tls_handshake_with_shared, handle_tls_handshake_with_shared_and_options,
|
||||
@@ -53,9 +51,9 @@ use crate::proxy::handshake::{
|
||||
#[cfg(test)]
|
||||
use crate::proxy::handshake::{handle_mtproto_handshake, handle_tls_handshake};
|
||||
use crate::proxy::masking::handle_bad_client_with_shared;
|
||||
use crate::proxy::route_mode::RouteRuntimeController;
|
||||
#[cfg(test)]
|
||||
use crate::proxy::route_mode::RelayRouteMode;
|
||||
use crate::proxy::route_mode::RouteRuntimeController;
|
||||
use crate::proxy::shared_state::{ConntrackClosePolicy, ProxySharedState};
|
||||
|
||||
fn beobachten_ttl(config: &ProxyConfig) -> Duration {
|
||||
|
||||
@@ -57,8 +57,8 @@ use self::tls_auth::{parse_tls_auth_material, validate_tls_secret_candidate};
|
||||
pub(crate) use self::auth_probe::{AuthProbeSaturationState, AuthProbeState};
|
||||
#[cfg(test)]
|
||||
pub use self::mtproto::handle_mtproto_handshake;
|
||||
pub use self::mtproto::handle_mtproto_handshake_with_shared;
|
||||
pub(crate) use self::mtproto::handle_mtproto_handshake_for_web_user;
|
||||
pub use self::mtproto::handle_mtproto_handshake_with_shared;
|
||||
#[allow(unused_imports)]
|
||||
pub use self::nonce::{encrypt_tg_nonce, encrypt_tg_nonce_with_ciphers, generate_tg_nonce};
|
||||
pub use self::session::HandshakeSuccess;
|
||||
|
||||
@@ -274,12 +274,7 @@ pub(super) fn mode_enabled_for_proto(
|
||||
proto_tag: ProtoTag,
|
||||
is_tls: bool,
|
||||
) -> bool {
|
||||
mode_enabled_for_proto_with_policy(
|
||||
config,
|
||||
proto_tag,
|
||||
is_tls,
|
||||
MtprotoModePolicy::Configured,
|
||||
)
|
||||
mode_enabled_for_proto_with_policy(config, proto_tag, is_tls, MtprotoModePolicy::Configured)
|
||||
}
|
||||
|
||||
fn mode_enabled_for_proto_with_policy(
|
||||
|
||||
@@ -203,15 +203,23 @@ where
|
||||
}
|
||||
|
||||
let mut matched = exact_user_id.is_some_and(|user_id| try_user_id!(user_id));
|
||||
if exact_user.is_none() && let Some(user_id) = sticky_ip_hint {
|
||||
if exact_user.is_none()
|
||||
&& let Some(user_id) = sticky_ip_hint
|
||||
{
|
||||
matched = try_user_id!(user_id);
|
||||
}
|
||||
|
||||
if exact_user.is_none() && !matched && let Some(user_id) = preferred_user_id {
|
||||
if exact_user.is_none()
|
||||
&& !matched
|
||||
&& let Some(user_id) = preferred_user_id
|
||||
{
|
||||
matched = try_user_id!(user_id);
|
||||
}
|
||||
|
||||
if exact_user.is_none() && !matched && let Some(user_id) = sticky_prefix_hint {
|
||||
if exact_user.is_none()
|
||||
&& !matched
|
||||
&& let Some(user_id) = sticky_prefix_hint
|
||||
{
|
||||
matched = try_user_id!(user_id);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user