tuxmain/rust-rpxy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: deps

Browse source
This commit is contained in:
Jun Kurihara 2023-10-28 01:50:31 +09:00
commit 9123ef71a2
No known key found for this signature in database
GPG key ID: 48ADFD173ED22B03
4 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rpxy-bin/Cargo.toml
View file

@ -25,7 +25,7 @@ rpxy-lib = { path = "../rpxy-lib/", default-features = false, features = [
anyhow = "1.0.75" anyhow = "1.0.75"
rustc-hash = "1.1.0" rustc-hash = "1.1.0"
serde = { version = "1.0.189", default-features = false, features = ["derive"] } serde = { version = "1.0.190", default-features = false, features = ["derive"] }
derive_builder = "0.12.0" derive_builder = "0.12.0"
tokio = { version = "1.33.0", default-features = false, features = [ tokio = { version = "1.33.0", default-features = false, features = [
"net", "net",
@ -39,7 +39,7 @@ rustls-pemfile = "1.0.3"
mimalloc = { version = "*", default-features = false } mimalloc = { version = "*", default-features = false }
# config # config
clap = { version = "4.4.6", features = ["std", "cargo", "wrap_help"] } clap = { version = "4.4.7", features = ["std", "cargo", "wrap_help"] }
toml = { version = "0.8", default-features = false, features = ["parse"] } toml = { version = "0.8", default-features = false, features = ["parse"] }
hot_reload = "0.1.4" hot_reload = "0.1.4"

10
rpxy-lib/Cargo.toml
View file

@ -24,7 +24,7 @@ rand = "0.8.5"
rustc-hash = "1.1.0" rustc-hash = "1.1.0"
bytes = "1.5.0" bytes = "1.5.0"
derive_builder = "0.12.0" derive_builder = "0.12.0"
futures = { version = "0.3.28", features = ["alloc", "async-await"] } futures = { version = "0.3.29", features = ["alloc", "async-await"] }
tokio = { version = "1.33.0", default-features = false, features = [ tokio = { version = "1.33.0", default-features = false, features = [
"net", "net",
"rt-multi-thread", "rt-multi-thread",
@ -47,14 +47,14 @@ hyper = { version = "0.14.27", default-features = false, features = [
"http2", "http2",
"stream", "stream",
] } ] }
hyper-rustls = { version = "0.24.1", default-features = false, features = [ hyper-rustls = { version = "0.24.2", default-features = false, features = [
"tokio-runtime", "tokio-runtime",
"webpki-tokio", "webpki-tokio",
"http1", "http1",
"http2", "http2",
] } ] }
tokio-rustls = { version = "0.24.1", features = ["early-data"] } tokio-rustls = { version = "0.24.1", features = ["early-data"] }
rustls = { version = "0.21.7", default-features = false } rustls = { version = "0.21.8", default-features = false }
webpki = "0.22.4" webpki = "0.22.4"
x509-parser = "0.15.1" x509-parser = "0.15.1"
@ -68,7 +68,7 @@ h3 = { path = "../submodules/h3/h3/", optional = true }
# h3-quinn = { path = "./h3/h3-quinn/", optional = true } # h3-quinn = { path = "./h3/h3-quinn/", optional = true }
h3-quinn = { path = "../submodules/h3-quinn/", optional = true } # Tentative to support rustls-0.21 h3-quinn = { path = "../submodules/h3-quinn/", optional = true } # Tentative to support rustls-0.21
# for UDP socket wit SO_REUSEADDR when h3 with quinn # for UDP socket wit SO_REUSEADDR when h3 with quinn
socket2 = { version = "0.5.4", features = ["all"], optional = true } socket2 = { version = "0.5.5", features = ["all"], optional = true }
s2n-quic = { path = "../submodules/s2n-quic/quic/s2n-quic/", default-features = false, features = [ s2n-quic = { path = "../submodules/s2n-quic/quic/s2n-quic/", default-features = false, features = [
"provider-tls-rustls", "provider-tls-rustls",
], optional = true } ], optional = true }
@ -85,7 +85,7 @@ chrono = { version = "0.4.31", default-features = false, features = [
"alloc", "alloc",
"clock", "clock",
], optional = true } ], optional = true }
base64 = { version = "0.21.4", optional = true } base64 = { version = "0.21.5", optional = true }
sha2 = { version = "0.10.8", default-features = false, optional = true } sha2 = { version = "0.10.8", default-features = false, optional = true }

1
rpxy-lib/src/proxy/socket.rs
View file

@ -34,6 +34,7 @@ pub(super) fn bind_udp_socket(listening_on: &SocketAddr) -> Result<UdpSocket> {
}?; }?;
socket.set_reuse_address(true)?; // This isn't necessary? socket.set_reuse_address(true)?; // This isn't necessary?
socket.set_reuse_port(true)?; socket.set_reuse_port(true)?;
socket.set_nonblocking(true)?; // This was made true inside quinn. so this line isn't necessary here. but just in case.
if let Err(e) = socket.bind(&(*listening_on).into()) { if let Err(e) = socket.bind(&(*listening_on).into()) {
error!("Failed to bind UDP socket: {}", e); error!("Failed to bind UDP socket: {}", e);

2
submodules/quinn

@ -1 +1 @@
Subproject commit e1e1e6e392a382fbded42ca010505fecb8fe3655 Subproject commit 6d80efeeae60b96ff330ae6a70e8cc9291fcc615