Skip to content

Commit

Permalink
Update dependencies and add macos VPN whitelist function; add workspa…
Browse files Browse the repository at this point in the history
…ce configs
  • Loading branch information
nullchinchilla committed Aug 12, 2024
1 parent 54e3648 commit 2121138
Show file tree
Hide file tree
Showing 9 changed files with 25 additions and 16 deletions.
6 changes: 3 additions & 3 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions binaries/geph5-client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions binaries/geph5-client/src/vpn/macos.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,5 @@ pub(super) async fn packet_shuffle(
) -> anyhow::Result<()> {
todo!()
}

pub fn vpn_whitelist(addr: IpAddr) {}
5 changes: 4 additions & 1 deletion libraries/arc-writer/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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

Expand Down
6 changes: 5 additions & 1 deletion libraries/geph5-misc-rpc/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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"] }
Expand Down
2 changes: 1 addition & 1 deletion libraries/nanorpc-sillad/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion libraries/picomux/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion libraries/sillad-sosistab3/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion libraries/sillad/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 2121138

Please sign in to comment.