jjkiers/layer4-proxy
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases 3 Activity

Improve code style

Browse Source 
Signed-off-by: Jacob Kiers <code@kiers.eu>
This commit is contained in:
Jacob Kiers 2023-10-04 22:33:11 +02:00
parent 84f0499ec8
commit 23296c6436
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/config.rs
View File

@ -150,17 +150,14 @@ fn load_config(path: &str) -> Result<ParsedConfig, ConfigError> {
} }
} }
let addr = UpstreamAddress::new(format!("{}:{}", upstream_host, upstream_port));
parsed_upstream.insert( parsed_upstream.insert(
name.to_string(), name.to_string(),
Upstream::Proxy(ProxyToUpstream { Upstream::Proxy(ProxyToUpstream {
name: name.to_string(), name: name.to_string(),
addr: format!("{}:{}", upstream_host, upstream_port), addr: format!("{}:{}", upstream_host, upstream_port),
protocol: upstream_url.scheme().to_string(), protocol: upstream_url.scheme().to_string(),
addresses: Addr(Mutex::new(UpstreamAddress::new(format!( addresses: Addr(Mutex::new(addr)),
"{}:{}",
upstream_host, upstream_port
)))),
..Default::default()
}), }),
); );
} }

4
src/servers/protocol/tcp.rs
View File

@ -77,7 +77,7 @@ async fn accept(inbound: TcpStream, proxy: Arc<Proxy>) -> Result<(), Box<dyn std
} }
}; };
return process(inbound, &upstream).await; process(inbound, upstream).await
} }
async fn process( async fn process(
@ -86,7 +86,7 @@ async fn process(
) -> Result<(), Box<dyn std::error::Error>> { ) -> Result<(), Box<dyn std::error::Error>> {
match upstream { match upstream {
Upstream::Ban => { Upstream::Ban => {
let _ = inbound.shutdown(); inbound.shutdown().await?;
} }
Upstream::Echo => { Upstream::Echo => {
let (mut ri, mut wi) = io::split(inbound); let (mut ri, mut wi) = io::split(inbound);