mirrors/krata
1
0
Fork 0
mirror of https://github.com/edera-dev/krata.git synced 2025-08-03 13:11:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

network: cleaner internet stream processing

Browse Source
This commit is contained in:
Alex Zenla
2024-02-09 08:34:52 +00:00
parent 0b3171afc0
commit e8a3eba57d
1 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
network/src/backend.rs
View File

@ -122,28 +122,24 @@ impl InternetNetworkSlice {
}) })
} }
async fn process_stream(&self, stream: IpStackStream) -> Result<()> { async fn process_stream(stream: IpStackStream) {
match stream { match stream {
IpStackStream::Tcp(mut tcp) => { IpStackStream::Tcp(mut tcp) => {
debug!("tcp: {}", tcp.peer_addr()); debug!("tcp: {}", tcp.peer_addr());
tokio::spawn(async move { if let Ok(mut stream) = TcpStream::connect(tcp.peer_addr()).await {
if let Ok(mut stream) = TcpStream::connect(tcp.peer_addr()).await { let _ = tokio::io::copy_bidirectional(&mut tcp, &mut stream).await;
let _ = tokio::io::copy_bidirectional(&mut stream, &mut tcp).await; } else {
} else { warn!("failed to connect to tcp address: {}", tcp.peer_addr());
warn!("failed to connect to tcp address: {}", tcp.peer_addr()); }
}
});
} }
IpStackStream::Udp(mut udp) => { IpStackStream::Udp(mut udp) => {
debug!("udp: {}", udp.peer_addr()); debug!("udp: {}", udp.peer_addr());
tokio::spawn(async move { if let Ok(mut stream) = UdpStream::connect(udp.peer_addr()).await {
if let Ok(mut stream) = UdpStream::connect(udp.peer_addr()).await { let _ = tokio::io::copy_bidirectional(&mut stream, &mut udp).await;
let _ = tokio::io::copy_bidirectional(&mut stream, &mut udp).await; } else {
} else { warn!("failed to connect to udp address: {}", udp.peer_addr());
warn!("failed to connect to udp address: {}", udp.peer_addr()); }
}
});
} }
IpStackStream::UnknownTransport(u) => { IpStackStream::UnknownTransport(u) => {
@ -154,7 +150,6 @@ impl InternetNetworkSlice {
debug!("unknown network: {:?}", packet); debug!("unknown network: {:?}", packet);
} }
} }
Ok(())
} }
} }
@ -162,14 +157,14 @@ impl NetworkSlice for InternetNetworkSlice {
async fn run(&self) -> Result<()> { async fn run(&self) -> Result<()> {
let mut config = ipstack::IpStackConfig::default(); let mut config = ipstack::IpStackConfig::default();
config.mtu(1500); config.mtu(1500);
config.tcp_timeout(std::time::Duration::from_secs(600)); config.tcp_timeout(std::time::Duration::from_secs(60));
config.udp_timeout(std::time::Duration::from_secs(10)); config.udp_timeout(std::time::Duration::from_secs(10));
let socket = AsyncRawSocket::bind(&self.interface)?; let socket = AsyncRawSocket::bind(&self.interface)?;
let mut stack = ipstack::IpStack::new(config, socket); let mut stack = ipstack::IpStack::new(config, socket);
while let Ok(stream) = stack.accept().await { while let Ok(stream) = stack.accept().await {
self.process_stream(stream).await? tokio::spawn(InternetNetworkSlice::process_stream(stream));
} }
Ok(()) Ok(())
} }