From 39124df9fc457d98c0a8c0312f882a96e860851e Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Mon, 15 Feb 2021 23:46:24 +0100
Subject: [PATCH] Reexport tokio

---
 Cargo.toml            | 5 ++---
 src/libdoh/Cargo.toml | 2 +-
 src/libdoh/src/lib.rs | 4 ++++
 src/main.rs           | 1 +
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 1859aca..1ed4f74 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "doh-proxy"
-version = "0.3.7"
+version = "0.3.8"
 authors = ["Frank Denis <github@pureftpd.org>"]
 description = "A DNS-over-HTTPS (DoH) proxy"
 keywords = ["dns","https","doh","proxy"]
@@ -16,10 +16,9 @@ default = ["tls"]
 tls = ["libdoh/tls"]
 
 [dependencies]
-libdoh = { path = "src/libdoh", version = "0.3.7", default-features = false }
+libdoh = { path = "src/libdoh", version = "0.3.8", default-features = false }
 clap = "2.33.3"
 jemallocator = "0.3.2"
-tokio = { version = "1.2.0", features = ["net", "rt-multi-thread", "parking_lot", "time", "sync"] }
 
 [package.metadata.deb]
 extended-description = """\
diff --git a/src/libdoh/Cargo.toml b/src/libdoh/Cargo.toml
index 2d33fae..cdc845f 100644
--- a/src/libdoh/Cargo.toml
+++ b/src/libdoh/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "libdoh"
-version = "0.3.7"
+version = "0.3.8"
 authors = ["Frank Denis <github@pureftpd.org>"]
 description = "DoH library for the rust-doh app"
 keywords = ["dns","https","doh","proxy"]
diff --git a/src/libdoh/src/lib.rs b/src/libdoh/src/lib.rs
index 3b8908f..98dbbca 100644
--- a/src/libdoh/src/lib.rs
+++ b/src/libdoh/src/lib.rs
@@ -26,6 +26,10 @@ use tokio::net::{TcpListener, UdpSocket};
 use tokio::runtime;
 use tokio::sync::mpsc;
 
+pub mod reexports {
+    pub use tokio;
+}
+
 #[derive(Clone, Debug)]
 pub struct DoH {
     pub globals: Arc<Globals>,
diff --git a/src/main.rs b/src/main.rs
index 4214ca9..f7f69a4 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -13,6 +13,7 @@ use libdoh::*;
 use crate::config::*;
 use crate::constants::*;
 
+use libdoh::reexports::tokio;
 use std::net::{IpAddr, Ipv4Addr, SocketAddr};
 use std::sync::Arc;
 use std::time::Duration;