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

Update icmp-socket version

Browse Source
This commit is contained in:
Jeremy Wall 2022-07-14 21:33:33 -04:00
parent 2cea3a294e
commit 3dc6ded1b0
3 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Cargo.lock generated
View File

@ -95,7 +95,7 @@ dependencies = [
"nursery", "nursery",
"prometheus", "prometheus",
"resolve", "resolve",
"socket2", "socket2 0.3.19",
"tiny_http", "tiny_http",
"tracing", "tracing",
"tracing-subscriber", "tracing-subscriber",
@ -159,12 +159,12 @@ dependencies = [
[[package]] [[package]]
name = "icmp-socket" name = "icmp-socket"
version = "0.1.1" version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8c83b37323293113bad20766377951f5b51e0b23fc7cc6694b6b93e6ff02ecf8" checksum = "98bc3daf82cd6b2f02709427c17f75e1023471f59bc74726bbd27d8a907af605"
dependencies = [ dependencies = [
"byteorder", "byteorder",
"socket2", "socket2 0.4.4",
] ]
[[package]] [[package]]
@ -228,9 +228,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]] [[package]]
name = "libc" name = "libc"
version = "0.2.84" version = "0.2.126"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1cca32fa0182e8c0989459524dc356b8f2b5c10f1b9eb521b7d182c03cf8c5ff" checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"
[[package]] [[package]]
name = "lock_api" name = "lock_api"
@ -513,6 +513,16 @@ dependencies = [
"winapi", "winapi",
] ]
[[package]]
name = "socket2"
version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0"
dependencies = [
"libc",
"winapi",
]
[[package]] [[package]]
name = "syn" name = "syn"
version = "1.0.60" version = "1.0.60"

2
Cargo.toml
View File

@ -15,5 +15,5 @@ nursery = "^0.0.1"
prometheus = "0.11.0" prometheus = "0.11.0"
tiny_http = "0.8.0" tiny_http = "0.8.0"
socket2 = "0.3.19" socket2 = "0.3.19"
icmp-socket = "0.1.1" icmp-socket = "0.2.0"
resolve = "^0.2.0" resolve = "^0.2.0"

7
src/icmp.rs
View File

@ -70,7 +70,6 @@ struct State<AddrType> {
struct PingerImpl<Sock: IcmpSocket> { struct PingerImpl<Sock: IcmpSocket> {
sock: Sock, sock: Sock,
timeout: Duration,
} }
trait PacketHandler<PacketType, AddrType> trait PacketHandler<PacketType, AddrType>
@ -399,9 +398,7 @@ where
debug!("Nothing to recieve for so skipping for this socket"); debug!("Nothing to recieve for so skipping for this socket");
return; return;
} }
self.sock self.sock.set_timeout(None);
.set_timeout(self.timeout)
.expect("Unable to set timout for recieves on socket.");
let loop_start_time = Instant::now(); let loop_start_time = Instant::now();
loop { loop {
// Receive loop // Receive loop
@ -515,7 +512,6 @@ pub fn schedule_echo_server(
} }
let v4_pinger = PingerImpl { let v4_pinger = PingerImpl {
sock: IcmpSocket4::new().expect("Failed to open Icmpv4 Socket"), sock: IcmpSocket4::new().expect("Failed to open Icmpv4 Socket"),
timeout: Duration::from_millis(10),
}; };
let v6_state = State { let v6_state = State {
destinations: v6_destinations, destinations: v6_destinations,
@ -525,7 +521,6 @@ pub fn schedule_echo_server(
}; };
let v6_pinger = PingerImpl { let v6_pinger = PingerImpl {
sock: IcmpSocket6::new().expect("Failed to open Icmpv6 Socket"), sock: IcmpSocket6::new().expect("Failed to open Icmpv6 Socket"),
timeout: Duration::from_millis(10),
}; };
let multi = std::sync::Arc::new(std::sync::Mutex::new(Multi { let multi = std::sync::Arc::new(std::sync::Mutex::new(Multi {
v4_pinger, v4_pinger,