diff options
author | hozan23 <hozan23@proton.me> | 2024-03-13 12:33:34 +0100 |
---|---|---|
committer | hozan23 <hozan23@proton.me> | 2024-03-13 12:33:34 +0100 |
commit | df6aad2be4c6c5d11483f20e62d41e71f0ac989e (patch) | |
tree | bbbc8db330d254eab993f7e3e4bbdbcbb0b3ec6e /p2p/src/listener.rs | |
parent | 76e952830302271e07a4be9df6dfaa1c11e3e675 (diff) |
net: major cleanup and improvement of the crate api
Diffstat (limited to 'p2p/src/listener.rs')
-rw-r--r-- | p2p/src/listener.rs | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/p2p/src/listener.rs b/p2p/src/listener.rs index 254e4e6..17aa187 100644 --- a/p2p/src/listener.rs +++ b/p2p/src/listener.rs @@ -8,7 +8,7 @@ use karyon_core::{ GlobalExecutor, }; -use karyon_net::{listen, tls, Conn, ConnListener, Endpoint}; +use karyon_net::{tcp, tls, Conn, ConnListener, Endpoint}; use crate::{ monitor::{ConnEvent, Monitor}, @@ -67,7 +67,7 @@ impl Listener { where Fut: Future<Output = Result<()>> + Send + 'static, { - let listener = match self.listend(&endpoint).await { + let listener = match self.listen(&endpoint).await { Ok(listener) => { self.monitor .notify(&ConnEvent::Listening(endpoint.clone()).into()) @@ -152,14 +152,16 @@ impl Listener { } } - async fn listend(&self, endpoint: &Endpoint) -> Result<Box<dyn ConnListener>> { + async fn listen(&self, endpoint: &Endpoint) -> Result<karyon_net::Listener> { if self.enable_tls { let tls_config = tls_server_config(&self.key_pair)?; - tls::listen_tls(endpoint, tls_config) + tls::listen(endpoint, tls_config) .await - .map(|l| Box::new(l) as Box<dyn ConnListener>) + .map(|l| Box::new(l) as karyon_net::Listener) } else { - listen(endpoint).await + tcp::listen(endpoint) + .await + .map(|l| Box::new(l) as karyon_net::Listener) } .map_err(Error::KaryonNet) } |