From b1ef8c10793cc535ec08ea6dc287cf14a0f838d8 Mon Sep 17 00:00:00 2001 From: Jun Kurihara Date: Sat, 9 Jul 2022 18:16:48 +0900 Subject: [PATCH] fix some owned args --- src/proxy/proxy_handler.rs | 6 +++--- src/proxy/utils_headers.rs | 4 ++-- src/proxy/utils_request.rs | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/proxy/proxy_handler.rs b/src/proxy/proxy_handler.rs index 6d597cf..237506c 100644 --- a/src/proxy/proxy_handler.rs +++ b/src/proxy/proxy_handler.rs @@ -19,7 +19,7 @@ where mut req: Request, client_addr: SocketAddr, // アクセス制御用 ) -> Result> { - let request_log = log_request_msg(&req, client_addr); + let request_log = log_request_msg(&req, &client_addr); // Here we start to handle with server_name // Find backend application for given server_name @@ -71,7 +71,7 @@ where // Build request from destination information let req_forwarded = if let Ok(req) = self.generate_request_forwarded( - client_addr, + &client_addr, req, upstream_scheme_host, &upgrade_in_request, @@ -186,7 +186,7 @@ where fn generate_request_forwarded( &self, - client_addr: SocketAddr, + client_addr: &SocketAddr, mut req: Request, upstream_scheme_host: &Uri, upgrade: &Option, diff --git a/src/proxy/utils_headers.rs b/src/proxy/utils_headers.rs index 1790332..b3065d9 100644 --- a/src/proxy/utils_headers.rs +++ b/src/proxy/utils_headers.rs @@ -11,7 +11,7 @@ use std::net::SocketAddr; pub(super) fn apply_upstream_options_to_header( headers: &mut HeaderMap, - _client_addr: SocketAddr, + _client_addr: &SocketAddr, upstream_scheme_host: &Uri, upstream: &Upstream, ) -> Result<()> { @@ -48,7 +48,7 @@ pub(super) fn append_header_entry( pub(super) fn add_forwarding_header( headers: &mut HeaderMap, - client_addr: SocketAddr, + client_addr: &SocketAddr, tls: bool, ) -> Result<()> { // default process diff --git a/src/proxy/utils_request.rs b/src/proxy/utils_request.rs index c93322e..98bd60a 100644 --- a/src/proxy/utils_request.rs +++ b/src/proxy/utils_request.rs @@ -5,7 +5,7 @@ use std::net::SocketAddr; //////////////////////////////////////////////////// // Functions of utils for request messages -pub(super) fn log_request_msg(req: &Request, client_addr: SocketAddr) -> String { +pub(super) fn log_request_msg(req: &Request, client_addr: &SocketAddr) -> String { let server_name = req.headers().get(header::HOST).map_or_else( || { req