build

Devolutions · Jan 22, 2024 · 5075fd1 · 5075fd1
1 parent be4681c
commit 5075fd1
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 38 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/network-scanner-net/examples/boardcast.rs b/crates/network-scanner-net/examples/boardcast.rs
diff --git a/crates/network-scanner/Cargo.toml b/crates/network-scanner/Cargo.toml
@@ -11,7 +11,8 @@ anyhow = "1.0.79"
 network-scanner-net ={ path = "../network-scanner-net" }
 network-scanner-proto ={ path = "../network-scanner-proto" }
 socket2 = "0.5.5"
-tokio = { version = "1.35.1", features = ["io-util"] }
+tokio = { version = "1.35.1", features = ["io-util", "full"] }
+tokio-stream = "0.1.14"
 tracing = "0.1.40"
 
 [dev-dependencies]

diff --git a/crates/network-scanner/examples/boardcast.rs b/crates/network-scanner/examples/boardcast.rs
@@ -11,7 +11,7 @@ pub async fn main() -> anyhow::Result<()> {
         .init();
 
     let ip = std::net::Ipv4Addr::new(192, 168, 1, 255);
-    let runtime = network_scanner_net::runtime::Socket2Runtime::new()?;
+    let runtime = network_scanner_net::runtime::Socket2Runtime::new(None)?;
     {
         let socket = runtime.new_socket(
             socket2::Domain::IPV4,

diff --git a/crates/network-scanner/src/broadcast.rs b/crates/network-scanner/src/broadcast.rs
@@ -103,7 +103,7 @@ impl tokio_stream::Stream for BroadcastStream {
 pub async fn boardcast(
     ip: Ipv4Addr,
     read_time_out: Option<Duration>,
-    socket: AsyncRawSocket,
+    mut socket: AsyncRawSocket,
 ) -> anyhow::Result<BroadcastStream> {
     socket.set_broadcast(true)?;
     if let Some(time_out) = read_time_out {

diff --git a/crates/network-scanner/src/ping.rs b/crates/network-scanner/src/ping.rs
@@ -59,7 +59,7 @@ pub(crate) unsafe fn assume_init(buf: &[MaybeUninit<u8>]) -> &[u8] {
     &*(buf as *const [MaybeUninit<u8>] as *const [u8])
 }
 
-fn create_echo_request() -> anyhow::Result<(icmp_v4::Icmpv4Packet, Vec<u8>)> {
+pub(crate) fn create_echo_request() -> anyhow::Result<(icmp_v4::Icmpv4Packet, Vec<u8>)> {
     let time = std::time::SystemTime::now()
         .duration_since(std::time::UNIX_EPOCH)
         .with_context(|| "failed to get current time")?