From 3dc6ded1b048b910c104ae5f42124af68d5e4209 Mon Sep 17 00:00:00 2001
From: Jeremy Wall <jeremy@marzhillstudios.com>
Date: Thu, 14 Jul 2022 21:33:33 -0400
Subject: [PATCH] Update icmp-socket version

---
 Cargo.lock  | 22 ++++++++++++++++------
 Cargo.toml  |  2 +-
 src/icmp.rs |  7 +------
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 447c969..f37ad5e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -95,7 +95,7 @@ dependencies = [
  "nursery",
  "prometheus",
  "resolve",
- "socket2",
+ "socket2 0.3.19",
  "tiny_http",
  "tracing",
  "tracing-subscriber",
@@ -159,12 +159,12 @@ dependencies = [
 
 [[package]]
 name = "icmp-socket"
-version = "0.1.1"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c83b37323293113bad20766377951f5b51e0b23fc7cc6694b6b93e6ff02ecf8"
+checksum = "98bc3daf82cd6b2f02709427c17f75e1023471f59bc74726bbd27d8a907af605"
 dependencies = [
  "byteorder",
- "socket2",
+ "socket2 0.4.4",
 ]
 
 [[package]]
@@ -228,9 +228,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.84"
+version = "0.2.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cca32fa0182e8c0989459524dc356b8f2b5c10f1b9eb521b7d182c03cf8c5ff"
+checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"
 
 [[package]]
 name = "lock_api"
@@ -513,6 +513,16 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "socket2"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
 [[package]]
 name = "syn"
 version = "1.0.60"
diff --git a/Cargo.toml b/Cargo.toml
index 205857e..e688a36 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,5 +15,5 @@ nursery = "^0.0.1"
 prometheus = "0.11.0"
 tiny_http = "0.8.0"
 socket2 = "0.3.19" 
-icmp-socket = "0.1.1"
+icmp-socket = "0.2.0"
 resolve = "^0.2.0"
\ No newline at end of file
diff --git a/src/icmp.rs b/src/icmp.rs
index b663c2e..ec4dc37 100644
--- a/src/icmp.rs
+++ b/src/icmp.rs
@@ -70,7 +70,6 @@ struct State<AddrType> {
 
 struct PingerImpl<Sock: IcmpSocket> {
     sock: Sock,
-    timeout: Duration,
 }
 
 trait PacketHandler<PacketType, AddrType>
@@ -399,9 +398,7 @@ where
             debug!("Nothing to recieve for so skipping for this socket");
             return;
         }
-        self.sock
-            .set_timeout(self.timeout)
-            .expect("Unable to set timout for recieves on socket.");
+        self.sock.set_timeout(None);
         let loop_start_time = Instant::now();
         loop {
             // Receive loop
@@ -515,7 +512,6 @@ pub fn schedule_echo_server(
     }
     let v4_pinger = PingerImpl {
         sock: IcmpSocket4::new().expect("Failed to open Icmpv4 Socket"),
-        timeout: Duration::from_millis(10),
     };
     let v6_state = State {
         destinations: v6_destinations,
@@ -525,7 +521,6 @@ pub fn schedule_echo_server(
     };
     let v6_pinger = PingerImpl {
         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 {
         v4_pinger,