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

Update to the v0.4x branch of socket2

Browse Source
This commit is contained in:
Jeremy Wall 2022-02-02 23:07:24 -05:00
parent 5a00edf5e8
commit 3b5f3f9a25
4 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Cargo.toml
View File

@ -1,7 +1,7 @@
[package]
name = "icmp-socket"
description = "ICMP sockets for both IPv4 and IPv6"
version = "0.1.1"
version = "0.1.2"
repository = "https://github.com/zaphar/icmp-socket"
authors = ["Jeremy Wall <jeremy@marzhillstudios.com>"]
edition = "2018"
@ -10,5 +10,8 @@ license = "Apache-2.0"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
socket2 = "0.3.19"
byteorder = "1.3.4"
[dependencies.socket2]
version = "0.4.4"
features=[ "all" ]

3
examples/ping4.rs
View File

@ -83,7 +83,8 @@ pub fn main() {
break;
}
};
if packet_handler(resp, send_time, *sock_addr.as_inet().unwrap().ip()).is_some() {
if packet_handler(resp, send_time, *sock_addr.as_socket_ipv4().unwrap().ip()).is_some()
{
std::thread::sleep(Duration::from_secs(1));
break;
}

3
examples/ping6.rs
View File

@ -81,7 +81,8 @@ pub fn main() {
break;
}
};
if packet_handler(resp, send_time, *sock_addr.as_inet6().unwrap().ip()).is_some() {
if packet_handler(resp, send_time, *sock_addr.as_socket_ipv6().unwrap().ip()).is_some()
{
std::thread::sleep(Duration::from_millis(1000));
break;
}

19
src/socket.rs
View File

@ -18,6 +18,7 @@
use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr};
use std::{
convert::{Into, TryFrom, TryInto},
mem::MaybeUninit,
time::Duration,
};
@ -71,7 +72,7 @@ impl IcmpSocket4 {
/// Construct a new socket. The socket must be bound to an address using `bind_to`
/// before it can be used to send and receive packets.
pub fn new() -> std::io::Result<Self> {
let socket = Socket::new(Domain::ipv4(), Type::raw(), Some(Protocol::icmpv4()))?;
let socket = Socket::new(Domain::IPV4, Type::RAW, Some(Protocol::ICMPV4))?;
socket.set_recv_buffer_size(512)?;
Ok(Self {
bound_to: None,
@ -108,7 +109,12 @@ impl IcmpSocket for IcmpSocket4 {
fn rcv_from(&mut self) -> std::io::Result<(Self::PacketType, SockAddr)> {
self.inner.set_read_timeout(None)?;
let (read_count, addr) = self.inner.recv_from(&mut self.buf)?;
// NOTE(jwall): the `recv_from` implementation promises not to write uninitialised
// bytes to the `buf`fer, so this casting is safe.
// TODO(jwall): change to `Vec::spare_capacity_mut` when it stabilizes.
let mut buf =
unsafe { &mut *(self.buf.as_mut_slice() as *mut [u8] as *mut [MaybeUninit<u8>]) };
let (read_count, addr) = self.inner.recv_from(&mut buf)?;
Ok((self.buf[0..read_count].try_into()?, addr))
}
@ -129,7 +135,7 @@ impl IcmpSocket6 {
/// Construct a new socket. The socket must be bound to an address using `bind_to`
/// before it can be used to send and receive packets.
pub fn new() -> std::io::Result<Self> {
let socket = Socket::new(Domain::ipv6(), Type::raw(), Some(Protocol::icmpv6()))?;
let socket = Socket::new(Domain::IPV6, Type::RAW, Some(Protocol::ICMPV6))?;
socket.set_recv_buffer_size(512)?;
Ok(Self {
bound_to: None,
@ -180,7 +186,12 @@ impl IcmpSocket for IcmpSocket6 {
fn rcv_from(&mut self) -> std::io::Result<(Self::PacketType, SockAddr)> {
self.inner.set_read_timeout(None)?;
let (read_count, addr) = self.inner.recv_from(&mut self.buf)?;
// NOTE(jwall): the `recv_from` implementation promises not to write uninitialised
// bytes to the `buf`fer, so this casting is safe.
// TODO(jwall): change to `Vec::spare_capacity_mut` when it stabilizes.
let mut buf =
unsafe { &mut *(self.buf.as_mut_slice() as *mut [u8] as *mut [MaybeUninit<u8>]) };
let (read_count, addr) = self.inner.recv_from(&mut buf)?;
Ok((self.buf[0..read_count].try_into()?, addr))
}