Skip to content

Hold OutstationTask directly in ServerTask (#424) #426

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jadamcrain merged 1 commit into from
Jun 16, 2026
Merged

Hold OutstationTask directly in ServerTask (#424) #426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dnp3/src/tcp/outstation/server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use crate::tcp::server_task::{NewSession, ServerTask};
use crate::tcp::{AddressFilter, FilterError, ServerHandle};
use crate::util::channel::Sender;
use crate::util::phys::{PhysAddr, PhysLayer};
use crate::util::session::{Enabled, Session};
use crate::util::session::Enabled;
use crate::util::shutdown::ShutdownListener;
use std::net::SocketAddr;
use tracing::Instrument;
Expand Down Expand Up @@ -108,7 +108,7 @@ impl Server {
control_handler,
);

let (mut adapter, tx) = ServerTask::create(Session::outstation(task), listener);
let (mut adapter, tx) = ServerTask::create(task, listener);

let outstation = OutstationInfo {
filter,
Expand Down
17 changes: 9 additions & 8 deletions dnp3/src/tcp/outstation/server_task.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
use tracing::Instrument;

use crate::app::{Listener, Shutdown};
use crate::outstation::task::OutstationTask;
use crate::outstation::ConnectionState;
use crate::util::channel::{request_channel, Receiver, Sender};
use crate::util::phys::PhysLayer;
use crate::util::session::{Enabled, RunError, Session, StopReason};
use crate::util::session::{Enabled, RunError, StopReason};

/// message that gets sent to OutstationTaskAdapter when
/// it needs to switch to a new session
Expand All @@ -20,23 +21,23 @@ impl NewSession {
}
}

/// Wraps a session allowing it to receive new physical layers from a server component
/// Wraps an outstation task allowing it to receive new physical layers from a server component
pub(crate) struct ServerTask {
receiver: Receiver<NewSession>,
session: Session,
task: OutstationTask,
listener: Box<dyn Listener<ConnectionState>>,
}

impl ServerTask {
pub(crate) fn create(
session: Session,
task: OutstationTask,
listener: Box<dyn Listener<ConnectionState>>,
) -> (Self, Sender<NewSession>) {
let (tx, rx) = request_channel();
(
Self {
receiver: rx,
session,
task,
listener,
},
tx,
Expand All @@ -49,7 +50,7 @@ impl ServerTask {
session = self.receiver.receive() => {
return session;
}
ret = self.session.process_next_message() => {
ret = self.task.process_next_message() => {
if let Err(StopReason::Shutdown) = ret {
return Err(Shutdown);
}
Expand All @@ -60,7 +61,7 @@ impl ServerTask {

async fn run_one_session(&mut self, io: &mut PhysLayer) -> Result<NewSession, RunError> {
tokio::select! {
res = self.session.run(io) => {
res = self.task.run(io) => {
Err(res)
}
// a new connection cancels the session.run() future above; this relies on
Expand Down Expand Up @@ -111,7 +112,7 @@ impl ServerTask {
session.replace(self.wait_for_session().await?);
}
Some(s) => {
if self.session.enabled() == Enabled::Yes {
if self.task.enabled() == Enabled::Yes {
if let Some(s) = self.run_new_session(s).await? {
session.replace(s);
}
Expand Down