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

network: utilize bytes crate

Browse Source
This commit is contained in:
Alex Zenla
2024-02-12 17:01:47 +00:00
parent ddeab7610d
commit 341907a536
10 changed files with 86 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
network/src/proxynat/icmp.rs
View File

@ -5,6 +5,7 @@ use std::{
use anyhow::{anyhow, Result};
use async_trait::async_trait;
use bytes::BytesMut;
use etherparse::{
IcmpEchoHeader, Icmpv4Header, Icmpv4Type, Icmpv6Header, Icmpv6Type, IpNumber, Ipv4Slice,
Ipv6Slice, NetSlice, PacketBuilder, SlicedPacket,
@ -25,7 +26,7 @@ const ICMP_PING_TIMEOUT_SECS: u64 = 20;
const ICMP_TIMEOUT_SECS: u64 = 30;
pub struct ProxyIcmpHandler {
rx_sender: Sender<Vec<u8>>,
rx_sender: Sender<BytesMut>,
}
#[async_trait]
@ -34,26 +35,26 @@ impl NatHandler for ProxyIcmpHandler {
if self.rx_sender.is_closed() {
Ok(true)
} else {
self.rx_sender.try_send(data.to_vec())?;
self.rx_sender.try_send(data.into())?;
Ok(true)
}
}
}
enum ProxyIcmpSelect {
Internal(Vec<u8>),
Internal(BytesMut),
Close,
}
impl ProxyIcmpHandler {
pub fn new(rx_sender: Sender<Vec<u8>>) -> Self {
pub fn new(rx_sender: Sender<BytesMut>) -> Self {
ProxyIcmpHandler { rx_sender }
}
pub async fn spawn(
&mut self,
context: NatHandlerContext,
rx_receiver: Receiver<Vec<u8>>,
rx_receiver: Receiver<BytesMut>,
) -> Result<()> {
let client = IcmpClient::new(match context.key.external_ip.addr {
IpAddress::Ipv4(_) => IcmpProtocol::Icmpv4,
@ -69,7 +70,7 @@ impl ProxyIcmpHandler {
async fn process(
client: IcmpClient,
mut rx_receiver: Receiver<Vec<u8>>,
mut rx_receiver: Receiver<BytesMut>,
context: NatHandlerContext,
) -> Result<()> {
loop {
@ -222,7 +223,7 @@ impl ProxyIcmpHandler {
let packet = packet.icmpv4_echo_reply(echo.id, echo.seq);
let mut buffer: Vec<u8> = Vec::new();
packet.write(&mut buffer, &payload)?;
if let Err(error) = context.try_send(buffer) {
if let Err(error) = context.try_send(buffer.as_slice().into()) {
debug!("failed to transmit icmp packet: {}", error);
}
Ok(())
@ -265,7 +266,7 @@ impl ProxyIcmpHandler {
let packet = packet.icmpv6_echo_reply(echo.id, echo.seq);
let mut buffer: Vec<u8> = Vec::new();
packet.write(&mut buffer, &payload)?;
if let Err(error) = context.try_send(buffer) {
if let Err(error) = context.try_send(buffer.as_slice().into()) {
debug!("failed to transmit icmp packet: {}", error);
}
Ok(())