manbo/WTFnet
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix: Wrong function call in std::net under unix target

Browse Source
This commit is contained in:
DaZuo0122
2026-01-16 21:30:10 +08:00
parent 707aa22b07
commit 1441ce4a0a
1 changed files with 27 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
crates/wtfnet-probe/src/lib.rs
View File

@@ -6,15 +6,15 @@ use pnet::packet::icmpv6::{Icmpv6Packet, Icmpv6Types};
use pnet::packet::ip::IpNextHeaderProtocols; use pnet::packet::ip::IpNextHeaderProtocols;
#[cfg(unix)] #[cfg(unix)]
use pnet::transport::{ use pnet::transport::{
icmp_packet_iter, icmpv6_packet_iter, transport_channel, TransportChannelType, TransportChannelType, TransportProtocol, icmp_packet_iter, icmpv6_packet_iter,
TransportProtocol, transport_channel,
}; };
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use socket2::{Domain, Protocol, Socket, Type}; use socket2::{Domain, Protocol, Socket, Type};
use std::net::{IpAddr, SocketAddr}; use std::net::{IpAddr, SocketAddr};
use std::time::{Duration, Instant}; use std::time::{Duration, Instant};
use thiserror::Error; use thiserror::Error;
use tokio::net::{lookup_host, TcpStream}; use tokio::net::{TcpStream, lookup_host};
use tokio::time::timeout; use tokio::time::timeout;
use wtfnet_geoip::GeoIpRecord; use wtfnet_geoip::GeoIpRecord;
@@ -117,18 +117,19 @@ pub async fn ping(
.kind(surge_ping::ICMP::V6) .kind(surge_ping::ICMP::V6)
.build(), .build(),
}; };
let client = surge_ping::Client::new(&config) let client =
.map_err(|err| ProbeError::Ping(err.to_string()))?; surge_ping::Client::new(&config).map_err(|err| ProbeError::Ping(err.to_string()))?;
let mut pinger = client let mut pinger = client.pinger(addr, surge_ping::PingIdentifier(0)).await;
.pinger(addr, surge_ping::PingIdentifier(0))
.await;
let timeout_dur = Duration::from_millis(timeout_ms); let timeout_dur = Duration::from_millis(timeout_ms);
for seq in 0..count { for seq in 0..count {
let seq = seq as u16; let seq = seq as u16;
let start = Instant::now(); let start = Instant::now();
let response = let response = timeout(
timeout(timeout_dur, pinger.ping(surge_ping::PingSequence(seq), &[0; 8])).await; timeout_dur,
pinger.ping(surge_ping::PingSequence(seq), &[0; 8]),
)
.await;
match response { match response {
Ok(Ok((_packet, _))) => { Ok(Ok((_packet, _))) => {
let rtt = start.elapsed().as_millis(); let rtt = start.elapsed().as_millis();
@@ -250,9 +251,8 @@ pub async fn tcp_trace(
for ttl in 1..=max_hops { for ttl in 1..=max_hops {
let addr = socket_addr; let addr = socket_addr;
let start = Instant::now(); let start = Instant::now();
let result = tokio::task::spawn_blocking(move || { let result =
tcp_connect_with_ttl(addr, ttl, timeout_dur) tokio::task::spawn_blocking(move || tcp_connect_with_ttl(addr, ttl, timeout_dur))
})
.await .await
.map_err(|err| ProbeError::Io(err.to_string()))?; .map_err(|err| ProbeError::Io(err.to_string()))?;
@@ -385,11 +385,7 @@ async fn resolve_one(target: &str) -> Result<IpAddr, ProbeError> {
.ok_or_else(|| ProbeError::Resolve("no address found".to_string())) .ok_or_else(|| ProbeError::Resolve("no address found".to_string()))
} }
fn tcp_connect_with_ttl( fn tcp_connect_with_ttl(addr: SocketAddr, ttl: u8, timeout: Duration) -> Result<(), ProbeError> {
addr: SocketAddr,
ttl: u8,
timeout: Duration,
) -> Result<(), ProbeError> {
let domain = match addr.ip() { let domain = match addr.ip() {
IpAddr::V4(_) => Domain::IPV4, IpAddr::V4(_) => Domain::IPV4,
IpAddr::V6(_) => Domain::IPV6, IpAddr::V6(_) => Domain::IPV6,
@@ -441,11 +437,11 @@ fn udp_trace_hop_v4(
) -> Result<(Option<IpAddr>, bool), ProbeError> { ) -> Result<(Option<IpAddr>, bool), ProbeError> {
let protocol = let protocol =
TransportChannelType::Layer4(TransportProtocol::Ipv4(IpNextHeaderProtocols::Icmp)); TransportChannelType::Layer4(TransportProtocol::Ipv4(IpNextHeaderProtocols::Icmp));
let (_tx, mut rx) = transport_channel(4096, protocol) let (_tx, mut rx) =
.map_err(|err| ProbeError::Io(err.to_string()))?; transport_channel(4096, protocol).map_err(|err| ProbeError::Io(err.to_string()))?;
let socket = std::net::UdpSocket::bind("0.0.0.0:0") let socket =
.map_err(|err| ProbeError::Io(err.to_string()))?; std::net::UdpSocket::bind("0.0.0.0:0").map_err(|err| ProbeError::Io(err.to_string()))?;
socket socket
.set_ttl(u32::from(ttl)) .set_ttl(u32::from(ttl))
.map_err(|err| ProbeError::Io(err.to_string()))?; .map_err(|err| ProbeError::Io(err.to_string()))?;
@@ -472,13 +468,13 @@ fn udp_trace_hop_v6(
) -> Result<(Option<IpAddr>, bool), ProbeError> { ) -> Result<(Option<IpAddr>, bool), ProbeError> {
let protocol = let protocol =
TransportChannelType::Layer4(TransportProtocol::Ipv6(IpNextHeaderProtocols::Icmpv6)); TransportChannelType::Layer4(TransportProtocol::Ipv6(IpNextHeaderProtocols::Icmpv6));
let (_tx, mut rx) = transport_channel(4096, protocol) let (_tx, mut rx) =
.map_err(|err| ProbeError::Io(err.to_string()))?; transport_channel(4096, protocol).map_err(|err| ProbeError::Io(err.to_string()))?;
let socket = std::net::UdpSocket::bind("[::]:0") let socket =
.map_err(|err| ProbeError::Io(err.to_string()))?; std::net::UdpSocket::bind("[::]:0").map_err(|err| ProbeError::Io(err.to_string()))?;
socket socket
.set_unicast_hops_v6(u32::from(ttl)) .set_multicast_hops_v6(u32::from(ttl))
.map_err(|err| ProbeError::Io(err.to_string()))?; .map_err(|err| ProbeError::Io(err.to_string()))?;
let _ = socket.send_to(&[0u8; 4], addr); let _ = socket.send_to(&[0u8; 4], addr);