bpeetz
/
trinitrix
forked from trinitrix/core
1
0
Fork 0
Code Pull Requests Activity

fix(cbs): added missing parts of the handshake

This commit is contained in:
antifallobst 2024-05-21 04:59:23 +02:00
parent f6a1b5200a
commit fc8efe5060
Signed by: antifallobst
GPG Key ID: 2B4F402172791BAF
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/cbs/connection.rs
View File

@ -56,14 +56,21 @@ impl UnstableConnection {
let packet = Packet::recv(&mut sock_rx, &cipher, &nonce).await?; let packet = Packet::recv(&mut sock_rx, &cipher, &nonce).await?;
match packet { match packet {
Packet::Request { id, body } => { Packet::Request { id, body } => {
Packet::response(id_pool.acquire(), id, Response::Success) match body {
.send(&mut sock_tx, &cipher, &nonce) Request::HandshakeUpgradeConnection => {
.await?; Packet::response(id_pool.acquire(), id, Response::Success)
.send(&mut sock_tx, &cipher, &nonce)
.await?;
cli_log::info!( cli_log::info!(
"CBS {id}: upgraded connection to encrypted messagepack", "CBS {id}: upgraded connection to encrypted messagepack",
id = self.id id = self.id
); );
}
req => return Err(anyhow!(
"expected cbs to send: Request::HandshakeUpgradeConnection, but got: Request::{req}"
))
}
} }
body => { body => {
return Err(anyhow!( return Err(anyhow!(
@ -72,6 +79,10 @@ impl UnstableConnection {
} }
} }
Packet::request(id_pool.acquire(), Request::HandshakeSuccess)
.send(&mut sock_tx, &cipher, &nonce)
.await?;
// Poll packets from socket // Poll packets from socket
{ {
let cipher = cipher.clone(); let cipher = cipher.clone();