Skip to content

Commit

Permalink
fix(server): use local address in AddrStream
Browse files Browse the repository at this point in the history
Expose local address of tcp connection in AddrStream for the purpose
mentioned in hyperium#2773.
  • Loading branch information
ilyatrefilov committed Apr 20, 2022
1 parent d2c945e commit dfbf35d
Showing 1 changed file with 26 additions and 7 deletions.
33 changes: 26 additions & 7 deletions src/server/tcp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ impl AddrIncoming {

loop {
match ready!(self.listener.poll_accept(cx)) {
Ok((socket, addr)) => {
Ok((socket, remote_addr)) => {
if let Some(dur) = self.tcp_keepalive_timeout {
let socket = socket2::SockRef::from(&socket);
let conf = socket2::TcpKeepalive::new().with_time(dur);
Expand All @@ -118,7 +118,11 @@ impl AddrIncoming {
if let Err(e) = socket.set_nodelay(self.tcp_nodelay) {
trace!("error trying to set TCP nodelay: {}", e);
}
return Poll::Ready(Ok(AddrStream::new(socket, addr)));
return Poll::Ready(Ok(AddrStream::new(
socket,
remote_addr,
socket.local_addr()?,
)));
}
Err(e) => {
// Connection errors can be ignored directly, continue by
Expand Down Expand Up @@ -174,9 +178,12 @@ impl Accept for AddrIncoming {
/// The timeout is useful to handle resource exhaustion errors like ENFILE
/// and EMFILE. Otherwise, could enter into tight loop.
fn is_connection_error(e: &io::Error) -> bool {
matches!(e.kind(), io::ErrorKind::ConnectionRefused
| io::ErrorKind::ConnectionAborted
| io::ErrorKind::ConnectionReset)
matches!(
e.kind(),
io::ErrorKind::ConnectionRefused
| io::ErrorKind::ConnectionAborted
| io::ErrorKind::ConnectionReset
)
}

impl fmt::Debug for AddrIncoming {
Expand Down Expand Up @@ -207,14 +214,20 @@ mod addr_stream {
#[pin]
inner: TcpStream,
pub(super) remote_addr: SocketAddr,
pub(super) local_addr: SocketAddr
}
}

impl AddrStream {
pub(super) fn new(tcp: TcpStream, addr: SocketAddr) -> AddrStream {
pub(super) fn new(
tcp: TcpStream,
remote_addr: SocketAddr,
local_addr: SocketAddr,
) -> AddrStream {
AddrStream {
inner: tcp,
remote_addr: addr,
remote_addr,
local_addr,
}
}

Expand All @@ -224,6 +237,12 @@ mod addr_stream {
self.remote_addr
}

/// Returns the local address of this connection.
#[inline]
pub fn local_addr(&self) -> SocketAddr {
self.local_addr
}

/// Consumes the AddrStream and returns the underlying IO object
#[inline]
pub fn into_inner(self) -> TcpStream {
Expand Down

0 comments on commit dfbf35d

Please sign in to comment.