Addressing reviewer comments

Author: raoulstrackx

fortanix-vme/fortanix-vme-abi/Cargo.toml

@@ -14,7 +14,7 @@ compiler_builtins = { version = "0.1.0", optional = true }
 serde = { git = "https://github.com/fortanix/serde.git", branch = "master", default-features = false, features = ["derive", "alloc"] }
 
 [features]
-std = []
-default = []
+std = ["serde/std"]
+default = ["std"]
 docs = []
 rustc-dep-of-std = ["core", "alloc", "compiler_builtins/rustc-dep-of-std", "serde/rustc-dep-of-std"]

fortanix-vme/fortanix-vme-abi/src/lib.rs

@@ -16,7 +16,7 @@ pub enum Request {
         addr: String,
     },
     Bind {
-        /// The address the listen on in the parent VM
+        /// The address the listen to in the parent VM
         addr: String,
         /// The port the enclave is listening on to receive connections from the parent VM
         enclave_port: u32,
@@ -68,7 +68,7 @@ pub enum Response {
         proxy_port: u32,
     },
     Bound {
-        /// The TCP port the runner is listening on
+        /// The TCP port the parent VM is listening on
         port: u16,
         /// The id used to identify the listener. It can be used for subsequent calls (e.g., to
         /// accept new incoming connections)
@@ -78,12 +78,11 @@ pub enum Response {
         /// The address of the remote party
         peer: Addr,
         /// The vsock port number the runner will connect to the enclave in order to forward the
-        /// incomming connection
+        /// incoming connection
         proxy_port: u32,
     }
 }
 
-/*
 #[cfg(test)]
 mod test {
     use std::net::{IpAddr, SocketAddr};
@@ -101,4 +100,3 @@ mod test {
         }
     }
 }
-*/

fortanix-vme/fortanix-vme-runner/src/lib.rs

@@ -1,6 +1,5 @@
 use fnv::FnvHashMap;
 use nix::sys::select::{select, FdSet};
-use nix::sys::socket::SockAddr as NixSockAddr;
 use serde_cbor;
 use std::cmp;
 use std::str;
@@ -215,7 +214,7 @@ impl Server {
     }
 
     fn listener_info(&self, fd: &RawFd) -> Option<Arc<Mutex<ListenerInfo>>> {
-        self.listeners.lock().unwrap().get(&fd).map(|m| m.clone())
+        self.listeners.lock().unwrap().get(&fd).cloned()
     }
 
     /*
@@ -260,7 +259,8 @@ impl Server {
     }
 
     fn handle_request_accept(&self, fd: RawFd, enclave: &mut VsockStream) -> Result<(), IoError> {
-        let listener_info = self.listener_info(&fd).unwrap();
+        let listener_info = self.listener_info(&fd)
+            .ok_or(IoError::new(IoErrorKind::InvalidInput, "Information about provided file descriptor was not found"))?;
         let listener_info = listener_info.lock().unwrap();
         let (cid, port) = (listener_info.enclave_cid, listener_info.enclave_port);
         match listener_info.listener.accept() {