[import-netapp] import Netapp code into Garage codebase

1 files changed, 9 insertions, 6 deletions

diff --git a/Cargo.toml b/Cargo.toml
index f1b3832c..b7ffcfc5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,6 +3,7 @@ resolver = "2"
 members = [
 	"src/db",
 	"src/util",
+	"src/net",
 	"src/rpc",
 	"src/table",
 	"src/block",
@@ -24,15 +25,13 @@ garage_api = { version = "0.9.1", path = "src/api" }
 garage_block = { version = "0.9.1", path = "src/block" }
 garage_db = { version = "0.9.1", path = "src/db", default-features = false }
 garage_model = { version = "0.9.1", path = "src/model", default-features = false }
+garage_net = { version = "0.9.1", path = "src/net" }
 garage_rpc = { version = "0.9.1", path = "src/rpc" }
 garage_table = { version = "0.9.1", path = "src/table" }
 garage_util = { version = "0.9.1", path = "src/util" }
 garage_web = { version = "0.9.1", path = "src/web" }
 k2v-client = { version = "0.0.4", path = "src/k2v-client" }
 
-# Netapp is a special sister crate
-netapp = { version = "0.10", features = ["telemetry"] }
-
 # External crates from crates.io
 arc-swap = "1.0"
 async-trait = "0.1.7"
@@ -41,6 +40,7 @@ base64 = "0.21"
 blake2 = "0.10"
 bytes = "1.0"
 bytesize = "1.1"
+cfg-if = "1.0"
 chrono = "0.4"
 crypto-common = "0.1"
 digest = "0.10"
@@ -62,10 +62,12 @@ pin-project = "1.0.12"
 pnet_datalink = "0.34"
 rand = "0.8"
 sha2 = "0.10"
-sodiumoxide = { version = "0.2.5-0", package = "kuska-sodiumoxide" }
 timeago = { version = "0.4", default-features = false }
 xxhash-rust = { version = "0.8", default-features = false, features = ["xxh3"] }
 
+sodiumoxide = { version = "0.2.5-0", package = "kuska-sodiumoxide" }
+kuska-handshake = { version = "0.2.0", features = ["default", "async_std"] }
+
 clap = { version = "4.1", features = ["derive", "env"] }
 pretty_env_logger = "0.5"
 structopt = { version = "0.3", default-features = false }
@@ -106,13 +108,14 @@ url = "2.3"
 
 futures = "0.3"
 futures-util = "0.3"
-tokio = { version = "1.0", default-features = false, features = ["rt", "rt-multi-thread", "io-util", "net", "time", "macros", "sync", "signal", "fs"] }
-tokio-util = { version = "0.7", features = ["io"] }
+tokio = { version = "1.0", default-features = false, features = ["net", "rt", "rt-multi-thread", "io-util", "net", "time", "macros", "sync", "signal", "fs"] }
+tokio-util = { version = "0.7", features = ["compat", "io"] }
 tokio-stream = { version = "0.1", features = ["net"] }
 
 opentelemetry = { version = "0.17", features = [ "rt-tokio", "metrics", "trace" ] }
 opentelemetry-prometheus = "0.10"
 opentelemetry-otlp = "0.10"
+opentelemetry-contrib = "0.9"
 prometheus = "0.13"
 
 # used by the k2v-client crate only