From 9526ffa80fb1ffcfd242e09803ee87d31fdc1073 Mon Sep 17 00:00:00 2001 From: Tiago Lam Date: Wed, 5 Feb 2020 23:07:49 +0000 Subject: [PATCH] chan: Support opening "empty" ChanScheme. Similarly to how the "tcp:" in Redox's netstack supports opening a first empty scheme, only to later on being dup()'ed and set with an appropriate path, this follows the same approach - a map of NullFile structs is kept and initially associated with an id. Next time dup() is called, the true Handle is created, keeping the same definitions of the previously created NullFile. Not that it is important to add support for this in the ipcd to support AF_UNIX sockets, otherwise the socket() created in relibc won't be associated with a address / path. --- src/chan.rs | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/src/chan.rs b/src/chan.rs index 38df91fca7..97d1f64987 100644 --- a/src/chan.rs +++ b/src/chan.rs @@ -40,6 +40,10 @@ impl Default for Connection { } } +pub struct NullFile { + pub flags: usize, +} + #[derive(Debug, Default)] pub struct Handle { id: usize, @@ -92,6 +96,7 @@ impl Handle { } pub struct ChanScheme { + nulls: HashMap, handles: HashMap, listeners: HashMap, next_id: usize, @@ -100,6 +105,7 @@ pub struct ChanScheme { impl ChanScheme { pub fn new() -> io::Result { Ok(Self { + nulls: HashMap::new(), handles: HashMap::new(), listeners: HashMap::new(), next_id: 0, @@ -124,6 +130,20 @@ impl SchemeBlockMut for ChanScheme { let path = ::std::str::from_utf8(path).or(Err(Error::new(EPERM)))?; let new_id = self.next_id; + + if path.is_empty() { + let null = NullFile { + flags: flags, + }; + + let id = new_id; + + self.nulls.insert(id, null); + self.next_id += 1; + + return Ok(Some(id)); + } + let mut new = Handle::default(); new.flags = flags; @@ -154,6 +174,13 @@ impl SchemeBlockMut for ChanScheme { Ok(Some(new_id)) } fn dup(&mut self, id: usize, buf: &[u8]) -> Result> { + if let Some(flags) = self.nulls + .get(&id) + .map(|null| null.flags) + { + return self.open(buf, flags, 0, 0); + } + match buf { b"listen" => { loop { @@ -268,6 +295,10 @@ impl SchemeBlockMut for ChanScheme { } } fn close(&mut self, id: usize) -> Result> { + if let Some(_null) = self.nulls.remove(&id) { + return Ok(Some(0)); + } + let handle = self.handles.remove(&id).ok_or(Error::new(EBADF))?; match handle.extra {