We can use Default::default() instead of tokio's Handle

What kind of magic is that?
pull/12/head
Frank Denis 5 years ago
parent e3ac8cfca4
commit cf41840573

@ -34,7 +34,6 @@ serde_derive = "1.0.101"
serde-big-array = "0.2.0"
siphasher = "0.3.1"
tokio = "=0.2.0-alpha.6"
tokio-net = "=0.2.0-alpha.6"
toml = "0.5.3"
[dependencies.hyper]

@ -75,7 +75,6 @@ use tokio::net::{TcpListener, TcpStream, UdpSocket};
use tokio::prelude::*;
use tokio::runtime::Runtime;
use tokio::sync::oneshot;
use tokio_net::driver::Handle;
#[derive(Debug)]
struct UdpClientCtx {
@ -222,7 +221,7 @@ async fn tls_proxy(
.bind(&globals.external_addr)?
.to_tcp_stream()?;
let mut ext_socket =
TcpStream::connect_std(std_socket, tls_upstream_addr, &Handle::default()).await?;
TcpStream::connect_std(std_socket, tls_upstream_addr, &Default::default()).await?;
let (mut erh, mut ewh) = ext_socket.split();
let (mut rh, mut wh) = client_connection.split();
ewh.write_all(&binlen).await?;

@ -10,7 +10,6 @@ use std::hash::Hasher;
use std::net::SocketAddr;
use tokio::net::{TcpStream, UdpSocket};
use tokio::prelude::*;
use tokio_net::driver::Handle;
pub async fn resolve_udp(
globals: &Globals,
@ -67,7 +66,7 @@ pub async fn resolve_tcp(
.bind(&globals.external_addr)?
.to_tcp_stream()?;
let mut ext_socket =
TcpStream::connect_std(std_socket, &globals.upstream_addr, &Handle::default()).await?;
TcpStream::connect_std(std_socket, &globals.upstream_addr, &Default::default()).await?;
ext_socket.set_nodelay(true)?;
let mut binlen = [0u8, 0];
BigEndian::write_u16(&mut binlen[..], packet.len() as u16);

Loading…
Cancel
Save