From 2f6909ab6a48433f39ce3103ebaada4331841008 Mon Sep 17 00:00:00 2001 From: lunar-mining Date: Sat, 2 Jul 2022 13:29:55 +0200 Subject: [PATCH] net: create session() function that returns an Arc pointer to session --- src/net/channel.rs | 10 +++++----- src/net/mod.rs | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/net/channel.rs b/src/net/channel.rs index 2d1c3c498..8fcbabd66 100644 --- a/src/net/channel.rs +++ b/src/net/channel.rs @@ -19,7 +19,7 @@ use crate::{ use super::{ message, message_subscriber::{MessageSubscription, MessageSubsystem}, - SessionWeakPtr, TransportStream, + Session, SessionWeakPtr, TransportStream, }; /// Atomic pointer to async channel. @@ -104,10 +104,6 @@ impl Channel { self.info.lock().await.get_info().await } - //async fn session_type_id(&self) -> Result<()> { - // // - //} - /// Starts the channel. Runs a receive loop to start receiving messages or /// handles a network failure. pub fn start(self: Arc, executor: Arc>) { @@ -327,4 +323,8 @@ impl Channel { } debug!(target: "net", "Channel::handle_stop() [END, address={}]", self.address()); } + + fn session(&self) -> Arc { + self.session.upgrade().unwrap() + } } diff --git a/src/net/mod.rs b/src/net/mod.rs index d059884bf..5c4e3613a 100644 --- a/src/net/mod.rs +++ b/src/net/mod.rs @@ -97,7 +97,8 @@ pub use message_subscriber::MessageSubscription; pub use p2p::{P2p, P2pPtr}; pub use protocol::{ProtocolBase, ProtocolBasePtr, ProtocolJobsManager, ProtocolJobsManagerPtr}; pub use session::{ - SessionWeakPtr, SESSION_ALL, SESSION_INBOUND, SESSION_MANUAL, SESSION_OUTBOUND, SESSION_SEED, + Session, SessionWeakPtr, SESSION_ALL, SESSION_INBOUND, SESSION_MANUAL, SESSION_OUTBOUND, + SESSION_SEED, }; pub use settings::{Settings, SettingsPtr}; pub use transport::{