From 79d1f0de377e049b007455bdc003667f7f9bc4f4 Mon Sep 17 00:00:00 2001
From: Dr Maxim Orlovsky <orlovsky@cyphernet.io>
Date: Sun, 26 May 2024 14:05:39 +0200
Subject: [PATCH] wip on supporting socket2 nonblocking sessions

---
 Cargo.lock    | 4 ++--
 Cargo.toml    | 4 ++++
 src/lib.rs    | 2 +-
 src/server.rs | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ac222a3..6a366fa 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -543,8 +543,7 @@ dependencies = [
 [[package]]
 name = "netservices"
 version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af0f91a10aaddcc3b76770c3bf5c17680829aa0828e5ffc69c62d58bfbe9c48c"
+source = "git+https://github.com/cyphernet-dao/rust-netservices?branch=socket2accept#058c86936edb5bc640c3683736b28cde0c72841a"
 dependencies = [
  "amplify",
  "cyphernet",
@@ -580,6 +579,7 @@ dependencies = [
  "log",
  "netservices",
  "shellexpand",
+ "socket2",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index b1e96b8..81328b0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,6 +12,7 @@ rust-version = "1.59.0"
 
 [dependencies]
 amplify = "4.6.0"
+socket2 = "0.5.7"
 io-reactor = { version = "0.5.1", features = ["log"] }
 netservices = { version = "0.8.0", features = ["reactor", "log", "eidolon"] }
 cyphernet = { version = "0.5.2", features = ["noise_x25519", "ed25519", "noise_sha2", "p2p-ed25519", "dns", "mixnets", "multibase", "eidolon"] }
@@ -21,3 +22,6 @@ shellexpand = "3.1.0"
 crossbeam-channel = "0.5.12"
 log = { version = "0.4.21", features = ["std"] }
 env_logger = "0.11.3"
+
+[patch.crates-io]
+netservices = { git = "https://github.com/cyphernet-dao/rust-netservices", branch = "socket2accept" }
diff --git a/src/lib.rs b/src/lib.rs
index 342d336..b18caab 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -15,7 +15,7 @@ mod types {
     use netservices::session::CypherSession;
 
     pub type RemoteHost = PeerAddr<ed25519::PublicKey, NetAddr<HostName>>;
-    pub type Session = CypherSession<ed25519::PrivateKey, Sha256>;
+    pub type Session = CypherSession<ed25519::PrivateKey, Sha256, socket2::Socket>;
     pub type Transport = netservices::NetTransport<Session>;
 }
 pub use types::*;
diff --git a/src/server.rs b/src/server.rs
index 43ac0ec..543c15f 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -9,7 +9,7 @@ use reactor::{Error, Resource, ResourceId, ResourceType, Timestamp};
 
 use crate::{Session, Transport};
 
-pub type Accept = netservices::NetAccept<Session>;
+pub type Accept = netservices::NetAccept<Session, socket2::Socket>;
 pub type Action = reactor::Action<Accept, Transport>;
 
 pub type Ecdh = x25519::PrivateKey;