zaphar/icmp-socket
1
0
Fork 0
mirror of https://github.com/zaphar/icmp-socket.git synced 2025-07-22 19:30:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Reuse the buffer for receives

Browse Source
This commit is contained in:
Jeremy Wall 2021-01-27 20:38:24 -05:00
parent fc35908cb3
commit 931113a868
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/socket.rs
View File

@ -33,7 +33,7 @@ pub trait IcmpSocket {
fn send_to(&mut self, dest: Self::AddrType, packet: Self::PacketType) -> std::io::Result<()>; fn send_to(&mut self, dest: Self::AddrType, packet: Self::PacketType) -> std::io::Result<()>;
fn rcv_from(&self) -> std::io::Result<Self::PacketType>; fn rcv_from(&mut self) -> std::io::Result<Self::PacketType>;
} }
pub struct Opts { pub struct Opts {
@ -42,15 +42,19 @@ pub struct Opts {
pub struct IcmpSocket4 { pub struct IcmpSocket4 {
bound_to: Option<Ipv4Addr>, bound_to: Option<Ipv4Addr>,
buf: Vec<u8>,
inner: Socket, inner: Socket,
opts: Opts, opts: Opts,
} }
impl IcmpSocket4 { impl IcmpSocket4 {
pub fn new() -> std::io::Result<Self> { pub fn new() -> std::io::Result<Self> {
let socket = Socket::new(Domain::ipv4(), Type::raw(), Some(Protocol::icmpv4()))?;
socket.set_recv_buffer_size(512)?;
Ok(Self { Ok(Self {
bound_to: None, bound_to: None,
inner: Socket::new(Domain::ipv4(), Type::raw(), Some(Protocol::icmpv4()))?, inner: socket,
buf: vec![0; 512],
opts: Opts { hops: 50 }, opts: Opts { hops: 50 },
}) })
} }
@ -75,29 +79,34 @@ impl IcmpSocket for IcmpSocket4 {
fn send_to(&mut self, dest: Self::AddrType, packet: Self::PacketType) -> std::io::Result<()> { fn send_to(&mut self, dest: Self::AddrType, packet: Self::PacketType) -> std::io::Result<()> {
let dest = ip_to_socket(&IpAddr::V4(dest)); let dest = ip_to_socket(&IpAddr::V4(dest));
self.inner.set_ttl(self.opts.hops)?; self.inner.set_ttl(self.opts.hops)?;
self.inner self.inner.send_to(
.send_to(&packet.get_bytes(true), &(dest.into()))?; dbg!(&packet.with_checksum().get_bytes(true)),
&(dbg!(dest.into())),
)?;
Ok(()) Ok(())
} }
fn rcv_from(&self) -> std::io::Result<Self::PacketType> { fn rcv_from(&mut self) -> std::io::Result<Self::PacketType> {
let mut buf = vec![0; 512]; let (read_count, _addr) = dbg!(self.inner.recv_from(&mut self.buf)?);
let (read_count, _addr) = self.inner.recv_from(&mut buf)?; Ok(self.buf[0..read_count].try_into()?)
Ok(buf[0..read_count].try_into()?)
} }
} }
pub struct IcmpSocket6 { pub struct IcmpSocket6 {
bound_to: Option<Ipv6Addr>, bound_to: Option<Ipv6Addr>,
inner: Socket, inner: Socket,
buf: Vec<u8>,
opts: Opts, opts: Opts,
} }
impl IcmpSocket6 { impl IcmpSocket6 {
pub fn new() -> std::io::Result<Self> { pub fn new() -> std::io::Result<Self> {
let socket = Socket::new(Domain::ipv6(), Type::raw(), Some(Protocol::icmpv6()))?;
socket.set_recv_buffer_size(512)?;
Ok(Self { Ok(Self {
bound_to: None, bound_to: None,
inner: Socket::new(Domain::ipv6(), Type::raw(), Some(Protocol::icmpv6()))?, inner: socket,
buf: vec![0; 512],
opts: Opts { hops: 50 }, opts: Opts { hops: 50 },
}) })
} }
@ -141,10 +150,9 @@ impl IcmpSocket for IcmpSocket6 {
Ok(()) Ok(())
} }
fn rcv_from(&self) -> std::io::Result<Self::PacketType> { fn rcv_from(&mut self) -> std::io::Result<Self::PacketType> {
let mut buf = vec![0; 512]; let (read_count, _addr) = self.inner.recv_from(&mut self.buf)?;
let (read_count, _addr) = self.inner.recv_from(&mut buf)?; Ok(self.buf[0..read_count].try_into()?)
Ok(buf[0..read_count].try_into()?)
} }
} }