YGGverse/aquatic
1
0
Fork 0
mirror of https://github.com/YGGverse/aquatic.git synced 2026-03-31 17:55:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Upgrade tungstenite

Browse source
This commit is contained in:
Joakim Frostegård 2021-08-16 23:22:56 +02:00
parent 81dca0fb50
commit fae0692f90
5 changed files with 8 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Cargo.lock generated
View file

@ -790,15 +790,6 @@ dependencies = [
"regex", "regex",
] ]
[[package]]
name = "input_buffer"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f97967975f448f1a7ddb12b0bc41069d09ed6a1c161a92687e057325db35d413"
dependencies = [
"bytes",
]
[[package]] [[package]]
name = "instant" name = "instant"
version = "0.1.10" version = "0.1.10"
@ -1673,18 +1664,16 @@ dependencies = [
[[package]] [[package]]
name = "tungstenite" name = "tungstenite"
version = "0.13.0" version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5fe8dada8c1a3aeca77d6b51a4f1314e0f4b8e438b7b1b71e3ddaca8080e4093" checksum = "983d40747bce878d2fb67d910dcb8bd3eca2b2358540c3cc1b98c027407a3ae3"
dependencies = [ dependencies = [
"base64", "base64",
"byteorder", "byteorder",
"bytes", "bytes",
"http", "http",
"httparse", "httparse",
"input_buffer",
"log", "log",
"native-tls",
"rand", "rand",
"sha-1", "sha-1",
"thiserror", "thiserror",

2
aquatic_ws/Cargo.toml
View file

@ -34,7 +34,7 @@ privdrop = "0.5"
rand = { version = "0.8", features = ["small_rng"] } rand = { version = "0.8", features = ["small_rng"] }
serde = { version = "1", features = ["derive"] } serde = { version = "1", features = ["derive"] }
socket2 = { version = "0.4.1", features = ["all"] } socket2 = { version = "0.4.1", features = ["all"] }
tungstenite = "0.13" tungstenite = "0.15"
[dev-dependencies] [dev-dependencies]
quickcheck = "1.0" quickcheck = "1.0"

6
aquatic_ws/src/lib/network/connection.rs
View file

@ -9,7 +9,7 @@ use mio::{Poll, Token};
use native_tls::{MidHandshakeTlsStream, TlsAcceptor, TlsStream}; use native_tls::{MidHandshakeTlsStream, TlsAcceptor, TlsStream};
use tungstenite::handshake::{server::NoCallback, HandshakeError, MidHandshake}; use tungstenite::handshake::{server::NoCallback, HandshakeError, MidHandshake};
use tungstenite::protocol::WebSocketConfig; use tungstenite::protocol::WebSocketConfig;
use tungstenite::server::ServerHandshake; use tungstenite::ServerHandshake;
use tungstenite::WebSocket; use tungstenite::WebSocket;
use crate::common::*; use crate::common::*;
@ -111,7 +111,7 @@ impl HandshakeMachine {
if let Some(tls_acceptor) = opt_tls_acceptor { if let Some(tls_acceptor) = opt_tls_acceptor {
Self::handle_tls_handshake_result(tls_acceptor.accept(stream)) Self::handle_tls_handshake_result(tls_acceptor.accept(stream))
} else { } else {
let handshake_result = ::tungstenite::server::accept_with_config( let handshake_result = ::tungstenite::accept_with_config(
Stream::TcpStream(stream), Stream::TcpStream(stream),
Some(ws_config), Some(ws_config),
); );
@ -120,7 +120,7 @@ impl HandshakeMachine {
} }
} }
HandshakeMachine::TlsStream(stream) => { HandshakeMachine::TlsStream(stream) => {
let handshake_result = ::tungstenite::server::accept(Stream::TlsStream(stream)); let handshake_result = ::tungstenite::accept(Stream::TlsStream(stream));
Self::handle_ws_handshake_result(handshake_result) Self::handle_ws_handshake_result(handshake_result)
} }

2
aquatic_ws_load_test/Cargo.toml
View file

@ -21,7 +21,7 @@ rand_distr = "0.4"
serde = { version = "1", features = ["derive"] } serde = { version = "1", features = ["derive"] }
serde_json = "1" serde_json = "1"
slab = "0.4" slab = "0.4"
tungstenite = "0.13" tungstenite = "0.15"
[dev-dependencies] [dev-dependencies]
quickcheck = "1.0" quickcheck = "1.0"

2
aquatic_ws_protocol/Cargo.toml
View file

@ -22,7 +22,7 @@ hashbrown = { version = "0.11.2", features = ["serde"] }
serde = { version = "1", features = ["derive"] } serde = { version = "1", features = ["derive"] }
serde_json = "1" serde_json = "1"
simd-json = { version = "0.4.7", features = ["allow-non-simd"] } simd-json = { version = "0.4.7", features = ["allow-non-simd"] }
tungstenite = "0.13" tungstenite = "0.15"
[dev-dependencies] [dev-dependencies]
criterion = "0.3" criterion = "0.3"