From 32403c5423af3d2de7f80e22d839ed0e44d6ad3d Mon Sep 17 00:00:00 2001 From: ssrlive <30760636+ssrlive@users.noreply.github.com> Date: Thu, 23 Mar 2023 21:39:27 +0800 Subject: [PATCH] remove the From implement --- src/tun2proxy.rs | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/src/tun2proxy.rs b/src/tun2proxy.rs index 5ffbcbd..de27c2c 100644 --- a/src/tun2proxy.rs +++ b/src/tun2proxy.rs @@ -60,20 +60,6 @@ impl TryFrom for SocketAddr { } } -impl From<&Destination> for SocketAddr { - fn from(value: &Destination) -> Self { - SocketAddr::new( - match value.host { - DestinationHost::Address(addr) => addr, - Hostname(_) => { - panic!("Failed to convert hostname destination into socket address") - } - }, - value.port, - ) - } -} - impl From for Destination { fn from(addr: SocketAddr) -> Self { Self { @@ -438,7 +424,8 @@ impl<'a> TunToProxy<'a> { let resolved_conn = match &self.options.virtdns { None => connection.clone(), Some(virt_dns) => { - match virt_dns.ip_to_name(&SocketAddr::from(&connection.dst).ip()) { + let ip = SocketAddr::try_from(connection.dst.clone()).unwrap().ip(); + match virt_dns.ip_to_name(&ip) { None => connection.clone(), Some(name) => connection.to_named(name.clone()), }