Skip to content

Commit

Permalink
Clean up import
Browse files Browse the repository at this point in the history
  • Loading branch information
MarkusPettersson98 committed Nov 30, 2024
1 parent 40f5371 commit 64db1a5
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions mullvad-encrypted-dns-proxy/src/forwarder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,11 @@ use tokio::{
net::TcpStream,
};

use crate::config::Obfuscator;
use crate::config::{Obfuscator, ProxyConfig};

/// Forwards local traffic to a proxy endpoint, obfuscating it if the proxy config says so.
///
/// Obtain [`ProxyConfig`](crate::config::ProxyConfig)s with
/// [resolve_configs](crate::config_resolver::resolve_configs).
/// Obtain [`ProxyConfig`](ProxyConfig)s with [resolve_configs](crate::config_resolver::resolve_configs).
pub struct Forwarder<S> {
read_obfuscator: Option<Box<dyn Obfuscator>>,
write_obfuscator: Option<Box<dyn Obfuscator>>,
Expand All @@ -24,7 +23,7 @@ where
S: AsyncRead + AsyncWrite + Unpin,
{
/// Create a [`Forwarder`] with a connected `stream` to an encrypted DNS proxy server
pub fn from_stream(proxy_config: &crate::config::ProxyConfig, stream: S) -> Self {
pub fn from_stream(proxy_config: &ProxyConfig, stream: S) -> Self {
let (read_obfuscator, write_obfuscator) =
if let Some(obfuscation_config) = &proxy_config.obfuscation {
(
Expand All @@ -46,7 +45,7 @@ where
/// Forward TCP traffic over various proxy configurations.
impl Forwarder<TcpStream> {
/// Create a forwarder that will connect to a given proxy endpoint.
pub async fn connect(proxy_config: &crate::config::ProxyConfig) -> io::Result<Self> {
pub async fn connect(proxy_config: &ProxyConfig) -> io::Result<Self> {
let server_connection = TcpStream::connect(proxy_config.addr).await?;
Ok(Self::from_stream(proxy_config, server_connection))
}
Expand Down

0 comments on commit 64db1a5

Please sign in to comment.