IntenseWebs/veilid
3
0
Fork 0
mirror of https://gitlab.com/veilid/veilid.git synced 2024-11-22 08:56:58 -06:00
Code Issues Packages Projects Releases Wiki Activity

change signature of accept function

Browse Source
This commit is contained in:
John Smith 2023-12-15 16:56:31 -05:00 committed by Christien Rioux
parent d454f9fdf9
commit f47adfa03f
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
veilid-server/src/client_api.rs
View File

@ -456,7 +456,7 @@ impl ClientApi {
.await; .await;
debug!( debug!(
"Closed Client API Connection: {:?} -> {:?}", "Closed TCP Client API Connection: {:?} -> {:?}",
peer_addr, local_addr peer_addr, local_addr
); );
@ -486,7 +486,7 @@ impl ClientApi {
self.run_json_request_processor(reader, writer, stop_token) self.run_json_request_processor(reader, writer, stop_token)
.await; .await;
debug!("Closed Client API Connection",); debug!("Closed IPC Client API Connection",);
awg.done(); awg.done();
} }

20
veilid-tools/src/ipc/ipc_tokio/unix.rs
View File

@ -100,7 +100,7 @@ impl Drop for IpcIncoming {
pub struct IpcListener { pub struct IpcListener {
path: Option<PathBuf>, path: Option<PathBuf>,
internal: Option<UnixListener>, internal: Option<Arc<UnixListener>>,
} }
impl IpcListener { impl IpcListener {
@ -108,14 +108,20 @@ impl IpcListener {
pub async fn bind<P: AsRef<Path>>(path: P) -> io::Result<Self> { pub async fn bind<P: AsRef<Path>>(path: P) -> io::Result<Self> {
Ok(Self { Ok(Self {
path: Some(path.as_ref().to_path_buf()), path: Some(path.as_ref().to_path_buf()),
internal: Some(UnixListener::bind(path)?), internal: Some(Arc::new(UnixListener::bind(path)?)),
}) })
} }
/// Accepts a new incoming connection to this listener. /// Accepts a new incoming connection to this listener.
pub async fn accept(&self) -> io::Result<IpcStream> { pub fn accept(&self) -> SendPinBoxFuture<io::Result<IpcStream>> {
Ok(IpcStream { let this = IpcListener {
internal: self.internal.as_ref().unwrap().accept().await?.0, path: self.path.clone(),
internal: self.internal.clone(),
};
Box::pin(async move {
Ok(IpcStream {
internal: this.internal.as_ref().unwrap().accept().await?.0,
})
}) })
} }
@ -123,7 +129,9 @@ impl IpcListener {
pub fn incoming(mut self) -> IpcIncoming { pub fn incoming(mut self) -> IpcIncoming {
IpcIncoming { IpcIncoming {
path: self.path.take().unwrap(), path: self.path.take().unwrap(),
internal: UnixListenerStream::new(self.internal.take().unwrap()), internal: UnixListenerStream::new(
Arc::into_inner(self.internal.take().unwrap()).unwrap(),
),
} }
} }
} }