From eac87c4f9f812a219c64201421616de2d6e8a3f0 Mon Sep 17 00:00:00 2001 From: ssrlive <30760636+ssrlive@users.noreply.github.com> Date: Mon, 27 Mar 2023 22:26:57 +0800 Subject: [PATCH] refine code --- src/tun2proxy.rs | 4 +++- src/virtdevice.rs | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/tun2proxy.rs b/src/tun2proxy.rs index cc55c4a..706cacc 100644 --- a/src/tun2proxy.rs +++ b/src/tun2proxy.rs @@ -389,9 +389,10 @@ impl<'a> TunToProxy<'a> { if resolved_conn.proto == IpProtocol::Tcp { let cm = self.get_connection_manager(&resolved_conn); if cm.is_none() { + log::trace!("no connect manager"); return Ok(()); } - let server = cm.ok_or("no connect manager")?.get_server(); + let server = cm.unwrap().get_server(); if first_packet { for manager in self.connection_managers.iter_mut() { if let Some(handler) = @@ -581,6 +582,7 @@ impl<'a> TunToProxy<'a> { let e = "connection not found"; let conn_ref = self.token_to_connection.get(&event.token()); if conn_ref.is_none() { + log::trace!("{e}"); return Ok(()); } let connection = conn_ref.unwrap().clone(); diff --git a/src/virtdevice.rs b/src/virtdevice.rs index 3b718cc..c215159 100644 --- a/src/virtdevice.rs +++ b/src/virtdevice.rs @@ -11,8 +11,7 @@ pub struct VirtualTunDevice { impl VirtualTunDevice { pub fn inject_packet(&mut self, buffer: &[u8]) { - let vec = Vec::from(buffer); - self.inbuf.push(vec); + self.inbuf.push(buffer.to_vec()); } pub fn exfiltrate_packet(&mut self) -> Option> {