From af5ab419870b91b103f5b0862fc618340b345404 Mon Sep 17 00:00:00 2001
From: Matt Johnston <matt@ucc.asn.au>
Date: Sat, 14 Jan 2023 13:45:17 +0800
Subject: [PATCH] Rename common.rs to server.rs
---
embassy/demos/common/{common.rs => server.rs} | 14 ++++++++------
embassy/demos/picow/src/main.rs | 2 +-
embassy/demos/std/src/main.rs | 2 +-
3 files changed, 10 insertions(+), 8 deletions(-)
rename embassy/demos/common/{common.rs => server.rs} (95%)
diff --git a/embassy/demos/common/common.rs b/embassy/demos/common/server.rs
similarity index 95%
rename from embassy/demos/common/common.rs
rename to embassy/demos/common/server.rs
index a74f212..3b4628a 100644
--- a/embassy/demos/common/common.rs
+++ b/embassy/demos/common/server.rs
@@ -54,7 +54,7 @@ pub async fn listener<D: Device>(stack: &'static Stack<D>, config: &SSHConfig) -
info!("Listening on TCP:22...");
if let Err(e) = socket.accept(22).await {
- warn!("accept error: {:?}", e);
+ warn!("accept error");
continue;
}
@@ -122,7 +122,7 @@ impl<'a> ServBehaviour for DemoServer<'a> {
#[derive(Default)]
struct DemoShell {
- notify: Signal<CriticalSectionRawMutex, u32>,
+ notify: Signal<NoopRawMutex, u32>,
}
impl DemoShell {
@@ -156,19 +156,21 @@ impl DemoShell {
async fn session(socket: &mut TcpSocket<'_>, config: &SSHConfig) -> sunset::Result<()> {
let shell = DemoShell::default();
+
let app = DemoServer::new(&shell, config)?;
+ let app = Mutex::<NoopRawMutex, _>::new(app);
+ let app = &app as &Mutex::<NoopRawMutex, dyn ServBehaviour>;
let mut ssh_rxbuf = [0; 2000];
let mut ssh_txbuf = [0; 2000];
let serv = SSHServer::new(&mut ssh_rxbuf, &mut ssh_txbuf)?;
let serv = &serv;
- let app = Mutex::<NoopRawMutex, _>::new(app);
-
let session = shell.run(serv);
- let app = &app as &Mutex::<NoopRawMutex, dyn ServBehaviour>;
- let run = serv.run(socket, app);
+ let (mut rsock, mut wsock) = socket.split();
+
+ let run = serv.run(&mut rsock, &mut wsock, app);
join(run, session).await;
diff --git a/embassy/demos/picow/src/main.rs b/embassy/demos/picow/src/main.rs
index 8db7777..331afe7 100644
--- a/embassy/demos/picow/src/main.rs
+++ b/embassy/demos/picow/src/main.rs
@@ -18,7 +18,7 @@ use rand::RngCore;
use sunset::*;
mod wifi;
-#[path = "../../common/common.rs"]
+#[path = "../../common/server.rs"]
mod demo_common;
use demo_common::SSHConfig;
diff --git a/embassy/demos/std/src/main.rs b/embassy/demos/std/src/main.rs
index 5246a6b..7cfafcd 100644
--- a/embassy/demos/std/src/main.rs
+++ b/embassy/demos/std/src/main.rs
@@ -15,7 +15,7 @@ use rand::RngCore;
use crate::tuntap::TunTapDevice;
mod tuntap;
-#[path = "../../common/common.rs"]
+#[path = "../../common/server.rs"]
mod demo_common;
use demo_common::SSHConfig;
--
GitLab