TheLanc3/lan-mouse
1
0
Fork 0
mirror of https://github.com/feschber/lan-mouse.git synced 2026-04-08 02:31:27 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix session not actually closed

Browse Source
This commit is contained in:
Ferdinand Schober
2024-07-12 11:41:32 +02:00
parent 8de738e597
commit 7328958dde
1 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
input-emulation/src/libei.rs
View File

@@ -105,7 +105,7 @@ async fn get_ei_fd<'a>() -> Result<(RemoteDesktop<'a>, Session<'a>, OwnedFd), as
impl<'a> LibeiEmulation<'a> { impl<'a> LibeiEmulation<'a> {
pub async fn new() -> Result<Self, LibeiEmulationCreationError> { pub async fn new() -> Result<Self, LibeiEmulationCreationError> {
let (remote_desktop, session, eifd) = get_ei_fd().await?; let (_remote_desktop, session, eifd) = get_ei_fd().await?;
let stream = UnixStream::from(eifd); let stream = UnixStream::from(eifd);
stream.set_nonblocking(true)?; stream.set_nonblocking(true)?;
let context = ei::Context::new(stream)?; let context = ei::Context::new(stream)?;
@@ -139,7 +139,7 @@ impl<'a> LibeiEmulation<'a> {
error, error,
libei_error, libei_error,
serial, serial,
remote_desktop, _remote_desktop,
session, session,
}) })
} }
@@ -252,20 +252,7 @@ impl<'a> InputEmulation for LibeiEmulation<'a> {
async fn destroy(&mut self, _: EmulationHandle) {} async fn destroy(&mut self, _: EmulationHandle) {}
async fn terminate(&mut self) { async fn terminate(&mut self) {
if let Err(e) = self.session.close().await { let _ = self.session.close().await;
log::warn!("session.close(): {e}");
};
match self
.session
.receive_closed()
.await
.expect("could not receive closed")
.next()
.await
{
Some(c) => log::info!("session closed: {c:?}"),
None => log::warn!("session.receive_closed(): Unexpected EOF"),
};
self.ei_task.abort(); self.ei_task.abort();
} }
} }