void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-04-30 19:03:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Web server actually works!

Browse source
This commit is contained in:
Adam Ierymenko 2021-02-26 01:22:26 -05:00
parent e1795bacef
commit 6fe78e2003
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
rust-zerotier-service/src/weblistener.rs
View file

@ -24,6 +24,7 @@ use hyper::server::Server;
use hyper::service::{make_service_fn, service_fn}; use hyper::service::{make_service_fn, service_fn};
use net2::TcpBuilder; use net2::TcpBuilder;
#[cfg(unix)] use net2::unix::UnixTcpBuilderExt; #[cfg(unix)] use net2::unix::UnixTcpBuilderExt;
use tokio::task::JoinHandle;
use zerotier_core::InetAddress; use zerotier_core::InetAddress;
@ -37,7 +38,7 @@ async fn web_handler(service: Service, req: Request<Body>) -> Result<Response<Bo
/// Listener for http connections to the API or for TCP P2P. /// Listener for http connections to the API or for TCP P2P.
pub(crate) struct WebListener { pub(crate) struct WebListener {
shutdown_tx: RefCell<Option<tokio::sync::oneshot::Sender<()>>>, shutdown_tx: RefCell<Option<tokio::sync::oneshot::Sender<()>>>,
server: Box<dyn Any>, server: JoinHandle<hyper::Result<()>>,
} }
impl WebListener { impl WebListener {
@ -87,7 +88,7 @@ impl WebListener {
let (shutdown_tx, shutdown_rx) = tokio::sync::oneshot::channel::<()>(); let (shutdown_tx, shutdown_rx) = tokio::sync::oneshot::channel::<()>();
let service = service.clone(); let service = service.clone();
let server = builder.serve(make_service_fn(move |_| { let server = tokio::task::spawn(builder.serve(make_service_fn(move |_| {
let service = service.clone(); let service = service.clone();
async move { async move {
Ok::<_, Infallible>(service_fn(move |req: Request<Body>| { Ok::<_, Infallible>(service_fn(move |req: Request<Body>| {
@ -97,11 +98,11 @@ impl WebListener {
} }
})) }))
} }
})).with_graceful_shutdown(async { let _ = shutdown_rx.await; }); })).with_graceful_shutdown(async { let _ = shutdown_rx.await; }));
Ok(WebListener { Ok(WebListener {
shutdown_tx: RefCell::new(Some(shutdown_tx)), shutdown_tx: RefCell::new(Some(shutdown_tx)),
server: Box::new(server), server,
}) })
} }
} }
@ -109,5 +110,6 @@ impl WebListener {
impl Drop for WebListener { impl Drop for WebListener {
fn drop(&mut self) { fn drop(&mut self) {
let _ = self.shutdown_tx.take().map(|tx| { tx.send(()); }); let _ = self.shutdown_tx.take().map(|tx| { tx.send(()); });
self.server.abort();
} }
} }