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>; - pub type Session = CypherSession; + pub type Session = CypherSession; pub type Transport = netservices::NetTransport; } 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; +pub type Accept = netservices::NetAccept; pub type Action = reactor::Action; pub type Ecdh = x25519::PrivateKey;