lx
/
netapp
1
1
Fork 5
Code Issues 2 Pull Requests 1 Releases 1 Wiki Activity

Use tokio_util::compat instead of the one from kuska-handshake
continuous-integration/drone Build is failing Details

This commit is contained in:
Alex 2021-10-12 14:51:28 +02:00
parent b14515a422
commit a4069d703c
No known key found for this signature in database
GPG Key ID: EDABF9711E244EB1
4 changed files with 162 additions and 572 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

686
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

7
Cargo.toml
View File

@ -19,8 +19,9 @@ default = []
basalt = ["lru", "rand"]
[dependencies]
async-std = { version = "1.5.0", default-features = false }
tokio = { version = "1.0", default-features = false, features = ["net", "rt", "rt-multi-thread", "sync", "time", "macros"] }
futures = "0.3.17"
tokio = { version = "1.0", default-features = false, features = ["net", "rt", "rt-multi-thread", "sync", "time", "macros", "io-util"] }
tokio-util = { version = "0.6.8", default-features = false, features = ["compat"] }
serde = { version = "1.0", default-features = false, features = ["derive"] }
rmp-serde = "0.14.3"
@ -38,7 +39,7 @@ bytes = "0.6.0"
lru = { version = "0.6", optional = true }
sodiumoxide = { version = "0.2.5-0", package = "kuska-sodiumoxide" }
kuska-handshake = { version = "0.2.0", git = "https://github.com/Alexis211/handshake", branch = "tokio1.0", features = ["default", "tokio_compat"] }
kuska-handshake = { version = "0.2.0", git = "https://github.com/Alexis211/handshake", branch = "tokio1.0", features = ["default", "async_std"] }
[dev-dependencies]
structopt = { version = "0.3", default-features = false }

34
src/conn.rs
View File

@ -6,15 +6,16 @@ use std::sync::{Arc, Mutex};
use bytes::Bytes;
use log::{debug, error, trace};
use tokio::io::split;
use tokio::net::TcpStream;
use tokio::sync::{mpsc, oneshot, watch};
use tokio_util::compat::*;
use futures::io::AsyncReadExt;
use async_trait::async_trait;
use kuska_handshake::async_std::{
handshake_client, handshake_server, BoxStream, TokioCompatExt, TokioCompatExtRead,
TokioCompatExtWrite,
handshake_client, handshake_server, BoxStream
};
use crate::error::*;
@ -35,9 +36,11 @@ pub(crate) struct ServerConn {
impl ServerConn {
pub(crate) async fn run(netapp: Arc<NetApp>, socket: TcpStream) -> Result<(), Error> {
let mut asyncstd_socket = TokioCompatExt::wrap(socket);
let remote_addr = socket.peer_addr()?;
let mut socket = socket.compat();
let handshake = handshake_server(
&mut asyncstd_socket,
&mut socket,
netapp.netid.clone(),
netapp.id,
netapp.privkey.clone(),
@ -45,19 +48,13 @@ impl ServerConn {
.await?;
let peer_id = handshake.peer_pk;
let tokio_socket = asyncstd_socket.into_inner();
let remote_addr = tokio_socket.peer_addr()?;
debug!(
"Handshake complete (server) with {}@{}",
hex::encode(&peer_id),
remote_addr
);
let (read, write) = split(tokio_socket);
let read = TokioCompatExtRead::wrap(read);
let write = TokioCompatExtWrite::wrap(write);
let (read, write) = socket.split();
let (read, write) =
BoxStream::from_handshake(read, write, handshake, 0x8000).split_read_write();
@ -148,10 +145,11 @@ impl ClientConn {
socket: TcpStream,
peer_id: NodeID,
) -> Result<(), Error> {
let mut asyncstd_socket = TokioCompatExt::wrap(socket);
let remote_addr = socket.peer_addr()?;
let mut socket = socket.compat();
let handshake = handshake_client(
&mut asyncstd_socket,
&mut socket,
netapp.netid.clone(),
netapp.id,
netapp.privkey.clone(),
@ -159,19 +157,13 @@ impl ClientConn {
)
.await?;
let tokio_socket = asyncstd_socket.into_inner();
let remote_addr = tokio_socket.peer_addr()?;
debug!(
"Handshake complete (client) with {}@{}",
hex::encode(&peer_id),
remote_addr
);
let (read, write) = split(tokio_socket);
let read = TokioCompatExtRead::wrap(read);
let write = TokioCompatExtWrite::wrap(write);
let (read, write) = socket.split();
let (read, write) =
BoxStream::from_handshake(read, write, handshake, 0x8000).split_read_write();

7
src/proto.rs
View File

@ -3,8 +3,7 @@ use std::sync::Arc;
use log::trace;
use async_std::io::prelude::WriteExt;
use async_std::io::ReadExt;
use futures::{AsyncReadExt, AsyncWriteExt};
use tokio::sync::mpsc;
@ -94,7 +93,7 @@ pub(crate) trait SendLoop: Sync {
mut write: W,
) -> Result<(), Error>
where
W: WriteExt + Unpin + Send + Sync,
W: AsyncWriteExt + Unpin + Send + Sync,
{
let mut sending = SendQueue::new();
let mut should_exit = false;
@ -168,7 +167,7 @@ pub(crate) trait RecvLoop: Sync + 'static {
async fn recv_loop<R>(self: Arc<Self>, mut read: R) -> Result<(), Error>
where
R: ReadExt + Unpin + Send + Sync,
R: AsyncReadExt + Unpin + Send + Sync,
{
let mut receiving = HashMap::new();
loop {