archive/tuic
1
0
Fork 0
Code

update dependencies

Browse Source
This commit is contained in:
EAimTY 2023-05-11 21:58:52 +09:00
parent c776c53d33
commit e264448ff0
7 changed files with 34 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tuic-client/Cargo.toml
View File

@ -12,20 +12,19 @@ lexopt = { version = "0.3.0", default-features = false }
log = { version = "0.4.17", default-features = false, features = ["serde", "std"] } log = { version = "0.4.17", default-features = false, features = ["serde", "std"] }
once_cell = { version = "1.17.1", default-features = false, features = ["parking_lot", "std"] } once_cell = { version = "1.17.1", default-features = false, features = ["parking_lot", "std"] }
parking_lot = { version = "0.12.1", default-features = false, features = ["send_guard"] } parking_lot = { version = "0.12.1", default-features = false, features = ["send_guard"] }
quinn = { version = "0.9.3", default-features = false, features = ["futures-io", "runtime-tokio", "tls-rustls"] } quinn = { version = "0.10.0", default-features = false, features = ["futures-io", "runtime-tokio", "tls-rustls"] }
register-count = { version = "0.1.0", default-features = false, features = ["std"] } register-count = { version = "0.1.0", default-features = false, features = ["std"] }
rustls = { version = "0.20.8", default-features = false, features = ["quic"] } rustls = { version = "0.21.1", default-features = false, features = ["quic"] }
rustls-native-certs = { version = "0.6.2", default-features = false } rustls-native-certs = { version = "0.6.2", default-features = false }
rustls-pemfile = { version = "1.0.2", default-features = false } rustls-pemfile = { version = "1.0.2", default-features = false }
serde = { version = "1.0.152", default-features = false, features = ["derive", "std"] } serde = { version = "1.0.163", default-features = false, features = ["derive", "std"] }
serde_json = { version = "1.0.94", default-features = false, features = ["std"] } serde_json = { version = "1.0.96", default-features = false, features = ["std"] }
socket2 = { version = "0.5.1", default-features = false } socket2 = { version = "0.5.2", default-features = false }
socks5-proto = { version = "0.3.3", default-features = false } socks5-proto = { version = "0.3.3", default-features = false }
socks5-server = { version = "0.8.3", default-features = false } socks5-server = { version = "0.8.3", default-features = false }
thiserror = { version = "1.0.39", default-features = false } thiserror = { version = "1.0.40", default-features = false }
tokio = { version = "1.26.0", default-features = false, features = ["io-util", "macros", "net", "parking_lot", "rt-multi-thread", "time"] } tokio = { version = "1.28.1", default-features = false, features = ["io-util", "macros", "net", "parking_lot", "rt-multi-thread", "time"] }
tokio-util = { version = "0.7.7", default-features = false, features = ["compat"] } tokio-util = { version = "0.7.8", default-features = false, features = ["compat"] }
tuic = { path = "../tuic", default-features = false } tuic = { path = "../tuic", default-features = false }
tuic-quinn = { path = "../tuic-quinn", default-features = false } tuic-quinn = { path = "../tuic-quinn", default-features = false }
uuid = { version = "1.3.0", default-features = false, features = ["serde", "std"] } uuid = { version = "1.3.2", default-features = false, features = ["serde", "std"] }
webpki = { version = "0.22.0", default-features = false }

7
tuic-client/src/connection.rs
View File

@ -89,7 +89,12 @@ impl Endpoint {
config.transport_config(Arc::new(tp_cfg)); config.transport_config(Arc::new(tp_cfg));
let socket = UdpSocket::bind(SocketAddr::from(([0, 0, 0, 0], 0)))?; let socket = UdpSocket::bind(SocketAddr::from(([0, 0, 0, 0], 0)))?;
let mut ep = QuinnEndpoint::new(EndpointConfig::default(), None, socket, TokioRuntime)?; let mut ep = QuinnEndpoint::new(
EndpointConfig::default(),
None,
socket,
Arc::new(TokioRuntime),
)?;
ep.set_default_client_config(config); ep.set_default_client_config(config);
let ep = Self { let ep = Self {

4
tuic-client/src/main.rs
View File

@ -5,10 +5,10 @@ use self::{
}; };
use env_logger::Builder as LoggerBuilder; use env_logger::Builder as LoggerBuilder;
use quinn::{ConnectError, ConnectionError}; use quinn::{ConnectError, ConnectionError};
use rustls::Error as RustlsError;
use std::{env, io::Error as IoError, process}; use std::{env, io::Error as IoError, process};
use thiserror::Error; use thiserror::Error;
use tuic_quinn::Error as ModelError; use tuic_quinn::Error as ModelError;
use webpki::Error as WebpkiError;
mod config; mod config;
mod connection; mod connection;
@ -65,7 +65,7 @@ pub enum Error {
#[error(transparent)] #[error(transparent)]
Model(#[from] ModelError), Model(#[from] ModelError),
#[error(transparent)] #[error(transparent)]
Webpki(#[from] WebpkiError), Rustls(#[from] RustlsError),
#[error("timeout establishing connection")] #[error("timeout establishing connection")]
Timeout, Timeout,
#[error("cannot resolve the server name")] #[error("cannot resolve the server name")]

8
tuic-quinn/Cargo.toml
View File

@ -13,8 +13,8 @@ repository = "https://github.com/EAimTY/tuic"
[dependencies] [dependencies]
bytes = { version = "1.4.0", default-features = false, features = ["std"] } bytes = { version = "1.4.0", default-features = false, features = ["std"] }
futures-util = { version = "0.3.26", default-features = false, features = ["io", "std"] } futures-util = { version = "0.3.28", default-features = false, features = ["io", "std"] }
quinn = { version = "0.9.3", default-features = false, features = ["futures-io"] } quinn = { version = "0.10.0", default-features = false, features = ["futures-io"] }
thiserror = { version = "1.0.39", default-features = false } thiserror = { version = "1.0.40", default-features = false }
tuic = { path = "../tuic", default-features = false, features = ["async_marshal", "marshal", "model"] } tuic = { path = "../tuic", default-features = false, features = ["async_marshal", "marshal", "model"] }
uuid = { version = "1.3.0", default-features = false, features = ["std"] } uuid = { version = "1.3.2", default-features = false, features = ["std"] }

18
tuic-server/Cargo.toml
View File

@ -11,16 +11,16 @@ humantime = { version = "2.1.0", default-features = false }
lexopt = { version = "0.3.0", default-features = false } lexopt = { version = "0.3.0", default-features = false }
log = { version = "0.4.17", default-features = false, features = ["serde", "std"] } log = { version = "0.4.17", default-features = false, features = ["serde", "std"] }
parking_lot = { version = "0.12.1", default-features = false } parking_lot = { version = "0.12.1", default-features = false }
quinn = { version = "0.9.3", default-features = false, features = ["futures-io", "runtime-tokio", "tls-rustls"] } quinn = { version = "0.10.0", default-features = false, features = ["futures-io", "runtime-tokio", "tls-rustls"] }
register-count = { version = "0.1.0", default-features = false, features = ["std"] } register-count = { version = "0.1.0", default-features = false, features = ["std"] }
rustls = { version = "0.20.8", default-features = false, features = ["quic"] } rustls = { version = "0.21.1", default-features = false, features = ["quic"] }
rustls-pemfile = { version = "1.0.2", default-features = false } rustls-pemfile = { version = "1.0.2", default-features = false }
serde = { version = "1.0.152", default-features = false, features = ["derive", "std"] } serde = { version = "1.0.163", default-features = false, features = ["derive", "std"] }
serde_json = { version = "1.0.94", default-features = false, features = ["std"] } serde_json = { version = "1.0.96", default-features = false, features = ["std"] }
socket2 = { version = "0.5.1", default-features = false } socket2 = { version = "0.5.2", default-features = false }
thiserror = { version = "1.0.39", default-features = false } thiserror = { version = "1.0.40", default-features = false }
tokio = { version = "1.26.0", default-features = false, features = ["io-util", "macros", "net", "parking_lot", "rt-multi-thread", "time"] } tokio = { version = "1.28.1", default-features = false, features = ["io-util", "macros", "net", "parking_lot", "rt-multi-thread", "time"] }
tokio-util = { version = "0.7.7", default-features = false, features = ["compat"] } tokio-util = { version = "0.7.8", default-features = false, features = ["compat"] }
tuic = { path = "../tuic", default-features = false } tuic = { path = "../tuic", default-features = false }
tuic-quinn = { path = "../tuic-quinn", default-features = false } tuic-quinn = { path = "../tuic-quinn", default-features = false }
uuid = { version = "1.3.0", default-features = false, features = ["serde", "std"] } uuid = { version = "1.3.2", default-features = false, features = ["serde", "std"] }

2
tuic-server/src/server.rs
View File

@ -113,7 +113,7 @@ impl Server {
EndpointConfig::default(), EndpointConfig::default(),
Some(config), Some(config),
socket, socket,
TokioRuntime, Arc::new(TokioRuntime),
)?; )?;
let users = cfg let users = cfg

6
tuic/Cargo.toml
View File

@ -18,11 +18,11 @@ model = ["parking_lot", "register-count", "thiserror"]
[dependencies] [dependencies]
bytes = { version = "1.4.0", default-features = false, features = ["std"], optional = true } bytes = { version = "1.4.0", default-features = false, features = ["std"], optional = true }
futures-util = { version = "0.3.26", default-features = false, features = ["io", "std"], optional = true } futures-util = { version = "0.3.28", default-features = false, features = ["io", "std"], optional = true }
parking_lot = { version = "0.12.1", default-features = false, optional = true } parking_lot = { version = "0.12.1", default-features = false, optional = true }
register-count = { version = "0.1.0", default-features = false, features = ["std"], optional = true } register-count = { version = "0.1.0", default-features = false, features = ["std"], optional = true }
thiserror = { version = "1.0.39", default-features = false, optional = true } thiserror = { version = "1.0.40", default-features = false, optional = true }
uuid = { version = "1.3.0", default-features = false, features = ["std"] } uuid = { version = "1.3.2", default-features = false, features = ["std"] }
[dev-dependencies] [dev-dependencies]
tuic = { path = ".", features = ["async_marshal", "marshal", "model"] } tuic = { path = ".", features = ["async_marshal", "marshal", "model"] }