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

socket: fix: socket timeout handling

Browse Source 
rcv_from() would always overwrite the timeout parameter set by the
user.

Instead of setting the timeout within the socket when set_timeout() is
called, store the timeout information within the options (along with
hops) and read that data when the sockets timeout is actually set in
rcv_from().
This commit is contained in:
ishbosamiya 2022-02-08 13:06:35 +05:30
parent d5672b00c6
commit b30dfb48bd
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/socket.rs
View File

@ -37,9 +37,9 @@ pub trait IcmpSocket {
/// The type of packet this socket handles. /// The type of packet this socket handles.
type PacketType; type PacketType;
/// Sets the timeout on the socket for rcv_from. A value of 0 will cause /// Sets the timeout on the socket for rcv_from. A value of None
/// rcv_from to block. /// will cause rcv_from to block.
fn set_timeout(&mut self, timeout: Duration) -> std::io::Result<()>; fn set_timeout(&mut self, timeout: Option<Duration>);
/// Sets the ttl for packets sent on this socket. Controls the number of /// Sets the ttl for packets sent on this socket. Controls the number of
/// hops the packet will be allowed to traverse. /// hops the packet will be allowed to traverse.
@ -58,6 +58,7 @@ pub trait IcmpSocket {
/// Options for this socket. /// Options for this socket.
pub struct Opts { pub struct Opts {
hops: u32, hops: u32,
timeout: Option<Duration>,
} }
/// An ICMPv4 socket. /// An ICMPv4 socket.
@ -78,7 +79,10 @@ impl IcmpSocket4 {
bound_to: None, bound_to: None,
inner: socket, inner: socket,
buf: vec![0; 512], buf: vec![0; 512],
opts: Opts { hops: 50 }, opts: Opts {
hops: 50,
timeout: None,
},
}) })
} }
} }
@ -108,7 +112,7 @@ impl IcmpSocket for IcmpSocket4 {
} }
fn rcv_from(&mut self) -> std::io::Result<(Self::PacketType, SockAddr)> { fn rcv_from(&mut self) -> std::io::Result<(Self::PacketType, SockAddr)> {
self.inner.set_read_timeout(None)?; self.inner.set_read_timeout(self.opts.timeout)?;
// NOTE(jwall): the `recv_from` implementation promises not to write uninitialised // NOTE(jwall): the `recv_from` implementation promises not to write uninitialised
// bytes to the `buf`fer, so this casting is safe. // bytes to the `buf`fer, so this casting is safe.
// TODO(jwall): change to `Vec::spare_capacity_mut` when it stabilizes. // TODO(jwall): change to `Vec::spare_capacity_mut` when it stabilizes.
@ -118,8 +122,8 @@ impl IcmpSocket for IcmpSocket4 {
Ok((self.buf[0..read_count].try_into()?, addr)) Ok((self.buf[0..read_count].try_into()?, addr))
} }
fn set_timeout(&mut self, timeout: Duration) -> std::io::Result<()> { fn set_timeout(&mut self, timeout: Option<Duration>) {
self.inner.set_read_timeout(Some(timeout)) self.opts.timeout = timeout;
} }
} }
@ -141,7 +145,10 @@ impl IcmpSocket6 {
bound_to: None, bound_to: None,
inner: socket, inner: socket,
buf: vec![0; 512], buf: vec![0; 512],
opts: Opts { hops: 50 }, opts: Opts {
hops: 50,
timeout: None,
},
}) })
} }
} }
@ -185,7 +192,7 @@ impl IcmpSocket for IcmpSocket6 {
} }
fn rcv_from(&mut self) -> std::io::Result<(Self::PacketType, SockAddr)> { fn rcv_from(&mut self) -> std::io::Result<(Self::PacketType, SockAddr)> {
self.inner.set_read_timeout(None)?; self.inner.set_read_timeout(self.opts.timeout)?;
// NOTE(jwall): the `recv_from` implementation promises not to write uninitialised // NOTE(jwall): the `recv_from` implementation promises not to write uninitialised
// bytes to the `buf`fer, so this casting is safe. // bytes to the `buf`fer, so this casting is safe.
// TODO(jwall): change to `Vec::spare_capacity_mut` when it stabilizes. // TODO(jwall): change to `Vec::spare_capacity_mut` when it stabilizes.
@ -195,8 +202,8 @@ impl IcmpSocket for IcmpSocket6 {
Ok((self.buf[0..read_count].try_into()?, addr)) Ok((self.buf[0..read_count].try_into()?, addr))
} }
fn set_timeout(&mut self, timeout: Duration) -> std::io::Result<()> { fn set_timeout(&mut self, timeout: Option<Duration>) {
self.inner.set_read_timeout(Some(timeout)) self.opts.timeout = timeout;
} }
} }