diff --git a/src/runtime2/stdlib/internet.rs b/src/runtime2/stdlib/internet.rs index f1e52354ea015e4d79ed598efb5178670b2a088d..d32e849a1b76464ae208cb9e11c18789b56e5ea9 100644 --- a/src/runtime2/stdlib/internet.rs +++ b/src/runtime2/stdlib/internet.rs @@ -45,13 +45,14 @@ impl SocketTcpClient { return Err(SocketError::Modifying); } + println!(" CREATE [{:04}] client", socket_handle); return Ok(SocketTcpClient{ socket_handle, is_blocking: SOCKET_BLOCKING, }) } - fn new_from_handle(socket_handle: libc::c_int) -> Result { + pub(crate) fn new_from_handle(socket_handle: libc::c_int) -> Result { if !set_socket_blocking(socket_handle, SOCKET_BLOCKING) { unsafe{ libc::close(socket_handle); } return Err(SocketError::Modifying); @@ -92,6 +93,7 @@ impl SocketTcpClient { impl Drop for SocketTcpClient { fn drop(&mut self) { + println!("DESTRUCT [{:04}] client", self.socket_handle); debug_assert!(self.socket_handle >= 0); unsafe{ close(self.socket_handle) }; } @@ -129,13 +131,15 @@ impl SocketTcpListener { } } + + println!(" CREATE [{:04}] listener", socket_handle); return Ok(SocketTcpListener{ socket_handle, is_blocking: SOCKET_BLOCKING, }); } - pub fn accept(&self) -> Result, IoError> { + pub fn accept(&self) -> Result { let (mut address, mut address_size) = create_sockaddr_in_empty(); let address_pointer = &mut address as *mut sockaddr_in; let socket_handle = unsafe { accept(self.socket_handle, address_pointer.cast(), &mut address_size) }; @@ -143,12 +147,14 @@ impl SocketTcpListener { return Err(IoError::last_os_error()); } - return Ok(SocketTcpClient::new_from_handle(socket_handle)); + println!(" CREATE [{:04}] client (from listener)", socket_handle); + return Ok(socket_handle); } } impl Drop for SocketTcpListener { fn drop(&mut self) { + println!("DESTRUCT [{:04}] listener", self.socket_handle); debug_assert!(self.socket_handle >= 0); unsafe{ close(self.socket_handle) }; }