From b74f53c54ccccc0aee760cf76a23d3417cfc6eaa Mon Sep 17 00:00:00 2001
From: Zhang Jingqiang <zhangjingqiang@bytedance.com>
Date: Fri, 23 Aug 2024 18:44:24 +0800
Subject: [PATCH] g3proxy: fix clippy warning when quic disabled

---
 Cargo.lock                         |  4 ++--
 g3proxy/src/audit/detour/stream.rs |  8 ++++----
 g3proxy/src/inspect/imap/mod.rs    |  4 ++--
 g3proxy/src/inspect/mod.rs         | 28 ++++++++--------------------
 g3proxy/src/inspect/smtp/mod.rs    |  4 ++--
 5 files changed, 18 insertions(+), 30 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 320c5b5c..ec1c74b6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -502,9 +502,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.1.13"
+version = "1.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72db2f7947ecee9b03b510377e8bb9077afa27176fdbff55c51027e976fdcc48"
+checksum = "50d2eb3cd3d1bf4529e31c215ee6f93ec5a3d536d9f578f93d9d33ee19562932"
 dependencies = [
  "jobserver",
  "libc",
diff --git a/g3proxy/src/audit/detour/stream.rs b/g3proxy/src/audit/detour/stream.rs
index dccfc51b..2f3758e2 100644
--- a/g3proxy/src/audit/detour/stream.rs
+++ b/g3proxy/src/audit/detour/stream.rs
@@ -261,8 +261,8 @@ where
         match_id: u16,
     ) -> Result<ProxyProtocolV2Encoder, ProxyProtocolEncodeError> {
         let mut ppv2 = ProxyProtocolV2Encoder::new_tcp(
-            self.task_notes.client_addr(),
-            self.task_notes.server_addr(),
+            self.task_notes.client_addr,
+            self.task_notes.server_addr,
         )?;
         if let Some(name) = self.task_notes.raw_username() {
             ppv2.push_username(name)?;
@@ -282,8 +282,8 @@ where
         match_id: u16,
     ) -> Result<ProxyProtocolV2Encoder, ProxyProtocolEncodeError> {
         let mut ppv2 = ProxyProtocolV2Encoder::new_tcp(
-            self.task_notes.client_addr(),
-            self.task_notes.server_addr(),
+            self.task_notes.client_addr,
+            self.task_notes.server_addr,
         )?;
         ppv2.push_match_id(match_id)?;
         Ok(ppv2)
diff --git a/g3proxy/src/inspect/imap/mod.rs b/g3proxy/src/inspect/imap/mod.rs
index 9be7cadf..1b7f2cfe 100644
--- a/g3proxy/src/inspect/imap/mod.rs
+++ b/g3proxy/src/inspect/imap/mod.rs
@@ -18,7 +18,7 @@ use anyhow::anyhow;
 use slog::slog_info;
 use tokio::io::AsyncWriteExt;
 
-use g3_dpi::{Protocol, ProtocolInspectPolicy};
+use g3_dpi::ProtocolInspectPolicy;
 use g3_imap_proto::response::ByeResponse;
 use g3_imap_proto::CommandPipeline;
 use g3_io_ext::{LineRecvVec, OnceBufReader};
@@ -175,7 +175,7 @@ where
             &self.ctx.server_quit_policy,
             &self.ctx.task_notes,
             &self.upstream,
-            Protocol::Imap,
+            g3_dpi::Protocol::Imap,
         );
 
         client.detour_relay(clt_r, clt_w, ups_r, ups_w, ctx).await
diff --git a/g3proxy/src/inspect/mod.rs b/g3proxy/src/inspect/mod.rs
index 226440b0..281dcf22 100644
--- a/g3proxy/src/inspect/mod.rs
+++ b/g3proxy/src/inspect/mod.rs
@@ -69,10 +69,10 @@ impl StreamInspectUserContext {
 }
 
 #[derive(Clone)]
-pub(super) struct StreamInspectTaskNotes {
+pub(crate) struct StreamInspectTaskNotes {
     task_id: Uuid,
-    client_addr: SocketAddr,
-    server_addr: SocketAddr,
+    pub(crate) client_addr: SocketAddr,
+    pub(crate) server_addr: SocketAddr,
     worker_id: Option<usize>,
     user_ctx: Option<StreamInspectUserContext>,
 }
@@ -82,26 +82,16 @@ impl StreamInspectTaskNotes {
         self.user_ctx.as_ref().map(|ctx| &ctx.user)
     }
 
-    pub(crate) fn raw_username(&self) -> Option<&String> {
+    pub(crate) fn raw_username(&self) -> Option<&str> {
         self.user_ctx
             .as_ref()
-            .and_then(|ctx| ctx.raw_user_name.as_ref())
+            .and_then(|ctx| ctx.raw_user_name.as_deref())
     }
 
     #[inline]
     pub(crate) fn task_id(&self) -> &Uuid {
         &self.task_id
     }
-
-    #[inline]
-    pub(crate) fn client_addr(&self) -> SocketAddr {
-        self.client_addr
-    }
-
-    #[inline]
-    pub(crate) fn server_addr(&self) -> SocketAddr {
-        self.server_addr
-    }
 }
 
 impl From<&ServerTaskNotes> for StreamInspectTaskNotes {
@@ -175,16 +165,14 @@ impl<SC: ServerConfig> StreamInspectContext<SC> {
         self.task_notes.user()
     }
 
+    #[inline]
     fn raw_user_name(&self) -> Option<&str> {
-        self.task_notes
-            .user_ctx
-            .as_ref()
-            .and_then(|cx| cx.raw_user_name.as_deref())
+        self.task_notes.raw_username()
     }
 
     #[inline]
     pub(crate) fn server_task_id(&self) -> &Uuid {
-        &self.task_notes.task_id
+        self.task_notes.task_id()
     }
 
     #[inline]
diff --git a/g3proxy/src/inspect/smtp/mod.rs b/g3proxy/src/inspect/smtp/mod.rs
index 61512952..e69e8e69 100644
--- a/g3proxy/src/inspect/smtp/mod.rs
+++ b/g3proxy/src/inspect/smtp/mod.rs
@@ -18,7 +18,7 @@ use anyhow::anyhow;
 use slog::slog_info;
 use tokio::io::AsyncWriteExt;
 
-use g3_dpi::{Protocol, ProtocolInspectPolicy};
+use g3_dpi::ProtocolInspectPolicy;
 use g3_io_ext::{LineRecvBuf, OnceBufReader};
 use g3_slog_types::{LtHost, LtUpstreamAddr, LtUuid};
 use g3_smtp_proto::command::Command;
@@ -166,7 +166,7 @@ where
             &self.ctx.server_quit_policy,
             &self.ctx.task_notes,
             &self.upstream,
-            Protocol::Smtp,
+            g3_dpi::Protocol::Smtp,
         );
 
         client.detour_relay(clt_r, clt_w, ups_r, ups_w, ctx).await