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

Expose errors when setting timeouts

Browse Source
This commit is contained in:
Jeremy Wall 2021-02-01 17:06:23 -05:00
parent dc13a70e4a
commit e331d94a26
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/socket.rs
View File

@ -93,7 +93,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(None)?;
let (read_count, addr) = self.inner.recv_from(&mut self.buf)?; let (read_count, addr) = self.inner.recv_from(&mut self.buf)?;
Ok((self.buf[0..read_count].try_into()?, addr)) Ok((self.buf[0..read_count].try_into()?, addr))
} }
@ -102,7 +102,7 @@ impl IcmpSocket for IcmpSocket4 {
&mut self, &mut self,
timeout: Duration, timeout: Duration,
) -> std::io::Result<(Self::PacketType, SockAddr)> { ) -> std::io::Result<(Self::PacketType, SockAddr)> {
self.inner.set_read_timeout(Some(timeout)); self.inner.set_read_timeout(Some(timeout))?;
let (read_count, addr) = self.inner.recv_from(&mut self.buf)?; let (read_count, addr) = self.inner.recv_from(&mut self.buf)?;
Ok((self.buf[0..read_count].try_into()?, addr)) Ok((self.buf[0..read_count].try_into()?, addr))
} }
@ -167,7 +167,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(None)?;
let (read_count, addr) = self.inner.recv_from(&mut self.buf)?; let (read_count, addr) = self.inner.recv_from(&mut self.buf)?;
Ok((self.buf[0..read_count].try_into()?, addr)) Ok((self.buf[0..read_count].try_into()?, addr))
} }
@ -176,7 +176,7 @@ impl IcmpSocket for IcmpSocket6 {
&mut self, &mut self,
timeout: Duration, timeout: Duration,
) -> std::io::Result<(Self::PacketType, SockAddr)> { ) -> std::io::Result<(Self::PacketType, SockAddr)> {
self.inner.set_read_timeout(Some(timeout)); self.inner.set_read_timeout(Some(timeout))?;
let (read_count, addr) = self.inner.recv_from(&mut self.buf)?; let (read_count, addr) = self.inner.recv_from(&mut self.buf)?;
Ok((self.buf[0..read_count].try_into()?, addr)) Ok((self.buf[0..read_count].try_into()?, addr))
} }