From 9123ef71a2da473f7c47ca5a21f1a787fca6c540 Mon Sep 17 00:00:00 2001 From: Jun Kurihara Date: Sat, 28 Oct 2023 01:50:31 +0900 Subject: [PATCH] chore: deps --- rpxy-bin/Cargo.toml | 4 ++-- rpxy-lib/Cargo.toml | 10 +++++----- rpxy-lib/src/proxy/socket.rs | 1 + submodules/quinn | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/rpxy-bin/Cargo.toml b/rpxy-bin/Cargo.toml index 6eb36d0..a256549 100644 --- a/rpxy-bin/Cargo.toml +++ b/rpxy-bin/Cargo.toml @@ -25,7 +25,7 @@ rpxy-lib = { path = "../rpxy-lib/", default-features = false, features = [ anyhow = "1.0.75" 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" tokio = { version = "1.33.0", default-features = false, features = [ "net", @@ -39,7 +39,7 @@ rustls-pemfile = "1.0.3" mimalloc = { version = "*", default-features = false } # 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"] } hot_reload = "0.1.4" diff --git a/rpxy-lib/Cargo.toml b/rpxy-lib/Cargo.toml index 0c882e4..7f10e60 100644 --- a/rpxy-lib/Cargo.toml +++ b/rpxy-lib/Cargo.toml @@ -24,7 +24,7 @@ rand = "0.8.5" rustc-hash = "1.1.0" bytes = "1.5.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 = [ "net", "rt-multi-thread", @@ -47,14 +47,14 @@ hyper = { version = "0.14.27", default-features = false, features = [ "http2", "stream", ] } -hyper-rustls = { version = "0.24.1", default-features = false, features = [ +hyper-rustls = { version = "0.24.2", default-features = false, features = [ "tokio-runtime", "webpki-tokio", "http1", "http2", ] } 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" 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 = "../submodules/h3-quinn/", optional = true } # Tentative to support rustls-0.21 # 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 = [ "provider-tls-rustls", ], optional = true } @@ -85,7 +85,7 @@ chrono = { version = "0.4.31", default-features = false, features = [ "alloc", "clock", ], 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 } diff --git a/rpxy-lib/src/proxy/socket.rs b/rpxy-lib/src/proxy/socket.rs index 9e4c8f9..cf38ddc 100644 --- a/rpxy-lib/src/proxy/socket.rs +++ b/rpxy-lib/src/proxy/socket.rs @@ -34,6 +34,7 @@ pub(super) fn bind_udp_socket(listening_on: &SocketAddr) -> Result { }?; socket.set_reuse_address(true)?; // This isn't necessary? 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()) { error!("Failed to bind UDP socket: {}", e); diff --git a/submodules/quinn b/submodules/quinn index e1e1e6e..6d80efe 160000 --- a/submodules/quinn +++ b/submodules/quinn @@ -1 +1 @@ -Subproject commit e1e1e6e392a382fbded42ca010505fecb8fe3655 +Subproject commit 6d80efeeae60b96ff330ae6a70e8cc9291fcc615