From 2121138173a9086afdb5c37ae75c851e83abd048 Mon Sep 17 00:00:00 2001 From: nullchinchilla Date: Mon, 12 Aug 2024 12:44:18 -0400 Subject: [PATCH] Update dependencies and add macos VPN whitelist function; add workspace configs --- Cargo.lock | 6 +++--- binaries/geph5-client/Cargo.toml | 14 +++++++------- binaries/geph5-client/src/vpn/macos.rs | 2 ++ libraries/arc-writer/Cargo.toml | 5 ++++- libraries/geph5-misc-rpc/Cargo.toml | 6 +++++- libraries/nanorpc-sillad/Cargo.toml | 2 +- libraries/picomux/Cargo.toml | 2 +- libraries/sillad-sosistab3/Cargo.toml | 2 +- libraries/sillad/Cargo.toml | 2 +- 9 files changed, 25 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1fa7848..e3c4fbb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -301,7 +301,7 @@ dependencies = [ [[package]] name = "arc-writer" -version = "0.1.0" +version = "0.2.0-alpha.0" [[package]] name = "argon2" @@ -3259,7 +3259,7 @@ dependencies = [ [[package]] name = "geph5-misc-rpc" -version = "0.1.0" +version = "0.2.0-alpha.0" dependencies = [ "anyhow", "async-task", @@ -6281,7 +6281,7 @@ dependencies = [ [[package]] name = "sillad" -version = "0.2.0-alpha.0" +version = "0.1.0" dependencies = [ "async-io 2.3.3", "async-trait", diff --git a/binaries/geph5-client/Cargo.toml b/binaries/geph5-client/Cargo.toml index 2700b97..5fc30e2 100644 --- a/binaries/geph5-client/Cargo.toml +++ b/binaries/geph5-client/Cargo.toml @@ -31,8 +31,8 @@ ed25519-dalek = {version="2", default-features=false, features=["serde"]} elevated-command = "1.1.2" event-listener = "5.3.1" futures-util = "0.3.30" -geph5-broker-protocol = { path = "../../libraries/geph5-broker-protocol" } -geph5-misc-rpc = { path = "../../libraries/geph5-misc-rpc" } +geph5-broker-protocol = { version = "0.2.0-alpha.0", path = "../../libraries/geph5-broker-protocol" } +geph5-misc-rpc = { version = "0.2.0-alpha.0", path = "../../libraries/geph5-misc-rpc" } hex = "0.4.3" http = "1.1.0" http-body-util = "0.1.2" @@ -47,12 +47,12 @@ libc = "0.2.155" mizaru2 = { path = "../../libraries/mizaru2" } moka = { version = "0.12.7", features = ["future", "sync"] } nanorpc = "0.1.12" -nanorpc-sillad = { path = "../../libraries/nanorpc-sillad" } +nanorpc-sillad = { version = "0.1", path = "../../libraries/nanorpc-sillad" } nursery_macro = "0.1.0" once_cell = "1.19.0" oneshot = "0.1.8" parking_lot = "0.12.3" -picomux = { path = "../../libraries/picomux" } +picomux = { version = "0.1", path = "../../libraries/picomux" } pin-project = "1.1.5" pnet_packet = "0.35.0" rand = "0.8.5" @@ -61,9 +61,9 @@ scopeguard = "1.2.0" serde = { version = "1", features = ["derive"] } serde_json = "1.0.120" serde_yaml = "0.9.34" -sillad = { path = "../../libraries/sillad" } -sillad-sosistab3 = { path = "../../libraries/sillad-sosistab3" } -arc-writer = { path = "../../libraries/arc-writer" } +sillad = { version="0.1", path = "../../libraries/sillad" } +sillad-sosistab3 = { version = "0.2.0-alpha.0", path = "../../libraries/sillad-sosistab3" } +arc-writer = { version = "0.2.0-alpha.0", path = "../../libraries/arc-writer" } simple-dns = "0.7.0" smol = "2.0.0" smol-timeout = "0.6.0" diff --git a/binaries/geph5-client/src/vpn/macos.rs b/binaries/geph5-client/src/vpn/macos.rs index 8a3dfd5..c179e4a 100644 --- a/binaries/geph5-client/src/vpn/macos.rs +++ b/binaries/geph5-client/src/vpn/macos.rs @@ -12,3 +12,5 @@ pub(super) async fn packet_shuffle( ) -> anyhow::Result<()> { todo!() } + +pub fn vpn_whitelist(addr: IpAddr) {} diff --git a/libraries/arc-writer/Cargo.toml b/libraries/arc-writer/Cargo.toml index f29b5f9..8097035 100644 --- a/libraries/arc-writer/Cargo.toml +++ b/libraries/arc-writer/Cargo.toml @@ -1,7 +1,10 @@ [package] name = "arc-writer" -version = "0.1.0" edition = "2021" +description = "Arc writer" +version.workspace = true +repository.workspace = true +license.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/libraries/geph5-misc-rpc/Cargo.toml b/libraries/geph5-misc-rpc/Cargo.toml index 8d4adf6..b382f51 100644 --- a/libraries/geph5-misc-rpc/Cargo.toml +++ b/libraries/geph5-misc-rpc/Cargo.toml @@ -1,7 +1,11 @@ [package] name = "geph5-misc-rpc" -version = "0.1.0" edition = "2021" +description = "Geph5 misc RPC protocols" +version.workspace = true +repository.workspace = true +license.workspace = true + [dependencies] serde = { version = "1.0.204", features = ["derive"] } diff --git a/libraries/nanorpc-sillad/Cargo.toml b/libraries/nanorpc-sillad/Cargo.toml index d734404..6738037 100644 --- a/libraries/nanorpc-sillad/Cargo.toml +++ b/libraries/nanorpc-sillad/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -sillad = { path = "../sillad" } +sillad = { version = "0.1", path = "../sillad" } async-trait = "0.1.80" nanorpc = "0.1.12" serde_json = "1.0.120" diff --git a/libraries/picomux/Cargo.toml b/libraries/picomux/Cargo.toml index 8ad475f..2bbb649 100644 --- a/libraries/picomux/Cargo.toml +++ b/libraries/picomux/Cargo.toml @@ -32,7 +32,7 @@ tap = "1.0.1" serde = { version = "1.0.204", features = ["derive"] } serde_json = "1.0.120" async-io = "2.3.3" -sillad = { version = "0.2.0-alpha.0", path = "../sillad" } +sillad = { version = "0.1", path = "../sillad" } futures-intrusive = "0.5.0" async-channel = "2.3.1" pin-project = "1.1.5" diff --git a/libraries/sillad-sosistab3/Cargo.toml b/libraries/sillad-sosistab3/Cargo.toml index 3b23636..1cd7bd3 100644 --- a/libraries/sillad-sosistab3/Cargo.toml +++ b/libraries/sillad-sosistab3/Cargo.toml @@ -12,7 +12,7 @@ blake3 = "1.5.1" chacha20poly1305 = "0.10.1" rand = "0.8.5" x25519-dalek = {version="2", default-features=false, features=["serde"]} -sillad = { version = "0.2.0-alpha.0", path = "../sillad" } +sillad = { version = "0.1", path = "../sillad" } futures-util = { version = "0.3.30", features = ["io"] } pin-project = "1.1.5" smallvec = "1.13.2" diff --git a/libraries/sillad/Cargo.toml b/libraries/sillad/Cargo.toml index b0c5631..084f8ce 100644 --- a/libraries/sillad/Cargo.toml +++ b/libraries/sillad/Cargo.toml @@ -2,7 +2,7 @@ name = "sillad" edition = "2021" description = "A framework for talking about TCP-like dialers and listeners, within the futures-io ecosystem" -version.workspace = true +version = "0.1.0" repository.workspace = true license.workspace = true