mirrors/doh-server
1
0
Fork 0
mirror of https://github.com/DNSCrypt/doh-server.git synced 2025-04-05 14:07:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Use Rust 2018

Browse source
This commit is contained in:
Frank Denis 2019-03-12 02:09:26 +01:00
parent 4ae4c5d974
commit 2f85b58f33
2 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Cargo.toml
View file

@ -8,6 +8,7 @@ license = "MIT"
homepage = "https://github.com/jedisct1/rust-doh" homepage = "https://github.com/jedisct1/rust-doh"
repository = "https://github.com/jedisct1/rust-doh" repository = "https://github.com/jedisct1/rust-doh"
categories = ["asynchronous", "network-programming","command-line-utilities"] categories = ["asynchronous", "network-programming","command-line-utilities"]
edition = "2018"
[dependencies] [dependencies]
base64 = "0.10" base64 = "0.10"

23
src/main.rs
View file

@ -1,10 +1,6 @@
extern crate base64; use base64;
extern crate clap; use hyper;
extern crate futures; use tokio;
extern crate hyper;
extern crate tokio;
extern crate tokio_current_thread;
extern crate tokio_timer;
mod dns; mod dns;
@ -80,7 +76,7 @@ enum Error {
Hyper(hyper::Error), Hyper(hyper::Error),
} }
impl std::fmt::Display for Error { impl std::fmt::Display for Error {
fn fmt(&self, fmt: &mut std::fmt::Formatter) -> Result<(), std::fmt::Error> { fn fmt(&self, fmt: &mut std::fmt::Formatter<'_>) -> Result<(), std::fmt::Error> {
std::fmt::Debug::fmt(self, fmt) std::fmt::Debug::fmt(self, fmt)
} }
} }
@ -98,7 +94,7 @@ impl Service for DoH {
type ReqBody = Body; type ReqBody = Body;
type ResBody = Body; type ResBody = Body;
type Error = Error; type Error = Error;
type Future = Box<Future<Item = Response<Body>, Error = Self::Error> + Send>; type Future = Box<dyn Future<Item = Response<Body>, Error = Self::Error> + Send>;
fn call(&mut self, req: Request<Body>) -> Self::Future { fn call(&mut self, req: Request<Body>) -> Self::Future {
let inner = &self.inner; let inner = &self.inner;
@ -121,7 +117,7 @@ impl DoH {
fn handle_client( fn handle_client(
&self, &self,
req: Request<Body>, req: Request<Body>,
) -> Box<Future<Item = Response<Body>, Error = Error> + Send> { ) -> Box<dyn Future<Item = Response<Body>, Error = Error> + Send> {
let inner = &self.inner; let inner = &self.inner;
if req.uri().path() != inner.path { if req.uri().path() != inner.path {
let response = Response::builder() let response = Response::builder()
@ -171,7 +167,7 @@ impl DoH {
} }
} }
fn proxy(&self, query: Vec<u8>) -> Box<Future<Item = Response<Body>, Error = ()> + Send> { fn proxy(&self, query: Vec<u8>) -> Box<dyn Future<Item = Response<Body>, Error = ()> + Send> {
let inner = &self.inner; let inner = &self.inner;
let socket = UdpSocket::bind(&inner.local_bind_address).unwrap(); let socket = UdpSocket::bind(&inner.local_bind_address).unwrap();
let expected_server_address = inner.server_address; let expected_server_address = inner.server_address;
@ -209,7 +205,7 @@ impl DoH {
fn read_body_and_proxy( fn read_body_and_proxy(
&self, &self,
body: Body, body: Body,
) -> Box<Future<Item = Response<Body>, Error = ()> + Send> { ) -> Box<dyn Future<Item = Response<Body>, Error = ()> + Send> {
let mut sum_size = 0; let mut sum_size = 0;
let inner = self.clone(); let inner = self.clone();
let fut = body let fut = body
@ -227,7 +223,8 @@ impl DoH {
.map(move |chunk| chunk.to_vec()) .map(move |chunk| chunk.to_vec())
.and_then(move |query| { .and_then(move |query| {
if query.len() < MIN_DNS_PACKET_LEN { if query.len() < MIN_DNS_PACKET_LEN {
return Box::new(future::err(())) as Box<Future<Item = _, Error = _> + Send>; return Box::new(future::err(()))
as Box<dyn Future<Item = _, Error = _> + Send>;
} }
inner.proxy(query) inner.proxy(query)
}); });