Skip to content

Commit

Permalink
make NetConnection local and remote address failable
Browse files Browse the repository at this point in the history
Closes #37
  • Loading branch information
dr-orlovsky committed Feb 12, 2024
1 parent 6394e80 commit b544efa
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 19 deletions.
30 changes: 12 additions & 18 deletions src/connection.rs
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ pub trait NetConnection: NetStream + AsRawFd + Debug {

fn shutdown(&mut self, how: Shutdown) -> io::Result<()>;

fn remote_addr(&self) -> Self::Addr;
fn local_addr(&self) -> Self::Addr;
fn remote_addr(&self) -> io::Result<Self::Addr>;
fn local_addr(&self) -> io::Result<Self::Addr>;

fn set_read_timeout(&mut self, dur: Option<Duration>) -> io::Result<()>;
fn set_write_timeout(&mut self, dur: Option<Duration>) -> io::Result<()>;
Expand Down Expand Up @@ -104,13 +104,9 @@ impl NetConnection for TcpStream {

fn shutdown(&mut self, how: Shutdown) -> io::Result<()> { TcpStream::shutdown(self, how) }

fn remote_addr(&self) -> Self::Addr {
TcpStream::peer_addr(self).expect("TCP stream doesn't know remote peer address").into()
}
fn remote_addr(&self) -> io::Result<Self::Addr> { Ok(TcpStream::peer_addr(self)?.into()) }

fn local_addr(&self) -> Self::Addr {
TcpStream::local_addr(self).expect("TCP stream doesn't has local address").into()
}
fn local_addr(&self) -> io::Result<Self::Addr> { Ok(TcpStream::local_addr(self)?.into()) }

fn set_read_timeout(&mut self, dur: Option<Duration>) -> io::Result<()> {
TcpStream::set_read_timeout(self, dur)
Expand Down Expand Up @@ -229,20 +225,18 @@ impl NetConnection for socket2::Socket {

fn shutdown(&mut self, how: Shutdown) -> io::Result<()> { socket2::Socket::shutdown(self, how) }

fn remote_addr(&self) -> Self::Addr {
socket2::Socket::peer_addr(self)
.expect("net stream must use only connections")
fn remote_addr(&self) -> io::Result<Self::Addr> {
Ok(socket2::Socket::peer_addr(self)?
.as_socket()
.expect("net stream must use only connections")
.into()
.ok_or::<io::Error>(io::ErrorKind::NotFound.into())?
.into())
}

fn local_addr(&self) -> Self::Addr {
socket2::Socket::local_addr(self)
.expect("net stream doesn't has local socket")
fn local_addr(&self) -> io::Result<Self::Addr> {
Ok(socket2::Socket::local_addr(self)?
.as_socket()
.expect("net stream doesn't has local socket")
.into()
.ok_or::<io::Error>(io::ErrorKind::NotFound.into())?
.into())
}

fn set_read_timeout(&mut self, dur: Option<Duration>) -> io::Result<()> {
Expand Down
2 changes: 1 addition & 1 deletion src/resource.rs
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ impl<S: NetSession> NetTransport<S> {
pub fn is_outbound(&self) -> bool { self.link_direction() == Direction::Outbound }
pub fn link_direction(&self) -> Direction { self.link_direction }

pub fn local_addr(&self) -> <S::Connection as NetConnection>::Addr {
pub fn local_addr(&self) -> io::Result<<S::Connection as NetConnection>::Addr> {
self.session.as_connection().local_addr()
}

Expand Down

0 comments on commit b544efa

Please sign in to comment.