network: parse received packet before NAT

This commit is contained in:
Alex Zenla
2024-02-12 11:11:04 +00:00
parent 982536513a
commit 31c4c0fe72
4 changed files with 211 additions and 191 deletions

View File

@ -1,9 +1,11 @@
use crate::chandev::ChannelDevice;
use crate::nat::NatRouter;
use crate::pkt::RecvPacket;
use crate::proxynat::ProxyNatHandlerFactory;
use crate::raw_socket::{AsyncRawSocket, RawSocketProtocol};
use advmac::MacAddr6;
use anyhow::{anyhow, Result};
use etherparse::SlicedPacket;
use futures::TryStreamExt;
use log::debug;
use smoltcp::iface::{Config, Interface, SocketSet};
@ -41,30 +43,32 @@ struct NetworkStack<'a> {
}
impl NetworkStack<'_> {
async fn poll(&mut self, receive_buffer: &mut [u8]) -> Result<()> {
async fn poll(&mut self, buffer: &mut [u8]) -> Result<()> {
let what = select! {
x = self.kdev.read(buffer) => NetworkStackSelect::Receive(&buffer[0..x?]),
x = self.tx.recv() => NetworkStackSelect::Send(x),
x = self.kdev.read(receive_buffer) => NetworkStackSelect::Receive(&receive_buffer[0..x?]),
_ = self.router.process_reclaim() => NetworkStackSelect::Reclaim,
};
match what {
NetworkStackSelect::Receive(packet) => {
let slice = SlicedPacket::from_ethernet(packet)?;
let packet = RecvPacket::new(packet, &slice)?;
if let Err(error) = self.router.process(&packet).await {
debug!("router failed to process packet: {}", error);
}
self.udev.rx = Some(packet.raw.to_vec());
self.interface
.poll(Instant::now(), &mut self.udev, &mut self.sockets);
}
NetworkStackSelect::Send(packet) => {
if let Some(packet) = packet {
self.kdev.write_all(&packet).await?
}
}
NetworkStackSelect::Receive(packet) => {
if let Err(error) = self.router.process(packet).await {
debug!("router failed to process packet: {}", error);
}
self.udev.rx = Some(packet.to_vec());
self.interface
.poll(Instant::now(), &mut self.udev, &mut self.sockets);
}
NetworkStackSelect::Reclaim => {}
}