Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-28 03:43:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix endless loops when send buffer is full

Browse Source
This commit is contained in:
Ruihan Li
2023-11-02 14:00:50 +08:00
committed by Tate, Hongliang Tian
parent c5d04c41a2
commit f6c230f756
3 changed files with 313 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
services/libs/jinux-std/src/net/socket/ip/stream/connected.rs
View File

@ -77,21 +77,43 @@ impl ConnectedStream {
pub fn sendto(&self, buf: &[u8], flags: SendRecvFlags) -> Result<usize> {
debug_assert!(flags.is_all_supported());
let mut sent_len = 0;
let buf_len = buf.len();
let poller = Poller::new();
loop {
let len = self
.bound_socket
.raw_with(|socket: &mut RawTcpSocket| socket.send_slice(&buf[sent_len..]))
.map_err(|_| Error::with_message(Errno::ENOBUFS, "cannot send packet"))?;
poll_ifaces();
sent_len += len;
if sent_len == buf_len {
let sent_len = self.try_sendto(buf, flags)?;
if sent_len > 0 {
return Ok(sent_len);
}
let events = self.bound_socket.poll(IoEvents::OUT, Some(&poller));
if events.contains(IoEvents::HUP) || events.contains(IoEvents::ERR) {
return_errno_with_message!(Errno::ENOBUFS, "fail to send packets");
}
if !events.contains(IoEvents::OUT) {
if self.is_nonblocking() {
return_errno_with_message!(Errno::EAGAIN, "try to send again");
}
// FIXME: deal with send timeout
poller.wait()?;
}
}
}
fn try_sendto(&self, buf: &[u8], flags: SendRecvFlags) -> Result<usize> {
let res = self
.bound_socket
.raw_with(|socket: &mut RawTcpSocket| socket.send_slice(buf))
.map_err(|_| Error::with_message(Errno::ENOBUFS, "cannot send packet"));
match res {
// We have to explicitly invoke `update_socket_state` when the send buffer becomes
// full. Note that smoltcp does not think it is an interface event, so calling
// `poll_ifaces` alone is not enough.
Ok(0) => self.bound_socket.update_socket_state(),
Ok(_) => poll_ifaces(),
_ => (),
};
res
}
pub fn local_endpoint(&self) -> Result<IpEndpoint> {
self.bound_socket
.local_endpoint()

11
services/libs/jinux-std/src/net/socket/ip/stream/mod.rs
View File

@ -228,10 +228,11 @@ impl Socket for StreamSocket {
if remote.is_some() {
return_errno_with_message!(Errno::EINVAL, "tcp socked should not provide remote addr");
}
let state = self.state.read();
match &*state {
State::Connected(connected_stream) => connected_stream.sendto(buf, flags),
_ => return_errno_with_message!(Errno::EINVAL, "cannot send"),
}
let connected_stream = match &*self.state.read() {
State::Connected(connected_stream) => connected_stream.clone(),
_ => return_errno_with_message!(Errno::EINVAL, "the socket is not connected"),
};
connected_stream.sendto(buf, flags)
}
}