Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 6 additions & 10 deletions src/fd/socket/tcp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -313,19 +313,15 @@ impl ObjectInterface for Socket {
let connection_handle = future::poll_fn(|cx| {
let mut guard = NIC.lock();
let nic = guard.as_nic_mut().unwrap();
let mut socket_handle = None;

for handle in self.handle.iter() {
let s = nic.get_mut_socket::<tcp::Socket<'_>>(*handle);

if s.is_active() {
socket_handle = Some(*handle);
break;
}
}
let socket_handle = self
.handle
.extract_if(.., |handle| {
nic.get_mut_socket::<tcp::Socket<'_>>(*handle).is_active()
})
.next();

if let Some(handle) = socket_handle {
self.handle.remove(&handle);
Poll::Ready(Ok(handle))
} else if self.is_nonblocking {
Poll::Ready(Err(Errno::Again))
Expand Down
Loading